grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

store account code if it exists

Browse Source
This commit is contained in:
Robert Habermeier 2016-06-13 21:05:06 +02:00
parent 5cc6a681c9
commit 835b158069
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ethcore/src/snapshot/mod.rs
View File

@ -33,8 +33,7 @@ use views::BlockView;
use util::{Bytes, Hashable, HashDB, TrieDB}; use util::{Bytes, Hashable, HashDB, TrieDB};
use util::hash::{FixedHash, H256}; use util::hash::{FixedHash, H256};
use util::numbers::U256; use util::numbers::U256;
use util::rlp::{DecoderError, Stream, Rlp, RlpStream, UntrustedRlp, View}; use util::rlp::{DecoderError, Rlp, RlpStream, Stream, SHA3_NULL_RLP, UntrustedRlp, View};
/// Used to build block chunks. /// Used to build block chunks.
struct BlockChunker<'a> { struct BlockChunker<'a> {
client: &'a BlockChainClient, client: &'a BlockChainClient,
@ -269,9 +268,17 @@ impl AccountReader {
let mut account_stream = RlpStream::new_list(5); let mut account_stream = RlpStream::new_list(5);
account_stream.append(&self.nonce) account_stream.append(&self.nonce)
.append(&self.balance) .append(&self.balance)
.append(&self.storage_root) .append(&self.storage_root);
.append(&self.code_hash)
.append(&pairs_rlp); account_stream.begin_list(2);
if self.code_hash == SHA3_NULL_RLP {
account_stream.append(&true).append(&hash_db.get(&self.code_hash).unwrap());
} else {
let empty: &[u8] = &[];
account_stream.append(&false).append(&empty);
}
account_stream.append(&pairs_rlp);
Ok(account_stream.out()) Ok(account_stream.out())
} }