Remove shuffling stable from fulu onwards - #11203
Open
gfukushima wants to merge 8 commits into
Open
Conversation
Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
zilm13
previously approved these changes
Aug 31, 2026
zilm13
left a comment
zilm13
left a comment
Contributor
There was a problem hiding this comment.
LGTM
both comments are nit and optional
| import tech.pegasys.teku.spec.logic.common.statetransition.exceptions.SlotProcessingException; | ||
|
|
||
| @TestSpecContext(milestone = {BELLATRIX, FULU}) | ||
| class ForkChoiceUtilProposerHeadTest { |
Contributor
There was a problem hiding this comment.
Maybe ForkChoiceUtilReorgMilestoneTest?
The key purpose of this is to handle parameterized tests (compared to ForkChoiceUtilReorgTest)
| final boolean isProposerBoostActive = isProposerBoostActive(store, headNode.blockRoot()); | ||
| final boolean isShufflingStableAndForkChoiceOk = | ||
| isForkChoiceStableAndFinalizationOk(store, slot); | ||
| final boolean isProposerHeadReorgAllowed = isProposerHeadReorgAllowed(store, slot); |
Contributor
There was a problem hiding this comment.
isProposerHeadReorgAllowed is a very general name which combines all the conditions together. What i suggest:
isFinalizationOk
isProposerStable: >fulu? true : isShuffilngStable
2 of those are different by meaning if I understand it correctly, there were not many reasons to combine them before, and even less now with fulu change.
Signed-off-by: Gabriel Fukushima <gabrielfukushima@gmail.com>
lucassaldanha
approved these changes
Sep 2, 2026
lucassaldanha
enabled auto-merge (squash)
September 2, 2026 21:41
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.
PR Description
Since the introduction of EIP 7917 (proposer lookahead) the shuffling in the proposers of the next epoch isn't possible at the last slot of the previous epoch. So from FULU onwards
isForkChoiceStableAndFinalizationOkgets simplified to the single checkisFinalizationOkFixed Issue(s)
Fixes #11150
Documentation
doc-change-requiredlabel to this PR if updates are required.Changelog
Note
Medium Risk
Changes consensus fork-choice proposer-head behavior at epoch boundaries on Fulu; FCU override path is intentionally unchanged.
Overview
Aligns late-block proposer re-org logic with EIP-7917 (Fulu):
getProposerHeadno longer requires shuffling stability at epoch boundaries once the fork uses proposer lookahead.The combined
isForkChoiceStableAndFinalizationOkhelper is replaced byisProposerStableplusisFinalizationOk. Pre-Fulu,isProposerStablestill maps tois_shuffling_stable;ForkChoiceUtilFuluoverrides it to always return true, so a late head at the last slot of an epoch can re-org to the parent when other checks pass.shouldOverrideForkChoiceUpdatestill appliesisShufflingStableand finalization separately (documented Teku-only conservatism for payload prep).Adds
ForkChoiceUtilReorgMilestoneTest(Bellatrix vs Fulu at an epoch boundary) and updates existing re-org tests and specrefs for Fuluget_proposer_head.Reviewed by Cursor Bugbot for commit ee981ca. Bugbot is set up for automated code reviews on this repo. Configure here.