Repository navigation
fix(engine): backport forkchoice-update fixes from v2.7.0 - #13
Closed
sebastianst wants to merge 2 commits into
Closed
sebastianst wants to merge 2 commits into
sebastianst wants to merge 2 commits into
Conversation
…igmxyz#27247) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> (cherry picked from commit a120f00)
…igmxyz#27429) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> (cherry picked from commit 444e867)
This was referenced Oct 1, 2026
Member
Author
|
🤖 Opus 5.5 says: Superseded by Josh's pin branch |
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
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.
Backports two upstream forkchoice-update fixes, both first released in v2.7.0, onto the v2.6.0 pin. Stacked on #11.
a120f00d47): validate the forkchoice state (safe and finalized hashes) before applying the head update. Before this, a forkchoice update applied the reorg first and checked safe and finalized afterwards. The canonical-ancestor path never checked them at all.444e867155): don't treat a stale persisted head as canonical. Before this, a forkchoice update to a head that had been reorged out after persistence returned VALID without making it canonical. On OP the same update can also start a payload job on that head.op-reth's engine API delegates forkchoice updates to the upstream engine tree, so both are reachable from op-node and kona-node. Both picks apply cleanly.
reth-engine-treetests pass (216, including the new tests), and nightly clippy is clean.🤖 Co-created with Claude Opus 5.5