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

feat: support make canonical on demand (#9867)

Browse Source
This commit is contained in:
Matthias Seitz
2024-07-29 15:43:52 +02:00
committed by GitHub
parent d6f633b695
commit 8eba1286d8
1 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
crates/engine/tree/src/tree/mod.rs
View File

@ -185,6 +185,9 @@ impl TreeState {
/// Returns the new chain for the given head.
///
/// This also handles reorgs.
///
/// Note: This does not update the tracked state and instead returns the new chain based on the
/// given head.
fn on_new_head(&self, new_head: B256) -> Option<NewCanonicalChain> {
let mut new_chain = Vec::new();
let mut current_hash = new_head;
@ -630,8 +633,10 @@ where
/// Attempts to make the given target canonical.
///
/// This will update the tracked canonical in memory state and do the necessary housekeeping.
const fn make_canonical(&self, target: B256) {
// TODO: implement state updates and shift canonical state
fn make_canonical(&mut self, target: B256) {
if let Some(chain_update) = self.state.tree_state.on_new_head(target) {
self.on_canonical_chain_update(chain_update);
}
}
/// Convenience function to handle an optional tree event.
@ -1018,6 +1023,25 @@ where
None
}
/// Invoked when we the canonical chain has been updated.
///
/// This is invoked on a valid forkchoice update, or if we can make the target block canonical.
fn on_canonical_chain_update(&mut self, chain_update: NewCanonicalChain) {
trace!(target: "engine", new_blocks = %chain_update.new_block_count(), reorged_blocks = %chain_update.reorged_block_count() ,"applying new chain update");
// update the tracked canonical head
self.state.tree_state.set_canonical_head(chain_update.tip().num_hash());
let tip = chain_update.tip().header.clone();
let notification = chain_update.to_chain_notification();
// update the tracked in-memory state with the new chain
self.canonical_in_memory_state.update_chain(chain_update);
self.canonical_in_memory_state.set_canonical_head(tip);
// sends an event to all active listeners about the new canonical chain
self.canonical_in_memory_state.notify_canon_state(notification);
}
/// This handles downloaded blocks that are shown to be disconnected from the canonical chain.
///
/// This mainly compares the missing parent of the downloaded block with the current canonical
@ -1502,19 +1526,8 @@ where
// 2. ensure we can apply a new chain update for the head block
if let Some(chain_update) = self.state.tree_state.on_new_head(state.head_block_hash) {
trace!(target: "engine", new_blocks = %chain_update.new_block_count(), reorged_blocks = %chain_update.reorged_block_count() ,"applying new chain update");
// update the tracked canonical head
self.state.tree_state.set_canonical_head(chain_update.tip().num_hash());
let tip = chain_update.tip().header.clone();
let notification = chain_update.to_chain_notification();
// update the tracked in-memory state with the new chain
self.canonical_in_memory_state.update_chain(chain_update);
self.canonical_in_memory_state.set_canonical_head(tip.clone());
// sends an event to all active listeners about the new canonical chain
self.canonical_in_memory_state.notify_canon_state(notification);
self.on_canonical_chain_update(chain_update);
// update the safe and finalized blocks and ensure their values are valid, but only
// after the head block is made canonical