Repository navigation
Merge op-v2.7.0-0 for op-reth v2.9.0 - #103
Merged
Merged
Conversation
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com>
Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
…27291) Co-authored-by: Emma Jamieson-Hoare <21029500+emmajam@users.noreply.github.com>
…aradigmxyz#27264) Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
…27297) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ations on reorg (paradigmxyz#27301) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
Co-authored-by: grandizzy <38490174+grandizzy@users.noreply.github.com>
Co-authored-by: Alexey Shekhirin <github@shekhirin.com> Co-authored-by: Brian Picciano <me@mediocregopher.com>
…7284) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
…7316) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
…#27312) Co-authored-by: grandizzy <38490174+grandizzy@users.noreply.github.com>
…aradigmxyz#27317) Co-authored-by: Amp <amp@ampcode.com>
…27321) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
…digmxyz#27327) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
…digmxyz#27304) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com>
Co-authored-by: Matthias Seitz <matthias.seitz@outlook.de>
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. Pin the Rust toolchains the workflows install: stable to 1.97.0, nightly to nightly-2026-07-14. A maintenance branch outlives its release by weeks, and floating toolchains change under it. When replaying onto a new release, resolve each workflow hunk to upstream's side and re-apply only these pins, the llvm install in lint.yml's wasm job and the gcc-multilib `--yes`. Run cargo deny natively instead of through act (folded in from c279f31): lint.yml's `deny` job calls a reusable tempoxyz workflow that 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. Build the compact reader in a separate target directory so act cannot reuse libraries compiled from the comparison base after restoring older source mtimes (folded in from 785b057). Give the valid_blocks ef-tests group the ten-minute budget already used by grouped general-state fixtures instead of the single-test sixty-second timeout, which terminated it on every CircleCI attempt (folded in from d9bd987). Compare Compact vectors on pushes to an op-v<version> branch against upstream tag v<version>, derived from the branch name, instead of a hard-coded release commit (folded in from 447813d, #21). Pin the docs build to the nightly the book job installs: the script reads RUST_NIGHTLY instead of resolving `+nightly` to the newest channel, which fails to compile boa_engine since 2026-11-01 (rust-lang/rust#165263). Adapted from upstream 121b0f7. Ignore RUSTSEC-2026-0391, -0398 and -0403, compression advisories pinned by reth-zstd-compressors 0.7 whose patched releases need reth-core 0.8 and Rust 1.96, and RUSTSEC-2026-0387, crypto-bigint 0.5 with no patched release compatible with elliptic-curve 0.13. All four still apply on this base (folded in from 22ab931, #30). Update the lockfile to patched releases for the advisories cargo deny reports on this base, re-resolved against its lockfile rather than replayed: rustls 0.23.46, libz-sys 1.1.31, rustls-webpki 0.103.16, tokio 1.53.3, webpki-root-certs 1.0.10, webpki-roots 1.0.10 and zstd-sys 2.1.2. No manifest changes. Co-authored-by: Sebastian Stammler <seb@oplabs.co> Co-authored-by: Josh Klopfenstein <git@joshklop.com> Co-authored-by: einar-oplabs <oplabs@einar.io> Co-authored-by: falcorocks <14293929+falcorocks@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
(cherry picked from commit d994469)
Co-authored-by: Brian Picciano <933154+mediocregopher@users.noreply.github.com> (cherry picked from commit 078d026)
) Co-authored-by: Matthias Seitz <19890894+mattsse@users.noreply.github.com> (cherry picked from commit 42fa3c5)
(cherry picked from commit 5868ee4)
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: Sebastian Stammler <seb@oplabs.co> Co-authored-by: Claude <noreply@anthropic.com> (cherry picked from commit 186af6d)
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> (cherry picked from commit d70cc04)
RUSTSEC-2026-0441 marks pin-utils unmaintained with no safe upgrade. It is reachable only on wasm targets, through alloy-provider's wasmtimer.
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)
The docs job ran an unpinned `npx playwright install`, which resolves the newest `playwright` at run time and broke while npm had 1.65.0 of the CLI but not of `playwright-core`. Pin it to 1.64.1, as op-v2.6.0 does since ethereum-optimism#38. Nothing in the docs lockfile depends on a Playwright version. (cherry picked from the book.yml half of commit 806fa3b)
(cherry picked from commit 8572c88)
…paradigmxyz#28266) (#37) Backports paradigmxyz#28266 to op-v2.6.0. Every replay of a block's own transactions, canonical, raw or bad, runs through the chain's block executor instead of a bare EVM, so traces, replayed state diffs, `debug_accountAt` and `debug_intermediateRoots` include the per-transaction changes the executor applies on top of the EVM result. `Call` gains `block_executor` and `replay_transactions_until_with_executor`; `Trace::inspect_transaction_in_block` takes the target transaction's index instead of a transaction environment and rejects an out-of-range index; `TracingCtx` borrows the result and owns the inspector, as upstream. Raw and bad blocks the executor rejects error instead of returning pre-refund traces. Differences from upstream, both forced by alloy-evm 0.39: the inspector is a type parameter of the EVM, so tracing paths build an inspected executor and enable the inspector only for the target transaction instead of calling `inspect_transaction_without_commit`; and there is no `set_block_access_index`, so the cached-BAL path still executes the target transaction on a bare EVM. Ports upstream's end-to-end test: a node whose block executor credits a settlement to every sender shows that prestate diffs, block traces and intermediate roots agree with committed state. Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com> (cherry picked from commit 58c6608)
clippy's type_complexity rejects the return type of Call::block_executor since v2.7.0 wraps the provider in EvmStateProviderAdapter. Name the database StateCacheDb reads through instead.
The traced executor takes an EvmStateProvider like upstream's execute_block, and the engine-tree Firehose tests still need serde_json.
1 task
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.
Merges ethereum-optimism/reth
op-v2.7.0-0(reth v2.7.0 plus OP commits), the reth pin of upstream op-reth v2.9.0, intorelease/optimism-2.x. To be taggedop-reth-v2.9.0-fh3.1once merged.streamingfast/optimism#32 pins this PR's head commit, so merge this PR first, with a merge commit (not squash or rebase), so that the pinned commit lands on
release/optimism-2.x.Merge
op-v2.7.0-0does not descend fromop-v2.6.0-2(the OP reth fork re-applies its patches on each upstream release), so the merge conflicts in many files we never changed. Every file the Firehose fork does not touch now matchesop-v2.7.0-0exactly (git diff op-v2.7.0-0 HEADlists only Firehose files). Firehose conflicts:crates/engine/tree/src/tree/payload_validator.rs: keptmark_verified()after the last fallible step, before upstream's new BAL pairing code. The traced executorexecute_and_trace_blocknow takes anEvmStateProvider, like upstream'sexecute_block.Cargo.toml/Cargo.lock: took upstream's lock and re-added the Firehose crates.firehose-tracerstays at 5.5.1. Thealloy-evmpatch is pinned by commit (52afebec,v0.39.0-sf) instead of by tag. alloy-evm stays at 0.39, sostreamingfast/evmneeds no new release.crates/engine/tree/Cargo.toml: upstream dropped theserde_jsondev-dependency that the Firehose engine tests use, so it is added back.Firehose review
debug_trace*andtrace_*through the chain's block executor (Call::block_executor). That executor comes fromexecutor_for_block, which the Firehose tracer does not hook, so RPC calls never print Firehose blocks.flashbots_validateBuilderSubmissionusesexecute_one, which is not traced either.CHANGELOG
Open questions
op-reth-v2.8.1-fh3.1-1CHANGELOG section (the post-exec transaction fix from Trace Optimism post-exec transactions #92) was never tagged, and no op-reth release pinned it. Its entry now lives underop-reth-v2.9.0-fh3.1, the first release that ships it. Ifop-reth-v2.8.1-fh3.1-1is still meant to be tagged onrelease/optimism-2.x, restore that section.Test Execution Summary
Build Status
cargo check --workspace --all-targets: PASSEDrust/:cargo check --workspace --all-targets: PASSEDrust/:cargo build --release -p op-reth --bin op-reth: PASSEDUnit Tests
reth-firehosereth-firehose-tests(prestate golden files)reth-engine-tree --test firehose_live_tracingreth-optimism-firehoseop-alloy-consensus --features firehosereth-optimism-evmreth-optimism-payload-builderreth-optimism-trie(lib,tests/lib.rs,tests/live.rs)--test-threads=4(see notes)reth-optimism-node --test it builderNotes:
reth-optimism-triewith the default 60 test threads failed 88 tests with MDBXCannot allocate memory (12)when opening their test databases, all at once. With--test-threads=4all pass, so this is the test machine, not the merge.v0.3.3-sf1; the OP devnet needsv0.3.3-sf2(--sequencer-el,--enable-karst), built from source for this run.llvm-sys221 (LLVM 22). The build machine has LLVM 23 only; it builds withLLVM_SYS_221_PREFIX=/usr/lib/llvm-23and LLVM 23'sllvm-configfirst onPATH.Integration Tests
Battlefield Tests
Compare blocks(Firehose blocks against the node's JSON-RPC): PASSEDCommands (battlefield-ethereum
adb1921, builder-playgroundv0.3.3-sf2built from source, op-node v1.19.11, fireeth v2.24.1, op-reth fromcargo build --release -p op-reth --bin op-rethon this branch):./scripts/optimism/run_optimism_devnet.sh ./scripts/run_firehose_op_reth_devnet.sh # op-reth from this branch first on PATH pnpm test:fh3.0:op-reth-devnet