Simplify database anchor #6397
Merged
Simplify database anchor #6397
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
michaelsproul
added
work-in-progress
michaelsproul
commented
Sep 16, 2024
| @@ -905,9 +905,6 @@ impl<T: BeaconChainTypes> GossipVerifiedBlock<T> { | |||
|
|
|||
| let block_root = get_block_header_root(block_header); | |||
|
|
|||
| // Disallow blocks that conflict with the anchor (weak subjectivity checkpoint), if any. | |||
| check_block_against_anchor_slot(block.message(), chain)?; | |||
There was a problem hiding this comment.
These checks were unnecessary because the anchor slot is always older than finalization, so any block older than the anchor is also older than finalization and will be caught by check_block_against_finalized_slot
There was a problem hiding this comment.
What if checkpoint sync to a non-finalized checkpoint though? In that case, the checkpoint slot could be ahead of finalized slot.
There was a problem hiding this comment.
In that case, we force-initialize the fork-choice as if that checkpoint was finalized.
michaelsproul
commented
Sep 16, 2024
michaelsproul
commented
Sep 16, 2024
michaelsproul
commented
Sep 16, 2024
michaelsproul
commented
Sep 16, 2024
pawanjay176
approved these changes
Sep 18, 2024
| @@ -905,9 +905,6 @@ impl<T: BeaconChainTypes> GossipVerifiedBlock<T> { | |||
|
|
|||
| let block_root = get_block_header_root(block_header); | |||
|
|
|||
| // Disallow blocks that conflict with the anchor (weak subjectivity checkpoint), if any. | |||
| check_block_against_anchor_slot(block.message(), chain)?; | |||
There was a problem hiding this comment.
What if checkpoint sync to a non-finalized checkpoint though? In that case, the checkpoint slot could be ahead of finalized slot.
michaelsproul
merged commit 1890278
into
sigp:tree-states-archive
26 of 27 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Based on a suggestion from @dapplion, simplify the database's anchor by making it non-optional.
Rippling this change through the codebase also allowed for some other simplifications including deleting the
BackFillState::NotRequiredenum variant, which was redundant. Previously there were two checks for a backfill sync having already completed: checking if the anchor wasNone(theBackFillState::NotRequiredcase) and checking if all desired blocks had been downloaded based on the anchor'soldest_block_slot(theBackFillState::Completecase). I see no need to handle these cases differently, so I've deleted theNotRequiredvariant in the process of deleting the code that handledanchor == Nonewhich is no longer a possible state.