Repository navigation
Merge upstream v2.8.1 - #14
Merged
Merged
Conversation
* fix(proofs): upgrade SP1 guests and tooling to 6.10.0 * fix(proofs): bump enclave tokio to 1.53.3 for RUSTSEC-2026-0386 Amp-Thread-ID: https://ampcode.com/threads/T-01a181bc-23bf-77cb-aaa9-57a24e1657f8 Co-authored-by: Amp <amp@ampcode.com> * chore(proofs): refresh measurements from CI run 40676382882 Amp-Thread-ID: https://ampcode.com/threads/T-01a181bc-23bf-77cb-aaa9-57a24e1657f8 Co-authored-by: Amp <amp@ampcode.com> * ci(proofs): install SP1 6.10.0 toolchain * chore(proofs): ignore RUSTSEC-2026-0387 until upstream crypto-bigint upgrade Amp-Thread-ID: https://ampcode.com/threads/T-01a181bc-23bf-77cb-aaa9-57a24e1657f8 Co-authored-by: Amp <amp@ampcode.com> --------- Co-authored-by: Phillip Kemper <phillip.kemper@toolsforhumanity.com> Co-authored-by: Amp <amp@ampcode.com>
* chore(deps): upgrade op-reth to v2.8.1-rc.2 Amp-Thread-ID: https://ampcode.com/threads/T-01a1aae7-1d46-73ab-8531-2bdb9d43ec63 Co-authored-by: Amp <amp@ampcode.com> * docs(cli): regenerate reference for op-reth upgrade Amp-Thread-ID: https://ampcode.com/threads/T-01a1aae7-1d46-73ab-8531-2bdb9d43ec63 Co-authored-by: Amp <amp@ampcode.com> * fix(cli): disable state masking to match op-reth Amp-Thread-ID: https://ampcode.com/threads/T-01a1aae7-1d46-73ab-8531-2bdb9d43ec63 Co-authored-by: Amp <amp@ampcode.com> * fix(node): import state-masking guard from color-eyre Amp-Thread-ID: https://ampcode.com/threads/T-01a1aae7-1d46-73ab-8531-2bdb9d43ec63 Co-authored-by: Amp <amp@ampcode.com> --------- Co-authored-by: Amp <amp@ampcode.com>
Both Firehose forks move to world-chain-v2.8.1-fh3.1 and alloy-evm to v0.39.0-sf. firehose-tracer stays locked at 5.5.0.
added 2 commits
November 7, 2026 15:30
A git patch covers every rev of its URL, which moved the proof client onto op-reth v2.8.1. Pin the node's op crates to the fork directly instead.
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 worldcoin/world-chain
v2.8.1(5 commits sincev2.6.0), which World Chain asks every node operator to run to avoid falling out of sync. Upstream moved reth to ethereum-optimism/rethop-v2.6.0-2(reth v2.6.0) and the optimism monorepo toop-reth/v2.8.1, so both Firehose forks follow on their world-chain lines.alloy-evmmoves tostreamingfast/evmv0.39.0-sf;firehose-tracerstays at 5.5.0, so the block model does not change and the tag stays onfh3.1.Release: once merged, tag the merge commit
v2.8.1-fh3.1(newest tag onrelease/2.xisv2.6.0-fh3.1; the prompt's tag matches the naming rule).Merge order. This PR pins tags that do not exist yet and its build fails until they do:
world-chain-v2.8.1-fh3.1world-chain-v2.8.1-fh3.1v2.8.1-fh3.1Cargo.lockrecords the heads of those two PRs (0d253a1b,889f75b6) for the tags. If either tag lands on another commit, refresh the lock withcargo update -p reth-firehose -p reth-optimism-firehosebefore merging.Merge
bin/world-chain/src/main.rs: keeps the Firehoseinit_tracercall, takes upstream'sparse_args().Cargo.toml: upstream keeps the kona crates (proof services and devnet only) on optimism revda6d3252, with the op-alloy, op-revm and alloy-op-evm crates of that rev, while the node uses the same names atop-reth/v2.8.1. A[patch]covers every rev of its URL, so patching those names would move the proof client onto the new rev, where it does not compile. The 8 root dependencies on names that exist at both revs (op-alloy-*,alloy-op-hardforks,op-revm,alloy-op-evm) therefore point at the fork tag directly, and the optimism[patch]keeps only the crates that exist only at the new rev (reth-optimism-*,op-alloy-rpc-jsonrpsee). The reth patch is unchanged in shape.Cargo.lock: upstream's v2.8.1 lock with the node's sources swapped to the forks. Theda6d3252set is identical to upstream's (31 crates, same commit), andproofs/measured/is untouched.firehose-traceris locked back to 5.5.0 (a fresh resolve picks 5.7.0, whichreth-firehosedoes not compile against). No unused patch remains.Dockerfile.sf: base image Rust 1.99, as upstream'sDockerfile(the pinned nightly still compiles the node).ACTIVATIONS.mdreviewed: no World Chain fork or timestamp changed (details below)..dev/update-to-v2.8.1-fh.md.Operator-visible upstream changes
--proofs-history.storage-version v1is now rejected, and--engine.num-state-masking-blocksmust be 0.--engine.persistence-thresholddefaults to 50: after an unclean shutdown the node re-executes, and re-emits, up to 50 blocks.Firehose bug patterns
OpFirehoseEngineValidatorBuilderwithparallel_bal_execution = false; payload building and flashblock validation use the untraced EVM config. The upstream commits do not touch block execution.extraDataand BAL gas-limit checks run beforemark_verified().WorldChainHardforkunchanged, and the World Chain mainnet and Sepolia superchain-registry files are identical at the new gitlink (13907b9b). Tropo and Strato still have no execution code. Lagoon still maps toNever; the only fork-gated op-revm change sinceda6d3252is the Lagoon BLS precompile input cap, andhandler.rschanged only in comments, so the fee vault credits still match.OpTxEnvelope,OpTxType,OpReceiptand the header unchanged; World Chain adds no transaction type.Test Execution Summary
worldcoin/world-chain
v2.8.1merged into streamingfast/world-chainrelease/2.x, with streamingfast/reth and streamingfast/optimism moved on theirrelease/world-chain-2.xlines (branchbump/world-chain-2.8.1in all three). The forks were built through localworld-chain-v2.8.1-fh3.1tags on the PR heads (never pushed), so the lock files already resolve the tag names.Build Status
cargo test -p reth-firehose -p reth-firehose-tests(builds the crates): PASSEDrust/):cargo check --locked -p op-reth -p reth-optimism-firehose -p alloy-op-evm --tests: PASSEDcargo build --locked --bin world-chain: PASSEDcargo check --locked --workspace --all-targets: PASSEDcargo clippy --locked --workspace --all-targets -- -D warnings: PASSED (only cargo's manifest notices about unused workspace dependencies and[lints], as upstream)Dockerfile.sf): NOT RUN. It fetches the fork tags, which do not exist until the reth and optimism PRs are merged and tagged; thesf-release.ymlPR build fails for the same reason.Unit Tests
cargo test -p reth-firehose -p reth-firehose-testscargo test --locked -p reth-optimism-firehose -p alloy-op-evm -p reth-optimism-evm -p reth-optimism-node -p reth-optimism-payload-builder --no-fail-fastcargo test --locked -p world-chain-evm -p world-chain-node -p world-chain-cli --no-fail-fastThe world-chain tests ran with
CARGO_PROFILE_DEV_DEBUG=0 CARGO_PROFILE_TEST_DEBUG=0, as upstream'srust-ci.ymlsets: with full debug info, linking theworld-chain-nodeintegration test fails (rust-lld: relocation R_X86_64_32 out of rangein.debug_macro, over 4 GiB of debug info).Integration Tests
Battlefield Tests
master(879ea9a), targetworld-chain-devnet, fireethv2.24.1,world-chainbuilt from this branch (dev profile). Devnet hardforks: Bedrock through Karst at genesis.Compare blocks: Firehose blocks match RPC blocks(fireeth tools compare-blocks-rpc, blocks Fix sf-release CI branch refs after release/2.x rename #1–chore(builder): add ability to limit uncompressed block size worldcoin/world-chain#441): all 441 blocks differ, and only intransaction_traces[N].blob_gasandtransaction_traces[N].receipt.blob_gas_used, which the RPC side has and the Firehose block does not. Expected diff, not a node change: under Jovian, op-reth's receipt puts the transaction's DA footprint in receiptblobGasUsed(block 100: a deposit0x7etransaction withblobGasUsed = 0xa5a0while the header'sblobGasUsedis0x0), andcompare-blocks-rpccopies it intoblob_gas. The fix belongs in the compare tool.test/snapshots/genesis/fh3.0/world-chain-devnet/, which the repository does not have yet.FIRE INITread withfh_version 3.1, no panic or error in the reader or node logs, and the node kept up with the sequencer at 2 s blocks (to block 653, LIB 453)../scripts/world_chain/run_world_chain_devnet.sh(withWORLD_CHAIN_REPO= this branch)WORLD_CHAIN_BINARY=<world-chain>/target/debug/world-chain ./scripts/run_firehose_world_chain_devnet.shpnpm test:fh3.0:world-chain-devnet, once fireeth served on:8089host.docker.internal, which only resolves on Docker Desktop. A local change tocrates/devnet/src/full_stack.rsaddedwith_host("host.docker.internal", Host::HostGateway)to them.find_op_workdirin the Battlefield script tries macOSstat -f %mfirst; on Linux that succeeds with filesystem output, so a shim made it fall back tostat -c %Y.CHANGELOG
Open questions
Cargo.toml(op-alloy-*,alloy-op-hardforks,op-revm,alloy-op-evmpoint at our fork directly), so they will conflict on future upstream bumps. A[patch]cannot cover only one rev of a URL, and the alternative, editingproofs/measured/kona-client/Cargo.toml, would change measured inputs. Once upstream moves kona to the same rev as op-reth, these lines can go back to upstream's and into the patch.blob_gasfalse diff as v2.6.0. It needs a fix infireeth tools compare-blocks-rpc(skip receiptblobGasUsedon OP chains after Jovian), not in this repository.Dockerfile.sfwas not built: it needs the fork tags. Please check thesf-release.ymlbuild once the tags exist.