jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: misc tree notes,docs (#5184)

Browse Source
This commit is contained in:
Matthias Seitz
2023-10-27 10:42:50 +02:00
committed by GitHub
parent 998453c50f
commit e79743fe5f
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/blockchain-tree/src/blockchain_tree.rs
View File

@ -298,7 +298,7 @@ impl<DB: Database, EF: ExecutorFactory> BlockchainTree<DB, EF> {
let parent = block.parent_num_hash();
// check if block parent can be found in Tree
// check if block parent can be found in any side chain.
if let Some(chain_id) = self.block_indices().get_blocks_chain_id(&parent.hash) {
// found parent in side tree, try to insert there
return self.try_insert_block_into_side_chain(block, chain_id, block_validation_kind)
@ -917,6 +917,7 @@ impl<DB: Database, EF: ExecutorFactory> BlockchainTree<DB, EF> {
// If block is already canonical don't return error.
if let Some(header) = self.find_canonical_header(block_hash)? {
info!(target: "blockchain_tree", ?block_hash, "Block is already canonical, ignoring.");
// TODO: this could be fetched from the chainspec first
let td = self.externals.database().provider()?.header_td(block_hash)?.ok_or(
CanonicalError::from(BlockValidationError::MissingTotalDifficulty {
hash: *block_hash,

4
crates/consensus/beacon/src/engine/mod.rs
View File

@ -632,8 +632,9 @@ where
return Ok(OnForkChoiceUpdated::invalid_state())
}
// check if the new head hash is connected to any ancestor that we previously marked as
// invalid
let lowest_buffered_ancestor_fcu = self.lowest_buffered_ancestor_or(state.head_block_hash);
if let Some(status) = self.check_invalid_ancestor(lowest_buffered_ancestor_fcu) {
return Ok(OnForkChoiceUpdated::with_invalid(status))
}
@ -659,6 +660,7 @@ where
let start = Instant::now();
let make_canonical_result = self.blockchain.make_canonical(&state.head_block_hash);
let elapsed = self.record_make_canonical_latency(start, &make_canonical_result);
let status = match make_canonical_result {
Ok(outcome) => {
match outcome {