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

check if state root is valid for old blocks

Browse Source
This commit is contained in:
Robert Habermeier 2016-06-02 20:52:21 +02:00
parent d7b79c1274
commit 6c6229c963
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ethcore/src/client/client.rs
View File

@ -373,15 +373,18 @@ impl<V> Client<V> where V: Verifier {
let block_number = self.block_number(id.clone());
// check that the block is not too old -- blocks within `HISTORY` blocks of the best will
// always be available.
if self.state_db.does_pruning() && self.best_block_number() >= block_number + HISTORY {
return None;
}
self.block_header(id).and_then(|header| {
let root = HeaderView::new(&header).state_root();
// check that the block is not too old -- blocks within `HISTORY` blocks of the best will
// always be available. If the block could be too old, check if its state root is valid.
if self.state_db.does_pruning()
&& self.best_block_number() >= block_number + HISTORY
&& self.state_db.exists(root) {
return None;
}
self.block_header(id).map(|header| {
let db = self.state_db.lock().unwrap().boxed_clone();
State::from_existing(db, HeaderView::new(&header).state_root(), self.engine.account_start_nonce())
Some(State::from_existing(db, HeaderView::new(&header).state_root(), self.engine.account_start_nonce()))
})
}