gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-07-03 04:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

deprecate disallowed-offsets config for re-orgs (#9449)

Browse Source 
https://github.com/ethereum/consensus-specs/pull/5348. As per discussions in issue we no longer need to support `disallowed-offsets` for pre-Fulu forks.


  


Co-Authored-By: hopinheimer <knmanas6@gmail.com>
This commit is contained in:
hopinheimer
2026-06-13 23:02:48 -04:00
committed by GitHub
parent 1d921b2b4e
commit 227a7c976f
15 changed files with 77 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
beacon_node/beacon_chain/src/beacon_chain.rs
View File

@@ -5207,7 +5207,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
head_block_root,
re_org_head_threshold,
re_org_parent_threshold,
&self.config.re_org_disallowed_offsets,
re_org_max_epochs_since_finalization,
)
.map_err(|e| e.map_inner_error(Error::ProposerHeadForkChoiceError))?;
@@ -5244,44 +5243,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
return Err(Box::new(DoNotReOrg::HeadDistance.into()));
}
// Only attempt a re-org if we have a proposer registered for the re-org slot.
let proposing_at_re_org_slot = {
// We know our re-org block is not on the epoch boundary, so it has the same proposer
// shuffling as the head (but not necessarily the parent which may lie in the previous
// epoch).
let shuffling_decision_root = if self
.spec
.fork_name_at_slot::<T::EthSpec>(re_org_block_slot)
.fulu_enabled()
{
info.head_node.current_epoch_shuffling_id()
} else {
info.head_node.next_epoch_shuffling_id()
}
.shuffling_decision_block;
let proposer_index = self
.beacon_proposer_cache
.lock()
.get_slot::<T::EthSpec>(shuffling_decision_root, re_org_block_slot)
.ok_or_else(|| {
debug!(
slot = %re_org_block_slot,
decision_root = ?shuffling_decision_root,
"Fork choice override proposer shuffling miss"
);
Box::new(DoNotReOrg::NotProposing.into())
})?
.index as u64;
self.execution_layer
.as_ref()
.ok_or(ProposerHeadError::Error(Error::ExecutionLayerMissing))?
.has_proposer_preparation_data_blocking(proposer_index)
};
if !proposing_at_re_org_slot {
return Err(Box::new(DoNotReOrg::NotProposing.into()));
}
// TODO(gloas): reorg weight logic needs updating for Gloas. For now use
// total weight which is correct for pre-Gloas and conservative for post-Gloas.
let head_weight = info.head_node.weight();
@@ -5325,6 +5286,64 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
return Err(Box::new(DoNotReOrg::HeadNotLate.into()));
}
// Only attempt a re-org if we have a proposer registered for the re-org slot. This check
// runs after the cheaper checks above because it may compute (and cache) the proposer
// shuffling for the re-org slot's epoch on a cache miss.
let proposing_at_re_org_slot = {
// Since Fulu, proposer shuffling is computed one epoch in advance, so the shuffling
// for the re-org block's epoch is always decided by an ancestor of the head, even
// when the re-org block lies in the epoch after the head (epoch boundary re-org).
let proposal_in_head_epoch = re_org_block_slot.epoch(T::EthSpec::slots_per_epoch())
== head_slot.epoch(T::EthSpec::slots_per_epoch());
let shuffling_decision_root = if self
.spec
.fork_name_at_slot::<T::EthSpec>(re_org_block_slot)
.fulu_enabled()
&& proposal_in_head_epoch
{
info.head_node.current_epoch_shuffling_id()
} else {
info.head_node.next_epoch_shuffling_id()
}
.shuffling_decision_block;
let proposer_index = self
.with_proposer_cache::<u64, Error>(
shuffling_decision_root,
re_org_block_slot.epoch(T::EthSpec::slots_per_epoch()),
|proposers| {
proposers
.get_slot::<T::EthSpec>(re_org_block_slot)
.map(|proposer| proposer.index as u64)
},
|| {
debug!(
slot = %re_org_block_slot,
decision_root = ?shuffling_decision_root,
"Fork choice override proposer shuffling miss"
);
let head = self.canonical_head.cached_head();
Ok((head.head_state_root(), head.snapshot.beacon_state.clone()))
},
)
.map_err(|e| match e {
Error::ProposerCacheIncorrectState { .. } => {
// The head changed while we were computing the proposer shuffling.
// Decline the re-org rather than erroring out.
warn!("Head changed during fork choice override check");
Box::new(ProposerHeadError::from(DoNotReOrg::NotProposing))
}
e => Box::new(ProposerHeadError::Error(e)),
})?;
self.execution_layer
.as_ref()
.ok_or(ProposerHeadError::Error(Error::ExecutionLayerMissing))?
.has_proposer_preparation_data_blocking(proposer_index)
};
if !proposing_at_re_org_slot {
return Err(Box::new(DoNotReOrg::NotProposing.into()));
}
// TODO(gloas): V29 nodes don't carry execution_status, so this returns
// None for post-Gloas re-orgs. Need to source the EL block hash from
// the bid's block_hash instead. Re-org is disabled for Gloas for now.