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

Make DAG construction more permissive (#7460)

Browse Source 
Workaround/fix for:

- https://github.com/sigp/lighthouse/issues/7323


  - Remove the `StateSummariesNotContiguousError`. This allows us to continue with DAG construction and pruning, even in the case where the DAG is disjointed. We will treat any disjoint summaries as roots of their own tree, and prune them (as they are not descended from finalized). This should be safe, as canonical summaries should not be disjoint (if they are, then the DB is already corrupt).
This commit is contained in:
Michael Sproul
2025-05-15 12:15:35 +10:00
committed by GitHub
parent 851ee2bced
commit c2c7fb87a8
4 changed files with 31 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
beacon_node/beacon_chain/src/summaries_dag.rs
View File

@@ -43,13 +43,6 @@ pub enum Error {
state_root: Hash256,
latest_block_root: Hash256,
},
StateSummariesNotContiguous {
state_root: Hash256,
state_slot: Slot,
latest_block_root: Hash256,
parent_block_root: Box<Hash256>,
parent_block_latest_state_summary: Box<Option<(Slot, Hash256)>>,
},
MissingChildStateRoot(Hash256),
RequestedSlotAboveSummary {
starting_state_root: Hash256,
@@ -163,34 +156,17 @@ impl StateSummariesDAG {
**state_root
} else {
// Common case: not a skipped slot.
//
// If we can't find a state summmary for the parent block and previous slot,
// then there is some amount of disjointedness in the DAG. We set the parent
// state root to 0x0 in this case, and will prune any dangling states.
let parent_block_root = summary.block_parent_root;
if let Some(parent_block_summaries) =
state_summaries_by_block_root.get(&parent_block_root)
{
*parent_block_summaries
.get(&previous_slot)
// Should never error: summaries are contiguous, so if there's an
// entry it must contain at least one summary at the previous slot.
.ok_or(Error::StateSummariesNotContiguous {
state_root: *state_root,
state_slot: summary.slot,
latest_block_root: summary.latest_block_root,
parent_block_root: parent_block_root.into(),
parent_block_latest_state_summary: parent_block_summaries
.iter()
.max_by(|a, b| a.0.cmp(b.0))
.map(|(slot, (state_root, _))| (*slot, **state_root))
.into(),
})?
.0
} else {
// We don't know of any summary with this parent block root. We'll
// consider this summary to be a root of `state_summaries_v22`
// collection and mark it as zero.
// The test store_tests::finalizes_non_epoch_start_slot manages to send two
// disjoint trees on its second migration.
Hash256::ZERO
}
state_summaries_by_block_root
.get(&parent_block_root)
.and_then(|parent_block_summaries| {
parent_block_summaries.get(&previous_slot)
})
.map_or(Hash256::ZERO, |(parent_state_root, _)| **parent_state_root)
}
};