Merge branch 'broken' into state

Cargo.toml

@@ -11,6 +11,7 @@ log = "0.3"
 env_logger = "0.3"
 ethcore-util = "0.1.0"
 evmjit = { path = "rust-evmjit", optional = true }
+rustc-serialize = "0.3"
 
 [features]
 jit = ["evmjit"]

src/account.rs

@@ -96,7 +96,7 @@ impl Account {
 			_ => {}
 		}
 		// fetch - cannot be done in match because of the borrow rules.
-		let t = TrieDBMut::new_existing(db, &mut self.storage_root);
+		let t = TrieDB::new(db, &self.storage_root);
 		let r = H256::from_slice(t.get(key.bytes()).unwrap_or(&[0u8;32][..]));
 		self.storage_overlay.insert(key, r.clone());
 		r
@@ -286,6 +286,8 @@ fn rlpio() {
 
 #[test]
 fn new_account() {
+	use rustc_serialize::hex::ToHex;
+
 	let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
 	assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
 	assert_eq!(a.balance(), &U256::from(69u8));
@@ -296,6 +298,8 @@ fn new_account() {
 
 #[test]
 fn create_account() {
+	use rustc_serialize::hex::ToHex;
+
 	let a = Account::new(U256::from(69u8), U256::from(0u8), HashMap::new(), Bytes::new());
 	assert_eq!(a.rlp().to_hex(), "f8448045a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a0c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
 }

src/blockheader.rs

@@ -56,26 +56,30 @@ impl Header {
 
 impl Decodable for Header {
 	fn decode<D>(decoder: &D) -> Result<Self, DecoderError> where D: Decoder {
-		decoder.read_list(| d | {
+		let d = try!(decoder.as_list());
-			let blockheader = Header {
+
-				parent_hash: try!(Decodable::decode(&d[0])),
+		let mut blockheader = Header {
-				uncles_hash: try!(Decodable::decode(&d[1])),
+			parent_hash: try!(Decodable::decode(&d[0])),
-				author: try!(Decodable::decode(&d[2])),
+			uncles_hash: try!(Decodable::decode(&d[1])),
-				state_root: try!(Decodable::decode(&d[3])),
+			author: try!(Decodable::decode(&d[2])),
-				transactions_root: try!(Decodable::decode(&d[4])),
+			state_root: try!(Decodable::decode(&d[3])),
-				receipts_root: try!(Decodable::decode(&d[5])),
+			transactions_root: try!(Decodable::decode(&d[4])),
-				log_bloom: try!(Decodable::decode(&d[6])),
+			receipts_root: try!(Decodable::decode(&d[5])),
-				difficulty: try!(Decodable::decode(&d[7])),
+			log_bloom: try!(Decodable::decode(&d[6])),
-				number: try!(Decodable::decode(&d[8])),
+			difficulty: try!(Decodable::decode(&d[7])),
-				gas_limit: try!(Decodable::decode(&d[9])),
+			number: try!(Decodable::decode(&d[8])),
-				gas_used: try!(Decodable::decode(&d[10])),
+			gas_limit: try!(Decodable::decode(&d[9])),
-				timestamp: try!(Decodable::decode(&d[11])),
+			gas_used: try!(Decodable::decode(&d[10])),
-				extra_data: try!(Decodable::decode(&d[12])),
+			timestamp: try!(Decodable::decode(&d[11])),
-				seal: vec![],
+			extra_data: try!(Decodable::decode(&d[12])),
-			};
+			seal: vec![],
-			// TODO: fill blockheader.seal with (raw) list items index 12..)
+		};
-			Ok(blockheader)
+
-		})
+		for i in 13..d.len() {
+			blockheader.seal.push(try!(Decodable::decode(&d[i])));
+		}
+
+		Ok(blockheader)
 	}
 }
 
@@ -95,7 +99,10 @@ impl Encodable for Header {
 			self.gas_used.encode(e);
 			self.timestamp.encode(e);
 			self.extra_data.encode(e);
-			// TODO: emit raw seal items.
+		
+			for b in self.seal.iter() {
+				b.encode(e);
+			}
 		})
 	}
 }

src/lib.rs

@@ -72,6 +72,7 @@
 #[macro_use]
 extern crate log;
 extern crate env_logger;
+extern crate rustc_serialize;
 #[cfg(feature = "jit" )]
 extern crate evmjit;
 extern crate ethcore_util as util;

src/state.rs

@@ -61,7 +61,7 @@ impl State {
 	pub fn new_existing(mut db: OverlayDB, mut root: H256, account_start_nonce: U256) -> State {
 		{
 			// trie should panic! if root does not exist
-			let _ = TrieDBMut::new_existing(&mut db, &mut root);
+			let _ = TrieDB::new(&mut db, &mut root);
 		}
 
 		State {
@@ -164,8 +164,7 @@ impl State {
 	fn get(&mut self, a: &Address, require_code: bool) -> Option<&Account> {
 		if self.cache.get(a).is_none() {
 			// load from trie.
-			let t = TrieDBMut::new_existing(&mut self.db, &mut self.root);
+			self.cache.insert(a.clone(), TrieDB::new(&self.db, &self.root).get(&a).map(|rlp| Account::from_rlp(rlp)));
-			self.cache.insert(a.clone(), t.get(&a).map(|rlp| { println!("RLP: {:?}", rlp); Account::from_rlp(rlp) }));
 		}
 
 		let db = &self.db;
@@ -182,7 +181,7 @@ impl State {
 	fn require(&mut self, a: &Address, require_code: bool) -> &mut Account {
 		if self.cache.get(a).is_none() {
 			// load from trie.
-			self.cache.insert(a.clone(), TrieDBMut::new(&mut self.db, &mut self.root).get(&a).map(|rlp| Account::from_rlp(rlp)));
+			self.cache.insert(a.clone(), TrieDB::new(&self.db, &self.root).get(&a).map(|rlp| Account::from_rlp(rlp)));
 		}
 
 		if self.cache.get(a).unwrap().is_none() {

src/transaction.rs

@@ -37,17 +37,18 @@ impl Encodable for Transaction {
 
 impl Decodable for Transaction {
 	fn decode<D>(decoder: &D) -> Result<Self, DecoderError>  where D: Decoder {
-		decoder.read_list(| d | {
+		let d = try!(decoder.as_list());
-			let transaction = Transaction {
+
-				nonce: try!(Decodable::decode(&d[0])),
+		let transaction = Transaction {
-				gas_price: try!(Decodable::decode(&d[1])),
+			nonce: try!(Decodable::decode(&d[0])),
-				gas: try!(Decodable::decode(&d[2])),
+			gas_price: try!(Decodable::decode(&d[1])),
-				receive_address: try!(Decodable::decode(&d[3])),
+			gas: try!(Decodable::decode(&d[2])),
-				value: try!(Decodable::decode(&d[4])),
+			receive_address: try!(Decodable::decode(&d[3])),
-				data: try!(Decodable::decode(&d[5])),
+			value: try!(Decodable::decode(&d[4])),
-			};
+			data: try!(Decodable::decode(&d[5])),
-			Ok(transaction)
+		};
-		})
+
+		Ok(transaction)
 	}
 }