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

Clarify what first_block None means (#11269)

Browse Source
This commit is contained in:
David 2019-11-20 04:26:47 +01:00 committed by Marek Kotewicz
parent e0091c672a
commit ee01612768
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ethcore/blockchain/src/blockchain.rs
View File

@ -223,8 +223,9 @@ pub struct BlockChain {
// Stores best block of the first uninterrupted sequence of blocks. `None` if there are no gaps. // Stores best block of the first uninterrupted sequence of blocks. `None` if there are no gaps.
// Only updated with `insert_unordered_block`. // Only updated with `insert_unordered_block`.
best_ancient_block: RwLock<Option<BestAncientBlock>>, best_ancient_block: RwLock<Option<BestAncientBlock>>,
// Stores the last block of the last sequence of blocks. `None` if there are no gaps. // Stores the hash of the first block of the last sequence of blocks. `None` means that there
// This is calculated on start and does not get updated. // are no gaps in the chain; `Some(hash)` means that the database was warp-synced.
// This is calculated on start and is not updated.
first_block: Option<H256>, first_block: Option<H256>,
// block cache // block cache
@ -640,12 +641,12 @@ impl BlockChain {
best_ancient_number = best_ancient.as_ref().and_then(|h| bc.block_number(h)); best_ancient_number = best_ancient.as_ref().and_then(|h| bc.block_number(h));
} }
// binary search for the first block. // binary search for the first block (unless they warp synced their db we'll search back to genesis).
match raw_first { match raw_first {
None => { None => {
let (mut f, mut hash) = (best_block_number, best_block_hash); let (mut f, mut hash) = (best_block_number, best_block_hash);
let mut l = best_ancient_number.unwrap_or(0); let mut l = best_ancient_number.unwrap_or(0);
trace!(target: "blockchain", "Looking for first block. Starting binary search between f={} and l={}", f, l);
loop { loop {
if l >= f { break; } if l >= f { break; }
@ -659,7 +660,7 @@ impl BlockChain {
} }
if hash != bc.genesis_hash() { if hash != bc.genesis_hash() {
trace!("First block calculated: {:?}", hash); trace!(target:"blockchain", "First block calculated: #{}/{:?}; writing to disk", f, hash);
let mut batch = db.key_value().transaction(); let mut batch = db.key_value().transaction();
batch.put(db::COL_EXTRA, b"first", hash.as_bytes()); batch.put(db::COL_EXTRA, b"first", hash.as_bytes());
db.key_value().write(batch).expect("Low level database error when writing 'first' block. Some issue with disk?"); db.key_value().write(batch).expect("Low level database error when writing 'first' block. Some issue with disk?");
@ -1598,7 +1599,7 @@ impl BlockChain {
let first_block_number = self.first_block_number().into(); let first_block_number = self.first_block_number().into();
let genesis_hash = self.genesis_hash(); let genesis_hash = self.genesis_hash();
// ensure data consistencly by locking everything first // ensure data consistency by locking everything first
let best_block = self.best_block.read(); let best_block = self.best_block.read();
let best_ancient_block = self.best_ancient_block.read(); let best_ancient_block = self.best_ancient_block.read();
BlockChainInfo { BlockChainInfo {