Skip to content

reth v2.6.0 fork pin for op-reth - #15

Closed
joshklop wants to merge 10 commits into
upstream-v2.6.0from
joshklop/v2.6.0-pin
Closed

joshklop wants to merge 10 commits into
upstream-v2.6.0from
joshklop/v2.6.0-pin

Conversation

@joshklop

@joshklop joshklop commented Oct 12, 2026 •

Copy link
Copy Markdown

This is the reth fork pin for ethereum-optimism/optimism#23046 (reth v2.6.0), at 8d359d0. The PR's base, upstream-v2.6.0, is upstream tag v2.6.0 (73a3a00), so the diff is exactly what the fork adds on top of upstream.

Commits, oldest first:

Changes from the previous pin (a280002):

git range-diff v2.6.0..a2800024d4 v2.6.0..2f40498a3b shows only those differences. All other picks are content-identical to the previous pin.

Checked locally:

  • cargo check --workspace --exclude reth --locked passes. The reth binary needs LLVM for its jit feature, which wasn't installed here.
  • cargo check passes for chain-state, provider and storage-overlay with all targets and features.
  • cargo deny check all passes.

Update (8d359d0): rebuilt from 2f40498 with paradigmxyz#27782 picked before paradigmxyz#27832. git diff 2f40498a3b 8d359d0142 is exactly that commit's 12 lines; cargo test -p reth-trie -p reth-trie-db passes.

This replaces #12; its CI change is folded into the last commit.

🤖 Generated with Claude Code

mediocregopher and others added 6 commits October 12, 2026 13:42
Pin that `OverlayStateProvider::storage_root` reads trie nodes through
the overlay when partial persistence leaves database storage-trie nodes
older than the persisted hashed storage. OP Stack consensus depends on
this: the Isthmus withdrawals root is the L2ToL1MessagePasser storage
root, computed through `storage_root` when building and validating
blocks.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…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)
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
(cherry picked from commit 078d026)
…dAccounts (paradigmxyz#27252)

Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Brian Picciano <me@mediocregopher.com>
(cherry picked from commit 695b4f1)
mediocregopher and others added 4 commits October 13, 2026 10:33
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Co-authored-by: Brian Picciano <me@mediocregopher.com>
(cherry picked from commit 5e309af)
)

Co-authored-by: Sergei Shulepov <2205845+pepyakin@users.noreply.github.com>
(cherry picked from commit 2599319)
Squash the fork CI support from 04e73b7 and push-event support from b0d194c into one replayable maintenance commit.

Preserve release action pins and advisory policy when resolving the replay. Select the book build job without entering Pages deployment. Refresh the standalone lockfile to patched h2 and rustls releases instead of suppressing RUSTSEC-2026-0258 and RUSTSEC-2026-0285; rustls requires the updated AWS-LC backend.

Run cargo deny natively instead of through act (folded in from c279f31): lint.yml's `deny` job calls tempoxyz/ci's reusable deny.yml, which starts with tempoxyz's secure-runner. That action requires a GitHub OIDC token unless the event is a fork pull request, and act never receives one, so the job failed on every push and same-repo PR. Run the same `cargo deny --all-features check all` in a CircleCI job with a digest-pinned Rust image and a checksum-pinned cargo-deny release, and drop `deny` from the act lint matrix.

Co-authored-by: Josh Klopfenstein <git@joshklop.com>
Co-authored-by: falcorocks <14293929+falcorocks@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Maintenance CI: Compare optimism push vectors against v2.6.0, retaining actual PR and merge-queue bases.:
@joshklop
joshklop force-pushed the joshklop/v2.6.0-pin branch from 2f40498 to 8d359d0 Compare October 13, 2026 17:33
joshklop added a commit to ethereum-optimism/optimism that referenced this pull request Oct 13, 2026
The fork carries paradigmxyz/reth#27832, whose
`TrieWalker::remove_orphaned_descendants` seeks backward with
`seek_exact`. Upstream merged it on top of paradigmxyz/reth#27782, which
makes `InMemoryTrieCursor` and `HashedPostStateCursor` rewind on a
backward seek; without it they return the wrong entry or `None`. The
code path is reachable today only through the Merkle stage unwind over
raw database cursors, so no root is wrong at the current pin, but the
pick depends on that cursor contract.

Pin ethereum-optimism/reth#15 rebuilt with #27782 picked before #27832
and the CI commit last. The tree differs from the previous pin only by
those 12 lines, which touch none of the mirrored upstream symbols, so the
`UPSTREAM-MIRROR` tags advance with the pin.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@joshklop
joshklop force-pushed the joshklop/v2.6.0-pin branch from be5efad to 90d658e Compare October 16, 2026 17:25
@joshklop
joshklop force-pushed the joshklop/v2.6.0-pin branch 2 times, most recently from e038904 to 8d359d0 Compare October 16, 2026 17:46
@sebastianst

Copy link
Copy Markdown
Member

This has landed in the v2.6.0 reth update and is part of the op-v2.6.0 branch, so closing.

@sebastianst
sebastianst deleted the joshklop/v2.6.0-pin branch October 21, 2026 08:24
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.

7 participants