Skip to content

fix(trie): tighten iterator seek boundary (#28264) - #40

Merged
op-will merged 1 commit into
af/act-stub-secure-runnerfrom
af/carry-trie-seek-boundary
Nov 11, 2026
Merged

op-will merged 1 commit into
af/act-stub-secure-runnerfrom
af/carry-trie-seek-boundary

Conversation

@aakoshh

@aakoshh aakoshh commented Nov 10, 2026

Copy link
Copy Markdown

Stacked on #35. Carries the one op-v2.6.0 patch that op-v2.7.0 still lacks, so op-v2.7.0-0 doesn't regress it.

What

Cherry-picks upstream 8572c88fe fix(trie): tighten iterator seek boundary (paradigmxyz/reth#28264) with -x.

Why

op-v2.6.0-2, which the monorepo's develop pins, carries this fix as 3c5f2f11c (#32). It is newer than v2.7.0, and v2.8.0 and v2.9.0 don't contain it either, so op-v2.7.0 would 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

  • One conflict, in the test module's imports in crates/trie/trie/src/node_iter.rs: v2.7.0's list lacks B256, U256, which the fix's new test needs. Resolved to upstream's side.
  • The changed lines are the same as fix(trie): tighten iterator seek boundary #32's. They differ from upstream's only in that import list, where upstream also removes a separate B256, line that v2.7.0 doesn't have, so git patch-id --stable differs from upstream's.
  • cargo test -p reth-trie --lib node_iter passes, including the fix's new inserted_leaf_before_deeper_stored_branch_is_included.

Caveats

Potential follow-ups

The other commits on op-v2.6.0 past the tag develop pins, and the open PRs against it, as of this PR:

@aakoshh
aakoshh requested a review from a team as a code owner November 10, 2026 09:51
@aakoshh
aakoshh added this pull request to stack #36 November 10, 2026 09:51

@sebastianst sebastianst left a comment •

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I suggest matching the title of the cherry-picked commit so it's later easier to match, so that if we do a squash merge, the original commit title doesn't get lost.

@aakoshh aakoshh changed the title trie: carry upstream's iterator seek boundary fix fix(trie): tighten iterator seek boundary (#28264) 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.
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.
@geoknee
geoknee removed this pull request from stack #36 November 11, 2026 17:39
Base automatically changed from af/backport-e2e-race-fixes to af/act-stub-secure-runner November 11, 2026 17:40
@geoknee
geoknee added this pull request to stack #43 November 11, 2026 17:40
@op-will
op-will force-pushed the af/carry-trie-seek-boundary branch from c65bb32 to ea697ec Compare November 11, 2026 18:56
@op-will
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

@op-will
op-will merged commit 8d32058 into op-v2.7.0 Nov 11, 2026
30 checks passed
@op-will
op-will deleted the af/carry-trie-seek-boundary branch November 11, 2026 19:35
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.

4 participants