Repository navigation
fix(trie): tighten iterator seek boundary (#28264) - #40
Merged
Merged
Conversation
sebastianst
approved these changes
Nov 10, 2026
aakoshh
added a commit
to ethereum-optimism/optimism
that referenced
this pull request
Nov 10, 2026
develop's op-v2.6.0-2 carries upstream's iterator seek boundary fix (paradigmxyz/reth#28264), which v2.7.0 lacks. ethereum-optimism/reth#40 cherry-picks it onto ethereum-optimism/reth#35, so pin its head until op-v2.7.0-0 is tagged. Only the reth git source changes in Cargo.lock, and the SP1 guest workspace doesn't use reth. The fix only touches the trie node iterator, which no UPSTREAM-MIRROR covers, so the reth mirror tags move to the new rev unchanged.
This was referenced Nov 10, 2026
aakoshh
added a commit
to ethereum-optimism/optimism
that referenced
this pull request
Nov 10, 2026
develop now pins op-v2.6.0-4 (#23942), which carries ethereum-optimism/reth#37: RPC block replays through the block executor, which op-reth's SDM refund settlement depends on. Carry it onto op-v2.7.0 as ethereum-optimism/reth#41, stacked on ethereum-optimism/reth#40, and pin its head. Resolve the conflicts with #23942: - Cargo.toml and Cargo.lock: keep the op-v2.7.0 rev, now ethereum-optimism/reth#41's head. - UPDATING-RETH.md: keep both sides, and update "Carried patches" for op-v2.7.0: where ethereum-optimism/reth#37's carry conflicted on v2.7.0, and the trie seek boundary fix carried as ethereum-optimism/reth#40. - invalid_post_exec.rs: develop's crate::lagoon helpers in the E2ETestSetupBuilder call reth v2.7.0 needs. Adapt #23942's new tests to reth v2.7.0: trace_replayTransaction returns an optional TraceResultsWithTransactionHash, and StateProviderDatabase takes an EvmStateProvider. Advance the reth mirror tags; ethereum-optimism/reth#41 touches no mirrored symbol.
Base automatically changed from
af/backport-e2e-race-fixes
to
af/act-stub-secure-runner
November 11, 2026 17:40
(cherry picked from commit 8572c88)
op-will
force-pushed
the
af/carry-trie-seek-boundary
branch
from
November 11, 2026 18:56
c65bb32 to
ea697ec
Compare
op-will
enabled stacked auto-merge (rebase)
November 11, 2026 19:30
stacked auto-merge was automatically disabled
November 11, 2026 19:31
Auto-merge was disabled for another pull request in the stack
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.
Stacked on #35. Carries the one
op-v2.6.0patch thatop-v2.7.0still lacks, soop-v2.7.0-0doesn't regress it.What
Cherry-picks upstream
8572c88fefix(trie): tighten iterator seek boundary (paradigmxyz/reth#28264) with-x.Why
op-v2.6.0-2, which the monorepo'sdeveloppins, carries this fix as3c5f2f11c(#32). It is newer than v2.7.0, and v2.8.0 and v2.9.0 don't contain it either, soop-v2.7.0would drop it and the monorepo's bump to v2.7.0 would regress the trie seek boundary fix. The proofs-history ExEx run reported on #34 found the same gap.How
crates/trie/trie/src/node_iter.rs: v2.7.0's list lacksB256, U256, which the fix's new test needs. Resolved to upstream's side.B256,line that v2.7.0 doesn't have, sogit patch-id --stablediffers from upstream's.cargo test -p reth-trie --lib node_iterpasses, including the fix's newinserted_leaf_before_deeper_stored_branch_is_included.Caveats
reth-actuntil ci: restore the act and deny checks on op-v2.7.0 #34's stub is in; it merges with the rest of the stack.Potential follow-ups
The other commits on
op-v2.6.0past the tagdeveloppins, and the open PRs against it, as of this PR:op-v2.6.0-3=806fa3b2a(ci: keep the op-v2.6.0 required checks green #38): pins Playwright inbook.ymland ignores RUSTSEC-2026-0441. The ignore is already in ci: restore the act and deny checks on op-v2.7.0 #34. The Playwright pin isn't onop-v2.7.0, but test(e2e): wait for pruner in RocksDB pruning tests (#27601), harden Osaka blob conversion (#27687) #35's checks pass without it, so it is left out.op-v2.6.0-4=58c6608d3(rpc: replay block transactions through the block executor (backport of paradigmxyz#28266) #37): backport ofparadigmxyz/reth#28266, which routes RPC block replays through the block executor. No upstream release up to v2.9.0 contains it. It exists for op-reth: pin the executor-routing reth fork and lock SDM-settled RPC replay optimism#23942, which is still open. If that PR merges before the monorepo's v2.7.0 bump,op-v2.7.0needs rpc: replay block transactions through the block executor (backport of paradigmxyz#28266) #37 too, as another PR on this stack: it conflicts incall.rs,trace.rsanddebug.rs. Otherwise the bump can land first and perf(tasks): detach fire-and-forget named workers paradigmxyz/reth#23942 can rebase ontoop-v2.7.0.op-v2.6.0: fix(rpc): floor eth_capabilities oldestBlock at the genesis block #28 (eth_capabilitiesgenesis floor) and feat(rpc): add pending transaction lookup hook #22 (pending transaction lookup hook) would need carrying if they merge first. feat(trie): build the sparse trie implementations without std #39 is a draft experiment for kona's no-std sparse trie, not meant for merge.