From e4867d7cb98c599132821c9110b677bdb68c1497 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Thu, 16 Jun 2016 18:30:18 +0200
Subject: [PATCH] properly rebuild state trie

---
 ethcore/src/snapshot/mod.rs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/ethcore/src/snapshot/mod.rs b/ethcore/src/snapshot/mod.rs
index 3e3043df3..37d8d1873 100644
--- a/ethcore/src/snapshot/mod.rs
+++ b/ethcore/src/snapshot/mod.rs
@@ -27,7 +27,7 @@ use error::Error;
 use ids::BlockID;
 use views::BlockView;
 
-use util::{Bytes, Hashable, HashDB, snappy, TrieDB};
+use util::{Bytes, Hashable, HashDB, snappy, TrieDB, TrieDBMut, TrieMut};
 use util::hash::{FixedHash, H256};
 use util::rlp::{DecoderError, RlpStream, Stream, UntrustedRlp, View};
 
@@ -162,10 +162,10 @@ impl<'a> StateChunker<'a> {
 	//
 	// If the buffer is greater than the desired chunk size,
 	// this will write out the data to disk.
-	fn push(&mut self, key: Bytes, value: Bytes) -> Result<(), Error> {
+	fn push(&mut self, account_hash: Bytes, data: Bytes) -> Result<(), Error> {
 		let pair = {
 			let mut stream = RlpStream::new_list(2);
-			stream.append(&key).append(&value);
+			stream.append(&account_hash).append_raw(&data, 1);
 			stream.out()
 		};
 
@@ -305,7 +305,12 @@ impl<'a> StateRebuilder<'a> {
 				acc.to_thin_rlp()
 			};
 
-			self.db.insert(&thin_rlp);
+			let mut account_trie = if self.state_root != H256::zero() {
+				try!(TrieDBMut::from_existing(self.db, &mut self.state_root))
+			} else {
+				TrieDBMut::new(self.db, &mut self.state_root)
+			};
+			account_trie.insert(&hash, &thin_rlp);
 		}
 
 		Ok(())