Add mixed V17/V29 execution payload invalidation test#9089
Merged
mergify[bot] merged 2 commits intosigp:unstablefrom Apr 16, 2026
Merged
Add mixed V17/V29 execution payload invalidation test#9089mergify[bot] merged 2 commits intosigp:unstablefrom
mergify[bot] merged 2 commits intosigp:unstablefrom
Conversation
dapplion
force-pushed
the
dapplion/fc-mixed-invalidation-test
branch
from
ae4049b to
41d8b9f
Compare
jimmygchen
requested changes
Apr 9, 2026
| Err(_) => (), | ||
| // V29 nodes don't have execution_status. Zero their weight | ||
| // so invalidation propagates across the V17→V29 boundary. | ||
| Err(_) => *node.weight_mut() = 0, |
Member
There was a problem hiding this comment.
Is this necessary? filter_block_tree would block the branch at the invalid v17 parent right?
would this become non-zero when apply_score_changes gets called again?
| /// genesis(V17) -> block_1(V17, slot 31) -> block_2(V29, slot 32) | ||
| /// | ||
| /// Invalidate block_1, verify that both block_1 and its V29 descendant block_2 are zeroed. | ||
| fn get_gloas_mixed_invalidation_test_definition() -> ForkChoiceTestDefinition { |
Member
There was a problem hiding this comment.
This could be moved under the tests mod?
jimmygchen
added
waiting-on-author
…ests filter_block_tree already excludes the invalid branch from head selection, and the weight zeroing was not durable across apply_score_changes calls. Keep the test focused on verifying head falls back to genesis.
jimmygchen
changed the title
jimmygchen
added
ready-for-merge
Merge Queue Status
This pull request spent 31 minutes 9 seconds in the queue, including 29 minutes 15 seconds running CI. Required conditions to merge
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Follow-up from #9025. When a V17 block is invalidated, its V29 descendants were added to the invalidated set but their weight was never zeroed because apply_score_changes only checks execution_status on V17 nodes. Fixes by zeroing V29 node weight directly during invalidation propagation, and adds a test for the mixed V17/V29 case.