From e7676827522ada58ed2578454b09f8cad424a19c Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Thu, 4 May 2017 17:01:56 +0200 Subject: [PATCH] reorg into blocks before minimum history --- ethcore/src/client/client.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index b80d6831796..d48147f50c0 100644 --- a/ethcore/src/client/client.rs +++ b/ethcore/src/client/client.rs @@ -377,7 +377,7 @@ impl Client { let chain = self.chain.read(); // Check the block isn't so old we won't be able to enact it. let best_block_number = chain.best_block_number(); - if best_block_number >= self.history && header.number() <= best_block_number - self.history { + if self.pruning_info().earliest_state > header.number() { warn!(target: "client", "Block import failed for #{} ({})\nBlock is ancient (current best block: #{}).", header.number(), header.hash(), best_block_number); return Err(()); } @@ -770,7 +770,7 @@ impl Client { let db = self.state_db.lock().boxed_clone(); // early exit for pruned blocks - if db.is_pruned() && self.chain.read().best_block_number() >= block_number + self.history { + if db.is_pruned() && self.pruning_info().earliest_state > block_number { return None; } @@ -871,7 +871,7 @@ impl Client { let best_block_number = self.chain_info().best_block_number; let block_number = self.block_number(at).ok_or(snapshot::Error::InvalidStartingBlock(at))?; - if best_block_number > self.history + block_number && db.is_pruned() { + if db.is_pruned() && self.pruning_info().earliest_state > block_number { return Err(snapshot::Error::OldBlockPrunedDB.into()); }