Skip to content

fix(engine): backport forkchoice-update fixes from v2.7.0 - #13

Closed
sebastianst wants to merge 2 commits into
seb/overlay-storage-root-nodesfrom
seb/engine-fcu-fixes
Closed

sebastianst wants to merge 2 commits into
seb/overlay-storage-root-nodesfrom
seb/engine-fcu-fixes

Conversation

@sebastianst

Copy link
Copy Markdown
Member

Backports two upstream forkchoice-update fixes, both first released in v2.7.0, onto the v2.6.0 pin. Stacked on #11.

  • reth#27247 (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.
  • reth#27429 (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-tree tests pass (216, including the new tests), and nightly clippy is clean.

🤖 Co-created with Claude Opus 5.5

mattsse and others added 2 commits October 1, 2026 11:48
…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)
@sebastianst

Copy link
Copy Markdown
Member Author

🤖 Opus 5.5 says: Superseded by Josh's pin branch joshklop/v2.6.0-review-fixes (a280002), which carries these picks content-identically plus paradigmxyz#27634, paradigmxyz#27252 and paradigmxyz#27832. #12 is rebased onto that branch.

@sebastianst
sebastianst removed this pull request from stack #14 October 12, 2026 13:07
@sebastianst
sebastianst deleted the seb/engine-fcu-fixes branch October 21, 2026 08:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants