github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-28 08:37:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: ignore forkchoice updates to old head (#2952)

Browse Source 
Co-authored-by: Georgios Konstantopoulos <me@gakonst.com>
This commit is contained in:
Dan Cline
2023-06-05 18:24:29 -04:00
committed by GitHub
parent 3bd26b0441
commit df90caeb34
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -490,9 +490,6 @@ where
// node's fully synced, clear pending requests
self.sync.clear_full_block_requests();
// new VALID update that moved the canonical chain forward
let _ = self.update_canon_chain(&state);
let tip_number = self.blockchain.canonical_tip().number;
if self.sync.has_reached_max_block(tip_number) {
return true
@@ -534,14 +531,24 @@ where
let status = match self.blockchain.make_canonical(&state.head_block_hash) {
Ok(outcome) => {
let header = outcome.into_header();
debug!(target: "consensus::engine", hash=?state.head_block_hash, number=header.number, "canonicalized new head");
if !outcome.is_already_canonical() {
debug!(target: "consensus::engine", hash=?state.head_block_hash, number=outcome.header().number, "canonicalized new head");
// new VALID update that moved the canonical chain forward
let _ = self.update_canon_chain(&state);
} else {
debug!(target: "consensus::engine", fcu_head_num=?outcome.header().number, current_head_num=?self.blockchain.canonical_tip().number, "Ignoring beacon update to old head");
}
if let Some(attrs) = attrs {
// the CL requested to build a new payload on top of this new VALID head
let payload_response =
self.process_payload_attributes(attrs, header.unseal(), state);
trace!(target: "consensus::engine", status = ?payload_response, ?state, "Returning forkchoice status ");
let payload_response = self.process_payload_attributes(
attrs,
outcome.into_header().unseal(),
state,
);
trace!(target: "consensus::engine", status = ?payload_response, ?state, "Returning forkchoice status");
return Ok(payload_response)
}

5
crates/interfaces/src/blockchain_tree/mod.rs
View File

@@ -108,6 +108,11 @@ impl CanonicalOutcome {
CanonicalOutcome::Committed { head } => head,
}
}
/// Returns true if the block was already canonical.
pub fn is_already_canonical(&self) -> bool {
matches!(self, CanonicalOutcome::AlreadyCanonical { .. })
}
}
/// From Engine API spec, block inclusion can be valid, accepted or invalid.