Repository navigation
test(e2e): wait for pruner in RocksDB pruning tests (#27601), harden Osaka blob conversion (#27687) - #35
Merged
Conversation
Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> (cherry picked from commit f269bcc)
Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> (cherry picked from commit 0fc98b4)
Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> (cherry picked from commit e29c343)
Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> (cherry picked from commit cdc4e09)
Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> (cherry picked from commit 569c770)
(cherry picked from commit 7a5c817)
aakoshh
force-pushed
the
af/backport-e2e-race-fixes
branch
from
November 5, 2026 12:37
3746976 to
d7a863a
Compare
This was referenced Nov 5, 2026
aakoshh
added a commit
to ethereum-optimism/optimism
that referenced
this pull request
Nov 10, 2026
Pin the reth crates to the head of ethereum-optimism/reth#35, which stacks on ethereum-optimism/reth#34 on top of op-v2.7.0. Both are unmerged, so the pin is a rev until op-v2.7.0-0 is tagged. Sync the shared dependencies to the versions reth v2.7.0 requires: alloy 2.5.0, alloy-hardforks 0.4.9, reth-core 0.8.1, revm 43 and revm-inspectors 0.44. Adapt to the upstream API changes: - StateProviderDatabase now takes an EvmStateProvider (paradigmxyz/reth#27109). Wrap each provider with into_evm_state_provider, on a reference where it is used again. - CancelOnDrop moved from reth-revm to reth-tasks (paradigmxyz/reth#27466). - StateProviderFactory gained a Primitives type (paradigmxyz/reth#26923). Where a bound also names NodePrimitivesProvider, the debug witness API now says which one it means. - BlockAndReceipts holds SharedReceipts (paradigmxyz/reth#27427). - The e2e setup functions folded into E2ETestSetupBuilder (paradigmxyz/reth#27432). - MemoryOverlayStateProvider was removed in favour of the overlay manager (paradigmxyz/reth#26923). The test engine records every validated block in the manager it shares with its provider, so it now appends a block to its real parent with state_with_block_appended. The flashblock pending state does the same, but on the canonical anchor: a speculative block's parent is the pending block before it, which the overlay does not know. The next commit shows that this breaks for speculative builds.
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.
op-will
approved these changes
Nov 11, 2026
geoknee
enabled auto-merge (rebase)
November 11, 2026 17:39
auto-merge was automatically disabled
November 11, 2026 17:39
Pull request removed from 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 #34. Both PRs together make
reth-actpass onop-v2.7.0; see Caveats for how they can merge.What
Cherry-picks six upstream test-only commits from v2.8.0 with
-x. They fix two tests that race on CircleCI's runners:f269bccbctest(e2e): wait for pruner in RocksDB pruning tests (paradigmxyz/reth#27601)0fc98b4d8test(e2e): replace fixed sleeps with pool waits (paradigmxyz/reth#27500)e29c3433cfeat(e2e): control the next payload timestamp (paradigmxyz/reth#27596)cdc4e096ffeat(e2e): wait for the pool to process a new head (paradigmxyz/reth#27597)569c770cafeat(e2e): add import_payload helper (paradigmxyz/reth#27599)7a5c817abtest: harden Osaka blob conversion e2e (paradigmxyz/reth#27687)Each pick has the same
git patch-id --stableas its upstream commit.Why
With #34's stub in place, the
actjobs run again. Two of them fail on tests whose code is identical in v2.7.0 and in our branch:act-e2e.yml:test_rocksdb_storage_history_pruningfailed all three tries, andtest_rocksdb_account_history_pruningfailed once (job 3582). The test reads the history shards once the block is visible, which can be before the pruner has committed for it:act-integration.yml:blobs::blob_conversion_at_osakafailed all three tries:crates/transaction-pool/src/maintain.rs) 4 seconds later. On a slow runner, building and verifying the blob transactions takes longer than that. The first blob transaction has then been removed for conversion before the Prague payload is built. Both tests pass locally.How
f269bccbc(upstream 27601) addswait_for_prune_checkpointand calls it in both RocksDB tests before they read the shards.7a5c817ab(upstream 27687) replaces the wall-clock timestamps with fixed ones, so the conversion window opens only when the test imports the Prague payload. That happens after it has checked both legacy sidecars. The fix uses harness helpers that the other four commits add, so those come along. They also add tests of their own incustom_genesis.rs,pool.rsandp2p.rs.Caveats
op-*ruleset allows only squash merges and requiresreth-act. ci: restore the act and deny checks on op-v2.7.0 #34 can't pass without these picks, and this PR's changes can't run without ci: restore the act and deny checks on op-v2.7.0 #34's stub. There are two ways to merge:op-v2.7.0gets oneci:commit that also carries these picks. At the next bump, the replay of the CI commit has to resolve those test hunks to the new base's side.op-v2.7.0and merge it.op-v2.7.0gets a separate test commit. All itscherry picked fromsources are in v2.8.0, so the next bump's audit drops it automatically.crates/e2e-test-utilsgains public helpers, and test(e2e): replace fixed sleeps with pool waits paradigmxyz/reth#27500 replaces a fixed 1s sleep in its block-advancing helpers with pool waits. The monorepo's op-reth tests use this crate, so they get the new behaviour once they pinop-v2.7.0. v2.8.0 would bring it anyway.Alternatives
op-v2.6.0's harness as one commit) instead of the five upstream commits. That's a smaller diff, but it's fork-only: it has nocherry picked fromline, so the next bump's audit can't drop it automatically.blob_conversion_at_osaka: a one-line change, but it would be fork-only. The next bump would have to drop it by hand, while the audit drops upstream picks automatically.