Skip to content

kona-engine: prevent delegated finalized-head regression - #23899

Merged
einar-oplabs merged 7 commits into
einar/23676-delegated-forkchoicefrom
einar/23677-delegated-finality
Nov 12, 2026
Merged

einar-oplabs merged 7 commits into
einar/23676-delegated-forkchoicefrom
einar/23677-delegated-finality

Conversation

@einar-oplabs

@einar-oplabs einar-oplabs commented Nov 3, 2026 •

Copy link
Copy Markdown
Contributor

Why

A stale delegate could move kona's finalized head backward, and a delegate on another fork could name a finalized block that is not canonical in the EL, which stopped kona or reset it on every poll.

What

Breakdown

Added Removed Net
Implementation 241 51 190
Tests 663 53 610
Docs 0 0 0

Closes

  1. kona-node: prevent delegated finalized-head regression #23677

Part of ethereum-optimism/protocol-team#545; follows up on #23679. Stack, in merge order: #23900 → #23899 → #23908 → #23947 → #24004 → #24005 → #24006 → #24007 → #24065.

AI Reviews

  • 2026-11-07T00:26:09Z 0e0cdf7 GPT-6.1-Sol xhigh
  • 2026-11-07T00:31:43Z 0e0cdf7 Fable 5.1 xhigh

BREAKING CHANGE: EngineTaskErrorSeverity::Skip and FinalizeTaskError::{BehindFinalizedHead, BlockNumberMismatch, ConflictsWithFinalizedHead, NotCanonical} are new; exhaustive matches must handle them. A wrong-height block is no longer BlockNotFound. DelegateDerivationActor::new takes the engine's state receiver.

🤖 Generated with Claude Code

@einar-oplabs

einar-oplabs commented Nov 6, 2026 •

Copy link
Copy Markdown
Contributor Author

GPT-6.1-Sol (xhigh): Reviewed bb36509bc5f5f9c3b2ec565c56ee221c5529a265; no actionable findings.

Checked stale targets, same-height conflicts for both identifier kinds, identical and advancing targets, genesis initialization, and rejection of responses at an unrequested height.

  • All 369 library tests across kona-engine and kona-node-service passed locally.
  • All 122 PR checks were green at review time.

The initial review covered this PR independently; combined validation is recorded below.

Combined validation update (2026-11-06): locally merged the current heads of #23899 (bb36509bc5), #23900 (b628609e6f), #23908 (0c2fa31049), and #23947 (64d55f160c) into test commit 215a22332b. All four PR branches are unchanged.

The merge preserves both sets of finalization guards and their regression tests. Test fixtures account for the acknowledged forkchoice status and the new identity-mismatch error.

  • 401 Rust library tests passed across kona-engine and kona-node-service.
  • op-devstack/sysgo tests and formatting checks passed.
  • Clippy passed with --all-targets --all-features -- -D warnings; it emitted the existing workspace warning about the removed clippy::from_iter_instead_of_collect lint.
  • All three follow_l2 acceptance scenarios passed under both op-node + op-reth and kona-node + op-reth, using freshly built Rust binaries from the combined checkout: safe/finalized/current-L1 convergence, reorg recovery, and operation without CL P2P.

Nextest flagged an open output handle in one passing, unchanged attribute-format test; its isolated rerun passed without the flag. The first acceptance attempts stopped at setup because the new checkout lacked the Cannon helper fixture; the complete runs above passed after restoring that fixture.

@einar-oplabs
einar-oplabs force-pushed the einar/23677-delegated-finality branch from bb36509 to 0e0cdf7 Compare November 6, 2026 23:27
@einar-oplabs
einar-oplabs changed the base branch from develop to einar/23676-delegated-forkchoice November 6, 2026 23:29
@einar-oplabs
einar-oplabs marked this pull request as ready for review November 7, 2026 00:10
@einar-oplabs
einar-oplabs requested a review from a team as a code owner November 7, 2026 00:10

@einar-oplabs einar-oplabs left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

GPT-6.1-Sol (xhigh): Reviewed 0e0cdf7c305abd6f5c2dc0b5e38f30351d979906 against 7a290fc5579c87f7f9f13fe2a45adac92baf34cc. No actionable findings.

Checked monotonic finalization, same-height hash conflicts, canonical-by-number lookup while preserving the caller's pinned hash, default/genesis handling, skipped-task removal and actor recovery, and rejection of subsequent regressing delegate statuses. Also checked the catch-up behavior supplied by the next PR in this stack, #23908.

Validation: all 435 tests in kona-engine and kona-node-service passed at stack tip 454481f562f45c8c93022a6ed6090a226d12ce3c. This is validation of the combined stack; full acceptance devnets were not rerun during this review.

@einar-oplabs einar-oplabs left a comment

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fable 5.1 (xhigh): Reviewed 0e0cdf7c30. One gap in the new delegate guard (no baseline on the first poll, so a delegate that starts behind kona can still move the safe label under the finalized one), the land-together caveat shared with #23900, a design question on the by-number conflict case, and nits.

einar-oplabs added a commit that referenced this pull request Nov 7, 2026
A delegated safe head below the unsafe head was treated like an
intermediate span-batch block: it moved the consensus labels without a
forkchoice update. An update that left the labels unchanged was also
skipped, but a SYNCING answer moves the labels, so an identical retry
never reached the execution layer. And while the execution layer was
still syncing and lacked the delegated safe block, consolidation reset
the engine, which restarted the sync (the delegated case of #23931).

Only derived attributes inside a span batch now defer the update. The
delegated consolidation paths and the reset always send their
forkchoice, so each delegate poll is the retry after a SYNCING answer
or an execution-layer restart. A delegated safe head whose block the
syncing execution layer does not have yet moves only the safe labels,
as in op-node's follow-source mode, instead of resetting; the missing
block is logged at warn. One helper applies a delegated safe head with
or without the unsafe head.

The finalize that follows such a poll still fails on the same syncing
execution layer until #23908 skips it, so this lands together with
#23899 and #23908.

`test_utils::l1_info_deposit` replaces three inline copies of the
L1-info deposit, and the delegated consolidation table asserts what
reaches the block sink.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
@einar-oplabs
einar-oplabs force-pushed the einar/23676-delegated-forkchoice branch from bf83ae6 to c1c8522 Compare November 7, 2026 04:37
@einar-oplabs
einar-oplabs force-pushed the einar/23677-delegated-finality branch from 1cdca29 to cb2fc8d Compare November 7, 2026 04:37
A lagging delegate could move finality backward, and a delegate on
another fork could name a finalized block that is not the execution
layer's canonical block. The first is irreversible. The second either
stopped the node or failed every forkchoice update and reset the
engine on each poll.

The finalize task now looks the target up by number and finalizes a
pinned hash only when it is the canonical block at that height. A
target behind the finalized head, a different block at the finalized
height, or a pinned hash that is not canonical fails with an error of
the new `Skip` severity: the engine drops the task, counts it as a
failure, and the engine actor warns once per distinct error until a
reset. A target equal to the finalized head needs no lookup or
forkchoice update, and each finality guard runs once per kind of
target. A block served at another height is a distinct
`BlockNumberMismatch`.

The delegate actor also rejects a whole sync status whose finalized
L2 block is behind, or conflicts with, the engine's, so a lagging or
diverged delegate's safe head does not reach the engine either. The
baseline is the finalized head the engine applied, read from the state
it publishes, not the last target forwarded to it: a target the engine
skipped must not make the canonical block at its height look like a
conflict, which would stop the delegate's safe head too.

BREAKING CHANGE: `EngineTaskErrorSeverity` has a new `Skip` variant,
and `FinalizeTaskError` has new variants `BehindFinalizedHead`,
`BlockNumberMismatch`, `ConflictsWithFinalizedHead` and
`NotCanonical`; exhaustive matches must handle them. A block served at
another height is now `BlockNumberMismatch` instead of `BlockNotFound`.
`DerivationActorRequest::ProcessEngineSyncCompletionRequest` carries an
`EngineSyncState`, and `EngineDerivationClient::notify_sync_completed`
takes one. `DelegateDerivationActor::new` takes the engine's state
receiver.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>

@joshklop joshklop left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Non-blocking follow-ups from a deeper pass; my approval stands. All 426 kona-engine and kona-node-service tests pass at a4754b0.

einar-oplabs and others added 4 commits November 12, 2026 14:38
`ensure_not_behind_finalized_head` and
`ensure_no_conflict_with_finalized_head` each had one caller, so their
checks move inline. A new test pins a target above the safe head: it
fails with `BlockNotSafe` before any lookup.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
`ProcessEngineSyncCompletionRequest` and `notify_sync_completed` carry
the local-safe head again instead of the whole `EngineSyncState`. Both
consumers only read the local-safe head; the delegate actor takes its
finalized baseline from the engine's published state.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…its safe

Such a snapshot is inconsistent: the engine would refuse to finalize
it. op-node's follow mode rejects it the same way. A test also pins
that any finalized block, genesis included, is accepted before the
engine establishes finality, and the doc on the finality check now
states that it only catches a fork at the engine's finalized height.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
The test sends stale finalizations through the actor: it keeps
running, an identical repeat keeps the same skip in memory, and a
reset forgets it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.

kona-node: prevent delegated finalized-head regression

2 participants