diff --git a/docs/ai/rust-dev.md b/docs/ai/rust-dev.md index 0df4f19720a..d0a8d29f354 100644 --- a/docs/ai/rust-dev.md +++ b/docs/ai/rust-dev.md @@ -74,7 +74,7 @@ just test-docs ### Running op-reth E2E Tests -The op-reth E2E tests (`rust/op-reth/tests/proofs/`) run a full devnet with op-reth as both the sequencer and the validator EL by default; `OP_DEVSTACK_PROOF_SEQUENCER_EL` and `OP_DEVSTACK_PROOF_VALIDATOR_EL` override either role (`rust/op-reth/tests/proofs/utils/preset.go`). They require two build prerequisites: +The op-reth E2E tests (`rust/op-reth/tests/proofs/`) run a full devnet with op-reth as both the sequencer and the validator EL by default; `OP_DEVSTACK_PROOF_SEQUENCER_EL` and `OP_DEVSTACK_PROOF_VALIDATOR_EL` override either role (`rust/op-reth/tests/proofs/utils/preset.go`). They require three build prerequisites: 1. **Forge artifacts** — the devnet deploys contracts from compiled artifacts: ```bash @@ -82,7 +82,13 @@ The op-reth E2E tests (`rust/op-reth/tests/proofs/`) run a full devnet with op-r mise exec -- just build-no-tests ``` -2. **op-reth binary** — the test harness (`op-devstack/shared/rustbin/rust_binary.go`) uses the most recently built binary under `target/release/` or `target/debug/`. Options: +2. **Proof-test contract artifacts** — storage-proof tests also deploy their own fixtures: + ```bash + cd rust/op-reth/tests + mise exec -- just build-contracts + ``` + +3. **op-reth binary** — the test harness (`op-devstack/shared/rustbin/rust_binary.go`) uses the most recently built binary under `target/release/` or `target/debug/`. Options: ```bash # Option A: let the test build it (slow first run, cached after) RUST_JIT_BUILD=1 go test -v -run TestName ./rust/op-reth/tests/proofs/core/ diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 58f3302a4ab..0c28d645873 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -159,9 +159,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b836b372d3b742b7c083d2617d6e68563cd5dadbd8752c461a935a756551e69" +checksum = "727016fed834c2392d014dd697ea473f3e47bcec31ba31ccffa9c1d18ed904e5" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -201,11 +201,11 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1befb37485ea71e8599e32ffd76c98af7c3720a34741d30abd87f41c3148407" +checksum = "6ea5ae60bbb3ce9dc52685a70a3755ad4432045fd38079b763cfe5127c706134" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -216,18 +216,18 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b432cf09e307820b39ec5b856b25f396d8fde6089358f0c1d96d9654ad1e0b7d" +checksum = "8c807c974ae5ac07fa98431310b498d85f029da0d2f9a088b3ea673e5e33bb81" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 2.4.2", - "alloy-network-primitives 2.4.2", + "alloy-network 2.5.0", + "alloy-network-primitives 2.5.0", "alloy-primitives", "alloy-provider", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-sol-types", "alloy-transport", "futures", @@ -273,9 +273,9 @@ dependencies = [ [[package]] name = "alloy-eip2930" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9441120fa82df73e8959ae0e4ab8ade03de2aaae61be313fbf5746277847ce25" +checksum = "e64579d931b3f8eacc7c9ab0b220e87e9c4816e5c724ede1947b55c2f8e92ae5" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -318,9 +318,9 @@ dependencies = [ [[package]] name = "alloy-eip7928" -version = "0.4.5" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3b12337f74cbfa451cb04dac173974814a6ff463079e1793aa09600ba8813ab" +checksum = "6a12e1dc70236cfb8e79b96dd8544aed47c39e2f45dc6b51c3703e969e052faa" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -377,7 +377,7 @@ dependencies = [ "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", - "alloy-eip7928 0.4.5", + "alloy-eip7928 0.4.11", "alloy-eip8141", "alloy-primitives", "alloy-rlp", @@ -397,16 +397,16 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b307a52f91f7f3aad56b5cb4f54e5eb17dd0b3f4b2c82823301499fe1c6fdaf" +checksum = "7b6bd5f7e5ce9858bac99275e3f548c3b63bb3e5806da0142dc0b2f518d3ec4a" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-hardforks", "alloy-primitives", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-sol-types", "auto_impl", "derive_more 2.1.1", @@ -417,9 +417,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0680a2f7d4bbc6f48c0cb43368fa544918a1fa291e772bdb47c834ade338f363" +checksum = "53cfa407c1d874cb306187996e30eb551bd98025e60e913e69e298ed2c8ea045" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -432,9 +432,9 @@ dependencies = [ [[package]] name = "alloy-hardforks" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ba208044232d14d4adbfa77e57d6329f51bc1acc21f5667bb7db72d88a0831" +checksum = "09d5ff0394d9547798fa4b666c46e356d09a113f33d45fb3d75175681c1e2652" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -514,18 +514,18 @@ dependencies = [ [[package]] name = "alloy-network" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f263c8d752b15e19b7c2d3cbad00338ec2d7cc923a46cd1ff98aea2fa333166b" +checksum = "e11dfba13dac9e54576bf41e1b7461491367e0bce6a2a4293b9e40ffa3ebd5e9" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-consensus-any 2.4.2", + "alloy-consensus 2.5.0", + "alloy-consensus-any 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", - "alloy-network-primitives 2.4.2", + "alloy-network-primitives 2.5.0", "alloy-primitives", - "alloy-rpc-types-any 2.4.2", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-any 2.5.0", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-signer 2.5.0", "alloy-sol-types", @@ -553,11 +553,11 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8795eecf50374a0dd942caff57922c59333c9991ead9eccbbc1709f55d73c7c2" +checksum = "3819bf6794d25f679d42c3f2b168e12cae08c56bb41d393cb6249b55e6d5933e" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-serde 2.5.0", @@ -568,7 +568,7 @@ dependencies = [ name = "alloy-op-evm" version = "0.32.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-hardforks", @@ -631,22 +631,22 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef487e44dfae9c87cb732989d3f43682f65aefb11a0f56045b26be357f671fcf" +checksum = "9f8250dbbc93fab5b00fe0d3c1db3ede67d2a5fdbae8255de70b34ae39da244b" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", - "alloy-network 2.4.2", - "alloy-network-primitives 2.4.2", + "alloy-network 2.5.0", + "alloy-network-primitives 2.5.0", "alloy-primitives", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-trace", "alloy-signer 2.5.0", "alloy-sol-types", @@ -721,9 +721,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98267c2d47f9c185b575bac3f772a8ca66bcbd712693535e50980c12eab80a42" +checksum = "1f73519dc8f4ab73dafe90ac47aec4b9055c421c762d770d911eed83fcbef28d" dependencies = [ "alloy-json-rpc 2.5.0", "alloy-primitives", @@ -747,23 +747,23 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637fed69eda26e19fb42314006570519003c1bfc338c54165e610a657e3b46ff" +checksum = "e30da7fc40ff208becb4ebe462a149045c8613f60ee84f65731a522c67c351fd" dependencies = [ "alloy-primitives", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", ] [[package]] name = "alloy-rpc-types-admin" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91f1a1fa4d3c95ea5dba30c02d8987f0c052137dd7f1d55086cf36270517cbc" +checksum = "8d217ca58fed01c4c96d66767af04af39d57ee0d3af016aaf686a2d600aa66d0" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -773,12 +773,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848bfe2315338ec605863073aae54a90fcea9cec7e6855a9e93d988bf42e9740" +checksum = "ad4774d898cc10846f65c426a385071f3e2872876d7f0e7836f1f75ffa54d448" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", ] @@ -796,14 +796,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1176430031ba27abfb51b95516cf71e8ce3ff4172c72f3136627f0f89813a739" +checksum = "9c5d320312e4a9481b18185429e57fa161dbf9468414ba5667aff4ebe7bd37e7" dependencies = [ - "alloy-consensus-any 2.4.2", - "alloy-network-primitives 2.4.2", + "alloy-consensus-any 2.5.0", + "alloy-network-primitives 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", "serde_json", @@ -811,9 +811,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20f226662436bbdc221c9156a1f445c257da5e695b39a26878aa8b2644f710e" +checksum = "01f0837510a7e7789f99cf86bc0d0e3b54cfa663f25de803dad613364eef9fd3" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -844,11 +844,11 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a43d7b6b86be4885c7a76f1dfcde9651af2d419ff571e8ee7257de47101203b" +checksum = "77b967576e97165fed3fae1cf6adad964e192293e4ee61d9187afe3ecaa12323" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -886,18 +886,19 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756eb5803e70985be4066b636194ccb5f6629e5d141817c1f0c50cea8350bf5c" +checksum = "32c475e21fe8a8caa02166b326ed22207a1a0597fc9b0dcdfb46e2fe6f80dadf" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-consensus-any 2.4.2", + "alloy-consensus 2.5.0", + "alloy-consensus-any 2.5.0", "alloy-eips 2.5.0", - "alloy-network-primitives 2.4.2", + "alloy-network-primitives 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-serde 2.5.0", "alloy-sol-types", + "alloy-trie", "arbitrary", "itertools 0.14.0", "serde", @@ -908,14 +909,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c833a9b946d827d2b2aa8cad8e92279a4340ec1b7cf666f3e1ee6ef4684e0159" +checksum = "8c230cc2e3f19a76889664522ffc10d746292f43fa1f57a3a9e20fe011346203" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", "serde_json", @@ -923,12 +924,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1933d60c2f51b8906103484ea2ca2218357264dbf16f948f7c2dd4ac5818e1d8" +checksum = "e3d8edefcef7d45a3da4bb869bbee1ee4c71b7437b22b87794f0912c89b5702c" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", "serde_json", @@ -937,12 +938,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb5d708e45799bd963d7e3bd8d04110e90983833ed02f91a9099811ed39ce6d" +checksum = "2fcacd9928d9788790afcd1d3fd8d0206329d2ef2391070867bafcc20ecf278f" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", ] @@ -1037,12 +1038,12 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c81472fb0b73cbb18106e323e33e3f249f56318a330a8e0f6aa6e913e3519a" +checksum = "d6909c09d586c7b55eced688754d57dde8a6bcbae2b83e69a9b9250e74cfd79e" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-network 2.4.2", + "alloy-consensus 2.5.0", + "alloy-network 2.5.0", "alloy-primitives", "alloy-signer 2.5.0", "async-trait", @@ -1152,9 +1153,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38c841f63141cad3f1a4378cedf121914b32932cf09b66c6006d4a906112136" +checksum = "df948f2f9530ed0325d789ad98aa08403aaeaf55ddd6eeaf0cda143e02afab39" dependencies = [ "alloy-json-rpc 2.5.0", "alloy-rpc-types-engine", @@ -1214,9 +1215,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f14b5d9b2c2173980202c6ff470d96e7c5e202c65a9f67884ad565226df7fbb" +checksum = "b94e3e0a88f8db47250ac8a95fb825d020719f833eb1dc661bd3609c3bbece7d" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -2679,7 +2680,7 @@ dependencies = [ "bitflags 2.11.1", "cexpr", "clang-sys", - "itertools 0.12.1", + "itertools 0.13.0", "proc-macro2", "quote", "regex", @@ -3517,7 +3518,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] @@ -6014,7 +6015,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.5.10", + "socket2 0.6.5", "system-configuration", "tokio", "tower-layer", @@ -6893,7 +6894,7 @@ dependencies = [ name = "kona-client" version = "1.0.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -6933,7 +6934,7 @@ dependencies = [ name = "kona-derive" version = "0.4.5" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -6984,7 +6985,7 @@ dependencies = [ name = "kona-driver" version = "0.4.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-evm", "alloy-primitives", "async-trait", @@ -7003,15 +7004,15 @@ dependencies = [ name = "kona-engine" version = "0.1.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-hardforks", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-transport", "alloy-transport-http", "arbitrary", @@ -7044,7 +7045,7 @@ dependencies = [ name = "kona-executor" version = "0.4.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -7081,7 +7082,7 @@ name = "kona-genesis" version = "0.4.5" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", @@ -7104,7 +7105,7 @@ name = "kona-gossip" version = "0.1.2" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -7161,7 +7162,7 @@ dependencies = [ name = "kona-host" version = "1.0.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", "alloy-op-evm", @@ -7211,7 +7212,7 @@ dependencies = [ name = "kona-interop" version = "0.4.5" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -7240,7 +7241,7 @@ version = "0.1.2" name = "kona-mpt" version = "0.3.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rlp", @@ -7267,7 +7268,7 @@ dependencies = [ "alloy-provider", "alloy-rpc-types-engine", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "alloy-transport", "alloy-transport-http", "anyhow", @@ -7319,15 +7320,15 @@ name = "kona-node-service" version = "0.1.3" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "alloy-transport", "alloy-transport-http", "anyhow", @@ -7377,7 +7378,7 @@ dependencies = [ name = "kona-peers" version = "0.1.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rlp", "arbitrary", @@ -7421,7 +7422,7 @@ dependencies = [ name = "kona-proof" version = "0.3.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -7461,7 +7462,7 @@ dependencies = [ name = "kona-proof-interop" version = "0.2.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -7496,14 +7497,14 @@ name = "kona-protocol" version = "0.4.5" dependencies = [ "alloc-no-stdlib", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-hardforks", "alloy-op-hardforks", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-sol-types", "ambassador", @@ -7537,13 +7538,13 @@ dependencies = [ name = "kona-providers-alloy" version = "0.3.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-transport", "alloy-transport-http", @@ -7575,7 +7576,7 @@ dependencies = [ name = "kona-providers-local" version = "0.1.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "async-trait", @@ -7672,7 +7673,7 @@ dependencies = [ "alloy-primitives", "alloy-rpc-client", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "alloy-transport", "alloy-transport-http", "derive_more 2.1.1", @@ -7695,7 +7696,7 @@ version = "0.0.1" name = "kona-sp1-client-utils" version = "0.0.1" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -7734,7 +7735,7 @@ name = "kona-sp1-ethereum-client-utils" version = "0.0.1" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-op-evm", "alloy-primitives", @@ -7764,7 +7765,7 @@ dependencies = [ name = "kona-sp1-host-utils" version = "0.0.1" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-client", @@ -7805,15 +7806,15 @@ dependencies = [ name = "kona-sp1-proposer" version = "0.1.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-contract", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", - "alloy-rpc-types-eth 2.4.2", - "alloy-signer-local 2.4.2", + "alloy-rpc-types-eth 2.5.0", + "alloy-signer-local 2.5.0", "alloy-sol-types", "alloy-transport-http", "anyhow", @@ -8738,7 +8739,7 @@ dependencies = [ "ipnet", "metrics", "metrics-util", - "quanta", + "quanta 0.12.6", "thiserror 2.0.18", "tokio", "tracing", @@ -8772,7 +8773,7 @@ dependencies = [ "indexmap 2.14.0", "metrics", "ordered-float", - "quanta", + "quanta 0.12.6", "rand 0.9.4", "rand_xoshiro", "rapidhash", @@ -9299,7 +9300,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 1.3.1", + "proc-macro-crate 3.5.0", "proc-macro2", "quote", "syn 2.0.117", @@ -9415,12 +9416,12 @@ dependencies = [ name = "op-alloy-consensus" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-signer 2.5.0", "arbitrary", @@ -9449,10 +9450,10 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" name = "op-alloy-network" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-network 2.4.2", + "alloy-consensus 2.5.0", + "alloy-network 2.5.0", "alloy-provider", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "op-alloy-consensus", "op-alloy-rpc-types", ] @@ -9461,7 +9462,7 @@ dependencies = [ name = "op-alloy-provider" version = "2.0.0" dependencies = [ - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-types-engine", @@ -9482,12 +9483,12 @@ dependencies = [ name = "op-alloy-rpc-types" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", - "alloy-network-primitives 2.4.2", + "alloy-network 2.5.0", + "alloy-network-primitives 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-signer 2.5.0", "arbitrary", @@ -9506,7 +9507,7 @@ dependencies = [ name = "op-alloy-rpc-types-engine" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -9565,7 +9566,7 @@ dependencies = [ name = "op-reth-sdm-fixture" version = "0.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-evm", "alloy-op-evm", "alloy-primitives", @@ -9602,7 +9603,7 @@ dependencies = [ name = "op-reth-test-engine" version = "0.1.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -10811,7 +10812,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ "heck", - "itertools 0.12.1", + "itertools 0.14.0", "log", "multimap", "once_cell", @@ -10843,7 +10844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.117", @@ -10856,7 +10857,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.12.1", + "itertools 0.14.0", "proc-macro2", "quote", "syn 2.0.117", @@ -10915,6 +10916,21 @@ dependencies = [ "winapi", ] +[[package]] +name = "quanta" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "73be39b77b45d82a4d1a5793fe9a89a5c143ceaa6ad0d8417982566bb0f34e11" +dependencies = [ + "libc", + "portable-atomic", + "raw-cpuid", + "wasip1", + "wasip2", + "web-sys", + "windows-sys 0.61.2", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -10935,7 +10951,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.5.10", + "socket2 0.6.5", "thiserror 2.0.18", "tokio", "tracing", @@ -10974,7 +10990,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.5.10", + "socket2 0.6.5", "tracing", "windows-sys 0.60.2", ] @@ -11489,10 +11505,10 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "reth-basic-payload-builder" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "futures-core", @@ -11516,26 +11532,24 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "derive_more 2.1.1", "metrics", "parking_lot", "pin-project", "rand 0.9.4", "reth-chainspec", - "reth-errors", "reth-ethereum-primitives", "reth-execution-types", "reth-metrics", "reth-primitives-traits", - "reth-storage-api", "reth-trie", "reth-trie-sparse", "revm", @@ -11547,11 +11561,11 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", @@ -11567,8 +11581,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-genesis", "clap", @@ -11580,11 +11594,12 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -11669,8 +11684,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "reth-tasks", "tokio", @@ -11679,8 +11694,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -11700,11 +11715,11 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f0dd7f542fbcae0e490ebe13f3eababcc05547375246ff7f62700b533cf3f01" +checksum = "59a24479f12308e4ff8db606bc445fed267899a56661877231667f94eb0fd699" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -11721,9 +11736,9 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e508fcbb8cb775639dbbb56b81b62756d4322f28e76c60a52aa32575f993fe" +checksum = "ecf4de10362fdf18e80e9f3d096f617ce0725c85dc24e9deabb414c52089040c" dependencies = [ "proc-macro2", "quote", @@ -11732,8 +11747,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "eyre", "humantime-serde", @@ -11749,11 +11764,11 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.5", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-primitives", "auto_impl", "reth-execution-types", @@ -11763,10 +11778,10 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "reth-chainspec", @@ -11776,10 +11791,10 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", "alloy-primitives", @@ -11801,8 +11816,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "derive_more 2.1.1", @@ -11811,12 +11826,12 @@ dependencies = [ "metrics", "page_size", "parking_lot", - "quanta", "reth-db-api", "reth-fs-util", "reth-libmdbx", "reth-metrics", "reth-nippy-jar", + "reth-primitives-traits", "reth-static-file-types", "reth-storage-errors", "reth-tracing", @@ -11830,10 +11845,11 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", + "alloy-eips 2.5.0", "alloy-primitives", "arbitrary", "arrayvec", @@ -11856,10 +11872,10 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-genesis", "alloy-primitives", "boyer-moore-magiclen", @@ -11886,8 +11902,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -11901,8 +11917,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -11926,8 +11942,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -11950,8 +11966,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "dashmap", @@ -11974,10 +11990,10 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -11990,15 +12006,16 @@ dependencies = [ "rayon", "reth-config", "reth-consensus", + "reth-eth-wire-types", "reth-ethereum-primitives", "reth-metrics", "reth-network-p2p", "reth-network-peers", "reth-primitives-traits", - "reth-provider", "reth-storage-api", "reth-tasks", "reth-testing-utils", + "reth-trie-common", "tempfile", "thiserror 2.0.18", "tokio", @@ -12009,19 +12026,20 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-genesis", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "derive_more 2.1.1", "eyre", "futures-util", @@ -12036,7 +12054,6 @@ dependencies = [ "reth-engine-primitives", "reth-ethereum-primitives", "reth-network-api", - "reth-network-p2p", "reth-network-peers", "reth-node-api", "reth-node-builder", @@ -12055,6 +12072,8 @@ dependencies = [ "reth-tasks", "reth-tokio-util", "reth-tracing", + "reth-trie", + "reth-trie-db", "revm", "serde_json", "tempfile", @@ -12066,8 +12085,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "aes", "alloy-primitives", @@ -12093,10 +12112,10 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "eyre", @@ -12116,10 +12135,10 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", @@ -12143,11 +12162,11 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.5", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", @@ -12199,12 +12218,11 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", - "alloy-rlp", "alloy-rpc-types-engine", "eyre", "futures", @@ -12229,10 +12247,10 @@ dependencies = [ [[package]] name = "reth-era" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -12247,8 +12265,8 @@ dependencies = [ [[package]] name = "reth-era-downloader" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "bytes", @@ -12263,10 +12281,10 @@ dependencies = [ [[package]] name = "reth-era-utils" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rlp", "eyre", @@ -12287,8 +12305,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -12298,8 +12316,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-chains", "alloy-primitives", @@ -12327,12 +12345,12 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.5", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-hardforks", "alloy-primitives", @@ -12353,11 +12371,11 @@ dependencies = [ [[package]] name = "reth-ethereum" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "reth-chainspec", "reth-cli-util", "reth-codecs", @@ -12394,8 +12412,8 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "clap", "eyre", @@ -12417,10 +12435,10 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "reth-chainspec", @@ -12433,8 +12451,8 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -12449,8 +12467,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -12463,10 +12481,10 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -12493,13 +12511,12 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "reth-codecs", "reth-primitives-traits", "serde", @@ -12507,8 +12524,8 @@ dependencies = [ [[package]] name = "reth-etl" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "rayon", "reth-db-api", @@ -12517,11 +12534,11 @@ dependencies = [ [[package]] name = "reth-evm" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.5", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", @@ -12543,10 +12560,10 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", @@ -12563,8 +12580,8 @@ dependencies = [ [[package]] name = "reth-execution-cache" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "fixed-cache", @@ -12573,16 +12590,15 @@ dependencies = [ "reth-errors", "reth-metrics", "reth-primitives-traits", - "reth-provider", "reth-revm", - "reth-trie", + "reth-storage-api", "tracing", ] [[package]] name = "reth-execution-errors" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-evm", "alloy-primitives", @@ -12594,10 +12610,11 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", @@ -12613,10 +12630,10 @@ dependencies = [ [[package]] name = "reth-exex" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "eyre", @@ -12651,8 +12668,8 @@ dependencies = [ [[package]] name = "reth-exex-test-utils" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "eyre", @@ -12683,8 +12700,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -12697,8 +12714,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "serde", "serde_json", @@ -12707,10 +12724,10 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-debug", @@ -12733,8 +12750,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "bytes", "futures", @@ -12753,8 +12770,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "bitflags 2.11.1", "byteorder", @@ -12770,8 +12787,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "bindgen", "cc", @@ -12779,8 +12796,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "futures", "libc", @@ -12793,8 +12810,8 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "ipnet", @@ -12802,8 +12819,8 @@ dependencies = [ [[package]] name = "reth-net-nat" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "futures-util", "if-addrs 0.14.0", @@ -12816,10 +12833,10 @@ dependencies = [ [[package]] name = "reth-network" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -12851,6 +12868,7 @@ dependencies = [ "reth-fs-util", "reth-metrics", "reth-net-banlist", + "reth-net-nat", "reth-network-api", "reth-network-p2p", "reth-network-peers", @@ -12875,13 +12893,13 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rpc-types-admin", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "auto_impl", "derive_more 2.1.1", "enr", @@ -12900,11 +12918,11 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.5", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-primitives", "auto_impl", @@ -12924,8 +12942,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -12939,8 +12957,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -12953,8 +12971,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "anyhow", "bincode 1.3.3", @@ -12963,6 +12981,7 @@ dependencies = [ "memmap2", "reth-fs-util", "serde", + "smallvec", "thiserror 2.0.18", "tracing", "zstd", @@ -12970,8 +12989,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -12994,10 +13013,10 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-provider", @@ -13062,10 +13081,10 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", @@ -13117,18 +13136,20 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", + "alloy-rlp", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "ethereum_ssz", "ethereum_ssz_derive", "eyre", + "futures", "http-body-util", "jsonrpsee", "reth-chainspec", @@ -13155,8 +13176,10 @@ dependencies = [ "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", + "reth-tasks", "reth-tracing", "reth-transaction-pool", + "reth-trie-common", "revm", "serde", "serde_json", @@ -13166,10 +13189,10 @@ dependencies = [ [[package]] name = "reth-node-ethstats" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "chrono", "futures-util", @@ -13190,10 +13213,10 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", @@ -13214,8 +13237,8 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "bytes", "eyre", @@ -13228,6 +13251,7 @@ dependencies = [ "metrics-exporter-prometheus", "metrics-process", "metrics-util", + "parking_lot", "pprof_util", "procfs", "reqwest 0.13.2", @@ -13243,8 +13267,8 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "reth-chainspec", "reth-db-api", @@ -13299,7 +13323,7 @@ name = "reth-optimism-chainspec" version = "1.11.3" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", @@ -13331,7 +13355,7 @@ dependencies = [ name = "reth-optimism-cli" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-genesis", "alloy-primitives", "clap", @@ -13372,10 +13396,10 @@ dependencies = [ [[package]] name = "reth-optimism-consensus" -version = "1.11.3" +version = "2.0.0" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-trie", @@ -13409,13 +13433,13 @@ dependencies = [ name = "reth-optimism-evm" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", "alloy-op-evm", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "metrics-exporter-prometheus", "metrics-util", "op-alloy-consensus", @@ -13434,6 +13458,7 @@ dependencies = [ "reth-primitives-traits", "reth-revm", "reth-rpc-eth-api", + "reth-storage-api", "reth-storage-errors", "revm", "rstest", @@ -13446,7 +13471,7 @@ dependencies = [ name = "reth-optimism-exex" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "eyre", "futures", @@ -13463,6 +13488,7 @@ dependencies = [ "reth-optimism-trie", "reth-primitives-traits", "reth-provider", + "reth-stages-types", "reth-trie", "tempfile", "tokio", @@ -13473,13 +13499,13 @@ dependencies = [ name = "reth-optimism-flashblocks" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rpc-types", "alloy-rpc-types-engine", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "brotli", "derive_more 2.1.1", "eyre", @@ -13530,18 +13556,18 @@ dependencies = [ name = "reth-optimism-node" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-genesis", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-op-evm", "alloy-op-hardforks", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-admin", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-trace", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "clap", "eyre", "futures", @@ -13554,7 +13580,6 @@ dependencies = [ "op-alloy-network", "op-alloy-rpc-types-engine", "op-revm", - "reth-basic-payload-builder", "reth-chain-state", "reth-chainspec", "reth-consensus", @@ -13568,7 +13593,6 @@ dependencies = [ "reth-node-api", "reth-node-builder", "reth-node-core", - "reth-node-metrics", "reth-optimism-chainspec", "reth-optimism-consensus", "reth-optimism-evm", @@ -13612,14 +13636,14 @@ dependencies = [ name = "reth-optimism-payload-builder" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "derive_more 2.1.1", "metrics-exporter-prometheus", "metrics-util", @@ -13644,6 +13668,7 @@ dependencies = [ "reth-primitives-traits", "reth-revm", "reth-storage-api", + "reth-tasks", "reth-transaction-pool", "revm", "rstest", @@ -13657,7 +13682,7 @@ dependencies = [ name = "reth-optimism-post-exec-replay" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "op-alloy-consensus", @@ -13676,7 +13701,7 @@ dependencies = [ name = "reth-optimism-primitives" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -13703,7 +13728,7 @@ dependencies = [ name = "reth-optimism-rpc" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", @@ -13714,7 +13739,7 @@ dependencies = [ "alloy-rpc-client", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-transport", "alloy-transport-http", @@ -13736,6 +13761,7 @@ dependencies = [ "reth-basic-payload-builder", "reth-chain-state", "reth-chainspec", + "reth-errors", "reth-evm", "reth-metrics", "reth-node-api", @@ -13762,6 +13788,7 @@ dependencies = [ "reth-storage-api", "reth-tasks", "reth-transaction-pool", + "reth-trie-common", "revm", "rstest", "serde", @@ -13778,7 +13805,7 @@ dependencies = [ name = "reth-optimism-storage" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "reth-codecs", "reth-optimism-primitives", "reth-prune-types", @@ -13790,7 +13817,7 @@ dependencies = [ name = "reth-optimism-trie" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -13838,12 +13865,12 @@ dependencies = [ name = "reth-optimism-txpool" version = "1.11.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "async-trait", "c-kzg", @@ -13880,10 +13907,10 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rpc-types", "derive_more 2.1.1", @@ -13904,8 +13931,8 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "pin-project", "reth-payload-primitives", @@ -13916,10 +13943,10 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -13939,36 +13966,37 @@ dependencies = [ [[package]] name = "reth-payload-util" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "reth-transaction-pool", ] [[package]] name = "reth-payload-validator" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-rpc-types-engine", "reth-primitives-traits", ] [[package]] name = "reth-primitives-traits" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4666a8d5b246650b23e6767a45e46334d352557f473e91c2ea7211cc29291cca" +checksum = "f6ba9e5768d35c074e997bd8c92938c8a52f3207c5ff97258eb2eca5d7a79dd5" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-trie", "arbitrary", "byteorder", @@ -13979,7 +14007,7 @@ dependencies = [ "once_cell", "proptest", "proptest-arbitrary-interop", - "quanta", + "quanta 0.13.0", "rayon", "reth-codecs", "revm-bytecode", @@ -13992,11 +14020,11 @@ dependencies = [ [[package]] name = "reth-provider" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.5", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -14029,7 +14057,6 @@ dependencies = [ "reth-storage-errors", "reth-storage-overlay", "reth-tasks", - "reth-tokio-util", "reth-trie", "reth-trie-db", "revm", @@ -14042,10 +14069,10 @@ dependencies = [ [[package]] name = "reth-prune" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "itertools 0.14.0", "metrics", @@ -14069,8 +14096,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "arbitrary", @@ -14085,8 +14112,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -14100,16 +14127,16 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-dyn-abi", - "alloy-eip7928 0.4.5", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-client", @@ -14118,13 +14145,13 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", "alloy-serde 2.5.0", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "async-trait", "derive_more 2.1.1", "dyn-clone", @@ -14176,8 +14203,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-genesis", @@ -14189,7 +14216,7 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", @@ -14206,10 +14233,10 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-provider", "dyn-clone", "http 1.4.0", @@ -14249,15 +14276,15 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-evm", "alloy-json-rpc 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "auto_impl", "dyn-clone", "jsonrpsee-types", @@ -14269,8 +14296,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -14300,19 +14327,19 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-dyn-abi", - "alloy-eip7928 0.4.5", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-json-rpc 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-mev", "alloy-serde 2.5.0", "async-trait", @@ -14347,18 +14374,18 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.5", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-sol-types", "alloy-transport", @@ -14384,7 +14411,6 @@ dependencies = [ "reth-storage-api", "reth-tasks", "reth-transaction-pool", - "reth-trie", "revm", "revm-inspectors", "schnellru", @@ -14398,13 +14424,15 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-rpc-types-engine", "http 1.4.0", + "http-body-util", "jsonrpsee-http-client", "pin-project", + "tokio", "tower 0.5.3", "tower-http", "tracing", @@ -14412,10 +14440,9 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "jsonrpsee-core", @@ -14428,14 +14455,14 @@ dependencies = [ [[package]] name = "reth-rpc-traits" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b417a50d3fa9b58bb1a22e46fb47e0866006f24abffa1fbe75ae60116b5b2efa" +checksum = "8a4658e897dcc67b1710af3ec82e7bb4bcd766c171523b8ecf79baef43851d1a" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-network 2.4.2", + "alloy-consensus 2.5.0", + "alloy-network 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-signer 2.5.0", "reth-primitives-traits", "thiserror 2.0.18", @@ -14443,10 +14470,11 @@ dependencies = [ [[package]] name = "reth-stages" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-primitives", "alloy-rlp", "eyre", @@ -14494,8 +14522,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -14522,8 +14550,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "arbitrary", @@ -14536,8 +14564,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "parking_lot", @@ -14556,8 +14584,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "clap", @@ -14571,15 +14599,16 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.5", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", + "reth-chain-state", "reth-chainspec", "reth-db-api", "reth-db-models", @@ -14589,16 +14618,16 @@ dependencies = [ "reth-prune-types", "reth-stages-types", "reth-storage-errors", - "reth-tokio-util", "reth-trie-common", "revm", "serde_json", + "tokio", ] [[package]] name = "reth-storage-errors" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -14614,8 +14643,8 @@ dependencies = [ [[package]] name = "reth-storage-overlay" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -14636,13 +14665,14 @@ dependencies = [ "reth-trie", "reth-trie-common", "reth-trie-db", + "revm", "tracing", ] [[package]] name = "reth-tasks" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "crossbeam-utils", "dashmap", @@ -14662,10 +14692,10 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -14678,8 +14708,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "tokio", "tokio-stream", @@ -14688,8 +14718,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "clap", "eyre", @@ -14708,8 +14738,8 @@ dependencies = [ [[package]] name = "reth-tracing-otlp" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "base64 0.22.1", "clap", @@ -14727,10 +14757,10 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -14772,10 +14802,10 @@ dependencies = [ [[package]] name = "reth-trie" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -14798,13 +14828,13 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-trie", "arbitrary", @@ -14821,12 +14851,13 @@ dependencies = [ "revm", "serde", "serde_with", + "thiserror 2.0.18", ] [[package]] name = "reth-trie-db" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "reth-db-api", @@ -14841,8 +14872,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-evm", "alloy-primitives", @@ -14857,7 +14888,6 @@ dependencies = [ "reth-storage-errors", "reth-tasks", "reth-trie", - "reth-trie-sparse", "revm", "thiserror 2.0.18", "tracing", @@ -14865,8 +14895,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "2.5.2" -source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +version = "2.7.0" +source = "git+https://github.com/paradigmxyz/reth?tag=v2.7.0#3d592ece6de8c4559987416a544fc215fd6d6921" dependencies = [ "alloy-primitives", "alloy-trie", @@ -14877,8 +14907,6 @@ dependencies = [ "reth-metrics", "reth-primitives-traits", "reth-trie-common", - "serde", - "serde_json", "slotmap", "smallvec", "strum", @@ -14887,18 +14915,18 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80addacffc5df9398c55919f8993922d2b688f2aa5753708fdd658ca3cc63e39" +checksum = "65d41037bdcd4d60ca6bbe4e65cc61bbaf29ef7235c2c614e59c25d5a94ac813" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "42.0.1" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c7fcd426beab3b91300a6d0d5eb8d583c0fad0fba451126e19fd51443eca62" +checksum = "62b2fbb3bdce72fef4f156e2164bdfde44dc3aeebc5b4f31a413fba0c09c524c" dependencies = [ "revm-bytecode", "revm-context", @@ -14915,9 +14943,9 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537356bdec80dbc04e4e6bb688b3441ff7cf18eecdcf3cac23150633c46467f1" +checksum = "c8d38e16b72ec1c836ec8490562bfb21003165ea8bc496086bf345680a6e6c41" dependencies = [ "bitvec", "phf 0.14.0", @@ -14927,9 +14955,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "42.0.0" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6512f05f83378e29b2b016fa5bd7f5a533e3625548be4113732e1a536c2564" +checksum = "9b06efea511a15ff8309acaa4c283239b444b461bbd2e9f0326c8586f45fb1da" dependencies = [ "bitvec", "cfg-if", @@ -14944,9 +14972,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "42.0.0" +version = "43.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103fff818b10311034c0c11ff8760294ee0e3c320daab3c5717990fe8ee2617b" +checksum = "3068385c68f6a3bd2e781dd81cefd25c98dd0a574de6c8ec2a90acc33318b2da" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -14960,9 +14988,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "42.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df72760eab0852100e748c7cb03ce0221626d60ac14534118c84c5cc894fb4c9" +checksum = "8db6fb10912d7fba0161e91d4577ce71fa9726ec38a4d420e4242e504a47aa8f" dependencies = [ "alloy-eips 2.5.0", "derive_more 2.1.1", @@ -14976,9 +15004,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "42.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9286c059a11be1dee814cafdc3a3ade57521c8caa050785a52c19a9d894f400" +checksum = "5581ecadb3d0d1c18a91f1797d6b7c4c17720bea596e9e9ec90b95803db2bc77" dependencies = [ "auto_impl", "either", @@ -15000,9 +15028,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "42.0.1" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09126175c3fa482e71e80cc28c6bb17e681911e472b94d4f7f73dd6780411798" +checksum = "ba5102e9c02b9d27e7c98f449b495a2c2b2ec011209f4eeca16e054520ec5ac4" dependencies = [ "auto_impl", "derive-where", @@ -15019,9 +15047,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "42.0.1" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa55b208b52f0c083ea68147c78866eeecadd7c0071a614f477de316b60648e" +checksum = "825cf946c1bf3178f6a93aae4e8064a0ebd505bc764a7fe3d49411e7242e4091" dependencies = [ "auto_impl", "either", @@ -15037,19 +15065,22 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.42.2" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c136a072540987ee442e9824631835520b13e5756f20780a637ba2e11f9c28" +checksum = "3584d48ecc82f4df573c0b68994a27f46da53e06dfae224e446b1aa868bc1665" dependencies = [ + "alloy-eip2930", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", "boa_engine", "boa_gc", "colorchoice", + "num-bigint 0.4.6", "revm", + "ruint", "serde", "serde_json", "thiserror 2.0.18", @@ -15057,9 +15088,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "42.0.0" +version = "43.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd310927437752ce4bac6997b385772823b84843f04c82e151993bec1265a5ed" +checksum = "aa32f5099a266329d1869d6f9bf4bb7894345d2b58c57d05396f67385d65f299" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -15070,9 +15101,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "42.0.1" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2431091420999795df6a200b9f7933defe3d654710560a895e6bcabbd9954a5" +checksum = "aa80b8cef09bead8c8b1afa7733b09fc1428f49158d8657c239268409d2a2bf7" dependencies = [ "ark-bls12-381 0.6.0", "ark-bn254", @@ -15098,9 +15129,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef5564c1bce219fd08beca43d4f39fdcbc19193fa4f604c0c6b58950a13194a" +checksum = "f1f4ba1a5757fe4398262290422c371556fcebf236f762f7ed7ff2c56768a63c" dependencies = [ "alloy-primitives", "once_cell", @@ -15109,16 +15140,17 @@ dependencies = [ [[package]] name = "revm-state" -version = "42.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ae66db3abfcb565854dbfc95513bfa440b3dc390ddf8e50b0363d12a6fa79" +checksum = "3b2d2ec0be925c4c87ff4afae33af4b9f693d9b011f74d6b4d52267a62df0c49" dependencies = [ - "alloy-eip7928 0.4.5", + "alloy-eip7928 0.4.11", "bitflags 2.11.1", "nonmax", "revm-bytecode", "revm-primitives", "serde", + "triomphe", ] [[package]] @@ -17974,6 +18006,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", + "futures-util", "pin-project-lite", "slab", "tokio", @@ -18490,6 +18523,15 @@ dependencies = [ "rlp", ] +[[package]] +name = "triomphe" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b40688ea6389c8171614b25491f71d4a27946e0c7ce2da1c6de27e25abf1a0ae" +dependencies = [ + "serde", +] + [[package]] name = "try-lock" version = "0.2.5" @@ -18876,6 +18918,12 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" +[[package]] +name = "wasip1" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5e26842486624357dbeb8f0381cf1fb42f022291fd787d4a816768fec8cc760" + [[package]] name = "wasip2" version = "1.0.3+wasi-0.2.9" @@ -19121,7 +19169,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.61.2", ] [[package]] @@ -19694,6 +19742,9 @@ name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" +dependencies = [ + "bitflags 2.11.1", +] [[package]] name = "wit-bindgen-core" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index df38fb1a44d..f95903cc3ae 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -350,104 +350,104 @@ alloy-op-evm = { version = "0.32.0", path = "alloy-op-evm/", default-features = alloy-op-hardforks = { version = "0.5.0", path = "alloy-op-hardforks/", default-features = false } # ==================== RETH CRATES (crates.io) ==================== -reth-codecs = { version = "0.6.0", default-features = false, features = [ +reth-codecs = { version = "0.8.1", default-features = false, features = [ "alloy", ] } -reth-codecs-derive = "0.6.0" -reth-primitives-traits = { version = "0.6.0", default-features = false } -reth-rpc-traits = { version = "0.6.0", default-features = false } -reth-zstd-compressors = { version = "0.6.0", default-features = false } +reth-codecs-derive = "0.8.1" +reth-primitives-traits = { version = "0.8.1", default-features = false } +reth-rpc-traits = { version = "0.8.1", default-features = false } +reth-zstd-compressors = { version = "0.8.1", default-features = false } # ==================== RETH CRATES (git) ==================== -reth = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-basic-payload-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-chain-state = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-chainspec = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-cli = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-cli-commands = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-cli-runner = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-cli-util = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-consensus = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-consensus-common = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-db = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-db-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-db-common = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-downloaders = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-e2e-test-utils = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-engine-local = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-engine-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-eth-wire = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-eth-wire-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-ethereum-cli = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-ethereum-consensus = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-ethereum-forks = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-ethereum-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-evm = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-evm-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-exex = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-exex-test-utils = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-execution-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-execution-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-fs-util = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-metrics = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-network = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-network-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-network-peers = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-node-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-node-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-node-core = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-node-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-node-events = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-node-metrics = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-payload-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-payload-builder-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-payload-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-payload-util = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-payload-validator = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-provider = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-prune = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-prune-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-revm = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-rpc = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-rpc-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-rpc-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-rpc-engine-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-rpc-eth-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-rpc-eth-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-rpc-server-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-stages = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-stages-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-static-file = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-static-file-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-storage-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-storage-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-storage-overlay = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-tasks = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-tracing = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-transaction-pool = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-trie = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } -reth-trie-common = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66", default-features = false } -reth-trie-db = { git = "https://github.com/ethereum-optimism/reth", rev = "0fbe428518594611bdd3fdd822eb5968823c8e66" } +reth = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-chain-state = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-db = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-db-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-db-common = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-downloaders = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-engine-local = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-exex = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-fs-util = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-network = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-network-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-node-events = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-payload-util = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-payload-validator = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-prune = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-prune-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-stages = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-stages-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-static-file = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-static-file-types = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-storage-api = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-storage-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-storage-overlay = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-tasks = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } +reth-trie-common = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0", default-features = false } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", tag = "v2.7.0" } # ==================== REVM (latest: op-reth versions) ==================== -revm = { version = "42.0.1", default-features = false } -revm-bytecode = { version = "42.0.0", default-features = false } -revm-database = { version = "42.0.0", default-features = false } -revm-state = { version = "42.0.0", default-features = false } -revm-primitives = { version = "42.0.0", default-features = false } -revm-interpreter = { version = "42.0.0", default-features = false } -revm-database-interface = { version = "42.0.0", default-features = false } +revm = { version = "43.0.3", default-features = false } +revm-bytecode = { version = "43.0.0", default-features = false } +revm-database = { version = "43.0.1", default-features = false } +revm-state = { version = "43.0.1", default-features = false } +revm-primitives = { version = "43.0.0", default-features = false } +revm-interpreter = { version = "43.0.2", default-features = false } +revm-database-interface = { version = "43.0.1", default-features = false } op-revm = { version = "20.0.0", path = "op-revm/", default-features = false } -revm-inspectors = "0.42.0" +revm-inspectors = "0.44.0" # ==================== ALLOY ==================== alloy-chains = { version = "0.2.33", default-features = false } alloy-dyn-abi = "1.6.1" alloy-eip2124 = { version = "0.2.0", default-features = false } -alloy-eip7928 = { version = "0.4.5", default-features = false } -alloy-evm = { version = "0.38.0", default-features = false } +alloy-eip7928 = { version = "0.4.10", default-features = false } +alloy-evm = { version = "0.39.0", default-features = false } alloy-primitives = { version = "1.6.1", default-features = false, features = [ "map-foldhash", ] } @@ -458,45 +458,45 @@ alloy-sol-macro = "1.6.1" alloy-sol-types = { version = "1.6.1", default-features = false } alloy-trie = { version = "0.9.4", default-features = false } -alloy-hardforks = { version = "0.4.7", default-features = false } - -alloy-consensus = { version = "2.3.0", default-features = false } -alloy-contract = { version = "2.3.0", default-features = false } -alloy-eips = { version = "2.3.0", default-features = false } -alloy-genesis = { version = "2.3.0", default-features = false } -alloy-json-rpc = { version = "2.3.0", default-features = false } -alloy-network = { version = "2.3.0", default-features = false } -alloy-network-primitives = { version = "2.3.0", default-features = false } -alloy-node-bindings = { version = "2.3.0", default-features = false } -alloy-provider = { version = "2.3.0", features = [ +alloy-hardforks = { version = "0.4.9", default-features = false } + +alloy-consensus = { version = "2.5.0", default-features = false } +alloy-contract = { version = "2.5.0", default-features = false } +alloy-eips = { version = "2.5.0", default-features = false } +alloy-genesis = { version = "2.5.0", default-features = false } +alloy-json-rpc = { version = "2.5.0", default-features = false } +alloy-network = { version = "2.5.0", default-features = false } +alloy-network-primitives = { version = "2.5.0", default-features = false } +alloy-node-bindings = { version = "2.5.0", default-features = false } +alloy-provider = { version = "2.5.0", features = [ "reqwest", "debug-api", ], default-features = false } -alloy-pubsub = { version = "2.3.0", default-features = false } -alloy-rpc-client = { version = "2.3.0", default-features = false } -alloy-rpc-types = { version = "2.3.0", features = [ +alloy-pubsub = { version = "2.5.0", default-features = false } +alloy-rpc-client = { version = "2.5.0", default-features = false } +alloy-rpc-types = { version = "2.5.0", features = [ "eth", ], default-features = false } -alloy-rpc-types-admin = { version = "2.3.0", default-features = false } -alloy-rpc-types-anvil = { version = "2.3.0", default-features = false } -alloy-rpc-types-beacon = { version = "2.3.0", default-features = false } -alloy-rpc-types-debug = { version = "2.3.0", default-features = false } -alloy-rpc-types-engine = { version = "2.3.0", default-features = false } -alloy-rpc-types-eth = { version = "2.3.0", default-features = false } -alloy-rpc-types-mev = { version = "2.3.0", default-features = false } -alloy-rpc-types-trace = { version = "2.3.0", default-features = false } -alloy-rpc-types-txpool = { version = "2.3.0", default-features = false } -alloy-serde = { version = "2.3.0", default-features = false } -alloy-signer = { version = "2.3.0", default-features = false } +alloy-rpc-types-admin = { version = "2.5.0", default-features = false } +alloy-rpc-types-anvil = { version = "2.5.0", default-features = false } +alloy-rpc-types-beacon = { version = "2.5.0", default-features = false } +alloy-rpc-types-debug = { version = "2.5.0", default-features = false } +alloy-rpc-types-engine = { version = "2.5.0", default-features = false } +alloy-rpc-types-eth = { version = "2.5.0", default-features = false } +alloy-rpc-types-mev = { version = "2.5.0", default-features = false } +alloy-rpc-types-trace = { version = "2.5.0", default-features = false } +alloy-rpc-types-txpool = { version = "2.5.0", default-features = false } +alloy-serde = { version = "2.5.0", default-features = false } +alloy-signer = { version = "2.5.0", default-features = false } # sp1-sdk's dynamic_signer builder method uses alloy-signer 1.x, distinct from the workspace's 2.x. sp1-alloy-signer = { package = "alloy-signer", version = "1.0", default-features = false } -alloy-signer-local = { version = "2.3.0", default-features = false } -alloy-transport = { version = "2.3.0" } -alloy-transport-http = { version = "2.3.0", features = [ +alloy-signer-local = { version = "2.5.0", default-features = false } +alloy-transport = { version = "2.5.0" } +alloy-transport-http = { version = "2.5.0", features = [ "reqwest-rustls-tls", ], default-features = false } -alloy-transport-ipc = { version = "2.3.0", default-features = false } -alloy-transport-ws = { version = "2.3.0", default-features = false } +alloy-transport-ipc = { version = "2.5.0", default-features = false } +alloy-transport-ws = { version = "2.5.0", default-features = false } # ==================== OP-ALLOY (from crates.io) ==================== op-alloy = { version = "2.0.0", path = "op-alloy/crates/op-alloy", default-features = false } diff --git a/rust/UPDATING-RETH.md b/rust/UPDATING-RETH.md index c3192beef9f..14f5617996b 100644 --- a/rust/UPDATING-RETH.md +++ b/rust/UPDATING-RETH.md @@ -236,6 +236,35 @@ main's CI actually validated. it from an unreleased dependency bump; update it through the release generator after the next finalized tag. +## v2.7.0 adaptation notes + +- `StateProviderDatabase` now requires an EVM-state provider. Adapt a storage + `StateProvider` with `.into_evm_state_provider()` before constructing the + database, including in test fixtures; account/block reader traits alone are + not the new interface. +- `CancelOnDrop` moved from `reth_revm::cancelled` to `reth_tasks`. + The e2e `setup_engine` helper was replaced by `E2ETestSetupBuilder`. + `EthApiCtx` also gained `sender_recovery_cache`; forward the launch context's + cache when constructing it manually, including in doctest examples. +- Multi-block database fixtures must persist trie updates explicitly after + `append_blocks_with_state`: compute `state_root_with_updates` before appending + and call `write_trie_updates` before committing, as in reth#27307. Otherwise + subsequent blocks can read stale stored trie nodes despite current hashed state. + Derive updates from the execution state, not the header's root: negative tests + deliberately corrupt that header while retaining valid execution state. +- Reth removed `MemoryOverlayStateProviderRef` in paradigmxyz/reth#26923. + Its `state_with_block_appended` replacement assumes the historical provider + is at the appended block's immediate parent. Flashblocks instead overlay an + accumulated speculative bundle on its **canonical anchor**, which need not + equal that parent. Preserve this distinction in pending RPC state; use the + local owned `PendingStateProvider` port rather than looking up the speculative + parent in canonical storage. The proofs-buffer `hashed_post_state` port also + retains storage-zeroing behavior from the removed upstream provider. +- Alloy 2.5.0's canonical-receipt guards must also reach `OpReceipt`, not just + `OpReceiptEnvelope`: reth's network receipt type is + `ReceiptWithBloom`. Its EIP-2718 and RLP string decoders both reject + type-tagged legacy receipts; untagged legacy lists remain valid. + ## Expect upstream churn beyond your target change A rev bump is rarely "just a rev change." Upstream reth iterates trait diff --git a/rust/alloy-op-evm/src/block/mod.rs b/rust/alloy-op-evm/src/block/mod.rs index 903aeb6d62b..a4b4dc10bf7 100644 --- a/rust/alloy-op-evm/src/block/mod.rs +++ b/rust/alloy-op-evm/src/block/mod.rs @@ -832,14 +832,15 @@ fn validate_block_gas( Ok(()) } -/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::block::EthBlockExecutor` +/// UPSTREAM-MIRROR(copy): alloy-evm@0.39.0 `alloy_evm::eth::block::EthBlockExecutor` /// /// Mirrors upstream's `BlockExecutor` impl, reusing its `EthTxResult` for the inner result /// but reimplementing every method. Known divergences to re-confirm on each bump: upstream /// tracks regular and state block gas separately and returns `GasOutput::with_state_gas`, /// this tracks `gas_used`/`evm_gas_used` and returns `GasOutput::new`; upstream's admission /// check clamps the transaction gas limit by `cfg.tx_gas_limit_cap`, `validate_block_gas` -/// does not. +/// does not. Upstream's Amsterdam state-gas capacity check is inapplicable until an OP fork maps +/// to Amsterdam semantics. impl BlockExecutor for OpBlockExecutor where E: PostExecEvm< diff --git a/rust/alloy-op-evm/src/env.rs b/rust/alloy-op-evm/src/env.rs index ed474383d5c..2c693b92362 100644 --- a/rust/alloy-op-evm/src/env.rs +++ b/rust/alloy-op-evm/src/env.rs @@ -51,7 +51,7 @@ pub fn spec_by_timestamp_after_bedrock(chain_spec: impl OpHardforks, timestamp: OpSpecId::BEDROCK } -/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::env::EvmEnvInput` +/// UPSTREAM-MIRROR(copy): alloy-evm@0.39.0 `alloy_evm::eth::env::EvmEnvInput` /// /// Omits upstream `excess_blob_gas` and `slot_number`; OP uses synthetic blob values and zero slot. /// Internal helper for constructing EVM environment from block header fields. @@ -120,7 +120,7 @@ pub fn evm_env_for_op_next_block( ) } -/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::env::EvmEnv::for_eth` +/// UPSTREAM-MIRROR(copy): alloy-evm@0.39.0 `alloy_evm::eth::env::EvmEnv::for_eth` /// /// Copies upstream environment construction with OP fork mapping and blob semantics. Upstream /// sets `cfg_env.tx_gas_limit_cap` explicitly at Osaka; this leaves it unset and relies on revm's diff --git a/rust/alloy-op-evm/src/lib.rs b/rust/alloy-op-evm/src/lib.rs index 161da26db97..afa1b4cca0b 100644 --- a/rust/alloy-op-evm/src/lib.rs +++ b/rust/alloy-op-evm/src/lib.rs @@ -297,7 +297,7 @@ impl DerefMut for OpEvm { } } -/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::EthEvm` +/// UPSTREAM-MIRROR(copy): alloy-evm@0.39.0 `alloy_evm::eth::EthEvm` /// /// Mirrors upstream's `Evm` impl for `EthEvm`, adding the OP transaction wrapper, the post-exec /// transaction short-circuit and the post-exec refund tracking. A method added to the `Evm` diff --git a/rust/alloy-op-evm/src/tx.rs b/rust/alloy-op-evm/src/tx.rs index c561ba67d7f..0af33c69b2b 100644 --- a/rust/alloy-op-evm/src/tx.rs +++ b/rust/alloy-op-evm/src/tx.rs @@ -80,7 +80,7 @@ impl OpTxEnv for OpTx { } } -/// UPSTREAM-MIRROR(delegate): revm-context-interface@42.0.0 `revm_context_interface::Transaction` +/// UPSTREAM-MIRROR(delegate): revm-context-interface@43.0.2 `revm_context_interface::Transaction` /// /// Forwards the required getters and `effective_gas_price` to the inner `OpTransaction`, /// which overrides `tx_type` and `effective_gas_price` for deposits. The remaining defaulted diff --git a/rust/alloy-op-hardforks/src/lib.rs b/rust/alloy-op-hardforks/src/lib.rs index 730512da3b8..6de22688fd3 100644 --- a/rust/alloy-op-hardforks/src/lib.rs +++ b/rust/alloy-op-hardforks/src/lib.rs @@ -175,7 +175,7 @@ impl OpHardfork { *self as usize } - /// UPSTREAM-MIRROR(set): alloy-hardforks@0.4.7 `alloy_hardforks::EthereumHardfork` + /// UPSTREAM-MIRROR(set): alloy-hardforks@0.4.9 `alloy_hardforks::EthereumHardfork` /// /// A new upstream variant needs an explicit decision here. The `VARIANTS` loop below /// only smoke-tests lookup; semantic mappings remain explicit assertions. @@ -820,6 +820,7 @@ mod tests { // L1 forks newer than the latest implied one are not activated by any OP fork. assert_eq!(OpHardfork::activating_op_fork(EthereumHardfork::Bpo1), None); assert_eq!(OpHardfork::activating_op_fork(EthereumHardfork::Amsterdam), None); + assert_eq!(OpHardfork::activating_op_fork(EthereumHardfork::Bogota), None); } #[test] diff --git a/rust/kona/bin/client/src/fpvm_evm/precompiles/provider.rs b/rust/kona/bin/client/src/fpvm_evm/precompiles/provider.rs index 3602e6f4f40..5e33a142b54 100644 --- a/rust/kona/bin/client/src/fpvm_evm/precompiles/provider.rs +++ b/rust/kona/bin/client/src/fpvm_evm/precompiles/provider.rs @@ -96,7 +96,7 @@ where true } - /// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `revm_handler::EthPrecompiles::run` + /// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 `revm_handler::EthPrecompiles::run` /// /// FPVM acceleration replaces dispatch, while output conversion delegates to revm. Re-check /// input materialization, execution errors, and gas/reservoir propagation across both paths. diff --git a/rust/kona/sp1/programs/Cargo.lock b/rust/kona/sp1/programs/Cargo.lock index d345d71ebd5..781199b10b9 100644 --- a/rust/kona/sp1/programs/Cargo.lock +++ b/rust/kona/sp1/programs/Cargo.lock @@ -57,9 +57,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b836b372d3b742b7c083d2617d6e68563cd5dadbd8752c461a935a756551e69" +checksum = "727016fed834c2392d014dd697ea473f3e47bcec31ba31ccffa9c1d18ed904e5" dependencies = [ "alloy-eips", "alloy-primitives", @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1befb37485ea71e8599e32ffd76c98af7c3720a34741d30abd87f41c3148407" +checksum = "6ea5ae60bbb3ce9dc52685a70a3755ad4432045fd38079b763cfe5127c706134" dependencies = [ "alloy-consensus", "alloy-eips", @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "alloy-eip7928" -version = "0.4.2" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "951e1d988b5753bc424b837c98ce0dc575031db99e7cd01833d3a5053b97951a" +checksum = "6a12e1dc70236cfb8e79b96dd8544aed47c39e2f45dc6b51c3703e969e052faa" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -144,16 +144,29 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-eip8141" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36422c14bd57dcd638e276c8c9d7ac09eb16598e3a9dbd34e4b55267d4565b5e" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", + "thiserror", +] + [[package]] name = "alloy-eips" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3e76d47e8de277cb55e7e77fa38adde835162fc01cddbe1b258b5e0a86035b" +checksum = "e01905444bd2fc330673f11d2466c0f54e8488f7ce3132b6a5e6497916fca765" dependencies = [ "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", "alloy-eip7928", + "alloy-eip8141", "alloy-primitives", "alloy-rlp", "alloy-serde", @@ -168,9 +181,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b307a52f91f7f3aad56b5cb4f54e5eb17dd0b3f4b2c82823301499fe1c6fdaf" +checksum = "7b6bd5f7e5ce9858bac99275e3f548c3b63bb3e5806da0142dc0b2f518d3ec4a" dependencies = [ "alloy-consensus", "alloy-eips", @@ -186,9 +199,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0680a2f7d4bbc6f48c0cb43368fa544918a1fa291e772bdb47c834ade338f363" +checksum = "53cfa407c1d874cb306187996e30eb551bd98025e60e913e69e298ed2c8ea045" dependencies = [ "alloy-eips", "alloy-primitives", @@ -199,9 +212,9 @@ dependencies = [ [[package]] name = "alloy-hardforks" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83ba208044232d14d4adbfa77e57d6329f51bc1acc21f5667bb7db72d88a0831" +checksum = "09d5ff0394d9547798fa4b666c46e356d09a113f33d45fb3d75175681c1e2652" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -213,9 +226,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8795eecf50374a0dd942caff57922c59333c9991ead9eccbbc1709f55d73c7c2" +checksum = "3819bf6794d25f679d42c3f2b168e12cae08c56bb41d393cb6249b55e6d5933e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -298,9 +311,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a43d7b6b86be4885c7a76f1dfcde9651af2d419ff571e8ee7257de47101203b" +checksum = "77b967576e97165fed3fae1cf6adad964e192293e4ee61d9187afe3ecaa12323" dependencies = [ "alloy-consensus", "alloy-eips", @@ -315,9 +328,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756eb5803e70985be4066b636194ccb5f6629e5d141817c1f0c50cea8350bf5c" +checksum = "32c475e21fe8a8caa02166b326ed22207a1a0597fc9b0dcdfb46e2fe6f80dadf" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -327,7 +340,8 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.13.0", + "alloy-trie", + "itertools 0.14.0", "serde", "serde_json", "thiserror", @@ -335,9 +349,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc142e40df0c3eb5983b1637a68ab33471d8d22b8f402c9ed8260411a4e89d86" +checksum = "4f44f297d3b9e3ca2c3039e3c0ed69acde9b35edda15381cf78f725b7263fbe2" dependencies = [ "alloy-primitives", "serde", @@ -404,9 +418,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.9.5" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f14b5d9b2c2173980202c6ff470d96e7c5e202c65a9f67884ad565226df7fbb" +checksum = "b94e3e0a88f8db47250ac8a95fb825d020719f833eb1dc661bd3609c3bbece7d" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -420,9 +434,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25484345e4d89c259235e200d4f895eba33e70f125f4e8bb37a7aa69a97bd656" +checksum = "60fa90c57738ace5b38106c9f743f3d6d47de09a82e82ecfc42702c1acf116ee" dependencies = [ "darling", "proc-macro2", @@ -2672,9 +2686,9 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f0dd7f542fbcae0e490ebe13f3eababcc05547375246ff7f62700b533cf3f01" +checksum = "59a24479f12308e4ff8db606bc445fed267899a56661877231667f94eb0fd699" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2690,9 +2704,9 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7e508fcbb8cb775639dbbb56b81b62756d4322f28e76c60a52aa32575f993fe" +checksum = "ecf4de10362fdf18e80e9f3d096f617ce0725c85dc24e9deabb414c52089040c" dependencies = [ "proc-macro2", "quote", @@ -2701,18 +2715,18 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80addacffc5df9398c55919f8993922d2b688f2aa5753708fdd658ca3cc63e39" +checksum = "65d41037bdcd4d60ca6bbe4e65cc61bbaf29ef7235c2c614e59c25d5a94ac813" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "42.0.1" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c7fcd426beab3b91300a6d0d5eb8d583c0fad0fba451126e19fd51443eca62" +checksum = "62b2fbb3bdce72fef4f156e2164bdfde44dc3aeebc5b4f31a413fba0c09c524c" dependencies = [ "revm-bytecode", "revm-context", @@ -2729,9 +2743,9 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "537356bdec80dbc04e4e6bb688b3441ff7cf18eecdcf3cac23150633c46467f1" +checksum = "c8d38e16b72ec1c836ec8490562bfb21003165ea8bc496086bf345680a6e6c41" dependencies = [ "bitvec", "revm-primitives", @@ -2739,9 +2753,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "42.0.0" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6512f05f83378e29b2b016fa5bd7f5a533e3625548be4113732e1a536c2564" +checksum = "9b06efea511a15ff8309acaa4c283239b444b461bbd2e9f0326c8586f45fb1da" dependencies = [ "bitvec", "cfg-if", @@ -2755,9 +2769,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "42.0.0" +version = "43.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "103fff818b10311034c0c11ff8760294ee0e3c320daab3c5717990fe8ee2617b" +checksum = "3068385c68f6a3bd2e781dd81cefd25c98dd0a574de6c8ec2a90acc33318b2da" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -2770,9 +2784,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "42.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df72760eab0852100e748c7cb03ce0221626d60ac14534118c84c5cc894fb4c9" +checksum = "8db6fb10912d7fba0161e91d4577ce71fa9726ec38a4d420e4242e504a47aa8f" dependencies = [ "derive_more", "either", @@ -2784,9 +2798,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "42.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9286c059a11be1dee814cafdc3a3ade57521c8caa050785a52c19a9d894f400" +checksum = "5581ecadb3d0d1c18a91f1797d6b7c4c17720bea596e9e9ec90b95803db2bc77" dependencies = [ "auto_impl", "either", @@ -2797,9 +2811,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "42.0.1" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09126175c3fa482e71e80cc28c6bb17e681911e472b94d4f7f73dd6780411798" +checksum = "ba5102e9c02b9d27e7c98f449b495a2c2b2ec011209f4eeca16e054520ec5ac4" dependencies = [ "auto_impl", "derive-where", @@ -2815,9 +2829,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "42.0.1" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4aa55b208b52f0c083ea68147c78866eeecadd7c0071a614f477de316b60648e" +checksum = "825cf946c1bf3178f6a93aae4e8064a0ebd505bc764a7fe3d49411e7242e4091" dependencies = [ "auto_impl", "either", @@ -2831,9 +2845,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "42.0.0" +version = "43.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd310927437752ce4bac6997b385772823b84843f04c82e151993bec1265a5ed" +checksum = "aa32f5099a266329d1869d6f9bf4bb7894345d2b58c57d05396f67385d65f299" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -2843,9 +2857,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "42.0.1" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2431091420999795df6a200b9f7933defe3d654710560a895e6bcabbd9954a5" +checksum = "aa80b8cef09bead8c8b1afa7733b09fc1428f49158d8657c239268409d2a2bf7" dependencies = [ "ark-bls12-381 0.6.0", "ark-bn254", @@ -2866,9 +2880,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "42.0.0" +version = "43.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ef5564c1bce219fd08beca43d4f39fdcbc19193fa4f604c0c6b58950a13194a" +checksum = "f1f4ba1a5757fe4398262290422c371556fcebf236f762f7ed7ff2c56768a63c" dependencies = [ "alloy-primitives", "once_cell", @@ -2876,9 +2890,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "42.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4ae66db3abfcb565854dbfc95513bfa440b3dc390ddf8e50b0363d12a6fa79" +checksum = "3b2d2ec0be925c4c87ff4afae33af4b9f693d9b011f74d6b4d52267a62df0c49" dependencies = [ "alloy-eip7928", "bitflags", diff --git a/rust/kona/sp1/programs/Cargo.toml b/rust/kona/sp1/programs/Cargo.toml index 36994af73cc..a8a81f45524 100644 --- a/rust/kona/sp1/programs/Cargo.toml +++ b/rust/kona/sp1/programs/Cargo.toml @@ -124,7 +124,7 @@ kona-sp1-range-vkeys = { path = "../crates/range-vkeys" } # Feature anchor only: revm's `bn` forwards to revm-precompile/bn so the guest # build uses the SP1-patched substrate-bn backend for bn128. -revm = { version = "42.0.1", default-features = false, features = ["bn"] } +revm = { version = "43.0.2", default-features = false, features = ["bn"] } sp1-lib = { version = "6.8.1", features = ["verify"] } sp1-zkvm = { version = "6.8.1", features = ["verify"] } @@ -135,7 +135,7 @@ anyhow = { version = "1.0.101", default-features = false } [patch.crates-io] sha2 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.10.9-sp1-6.2.0" } -# revm-precompile 42 resolves the 0.11 line next to the 0.10 one; a patch only covers the version it names. +# revm-precompile 43 resolves the 0.11 line next to the 0.10 one; a patch only covers the version it names. sha2-0-11 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha2", tag = "patch-sha2-0.11.0-sp1-6.2.0" } sha3 = { git = "https://github.com/sp1-patches/RustCrypto-hashes", package = "sha3", tag = "patch-sha3-0.11.0-sp1-6.0.0" } crypto-bigint = { git = "https://github.com/sp1-patches/RustCrypto-bigint", tag = "patch-0.5.5-sp1-6.2.0" } diff --git a/rust/op-alloy/crates/consensus/src/receipts/envelope.rs b/rust/op-alloy/crates/consensus/src/receipts/envelope.rs index 80f9bd22f41..a494f508b55 100644 --- a/rust/op-alloy/crates/consensus/src/receipts/envelope.rs +++ b/rust/op-alloy/crates/consensus/src/receipts/envelope.rs @@ -10,7 +10,7 @@ use alloy_eips::{ use alloy_primitives::{Bloom, Log, logs_bloom}; use alloy_rlp::{BufMut, Decodable, Encodable, length_of_length}; -/// UPSTREAM-MIRROR(copy): alloy-consensus@2.4.2 `alloy_consensus::ReceiptEnvelope` +/// UPSTREAM-MIRROR(copy): alloy-consensus@2.5.0 `alloy_consensus::ReceiptEnvelope` /// /// Same per-transaction-type envelope over [`ReceiptWithBloom`], with the OP `PostExec` (0x7d) /// and `Deposit` (0x7e) variants added and EIP-4844 dropped. The shared Ethereum variants must @@ -21,10 +21,8 @@ use alloy_rlp::{BufMut, Decodable, Encodable, length_of_length}; /// /// Receipt envelope, as defined in [EIP-2718], modified for OP Stack chains. /// -/// This enum distinguishes between tagged and untagged legacy receipts, as the -/// in-protocol merkle tree may commit to EITHER 0-prefixed or raw. Therefore -/// we must ensure that encoding returns the precise byte-array that was -/// decoded, preserving the presence or absence of the `TransactionType` flag. +/// Legacy receipts are untagged RLP lists. Typed receipts retain their transaction type +/// prefix, so decoding and encoding preserve the canonical receipt bytes. /// /// Transaction receipt payloads are specified in their respective EIPs. /// diff --git a/rust/op-alloy/crates/consensus/src/receipts/receipt.rs b/rust/op-alloy/crates/consensus/src/receipts/receipt.rs index 72c29eb9018..a9135401f48 100644 --- a/rust/op-alloy/crates/consensus/src/receipts/receipt.rs +++ b/rust/op-alloy/crates/consensus/src/receipts/receipt.rs @@ -13,7 +13,7 @@ use alloy_eips::eip2718::{Eip2718Error, Eip2718Result, IsTyped2718}; use alloy_primitives::{Bloom, Log}; use alloy_rlp::{Buf, BufMut, Decodable, Encodable, Header}; -/// UPSTREAM-MIRROR(copy): alloy-consensus@2.4.2 `alloy_consensus::ReceiptEnvelope` +/// UPSTREAM-MIRROR(copy): alloy-consensus@2.5.0 `alloy_consensus::EthereumReceipt` /// /// Mirrors the envelope's per-transaction-type payload split, holding a bare [`Receipt`] rather /// than a [`ReceiptWithBloom`] — upstream has no unbloomed counterpart — and adding the OP @@ -309,6 +309,10 @@ impl Eip2718EncodableReceipt for OpReceipt { impl Eip2718DecodableReceipt for OpReceipt { fn typed_decode_with_bloom(ty: u8, buf: &mut &[u8]) -> Eip2718Result> { + // Legacy receipts are untagged; only the fallback decoder accepts them. + if ty == 0 { + return Err(Eip2718Error::UnexpectedType(ty)); + } let tx_type = OpTxType::try_from(ty).map_err(|_| Eip2718Error::UnexpectedType(ty))?; Ok(Self::rlp_decode_inner(buf, tx_type)?) } @@ -356,6 +360,10 @@ impl RlpDecodableReceipt for OpReceipt { let remaining = buf.len(); let tx_type = OpTxType::decode(buf)?; + // An RLP string can only wrap a typed receipt, never a legacy receipt. + if tx_type.is_legacy() { + return Err(Eip2718Error::UnexpectedType(tx_type as u8).into()); + } let this = Self::rlp_decode_inner(buf, tx_type)?; if buf.len() + header.payload_length != remaining { @@ -802,6 +810,55 @@ mod tests { ); } + #[test] + fn legacy_receipt_decode_paths_reject_type_prefix() { + let receipt: ReceiptWithBloom = ReceiptWithBloom { + receipt: OpReceipt::Legacy(Receipt { + status: Eip658Value::Eip658(true), + cumulative_gas_used: 21_000, + logs: vec![], + }), + logs_bloom: Bloom::default(), + }; + let encoded = receipt.encoded_2718(); + assert!(encoded[0] >= 0xc0); + assert_eq!(ReceiptWithBloom::::decode_2718_exact(&encoded).unwrap(), receipt); + assert_eq!( + ReceiptWithBloom::::network_decode(&mut encoded.as_slice()).unwrap(), + receipt + ); + assert_eq!( + ReceiptWithBloom::::decode(&mut encoded.as_slice()).unwrap(), + receipt + ); + + let mut tagged = vec![0x00]; + tagged.extend_from_slice(&encoded); + assert!(ReceiptWithBloom::::decode_2718_exact(&tagged).is_err()); + assert!( + ReceiptWithBloom::::network_decode(&mut network_framed(&tagged).as_slice()) + .is_err() + ); + assert!( + ReceiptWithBloom::::decode(&mut network_framed(&tagged).as_slice()).is_err() + ); + + // The RLP type decoder reads zero as 0x80, not the literal 0x00 type byte. + let mut rlp_zero_tagged = vec![0x80]; + rlp_zero_tagged.extend_from_slice(&encoded); + assert!( + ReceiptWithBloom::::decode(&mut network_framed(&rlp_zero_tagged).as_slice()) + .is_err() + ); + } + + fn network_framed(payload: &[u8]) -> Vec { + let mut out = Vec::new(); + Header { list: false, payload_length: payload.len() }.encode(&mut out); + out.extend_from_slice(payload); + out + } + #[test] fn post_exec_receipt_roundtrip() { let receipt: ReceiptWithBloom = ReceiptWithBloom { diff --git a/rust/op-alloy/crates/rpc-types-engine/src/payload/mod.rs b/rust/op-alloy/crates/rpc-types-engine/src/payload/mod.rs index 325ffc34908..ab04f4295cd 100644 --- a/rust/op-alloy/crates/rpc-types-engine/src/payload/mod.rs +++ b/rust/op-alloy/crates/rpc-types-engine/src/payload/mod.rs @@ -14,7 +14,7 @@ use alloy_rpc_types_engine::{ ExecutionPayloadV3, }; -/// UPSTREAM-MIRROR(copy): alloy-rpc-types-engine@2.4.2 `alloy_rpc_types_engine::ExecutionPayload` +/// UPSTREAM-MIRROR(copy): alloy-rpc-types-engine@2.5.0 `alloy_rpc_types_engine::ExecutionPayload` /// /// Same versioned enum and the same field-sniffing `Deserialize`, but V4 is the OP Isthmus /// payload selected by `withdrawalsRoot` where upstream's V4 is Amsterdam, and this type also diff --git a/rust/op-reth/crates/cli/src/lib.rs b/rust/op-reth/crates/cli/src/lib.rs index 513a2452f64..21bf63599c8 100644 --- a/rust/op-reth/crates/cli/src/lib.rs +++ b/rust/op-reth/crates/cli/src/lib.rs @@ -86,12 +86,25 @@ pub struct Cli< /// the type level. They are hidden from all help output and rejected with a hard error after /// parsing. Add new entries here as further unsupported upstream options are identified /// (tracked in [#21687](https://github.com/ethereum-optimism/optimism/issues/21687)). -const DENIED_ARGS: &[(&str, &str, &str)] = &[("node", "minimal", MINIMAL_REMOVED_HELP)]; +const DENIED_ARGS: &[(&str, &str, &str)] = &[ + ("node", "minimal", MINIMAL_REMOVED_HELP), + ("node", "max_bals", BAL_ARGS_UNSUPPORTED_HELP), + ("node", "max_bals_bytes", BAL_ARGS_UNSUPPORTED_HELP), + ("node", "cache_computed_bals", BAL_ARGS_UNSUPPORTED_HELP), + ("node", "prewarm_bals", BAL_ARGS_UNSUPPORTED_HELP), + ("node", "balstore_cache_size", BAL_ARGS_UNSUPPORTED_HELP), + ("node", "bal_parallel_execution_disabled", BAL_ARGS_UNSUPPORTED_HELP), + ("node", "bal_parallel_state_root_disabled", BAL_ARGS_UNSUPPORTED_HELP), + ("node", "disable_bal_batch_io", BAL_ARGS_UNSUPPORTED_HELP), +]; /// Startup error for `--minimal`, which configures pruning (including block-body pruning) that /// op-node derivation cannot tolerate. const MINIMAL_REMOVED_HELP: &str = "--minimal is not supported by op-reth and has been removed.\n\nIt prunes block bodies to a fixed 10,064-block window, which breaks op-node derivation\n(op-node reads the L1-info deposit transaction from historical block bodies).\n\nFor a pruned (non-archive) node, use the supported pruning recipe instead:\n --prune.minimum-distance \n --prune.receipts.distance \n --prune.account-history.distance \n --prune.storage-history.distance \nDo NOT prune block bodies.\n\nSee https://docs.optimism.io/node-operators/guides/management/archive-node#pruning-op-reth"; +/// Startup error for block access list options, which are not useful on OP chains. +const BAL_ARGS_UNSUPPORTED_HELP: &str = "Block access list options are not supported by op-reth.\n\nOP blocks do not carry EIP-7928 block access lists."; + impl Cli { /// Parses only the default CLI arguments, rejecting `DENIED_ARGS` pub fn parse_args() -> Self { @@ -240,6 +253,25 @@ mod test { assert!(help.contains("--full"), "other pruning args must stay visible:\n{help}"); } + #[test] + fn deny_bal_cache_byte_limit_on_parse_and_help() { + let err = Cli::::try_parse_with_denied_args_from([ + "op-reth", + "node", + "--rpc-cache.max-bals-bytes", + "1GB", + ]) + .unwrap_err(); + assert_eq!(err.kind(), clap::error::ErrorKind::ValueValidation); + assert!(err.to_string().contains("Block access list options are not supported")); + + let mut cmd = Cli::::command_with_denied_args_hidden(); + let help = cmd.find_subcommand_mut("node").unwrap().render_long_help().to_string(); + assert!(!help.contains("--rpc-cache.max-bals-bytes")); + assert!(help.contains("--rpc-cache.max-blocks-bytes")); + assert!(help.contains("--rpc-cache.max-receipts-bytes")); + } + #[test] fn deny_list_does_not_affect_other_args() { let cli = Cli::::try_parse_with_denied_args_from([ diff --git a/rust/op-reth/crates/cli/tests/snapshots/cli.snap b/rust/op-reth/crates/cli/tests/snapshots/cli.snap index ae5b76b073c..8955a6ad81d 100644 --- a/rust/op-reth/crates/cli/tests/snapshots/cli.snap +++ b/rust/op-reth/crates/cli/tests/snapshots/cli.snap @@ -86,7 +86,7 @@ arg: --max-seen-tx-history [action: Set] [num-args: 1] [default: 320] he arg: --max-pending-imports [action: Set] [num-args: 1] [default: 4096] help: Max number of transactions to import concurrently. arg: --pooled-tx-response-soft-limit [action: Set] [num-args: 1] [default: 2097152] help: Experimental, for usage in research. Sets the max accumulated byte size of transactions\nto pack in one response.\nSpec'd at 2MiB. arg: --pooled-tx-pack-soft-limit [action: Set] [num-args: 1] [default: 131072] help: Experimental, for usage in research. Sets the max accumulated byte size of transactions to\nrequest in one request. -arg: --max-tx-pending-fetch [action: Set] [num-args: 1] [default: 25600] help: Max capacity of cache of hashes for transactions pending fetch. +arg: --max-tx-pending-fetch [action: Set] [num-args: 1] [default: 25600] help: Maximum number of announced transaction hashes to track, including inflight requests. arg: --tx-channel-memory-limit [action: Set] [num-args: 1] [default: 1073741824] help: Memory limit (in bytes) for the channel that buffers transaction events flowing\nfrom the network manager to the transactions manager. arg: --net-if.experimental [action: Set] [num-args: 1] [conflicts: --addr] help: Name of network interface used to communicate with peers arg: --tx-propagation-policy [action: Set] [num-args: 1] [default: All] help: Transaction Propagation Policy @@ -102,6 +102,8 @@ arg: --http [action: SetTrue] [num-args: 0] [default: false] [default-values-if: arg: --http.addr [action: Set] [num-args: 1] [default: 127.0.0.1] help: Http server address to listen on arg: --http.port [action: Set] [num-args: 1] [default: 8545] help: Http server port to listen on arg: --http.disable-compression [action: SetTrue] [num-args: 0] [default: false] help: Disable compression for HTTP responses +arg: --http.compression [action: Append] [num-args: 1] [value-delimiter: ','] [possible: zstd, gzip, deflate, br] help: Comma-separated list of allowed compression algorithms for HTTP responses +arg: --http.decompression [action: Append] [num-args: 1] [value-delimiter: ','] [possible: zstd, gzip, deflate, br] help: Comma-separated list of allowed decompression algorithms for HTTP requests arg: --http.api [action: Set] [num-args: 1] [possible: admin, debug, eth, net, trace, txpool, web3, rpc, reth, ots, flashbots, miner, mev, testing] help: Rpc Modules to be configured for the HTTP server arg: --http.corsdomain [action: Set] [num-args: 1] help: Http Corsdomain to allow request from arg: --ws [action: SetTrue] [num-args: 0] [default: false] help: Enable the WS-RPC server @@ -114,7 +116,8 @@ arg: --ipcpath [action: Set] [num-args: 1] [default: /tmp/reth.ipc] he arg: --ipc.permissions [action: Set] [num-args: 1] help: Set the permissions for the IPC socket file, in octal format arg: --authrpc.addr [action: Set] [num-args: 1] [default: 127.0.0.1] help: Auth server address to listen on arg: --authrpc.port [action: Set] [num-args: 1] [default: 8551] help: Auth server port to listen on -arg: --authrpc.jwtsecret [action: Set] [num-args: 1] [global] help: Path to a JWT secret to use for the authenticated engine-API RPC server +arg: --authrpc.jwtsecret [action: Set] [num-args: 1] [conflicts: --authrpc.jwtsecret-hex] [global] help: Path to a JWT secret to use for the authenticated engine-API RPC server +arg: --authrpc.jwtsecret-hex [action: Set] [num-args: 1] [conflicts: --authrpc.jwtsecret] [global] help: Hex encoded JWT secret to use for the authenticated engine-API RPC server arg: --auth-ipc [action: SetTrue] [num-args: 0] [default: false] help: Enable auth engine API over IPC arg: --auth-ipc.path [action: Set] [num-args: 1] [default: /tmp/reth_engine_api.ipc] help: Filename for auth IPC socket/pipe within the datadir arg: --disable-auth-server [action: SetTrue] [num-args: 0] [aliases: disable-engine-api] [default: false] help: Disable the auth/engine API server @@ -129,7 +132,7 @@ arg: --rpc.max-blocking-io-requests [action: Set] [num-args: 1] [aliases arg: --rpc.max-trace-filter-blocks [action: Set] [num-args: 1] [aliases: rpc-max-trace-filter-blocks] [default: 100] help: Maximum number of blocks for `trace_filter` requests arg: --rpc.max-blocks-per-filter [action: Set] [num-args: 1] [aliases: rpc-max-blocks-per-filter] [default: 100000] help: Maximum number of blocks that could be scanned per filter request. (0 = entire chain) arg: --rpc.max-logs-per-response [action: Set] [num-args: 1] [aliases: rpc-max-logs-per-response] [default: 20000] help: Maximum number of logs that can be returned in a single response. (0 = no limit) -arg: --rpc.gascap [action: Set] [num-args: 1] [aliases: rpc-gascap] [default: 50000000] help: Maximum gas limit for `eth_call` and call tracing RPC methods +arg: --rpc.gascap [action: Set] [num-args: 1] [aliases: rpc-gascap] [default: 50000000] help: Maximum gas limit for `eth_call`, `eth_estimateGas`, and call tracing RPC methods arg: --rpc.evm-memory-limit [action: Set] [num-args: 1] [aliases: rpc-evm-memory-limit] [default: 4294967295] help: Maximum memory the EVM can allocate per RPC request arg: --rpc.txfeecap [action: Set] [num-args: 1] [aliases: rpc-txfeecap] [default: 1.0] help: Maximum eth transaction fee (in ether) that can be sent via the RPC APIs (0 = no cap) arg: --rpc.max-simulate-blocks [action: Set] [num-args: 1] [default: 256] help: Maximum number of blocks for `eth_simulateV1` call @@ -139,12 +142,18 @@ arg: --rpc.proof-permits [action: Set] [num-args: 1] [aliases: rpc-proof arg: --rpc.pending-block [action: Set] [num-args: 1] [default: full] help: Configures the pending block behavior for RPC responses arg: --rpc.forwarder [action: Set] [num-args: 1] [aliases: rpc-forwarder] help: Endpoint to forward transactions to arg: --builder.disallow [action: Set] [num-args: 1] help: Path to file containing disallowed addresses, json-encoded list of strings. Block validation API will reject blocks containing transactions from these addresses -arg: --rpc-cache.max-blocks [action: Set] [num-args: 1] [default: 5000] help: Max number of blocks in cache -arg: --rpc-cache.max-receipts [action: Set] [num-args: 1] [default: 2000] help: Max number receipts in cache -arg: --rpc-cache.max-headers [action: Set] [num-args: 1] [aliases: rpc-cache.max-envs] [default: 1000] help: Max number of headers in cache -arg: --rpc-cache.max-bals [action: Set] [num-args: 1] [default: 1000] help: Max number of block access lists in cache +arg: --rpc-cache.max-blocks [action: Set] [num-args: 1] [default: 1000] help: Max number of blocks in cache +arg: --rpc-cache.max-receipts [action: Set] [num-args: 1] [default: 500] help: Max number receipts in cache +arg: --rpc-cache.max-headers [action: Set] [num-args: 1] [aliases: rpc-cache.max-envs] [default: 1000] [hidden] help: Legacy no-op retained for CLI compatibility +arg: --rpc-cache.max-bals [action: Set] [num-args: 1] [default: 1000] [hidden] help: Max number of block access lists in cache +arg: --rpc-cache.max-blocks-bytes [action: Set] [num-args: 1] [default: 2147483648] help: Maximum estimated block cache memory in bytes or with a unit (e.g. 1GB, 500MB). Units use powers of 1024. Zero disables caching. The entry count limit also applies +arg: --rpc-cache.max-receipts-bytes [action: Set] [num-args: 1] [default: 1073741824] help: Maximum estimated receipts cache memory in bytes or with a unit (e.g. 1GB, 500MB). Units use powers of 1024. Zero disables caching. The entry count limit also applies +arg: --rpc-cache.max-bals-bytes [action: Set] [num-args: 1] [default: 524288000] [hidden] help: Maximum estimated block access list cache memory in bytes or with a unit (e.g. 1GB, 500MB). Units use powers of 1024. Zero disables caching. The entry count limit also applies +arg: --rpc-cache.idle-timeout [action: Set] [num-args: 1] [default: 1h] help: Evict blocks, receipts, and block access lists after this duration without a cache hit (e.g. 5m, 30s). Zero disables expiration. Cleanup starts every 1 to 60 seconds and removes at most five entries per cache per poll +arg: --rpc-cache.cache-computed-bals [action: SetTrue] [num-args: 0] [hidden] help: Cache block access lists computed by RPC requests for transaction tracing +arg: --rpc-cache.prewarm-bals [action: Set] [num-args: 0..=1] [default-missing-values: ["0"]] [hidden] [require-equals] help: Replay new canonical blocks to cache block access lists until native BAL support arg: --rpc-cache.max-concurrent-db-requests [action: Set] [num-args: 1] [default: 512] help: Max number of concurrent database requests -arg: --rpc-cache.max-cached-tx-hashes [action: Set] [num-args: 1] [default: 30000] help: Maximum number of transaction hashes to cache for transaction lookups +arg: --rpc-cache.max-cached-tx-hashes [action: Set] [num-args: 1] [default: 100000] help: Maximum number of transaction hashes to cache for transaction lookups arg: --gpo.blocks [action: Set] [num-args: 1] [default: 20] help: Number of recent blocks to check for gas price arg: --gpo.ignoreprice [action: Set] [num-args: 1] [default: 0] help: Gas Price below which gpo will ignore transactions arg: --gpo.maxprice [action: Set] [num-args: 1] [default: 500000000000] help: Maximum transaction priority fee(or gasprice before London Fork) to be recommended by gpo @@ -215,7 +224,7 @@ arg: --db.read-transaction-timeout [action: Set] [num arg: --db.max-readers [action: Set] [num-args: 1] help: Maximum number of readers allowed to access the database concurrently arg: --db.sync-mode [action: Set] [num-args: 1] help: Controls how aggressively the database synchronizes data to disk arg: --db.rocksdb-block-cache-size [action: Set] [num-args: 1] help: `RocksDB` block cache size (e.g., 512MB, 4GB) -arg: --db.balstore-cache-size [action: Set] [num-args: 1] help: Number of recent blocks to keep in the in-memory BAL store cache +arg: --db.balstore-cache-size [action: Set] [num-args: 1] [hidden] help: Number of recent blocks to keep in the in-memory BAL store cache arg: --db.disable-metrics [action: SetTrue] [num-args: 0] help: Disable built-in database metrics arg: --dev [action: SetTrue] [num-args: 0] [aliases: auto-mine] [default: false] help: Start the node in dev mode arg: --dev.block-max-transactions [action: Set] [num-args: 1] [conflicts: --dev.block-time] help: How many transactions to mine per block @@ -247,16 +256,18 @@ arg: --prune.bodies.pre-merge [action: SetTrue] [num-args: 0] [conflicts: --prun arg: --prune.bodies.distance [action: Set] [num-args: 1] [conflicts: --prune.bodies.before, --prune.bodies.pre-merge] help: Prune bodies before the `head-N` block number. In other words, keep last N + 1 blocks arg: --prune.bodies.before [action: Set] [num-args: 1] [conflicts: --prune.bodies.distance, --prune.bodies.pre-merge] help: Prune storage history before the specified block number. The specified block number is not pruned arg: --prune.minimum-distance [action: Set] [num-args: 1] help: Minimum pruning distance from the tip. This controls the safety margin for reorgs and manual unwinds -arg: --engine.persistence-threshold [action: Set] [num-args: 1] [default: 7] help: Configure persistence threshold for the engine. This determines how many canonical blocks must be in-memory, ahead of the last persisted block, before flushing canonical blocks to disk again +arg: --engine.persistence-threshold [action: Set] [num-args: 1] [env: RETH_ENGINE_PERSISTENCE_THRESHOLD] [default: 50] help: Configure persistence threshold for the engine. This determines how many canonical blocks must be in-memory, ahead of the last persisted block, before flushing canonical blocks to disk again arg: --engine.persistence-backpressure-threshold [action: Set] [num-args: 1] help: Configure the maximum number of blocks beyond the in-memory buffer target that may await persistence before engine API processing stalls +arg: --engine.num-state-masking-blocks [action: Set] [num-args: 1] [env: RETH_ENGINE_NUM_STATE_MASKING_BLOCKS] [default: 30] help: Configure how many of the blocks being persisted should only mask state/trie writes instead of durably persisting their state/trie updates in the current cycle arg: --engine.memory-block-buffer-target [action: Set] [num-args: 1] help: Configure the target number of blocks to keep in memory +arg: --engine.backfill-threshold [action: Set] [num-args: 1] [env: RETH_ENGINE_BACKFILL_THRESHOLD] [default: 32] help: Configure the largest gap, in blocks, between the local head and the forkchoice head that is closed by downloading the missing blocks directly. Larger gaps trigger a full pipeline (backfill) run instead arg: --engine.invalid-header-cache-hit-eviction-threshold [action: Set] [num-args: 1] [default: 128] help: Configure how many cache hits an invalid header can accumulate before it is evicted and reprocessed arg: --engine.legacy-state-root [action: SetTrue] [num-args: 0] [default: false] [hidden] help: CAUTION: This CLI flag has no effect anymore, use --engine.state-root-fallback if you want to force synchronous state root computation arg: --engine.caching-and-prewarming [action: SetTrue] [num-args: 0] [default: true] [hidden] help: CAUTION: This CLI flag has no effect anymore, use --engine.disable-caching-and-prewarming if you want to disable caching and prewarming arg: --engine.disable-state-cache [action: SetTrue] [num-args: 0] [default: false] help: Disable state cache arg: --engine.disable-prewarming [action: SetTrue] [num-args: 0] [aliases: engine.disable-caching-and-prewarming] [default: false] help: Disable parallel prewarming arg: --engine.txpool-prewarming [action: SetTrue] [num-args: 0] [env: RETH_ENGINE_TXPOOL_PREWARMING] [default: false] help: Enable best-effort txpool transaction prewarming between payloads -arg: --engine.sender-recovery-cache [action: SetTrue] [num-args: 0] [env: RETH_ENGINE_SENDER_RECOVERY_CACHE] [default: false] help: Enable caching recovered transaction senders across transaction ingress and payload execution +arg: --engine.sender-recovery-cache [action: SetTrue] [num-args: 0..=1] [env: RETH_ENGINE_SENDER_RECOVERY_CACHE] [default: true] [default-missing-values: ["true"]] [possible: true, false] help: Cache recovered transaction senders across transaction ingress and payload execution arg: --engine.parallel-sparse-trie [action: SetTrue] [num-args: 0] [default: true] [hidden] help: CAUTION: This CLI flag has no effect anymore. The parallel sparse trie is always enabled arg: --engine.disable-parallel-sparse-trie [action: SetTrue] [num-args: 0] [default: false] [hidden] help: CAUTION: This CLI flag has no effect anymore. The parallel sparse trie is always enabled arg: --engine.state-provider-metrics [action: SetTrue] [num-args: 0] [default: false] help: Enable state provider latency metrics. This allows the engine to collect and report stats about how long state provider calls took during execution, but this does introduce slight overhead to state provider calls @@ -280,9 +291,9 @@ arg: --engine.state-root-task-timeout [action: Set] [n arg: --engine.share-execution-cache-with-payload-builder [action: SetTrue] [num-args: 0] [default: false] help: Whether to share execution cache with the payload builder arg: --engine.share-sparse-trie-with-payload-builder [action: SetTrue] [num-args: 0] [default: false] help: Whether to share the sparse trie with the payload builder arg: --engine.suppress-persistence-during-build [action: SetTrue] [num-args: 0] [default: false] help: Suppress persistence while building a payload -arg: --engine.disable-bal-parallel-execution [action: SetTrue] [num-args: 0] [default: false] help: Disable BAL (Block Access List, EIP-7928) based parallel execution -arg: --engine.disable-bal-parallel-state-root [action: SetTrue] [num-args: 0] [default: false] help: Disable BAL-driven parallel state root computation. This is only valid together with `--engine.disable-bal-parallel-execution` -arg: --engine.disable-bal-batch-io [action: SetTrue] [num-args: 0] [default: false] help: Disable BAL (Block Access List) storage prefetch IO during prewarming. When set, BAL storage slots are not read into the execution cache +arg: --engine.disable-bal-parallel-execution [action: SetTrue] [num-args: 0] [default: false] [hidden] help: Disable BAL (Block Access List, EIP-7928) based parallel execution +arg: --engine.disable-bal-parallel-state-root [action: SetTrue] [num-args: 0] [default: false] [hidden] help: Disable BAL-driven parallel state root computation. This is only valid together with `--engine.disable-bal-parallel-execution` +arg: --engine.disable-bal-batch-io [action: SetTrue] [num-args: 0] [default: false] [hidden] help: Disable BAL (Block Access List) storage prefetch IO during prewarming. When set, BAL storage slots are not read into the execution cache arg: --era.enable [action: SetTrue] [num-args: 0] [default: false] help: Enable import from ERA1 files arg: --era.path [action: Set] [num-args: 1] help: The path to a directory for import. arg: --era.url [action: Set] [num-args: 1] help: The URL to a remote host where the ERA1 files are hosted. @@ -686,7 +697,7 @@ arg: --max-seen-tx-history [action: Set] [num-args: 1] [default: 320] he arg: --max-pending-imports [action: Set] [num-args: 1] [default: 4096] help: Max number of transactions to import concurrently. arg: --pooled-tx-response-soft-limit [action: Set] [num-args: 1] [default: 2097152] help: Experimental, for usage in research. Sets the max accumulated byte size of transactions\nto pack in one response.\nSpec'd at 2MiB. arg: --pooled-tx-pack-soft-limit [action: Set] [num-args: 1] [default: 131072] help: Experimental, for usage in research. Sets the max accumulated byte size of transactions to\nrequest in one request. -arg: --max-tx-pending-fetch [action: Set] [num-args: 1] [default: 25600] help: Max capacity of cache of hashes for transactions pending fetch. +arg: --max-tx-pending-fetch [action: Set] [num-args: 1] [default: 25600] help: Maximum number of announced transaction hashes to track, including inflight requests. arg: --tx-channel-memory-limit [action: Set] [num-args: 1] [default: 1073741824] help: Memory limit (in bytes) for the channel that buffers transaction events flowing\nfrom the network manager to the transactions manager. arg: --net-if.experimental [action: Set] [num-args: 1] [conflicts: --addr] help: Name of network interface used to communicate with peers arg: --tx-propagation-policy [action: Set] [num-args: 1] [default: All] help: Transaction Propagation Policy @@ -863,7 +874,7 @@ arg: --max-seen-tx-history [action: Set] [num-args: 1] [default: 320] he arg: --max-pending-imports [action: Set] [num-args: 1] [default: 4096] help: Max number of transactions to import concurrently. arg: --pooled-tx-response-soft-limit [action: Set] [num-args: 1] [default: 2097152] help: Experimental, for usage in research. Sets the max accumulated byte size of transactions\nto pack in one response.\nSpec'd at 2MiB. arg: --pooled-tx-pack-soft-limit [action: Set] [num-args: 1] [default: 131072] help: Experimental, for usage in research. Sets the max accumulated byte size of transactions to\nrequest in one request. -arg: --max-tx-pending-fetch [action: Set] [num-args: 1] [default: 25600] help: Max capacity of cache of hashes for transactions pending fetch. +arg: --max-tx-pending-fetch [action: Set] [num-args: 1] [default: 25600] help: Maximum number of announced transaction hashes to track, including inflight requests. arg: --tx-channel-memory-limit [action: Set] [num-args: 1] [default: 1073741824] help: Memory limit (in bytes) for the channel that buffers transaction events flowing\nfrom the network manager to the transactions manager. arg: --net-if.experimental [action: Set] [num-args: 1] [conflicts: --addr] help: Name of network interface used to communicate with peers arg: --tx-propagation-policy [action: Set] [num-args: 1] [default: All] help: Transaction Propagation Policy @@ -922,7 +933,7 @@ arg: --max-seen-tx-history [action: Set] [num-args: 1] [default: 320] he arg: --max-pending-imports [action: Set] [num-args: 1] [default: 4096] help: Max number of transactions to import concurrently. arg: --pooled-tx-response-soft-limit [action: Set] [num-args: 1] [default: 2097152] help: Experimental, for usage in research. Sets the max accumulated byte size of transactions\nto pack in one response.\nSpec'd at 2MiB. arg: --pooled-tx-pack-soft-limit [action: Set] [num-args: 1] [default: 131072] help: Experimental, for usage in research. Sets the max accumulated byte size of transactions to\nrequest in one request. -arg: --max-tx-pending-fetch [action: Set] [num-args: 1] [default: 25600] help: Max capacity of cache of hashes for transactions pending fetch. +arg: --max-tx-pending-fetch [action: Set] [num-args: 1] [default: 25600] help: Maximum number of announced transaction hashes to track, including inflight requests. arg: --tx-channel-memory-limit [action: Set] [num-args: 1] [default: 1073741824] help: Memory limit (in bytes) for the channel that buffers transaction events flowing\nfrom the network manager to the transactions manager. arg: --net-if.experimental [action: Set] [num-args: 1] [conflicts: --addr] help: Name of network interface used to communicate with peers arg: --tx-propagation-policy [action: Set] [num-args: 1] [default: All] help: Transaction Propagation Policy diff --git a/rust/op-reth/crates/consensus/Cargo.toml b/rust/op-reth/crates/consensus/Cargo.toml index 00df89a5a9a..1c644e10aa2 100644 --- a/rust/op-reth/crates/consensus/Cargo.toml +++ b/rust/op-reth/crates/consensus/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "reth-optimism-consensus" -version = "1.11.3" +version = "2.0.0" edition.workspace = true rust-version.workspace = true license.workspace = true diff --git a/rust/op-reth/crates/consensus/src/lib.rs b/rust/op-reth/crates/consensus/src/lib.rs index 78b9a2c2817..5883d955286 100644 --- a/rust/op-reth/crates/consensus/src/lib.rs +++ b/rust/op-reth/crates/consensus/src/lib.rs @@ -34,7 +34,7 @@ use reth_primitives_traits::{ }; mod proof; -pub use proof::calculate_receipt_root_no_memo_optimism; +pub use proof::calculate_receipt_root_optimism; #[cfg(feature = "std")] mod sdm_metrics; diff --git a/rust/op-reth/crates/consensus/src/proof.rs b/rust/op-reth/crates/consensus/src/proof.rs index 7fedc49ad0d..57e9d645c3d 100644 --- a/rust/op-reth/crates/consensus/src/proof.rs +++ b/rust/op-reth/crates/consensus/src/proof.rs @@ -9,7 +9,7 @@ use reth_optimism_forks::OpHardforks; use reth_optimism_primitives::DepositReceipt; /// Calculates the receipt root for a header. -pub(crate) fn calculate_receipt_root_optimism( +pub fn calculate_receipt_root_optimism( receipts: &[ReceiptWithBloom<&R>], chain_spec: impl OpHardforks, timestamp: u64, @@ -39,43 +39,6 @@ pub(crate) fn calculate_receipt_root_optimism( ordered_trie_root_with_encoder(receipts, |r, buf| r.encode_2718(buf)) } -/// Calculates the receipt root for a header for the reference type of an OP receipt. -/// -/// NOTE: Prefer calculate receipt root optimism if you have log blooms memoized. -pub fn calculate_receipt_root_no_memo_optimism( - receipts: &[R], - chain_spec: impl OpHardforks, - timestamp: u64, -) -> B256 { - // There is a minor bug in op-geth and op-erigon where in the Regolith hardfork, - // the receipt root calculation does not include the deposit nonce in the receipt - // encoding. In the Regolith Hardfork, we must strip the deposit nonce from the - // receipts before calculating the receipt root. This was corrected in the Canyon - // hardfork. - if chain_spec.is_regolith_active_at_timestamp(timestamp) && - !chain_spec.is_canyon_active_at_timestamp(timestamp) - { - let receipts = receipts - .iter() - .map(|r| { - let mut r = (*r).clone(); - if let Some(receipt) = r.as_deposit_receipt_mut() { - receipt.deposit_nonce = None; - } - r - }) - .collect::>(); - - return ordered_trie_root_with_encoder(&receipts, |r, buf| { - r.with_bloom_ref().encode_2718(buf); - }); - } - - ordered_trie_root_with_encoder(receipts, |r, buf| { - r.with_bloom_ref().encode_2718(buf); - }) -} - #[cfg(test)] mod tests { use super::*; diff --git a/rust/op-reth/crates/consensus/src/validation/mod.rs b/rust/op-reth/crates/consensus/src/validation/mod.rs index ebb5273046b..9442b7131f8 100644 --- a/rust/op-reth/crates/consensus/src/validation/mod.rs +++ b/rust/op-reth/crates/consensus/src/validation/mod.rs @@ -18,7 +18,7 @@ use reth_optimism_forks::OpHardforks; use reth_optimism_primitives::DepositReceipt; use reth_primitives_traits::{BlockBody, GotExpected, receipt::gas_spent_by_transactions}; -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_consensus_common::validation::validate_body_against_header` /// /// Copies the generic body/header checks and replaces withdrawals-root handling after Isthmus. @@ -85,7 +85,7 @@ where Ok(()) } -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_ethereum_consensus::validation::validate_block_post_execution` /// /// Copies upstream post-execution validation with OP receipt roots and Jovian DA accounting. @@ -163,7 +163,7 @@ pub fn validate_block_post_execution( Ok(()) } -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 `reth_ethereum_consensus::validation::verify_receipts` +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 `reth_ethereum_consensus::validation::verify_receipts` /// /// Copies the private upstream helper and substitutes OP receipt-root calculation. /// Verify the calculated receipts root against the expected receipts root. @@ -192,7 +192,7 @@ fn verify_receipts_optimism( Ok(()) } -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_ethereum_consensus::validation::compare_receipts_root_and_logs_bloom` /// /// Kept identical to the private upstream comparison helper. diff --git a/rust/op-reth/crates/evm/Cargo.toml b/rust/op-reth/crates/evm/Cargo.toml index 415418d7c3e..83640e4392b 100644 --- a/rust/op-reth/crates/evm/Cargo.toml +++ b/rust/op-reth/crates/evm/Cargo.toml @@ -52,6 +52,7 @@ tracing.workspace = true [dev-dependencies] reth-evm = { workspace = true, features = ["test-utils"] } reth-revm = { workspace = true, features = ["test-utils"] } +reth-storage-api.workspace = true alloy-genesis.workspace = true metrics-exporter-prometheus.workspace = true metrics-util.workspace = true @@ -89,6 +90,7 @@ std = [ "reth-evm/std", "op-alloy-rpc-types-engine/std", "reth-storage-errors/std", + "reth-storage-api/std", "op-alloy-rpc-types?/std", "alloy-rpc-types-eth?/std" ] diff --git a/rust/op-reth/crates/evm/src/build.rs b/rust/op-reth/crates/evm/src/build.rs index 07e999a1fd2..a8749203f6d 100644 --- a/rust/op-reth/crates/evm/src/build.rs +++ b/rust/op-reth/crates/evm/src/build.rs @@ -1,4 +1,4 @@ -use alloc::sync::Arc; +use alloc::{sync::Arc, vec::Vec}; use alloy_consensus::{ Block, BlockBody, EMPTY_OMMER_ROOT_HASH, Header, TxReceipt, constants::EMPTY_WITHDRAWALS, proofs, @@ -6,11 +6,11 @@ use alloy_consensus::{ use alloy_eips::{eip7685::EMPTY_REQUESTS_HASH, merge::BEACON_NONCE}; use alloy_evm::block::BlockExecutorFactory; use alloy_op_evm::OpBlockExecutionCtx; -use alloy_primitives::logs_bloom; +use alloy_primitives::Bloom; use reth_evm::execute::{BlockAssembler, BlockAssemblerInput}; use reth_execution_errors::BlockExecutionError; use reth_execution_types::BlockExecutionResult; -use reth_optimism_consensus::{calculate_receipt_root_no_memo_optimism, isthmus}; +use reth_optimism_consensus::{calculate_receipt_root_optimism, isthmus}; use reth_optimism_forks::OpHardforks; use reth_optimism_primitives::DepositReceipt; use reth_primitives_traits::{Receipt, SignedTransaction}; @@ -30,7 +30,7 @@ impl OpBlockAssembler { } impl OpBlockAssembler { - /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 + /// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_evm_ethereum::EthBlockAssembler::assemble_block` /// /// Copies upstream block assembly with OP receipt roots, withdrawals, and DA fields. @@ -61,9 +61,13 @@ impl OpBlockAssembler { let timestamp = evm_env.block_env.timestamp().saturating_to(); let transactions_root = proofs::calculate_transaction_root(&transactions); + // Reuse the receipt blooms for the block bloom instead of hashing every log twice. + let receipts_with_bloom = + receipts.iter().map(TxReceipt::with_bloom_ref).collect::>(); let receipts_root = - calculate_receipt_root_no_memo_optimism(receipts, &self.chain_spec, timestamp); - let logs_bloom = logs_bloom(receipts.iter().flat_map(|r| r.logs())); + calculate_receipt_root_optimism(&receipts_with_bloom, &self.chain_spec, timestamp); + let logs_bloom = + receipts_with_bloom.iter().fold(Bloom::ZERO, |acc, receipt| acc | receipt.bloom_ref()); let mut requests_hash = None; diff --git a/rust/op-reth/crates/evm/src/config.rs b/rust/op-reth/crates/evm/src/config.rs index 0515a63aecf..58576c413c9 100644 --- a/rust/op-reth/crates/evm/src/config.rs +++ b/rust/op-reth/crates/evm/src/config.rs @@ -25,7 +25,7 @@ pub struct OpNextBlockEnvAttributes { impl reth_rpc_eth_api::helpers::pending_block::BuildPendingEnv for OpNextBlockEnvAttributes { - /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 + /// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_rpc_eth_api::helpers::pending_block::NextBlockEnvAttributes::build_pending_env` /// /// Copies upstream pending-environment defaults for the OP attribute type, except that diff --git a/rust/op-reth/crates/evm/src/execute.rs b/rust/op-reth/crates/evm/src/execute.rs index f56ef5f9dd7..6ea8511a2e0 100644 --- a/rust/op-reth/crates/evm/src/execute.rs +++ b/rust/op-reth/crates/evm/src/execute.rs @@ -17,6 +17,7 @@ mod tests { use reth_optimism_primitives::{OpReceipt, OpTransactionSigned}; use reth_primitives_traits::{Account, RecoveredBlock}; use reth_revm::{database::StateProviderDatabase, test_utils::StateProviderTest}; + use reth_storage_api::StateProvider; use std::{collections::HashMap, str::FromStr}; fn create_op_state_provider() -> StateProviderTest { @@ -60,7 +61,10 @@ mod tests { senders: Vec
, ) -> BlockExecutionOutput { let provider = evm_config(chain_spec); - let mut executor = BasicBlockExecutor::new(provider, StateProviderDatabase::new(db)); + let mut executor = BasicBlockExecutor::new( + provider, + StateProviderDatabase::new(db.into_evm_state_provider()), + ); // make sure the L1 block contract state is preloaded. executor.with_state_mut(|state| { diff --git a/rust/op-reth/crates/evm/src/lib.rs b/rust/op-reth/crates/evm/src/lib.rs index ac5b4842009..0efb3bd608d 100644 --- a/rust/op-reth/crates/evm/src/lib.rs +++ b/rust/op-reth/crates/evm/src/lib.rs @@ -21,7 +21,7 @@ use alloy_op_evm::{ use core::fmt::Debug; use op_alloy_consensus::{ EIP1559ParamError, OpTransaction as OpConsensusTransaction, - parse_post_exec_payload_from_transactions, validate_post_exec_entry_count, + parse_post_exec_payload_from_transactions, }; use op_revm::OpSpecId; use reth_chainspec::EthChainSpec; @@ -45,6 +45,7 @@ use { #[cfg(feature = "std")] use { alloy_op_evm::evm_env_for_op_payload, + op_alloy_consensus::validate_post_exec_entry_count, reth_evm::{ConfigureEngineEvm, ExecutableTxIterator}, }; @@ -224,7 +225,7 @@ where } } -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 `reth_evm_ethereum::EthEvmConfig` +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 `reth_evm_ethereum::EthEvmConfig` /// /// Mirrors upstream `ConfigureEvm` plumbing with OP environments and execution context. impl ConfigureEvm for OpEvmConfig @@ -324,7 +325,7 @@ where } } -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 `reth_evm_ethereum::EthEvmConfig` +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 `reth_evm_ethereum::EthEvmConfig` /// /// Mirrors upstream payload-to-EVM configuration with OP payload and fork semantics. /// `tx_iterator_for_payload` recovers senders directly; upstream routes the same recovery through diff --git a/rust/op-reth/crates/exex/Cargo.toml b/rust/op-reth/crates/exex/Cargo.toml index e112dd325eb..708acc77098 100644 --- a/rust/op-reth/crates/exex/Cargo.toml +++ b/rust/op-reth/crates/exex/Cargo.toml @@ -18,6 +18,7 @@ reth-execution-types.workspace = true reth-node-api.workspace = true reth-trie.workspace = true reth-provider.workspace = true +reth-stages-types.workspace = true # op-reth # proofs exex handles `TrieUpdates` in notifications @@ -54,7 +55,8 @@ test-utils = [ "reth-provider/test-utils", "reth-ethereum-primitives/test-utils", "reth-primitives-traits/test-utils", - "reth-optimism-trie/test-utils" + "reth-optimism-trie/test-utils", + "reth-stages-types/test-utils" ] metrics = [ "reth-optimism-trie/metrics", diff --git a/rust/op-reth/crates/exex/src/lib.rs b/rust/op-reth/crates/exex/src/lib.rs index be269e08103..690b8fd45ae 100644 --- a/rust/op-reth/crates/exex/src/lib.rs +++ b/rust/op-reth/crates/exex/src/lib.rs @@ -9,7 +9,7 @@ #![cfg_attr(not(test), warn(unused_crate_dependencies))] use alloy_consensus::BlockHeader; -use alloy_eips::eip1898::BlockWithParent; +use alloy_eips::{NumHash, eip1898::BlockWithParent}; use futures_util::TryStreamExt; use reth_execution_types::Chain; use reth_exex::{ExExContext, ExExEvent, ExExNotification}; @@ -17,7 +17,8 @@ use reth_node_api::{FullNodeComponents, NodePrimitives, NodeTypes}; use reth_optimism_trie::{ OpProofStoragePruner, OpProofsProviderRO, OpProofsStore, engine::EngineHandle, }; -use reth_provider::BlockNumReader; +use reth_provider::{BlockNumReader, StageCheckpointReader}; +use reth_stages_types::StageId; use reth_trie::{HashedPostStateSorted, SortedTrieData, updates::TrieUpdatesSorted}; use std::sync::Arc; use tracing::{debug, info}; @@ -298,6 +299,18 @@ where return Ok(()); } + if let Some(parent) = self.execution_parent_above_durable_trie(&new)? { + debug!( + target: "optimism::exex", + parent_number = parent.number, + parent_hash = ?parent.hash, + target_block = new.tip().number(), + "Deferring proofs-history execution until parent state is available", + ); + engine_handle.sync_to(new.tip().number())?; + return Ok(()); + } + // `Chain::blocks()` is a BTreeMap so iteration is already ordered oldest → newest. for (&block_number, block) in new.blocks() { // Fast path: use pre-computed trie data only when verification is not due. @@ -322,6 +335,41 @@ where Ok(()) } + /// Returns the highest parent required for block execution if it is above reth's durable state + /// trie frontier. + /// + /// During pipeline sync, state above this frontier may depend on the canonical in-memory chain, + /// which the pipeline can prune concurrently. + fn execution_parent_above_durable_trie( + &self, + chain: &Chain, + ) -> eyre::Result> { + // Checking the highest execution parent is sufficient because the durable trie frontier is + // monotonic by block number. + let Some(parent) = chain.blocks().iter().rev().find_map(|(&block_number, block)| { + let should_verify = self.verification_interval > 0 && + block_number.is_multiple_of(self.verification_interval); + (should_verify || chain.trie_data_at(block_number).is_none()) + .then_some(NumHash::new(block_number.saturating_sub(1), block.parent_hash())) + }) else { + return Ok(None); + }; + + let durable_trie_tip = self + .ctx + .provider() + .get_stage_checkpoint(StageId::Finish)? + .map(|checkpoint| { + checkpoint + .finish_stage_checkpoint() + .and_then(|finish| finish.partial_state_trie()) + .unwrap_or(checkpoint.block_number) + }) + .unwrap_or_default(); + + Ok((parent.number > durable_trie_tip).then_some(parent)) + } + fn handle_chain_reorged( &self, old: Arc>, @@ -458,11 +506,26 @@ mod tests { trie_data.insert(n, data); } + mk_chain(blocks, from, trie_data) + } + + fn mk_chain_without_updates( + from: u64, + to: u64, + ) -> Chain { + mk_chain((from..=to).map(mk_block).collect(), from, BTreeMap::new()) + } + + fn mk_chain( + blocks: Vec>, + first_block: u64, + trie_data: BTreeMap, + ) -> Chain { let execution_outcome: ExecutionOutcome = ExecutionOutcome { bundle: Default::default(), receipts: Vec::new(), requests: Vec::new(), - first_block: from, + first_block, }; Chain::new(blocks, execution_outcome, trie_data) @@ -890,6 +953,39 @@ mod tests { assert_eq!(err.to_string(), "No blocks found"); } + #[tokio::test] + async fn handle_notification_defers_execution_while_merkle_stage_is_behind() { + let dir = tempdir_path(); + let store = Arc::new(MdbxProofsStorageV2::new(dir.as_path()).expect("env")); + init_storage(store.clone()); + + let (ctx, _handle) = + reth_exex_test_utils::test_exex_context().await.expect("exex test context"); + let pruner = OpProofStoragePruner::new(store.clone(), ctx.components.provider.clone(), 20); + let engine_handle = EngineHandle::spawn_with_thresholds( + ctx.components.components.evm_config.clone(), + ctx.components.provider.clone(), + store.clone(), + pruner, + 1, + 2, + ); + let exex = build_test_exex(ctx, store.clone()); + + // Without pre-computed trie data this notification needs EVM execution. The test provider + // has no state for its parent and no completed Merkle checkpoint, so execution must be + // handed to the retrying sync loop rather than failing the ExEx. + let notif = + ExExNotification::ChainCommitted { new: Arc::new(mk_chain_without_updates(5, 10)) }; + exex.handle_notification(notif, &engine_handle) + .expect("unavailable parent state should defer execution"); + + engine_handle.flush(); + let latest = + store.provider_ro().expect("provider ro").get_latest_block().expect("get").number; + assert_eq!(latest, 0); + } + #[tokio::test] async fn handle_notification_schedules_async_on_gap() { // MDBX proofs storage diff --git a/rust/op-reth/crates/flashblocks/src/worker.rs b/rust/op-reth/crates/flashblocks/src/worker.rs index 056d3bea27e..51b701f6d3d 100644 --- a/rust/op-reth/crates/flashblocks/src/worker.rs +++ b/rust/op-reth/crates/flashblocks/src/worker.rs @@ -27,8 +27,8 @@ use reth_revm::{ }; use reth_rpc_eth_types::{EthApiError, PendingBlock}; use reth_storage_api::{ - BlockReaderIdExt, HashedPostStateProvider, StateProviderFactory, StateRootProvider, - noop::NoopProvider, + BlockReaderIdExt, HashedPostStateProvider, StateProvider, StateProviderFactory, + StateRootProvider, noop::NoopProvider, }; use reth_trie_common::ComputedTrieData; use std::{ @@ -229,7 +229,8 @@ where args.pending_parent.as_ref().map(|p| p.cached_reads.clone()).unwrap_or_default() }); - let cached_db = request_cache.as_db_mut(StateProviderDatabase::new(&state_provider)); + let cached_db = request_cache + .as_db_mut(StateProviderDatabase::new((&state_provider).into_evm_state_provider())); // Check for resumable canonical execution state. let canonical_parent_hash = args.base.parent_hash; diff --git a/rust/op-reth/crates/hardforks/src/lib.rs b/rust/op-reth/crates/hardforks/src/lib.rs index 7d15cadc1d2..662d9a27c0b 100644 --- a/rust/op-reth/crates/hardforks/src/lib.rs +++ b/rust/op-reth/crates/hardforks/src/lib.rs @@ -23,7 +23,7 @@ use alloy_primitives::U256; use once_cell::sync::Lazy as LazyLock; use reth_ethereum_forks::{ChainHardforks, EthereumHardfork, ForkCondition, Hardfork}; -/// UPSTREAM-MIRROR(set): reth@rev:0fbe428 `reth_ethereum_forks::DEV_HARDFORKS` +/// UPSTREAM-MIRROR(set): reth@v2.7.0 `reth_ethereum_forks::DEV_HARDFORKS` /// /// Mirrors reth's dev hardfork list with OP forks interleaved. Upstream includes an explicit /// Osaka entry; this list activates those semantics through Karst instead. Re-diff every L1 diff --git a/rust/op-reth/crates/node/Cargo.toml b/rust/op-reth/crates/node/Cargo.toml index 522c3213908..89afad4c75a 100644 --- a/rust/op-reth/crates/node/Cargo.toml +++ b/rust/op-reth/crates/node/Cargo.toml @@ -90,8 +90,6 @@ alloy-genesis = { workspace = true, optional = true } serde_json = { workspace = true, optional = true } [dev-dependencies] -reth-basic-payload-builder.workspace = true -reth-node-metrics.workspace = true reth-optimism-node = { workspace = true, features = ["test-utils"] } reth-db = { workspace = true, features = ["test-utils"] } reth-db-common.workspace = true diff --git a/rust/op-reth/crates/node/src/node.rs b/rust/op-reth/crates/node/src/node.rs index 7f7c938e9f9..a2c41ad5f0d 100644 --- a/rust/op-reth/crates/node/src/node.rs +++ b/rust/op-reth/crates/node/src/node.rs @@ -675,10 +675,21 @@ where /// RPC methods an OP node does not serve, on any transport. /// -/// Upstream installs `eth_getMultiProof` by default, no OP user has asked for it, and a -/// proofs-history node could not answer it consistently from its pruned state window. Drop an -/// entry from this list once there is a user for the method. -const UNSERVED_RPC_METHODS: &[&str] = &["eth_getMultiProof"]; +/// UPSTREAM-MIRROR(set): reth@v2.7.0 `reth_rpc_eth_api::EthApi` +/// +/// Upstream installs these methods as part of the full `eth` API. `eth_getMultiProof` has no OP +/// users and a proofs-history node could not answer it consistently from its pruned state window. +/// The block access list methods are explicitly disabled because OP execution data does not carry +/// EIP-7928 BALs and reconstruction has not been tested against OP-specific state transitions. +/// Do not expose them until that behavior is tested; re-check this list whenever upstream changes +/// the `EthApi` method set. +const UNSERVED_RPC_METHODS: &[&str] = &[ + "eth_getMultiProof", + "eth_getBlockAccessListByBlockHash", + "eth_getBlockAccessListByBlockNumber", + "eth_getBlockAccessList", + "eth_getBlockAccessListRaw", +]; /// Removes [`UNSERVED_RPC_METHODS`] from the http/ws/ipc modules and from the auth module. fn remove_unserved_rpc_methods(modules: &mut TransportRpcModules, auth_module: &mut AuthRpcModule) { @@ -1799,6 +1810,18 @@ mod tests { assert!(UNSERVED_RPC_METHODS.contains(&"eth_getMultiProof")); } + #[test] + fn block_access_list_methods_are_unserved() { + for method in [ + "eth_getBlockAccessListByBlockHash", + "eth_getBlockAccessListByBlockNumber", + "eth_getBlockAccessList", + "eth_getBlockAccessListRaw", + ] { + assert!(UNSERVED_RPC_METHODS.contains(&method)); + } + } + #[test] fn unserved_methods_are_removed_from_every_transport() { let mut modules = TransportRpcModules::default() diff --git a/rust/op-reth/crates/node/src/rpc.rs b/rust/op-reth/crates/node/src/rpc.rs index 4826341105c..f476e1e4431 100644 --- a/rust/op-reth/crates/node/src/rpc.rs +++ b/rust/op-reth/crates/node/src/rpc.rs @@ -75,6 +75,7 @@ //! components: node.node_adapter(), //! config, //! cache, +//! sender_recovery_cache: node.sender_recovery_cache().cloned(), //! engine_handle: ConsensusEngineHandle::new(tx), //! }; //! let eth_api = OpEthApiBuilder::::default().build_eth_api(ctx).await.unwrap(); diff --git a/rust/op-reth/crates/node/src/utils.rs b/rust/op-reth/crates/node/src/utils.rs index bb504309731..50755d19210 100644 --- a/rust/op-reth/crates/node/src/utils.rs +++ b/rust/op-reth/crates/node/src/utils.rs @@ -3,7 +3,7 @@ use alloy_genesis::Genesis; use alloy_primitives::{Address, B256}; use op_alloy_rpc_types_engine::OpPayloadAttributes; use reth_e2e_test_utils::{ - NodeHelperType, TmpDB, transaction::TransactionTestContext, wallet::Wallet, + E2ETestSetupBuilder, NodeHelperType, TmpDB, transaction::TransactionTestContext, wallet::Wallet, }; use reth_node_api::NodeTypesWithDBAdapter; use reth_optimism_chainspec::OpChainSpecBuilder; @@ -20,15 +20,14 @@ pub(crate) type OpNode = pub async fn setup(num_nodes: usize) -> eyre::Result<(Vec, Wallet)> { let genesis: Genesis = serde_json::from_str(include_str!("../tests/assets/genesis.json")).unwrap(); - reth_e2e_test_utils::setup_engine( + E2ETestSetupBuilder::::new( num_nodes, Arc::new( OpChainSpecBuilder::optimism_sepolia().genesis(genesis).ecotone_activated().build(), ), - false, - Default::default(), - optimism_payload_attributes, ) + .with_attributes_generator(optimism_payload_attributes) + .build() .await } diff --git a/rust/op-reth/crates/node/tests/it/main.rs b/rust/op-reth/crates/node/tests/it/main.rs index 10382155c42..d44168c9a77 100644 --- a/rust/op-reth/crates/node/tests/it/main.rs +++ b/rust/op-reth/crates/node/tests/it/main.rs @@ -18,6 +18,4 @@ mod estimate_gas_7825; mod p2p_version; -mod payload_handoff; - const fn main() {} diff --git a/rust/op-reth/crates/node/tests/it/p2p_version.rs b/rust/op-reth/crates/node/tests/it/p2p_version.rs index 09983fe1b0e..c61d64a2642 100644 --- a/rust/op-reth/crates/node/tests/it/p2p_version.rs +++ b/rust/op-reth/crates/node/tests/it/p2p_version.rs @@ -11,10 +11,10 @@ use reth_rpc_api::servers::AdminApiServer; use std::time::Duration; use tokio::time::{sleep, timeout}; -const EXPECTED_ETH_VERSION: u64 = 69; +const EXPECTED_ETH_VERSION: u64 = 71; #[tokio::test] -async fn peers_negotiate_eth_69() -> eyre::Result<()> { +async fn peers_negotiate_eth_71() -> eyre::Result<()> { // This test intermittently segfaults during teardown, after the body below has // passed (ethereum-optimism/optimism#20973). The handler outlives the body, so it // reports the faulting thread and stack when that happens. diff --git a/rust/op-reth/crates/node/tests/it/payload_handoff.rs b/rust/op-reth/crates/node/tests/it/payload_handoff.rs deleted file mode 100644 index d37d86dc1ed..00000000000 --- a/rust/op-reth/crates/node/tests/it/payload_handoff.rs +++ /dev/null @@ -1,382 +0,0 @@ -//! Real OP payload jobs must not stop Engine API traffic while persistence hands off its overlay. - -use alloy_genesis::Genesis; -use alloy_primitives::B256; -use alloy_rpc_types_engine::{ForkchoiceState, PayloadId, PayloadStatus}; -use jsonrpsee::{core::client::ClientT, rpc_params}; -use op_alloy_rpc_types_engine::OpExecutionPayloadEnvelopeV3; -use reth_basic_payload_builder::{ - BuildArguments, BuildOutcome, HeaderForPayload, MissingPayloadBehaviour, PayloadBuilder, - PayloadConfig, -}; -use reth_chainspec::EthChainSpec; -use reth_e2e_test_utils::{transaction::TransactionTestContext, wallet::Wallet}; -use reth_node_api::PayloadAttributes; -use reth_node_builder::{ - BuilderContext, FullNodeTypes, Node, NodeBuilder, NodeConfig, - components::{BasicPayloadServiceBuilder, PayloadBuilderBuilder}, -}; -use reth_node_metrics::recorder::install_prometheus_recorder; -use reth_optimism_chainspec::OpChainSpecBuilder; -use reth_optimism_node::{OpNode, utils::optimism_payload_attributes}; -use reth_payload_builder::{PayloadBuilderError, PayloadKind}; -use reth_provider::{BlockNumReader, ChainSpecProvider, DatabaseProviderFactory}; -use reth_tasks::Runtime; -use reth_transaction_pool::TransactionPool; -use std::{future::Future, process::Command, sync::Arc, time::Duration}; -use tokio::sync::{mpsc, oneshot}; - -const GUARD: Duration = Duration::from_secs(20); -const ABANDONED_TIMESTAMP: u64 = 5; - -/// Dropping this also releases the worker, including when an assertion fails. -#[derive(Debug)] -struct BuildGate { - id: PayloadId, - release: oneshot::Sender<()>, - finished: oneshot::Receiver, -} - -impl BuildGate { - async fn release(self) { - let _ = self.release.send(()); - assert!(guard("cancelled worker did not finish", self.finished).await.unwrap()); - } -} - -/// Decorates the real builder, without replacing any build result or lease management. -#[derive(Clone, Debug)] -struct GatedBuilder { - inner: B, - entered: mpsc::UnboundedSender, -} - -impl PayloadBuilder for GatedBuilder { - type Attributes = B::Attributes; - type BuiltPayload = B::BuiltPayload; - - fn try_build( - &self, - args: BuildArguments, - ) -> Result, PayloadBuilderError> { - // Let the first attempt produce a real best payload. Hold its replacement attempt so - // normal getPayload can return that best payload while the detached worker still owns - // the BasicPayloadJob lease. The abandoned job instead stalls on its first attempt. - let finished = (args.best_payload.is_some() || - args.config.attributes.timestamp() == ABANDONED_TIMESTAMP) - .then(|| { - let (release, wait) = oneshot::channel(); - let (finished, done) = oneshot::channel(); - let gate = BuildGate { id: args.config.payload_id(), release, finished: done }; - if self.entered.send(gate).is_ok() { - let _ = wait.blocking_recv(); - } - finished - }); - let cancelled = args.cancel.is_cancelled(); - let result = self.inner.try_build(args); - if let Some(finished) = finished { - let _ = finished.send(cancelled); - } - result - } - - fn on_missing_payload( - &self, - args: BuildArguments, - ) -> MissingPayloadBehaviour { - self.inner.on_missing_payload(args) - } - - fn build_empty_payload( - &self, - config: PayloadConfig>, - ) -> Result { - self.inner.build_empty_payload(config) - } -} - -struct GatedBuilderFactory { - inner: B, - entered: mpsc::UnboundedSender, -} - -impl PayloadBuilderBuilder for GatedBuilderFactory -where - N: FullNodeTypes, - Pool: TransactionPool, - Evm: Send, - B: PayloadBuilderBuilder, -{ - type PayloadBuilder = GatedBuilder; - - async fn build_payload_builder( - self, - ctx: &BuilderContext, - pool: Pool, - evm: Evm, - ) -> eyre::Result { - Ok(GatedBuilder { - inner: self.inner.build_payload_builder(ctx, pool, evm).await?, - entered: self.entered, - }) - } -} - -async fn guard(message: &str, future: impl Future) -> T { - tokio::time::timeout(GUARD, future).await.unwrap_or_else(|_| panic!("{message}")) -} - -async fn wait_until(message: &str, mut ready: impl FnMut() -> bool) { - guard(message, async { - while !ready() { - tokio::task::yield_now().await; - } - }) - .await; -} - -fn persistence_completions() -> u64 { - // This histogram is recorded by EngineApiTreeHandler::finish_persistence, not the disk - // writer. Once observed, the engine must pass through its active-build handoff branch - // before it can receive another request. Disk height alone cannot establish that ordering. - install_prometheus_recorder() - .handle() - .render() - .lines() - .find_map(|line| { - line.strip_prefix("reth_consensus_engine_beacon_persistence_duration_count ") - .map(|count| count.parse().unwrap()) - }) - .unwrap_or_default() -} - -#[test] -fn pending_handoff_keeps_engine_responsive_and_drains() { - // Metrics handles are cached globally upstream. A fresh process makes the rendezvous - // specific to this node, even under cargo test with other node tests running concurrently. - const CHILD: &str = "OP_RETH_HANDOFF_TEST_CHILD"; - if std::env::var_os(CHILD).is_none() { - let output = Command::new(std::env::current_exe().unwrap()) - .args([ - "--exact", - "payload_handoff::pending_handoff_keeps_engine_responsive_and_drains", - "--nocapture", - ]) - .env(CHILD, "1") - .output() - .unwrap(); - assert!( - output.status.success(), - "handoff regression failed: {}\n{}\n{}", - output.status, - String::from_utf8_lossy(&output.stdout), - String::from_utf8_lossy(&output.stderr), - ); - return; - } - - super::crash_backtrace::install(); - // Also bound startup/teardown: a blocked OS worker can outlive Tokio's async timeout. - let (_watchdog, watchdog_rx) = std::sync::mpsc::channel::<()>(); - std::thread::spawn(move || { - if matches!( - watchdog_rx.recv_timeout(Duration::from_secs(180)), - Err(std::sync::mpsc::RecvTimeoutError::Timeout) - ) { - eprintln!("handoff regression exceeded its process hang guard"); - std::process::exit(1); - } - }); - tokio::runtime::Builder::new_multi_thread() - .worker_threads(2) - .enable_all() - .build() - .unwrap() - .block_on(run_handoff_scenario()) - .unwrap(); -} - -async fn run_handoff_scenario() -> eyre::Result<()> { - let genesis: Genesis = serde_json::from_str(include_str!("../assets/genesis.json"))?; - let chain_spec = Arc::new( - OpChainSpecBuilder::optimism_sepolia().genesis(genesis).ecotone_activated().build(), - ); - let wallet = Wallet::default().with_chain_id(chain_spec.chain_id()); - let mut config = NodeConfig::test().map_chain(chain_spec).with_unused_ports(); - config.network.discovery.discv5_port = Some(0); - config.network.discovery.discv5_port_ipv6 = Some(0); - config.engine.persistence_threshold = 0; - config.engine.memory_block_buffer_target = Some(0); - config.engine.num_state_masking_blocks = 0; - config.engine.suppress_persistence_during_build = false; - config.builder.interval = Duration::from_millis(1); - config.builder.deadline = Duration::from_secs(300); - // Four overlapping replacement attempts and one abandoned first attempt. - config.builder.max_payload_tasks = 8; - - let (entered, mut gates) = mpsc::unbounded_channel(); - let op_node = OpNode::default(); - let node = NodeBuilder::new(config) - .testing_node(Runtime::test()) - .with_types::() - .with_components(op_node.components().payload(BasicPayloadServiceBuilder::new( - GatedBuilderFactory { inner: op_node.payload_builder(), entered }, - ))) - .with_add_ons(op_node.add_ons()) - .launch() - .await? - .node; - let engine = &node.add_ons_handle.beacon_engine_handle; - let client = node.auth_server_handle().http_client(); - let memory = node.provider.canonical_in_memory_state(); - let disk_height = || node.provider.database_provider_ro().unwrap().last_block_number().unwrap(); - let handed_off_height = || memory.get_persisted_num_hash().map_or(0, |block| block.number); - let mut head = node.provider.chain_spec().genesis_hash(); - let mut held = Vec::new(); - - for number in 1..=4 { - let mut attrs = optimism_payload_attributes(number); - attrs.0.transactions = Some(vec![ - TransactionTestContext::optimism_l1_block_info_tx( - wallet.chain_id, - wallet.inner.clone(), - number - 1, - ) - .await, - ]); - let fcu = guard( - "FCU blocked behind a payload worker's persisted handoff", - engine.fork_choice_updated(ForkchoiceState::same_hash(head), Some(attrs)), - ) - .await?; - assert!(fcu.payload_status.is_valid()); - let id = fcu.payload_id.unwrap(); - let gate = guard("replacement build did not enter its gate", gates.recv()).await.unwrap(); - assert_eq!(gate.id, id); - held.push(gate); - - // Exercise the normal authenticated getPayload RPC, not a fabricated build outcome. - let payload: OpExecutionPayloadEnvelopeV3 = guard( - "getPayload waited for the replacement worker instead of returning the best payload", - client.request("engine_getPayloadV3", rpc_params![id]), - ) - .await?; - assert_eq!(payload.execution_payload.payload_inner.payload_inner.block_number, number); - head = payload.execution_payload.payload_inner.payload_inner.block_hash; - let status: PayloadStatus = guard( - "newPayload blocked behind a payload worker's persisted handoff", - client.request( - "engine_newPayloadV3", - rpc_params![ - payload.execution_payload, - Vec::::new(), - payload.parent_beacon_block_root - ], - ), - ) - .await?; - assert!(status.is_valid()); - let fcu = guard( - "canonical FCU blocked behind a payload worker's persisted handoff", - engine.fork_choice_updated(ForkchoiceState::same_hash(head), None), - ) - .await?; - assert!(fcu.payload_status.is_valid()); - - if number == 1 { - wait_until("engine did not observe persistence completion", || { - persistence_completions() > 0 - }) - .await; - } - assert_eq!(disk_height(), 1, "a pending handoff must retain its persistence frontier"); - assert_eq!(handed_off_height(), 0, "live worker leases must protect the old overlay"); - } - - // Abandon a first attempt with no best payload. Dropping resolve_kind's response receiver - // cancels the real service job; it cannot cancel the detached blocking worker's lease. - let attrs = optimism_payload_attributes(ABANDONED_TIMESTAMP); - let id = guard( - "FCU could not start the abandoned build", - engine.fork_choice_updated(ForkchoiceState::same_hash(head), Some(attrs)), - ) - .await? - .payload_id - .unwrap(); - let abandoned = guard("abandoned worker did not enter its gate", gates.recv()).await.unwrap(); - assert_eq!(abandoned.id, id); - drop(node.payload_builder_handle.resolve_kind(id, PayloadKind::Earliest)); - assert!( - guard( - "cancelled job remained in the payload service", - node.payload_builder_handle.payload_timestamp(id) - ) - .await - .is_none() - ); - abandoned.release().await; - - // Drain newer workers first. The oldest detached worker must still protect the handoff. - while held.len() > 1 { - held.pop().unwrap().release().await; - } - assert_eq!(disk_height(), 1); - assert_eq!(handed_off_height(), 0); - held.pop().unwrap().release().await; - wait_until("finite payload workload never released persistence", || { - disk_height() == 4 && handed_off_height() == 4 - }) - .await; - - // A new build after the drain must use the caught-up provider and persist normally too. - let mut attrs = optimism_payload_attributes(6); - attrs.0.transactions = Some(vec![ - TransactionTestContext::optimism_l1_block_info_tx(wallet.chain_id, wallet.inner.clone(), 4) - .await, - ]); - let id = guard( - "FCU did not recover after leases drained", - engine.fork_choice_updated(ForkchoiceState::same_hash(head), Some(attrs)), - ) - .await? - .payload_id - .unwrap(); - let gate = guard("post-handoff worker did not enter its gate", gates.recv()).await.unwrap(); - assert_eq!(gate.id, id); - let payload: OpExecutionPayloadEnvelopeV3 = guard( - "post-handoff getPayload stalled", - client.request("engine_getPayloadV3", rpc_params![id]), - ) - .await?; - gate.release().await; - assert_eq!(payload.execution_payload.payload_inner.payload_inner.block_number, 5); - head = payload.execution_payload.payload_inner.payload_inner.block_hash; - let status: PayloadStatus = guard( - "post-handoff newPayload stalled", - client.request( - "engine_newPayloadV3", - rpc_params![ - payload.execution_payload, - Vec::::new(), - payload.parent_beacon_block_root - ], - ), - ) - .await?; - assert!(status.is_valid()); - assert!( - guard( - "post-handoff canonical FCU stalled", - engine.fork_choice_updated(ForkchoiceState::same_hash(head), None), - ) - .await? - .payload_status - .is_valid() - ); - wait_until("post-handoff build never persisted", || { - disk_height() == 5 && handed_off_height() == 5 - }) - .await; - Ok(()) -} diff --git a/rust/op-reth/crates/payload/Cargo.toml b/rust/op-reth/crates/payload/Cargo.toml index 973e0658a26..c9c92dac5b7 100644 --- a/rust/op-reth/crates/payload/Cargo.toml +++ b/rust/op-reth/crates/payload/Cargo.toml @@ -26,6 +26,7 @@ reth-payload-primitives.workspace = true reth-basic-payload-builder.workspace = true reth-payload-validator.workspace = true reth-metrics.workspace = true +reth-tasks.workspace = true # op-reth reth-optimism-evm.workspace = true diff --git a/rust/op-reth/crates/payload/src/builder.rs b/rust/op-reth/crates/payload/src/builder.rs index 7522d964722..0f2dee6365d 100644 --- a/rust/op-reth/crates/payload/src/builder.rs +++ b/rust/op-reth/crates/payload/src/builder.rs @@ -43,13 +43,11 @@ use reth_payload_util::{BestPayloadTransactions, NoopPayloadTransactions, Payloa use reth_primitives_traits::{ HeaderTy, NodePrimitives, SealedHeader, SealedHeaderFor, SignedTransaction, TxTy, }; -use reth_revm::{ - cancelled::CancelOnDrop, database::StateProviderDatabase, db::State, - witness::ExecutionWitnessRecord, -}; +use reth_revm::{database::StateProviderDatabase, db::State, witness::ExecutionWitnessRecord}; use reth_storage_api::{ HeaderProvider, StateProvider, StateProviderFactory, errors::ProviderError, }; +use reth_tasks::CancelOnDrop; use reth_transaction_pool::{BestTransactionsAttributes, PoolTransaction, TransactionPool}; use revm::context::{Block, BlockEnv}; use std::{marker::PhantomData, sync::Arc}; @@ -266,7 +264,7 @@ where let builder = OpBuilder::new(best); let state_provider = self.client.state_by_block_hash(ctx.parent().hash())?; - let state = StateProviderDatabase::new(&state_provider); + let state = StateProviderDatabase::new((&state_provider).into_evm_state_provider()); if ctx.attributes().no_tx_pool() { builder.build(state, &state_provider, ctx) @@ -589,7 +587,7 @@ impl OpBuilder<'_, Txs> { Attrs: OpAttributes, { let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx.block_builder(&mut db)?; diff --git a/rust/op-reth/crates/payload/src/builder/tests.rs b/rust/op-reth/crates/payload/src/builder/tests.rs index 1e32e8c398a..065700cc345 100644 --- a/rust/op-reth/crates/payload/src/builder/tests.rs +++ b/rust/op-reth/crates/payload/src/builder/tests.rs @@ -35,6 +35,7 @@ use reth_payload_builder_primitives::PayloadBuilderError; use reth_payload_util::PayloadTransactionsFixed; use reth_primitives_traits::{Account, InMemorySize, SealedHeader}; use reth_revm::{database::StateProviderDatabase, db::State, test_utils::StateProviderTest}; +use reth_storage_api::StateProvider; use reth_transaction_pool::PoolTransaction; use std::{borrow::Cow, cell::Cell, sync::Arc}; @@ -258,7 +259,7 @@ where let best_txs = PayloadTransactionsFixed::new(txs); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx.block_builder(&mut db).expect("block builder can be created"); @@ -336,7 +337,7 @@ fn rebuilds_derived_block_with_embedded_post_exec_tx_regardless_of_opt_in() { let state_provider = StateProviderTest::default(); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx.block_builder(&mut db).expect("block builder can be created"); @@ -364,7 +365,7 @@ fn block_builder_with_mode_honors_snapshot_over_live_opt_in() { let produce_ctx = interop_ctx(false, false, Some(Vec::new())); let provider = StateProviderTest::default(); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&provider)) + .with_database(StateProviderDatabase::new((&provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = produce_ctx @@ -378,7 +379,7 @@ fn block_builder_with_mode_honors_snapshot_over_live_opt_in() { let disabled_ctx = interop_ctx(false, true, Some(Vec::new())); let provider = StateProviderTest::default(); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&provider)) + .with_database(StateProviderDatabase::new((&provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = disabled_ctx @@ -523,7 +524,7 @@ fn execute_best_transactions_on_commit_hook_execution() { // Re-execute each tx that should be committed so we know the gas passed to on_commit. let expected_committed_gas: Vec = { let mut oracle_db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut oracle = ctx.block_builder(&mut oracle_db).expect("oracle block builder"); @@ -547,7 +548,7 @@ fn execute_best_transactions_on_commit_hook_execution() { }; let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx.block_builder(&mut db).expect("block builder can be created"); @@ -643,7 +644,7 @@ fn on_commit_reports_canonical_and_pre_refund_gas_separately_under_sdm_refund() }; let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx diff --git a/rust/op-reth/crates/payload/src/lib.rs b/rust/op-reth/crates/payload/src/lib.rs index 3b1e5a6ddc2..730753bb131 100644 --- a/rust/op-reth/crates/payload/src/lib.rs +++ b/rust/op-reth/crates/payload/src/lib.rs @@ -84,7 +84,7 @@ where // `block_to_payload` and `From> for OpExecData` are // separate conversion paths to the same type. OP execution data does not // currently carry a BAL, so both paths intentionally discard it. - /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 + /// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_ethereum_engine_primitives::EthPayloadTypes::block_to_payload` /// /// Mirrors the upstream conversion while constructing OP execution data. diff --git a/rust/op-reth/crates/payload/src/payload.rs b/rust/op-reth/crates/payload/src/payload.rs index e3dac3eb042..4e2b881dfca 100644 --- a/rust/op-reth/crates/payload/src/payload.rs +++ b/rust/op-reth/crates/payload/src/payload.rs @@ -448,7 +448,7 @@ impl BuiltPayload for OpBuiltPayload { } } -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_ethereum_engine_primitives::EthBuiltPayload::into_execution_data` /// /// Counterpart to `OpPayloadTypes::block_to_payload`; the two conversion paths are kept diff --git a/rust/op-reth/crates/payload/src/validator.rs b/rust/op-reth/crates/payload/src/validator.rs index 9a41c8d3913..df149e01b97 100644 --- a/rust/op-reth/crates/payload/src/validator.rs +++ b/rust/op-reth/crates/payload/src/validator.rs @@ -5,7 +5,7 @@ use alloy_consensus::Block; use derive_more::{Constructor, Deref}; use op_alloy_rpc_types_engine::{OpExecutionData, OpExecutionPayloadEnvelope, OpPayloadError}; use reth_optimism_forks::OpHardforks; -use reth_payload_validator::{cancun, prague, shanghai}; +use reth_payload_validator::{amsterdam, cancun, prague, shanghai}; use reth_primitives_traits::{Block as _, SealedBlock, SignedTransaction}; /// Execution payload validator. @@ -37,7 +37,7 @@ where } } -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_ethereum_payload_builder::validator::ensure_well_formed_payload` /// /// Copies upstream's ordered payload checks with OP payload fields and fork activation. @@ -90,5 +90,10 @@ where chain_spec.is_prague_active_at_timestamp(sealed_block.timestamp), )?; + amsterdam::ensure_well_formed_fields( + &sealed_block, + chain_spec.is_amsterdam_active_at_timestamp(sealed_block.timestamp), + )?; + Ok(sealed_block) } diff --git a/rust/op-reth/crates/rpc/Cargo.toml b/rust/op-reth/crates/rpc/Cargo.toml index 1a59c2078cf..1ee68336094 100644 --- a/rust/op-reth/crates/rpc/Cargo.toml +++ b/rust/op-reth/crates/rpc/Cargo.toml @@ -14,6 +14,7 @@ workspace = true [dependencies] # reth reth-basic-payload-builder.workspace = true +reth-errors.workspace = true reth-evm.workspace = true reth-primitives-traits.workspace = true reth-storage-api.workspace = true @@ -32,6 +33,7 @@ reth-chain-state.workspace = true reth-rpc-engine-api.workspace = true reth-payload-util.workspace = true reth-provider.workspace = true +reth-trie-common.workspace = true # op-reth reth-optimism-evm.workspace = true @@ -95,6 +97,7 @@ metrics.workspace = true strum.workspace = true [dev-dependencies] +reth-revm = { workspace = true, features = ["test-utils"] } alloy-op-hardforks.workspace = true alloy-genesis.workspace = true reth-optimism-chainspec = { workspace = true, features = ["superchain-configs"] } diff --git a/rust/op-reth/crates/rpc/src/debug.rs b/rust/op-reth/crates/rpc/src/debug.rs index 71b5ffa426e..a8607f5350d 100644 --- a/rust/op-reth/crates/rpc/src/debug.rs +++ b/rust/op-reth/crates/rpc/src/debug.rs @@ -29,7 +29,7 @@ use reth_payload_util::NoopPayloadTransactions; use reth_primitives_traits::{SealedHeader, TxTy}; use reth_provider::{ BlockReaderIdExt, ChainSpecProvider, HeaderProvider, NodePrimitivesProvider, ProviderError, - ProviderResult, StateProviderFactory, + ProviderResult, StateProvider, StateProviderFactory, }; use reth_revm::{State, database::StateProviderDatabase, witness::ExecutionWitnessRecord}; use reth_rpc_api::eth::helpers::FullEthApi; @@ -231,7 +231,7 @@ where let state_provider = this .state_provider_factory - .state_provider(Some(BlockId::Hash(parent_hash.into()))) + .state_provider(BlockId::Hash(parent_hash.into())) .await .map_err(PayloadBuilderError::other)?; @@ -277,10 +277,10 @@ where let state_provider = this .state_provider_factory - .state_provider(Some(BlockId::Hash(block.parent_hash().into()))) + .state_provider(BlockId::Hash(block.parent_hash().into())) .await .map_err(EthApiError::from)?; - let db = StateProviderDatabase::new(&state_provider); + let db = StateProviderDatabase::new((&state_provider).into_evm_state_provider()); let block_executor = this.eth_api.evm_config().executor(db); let mut witness = None; diff --git a/rust/op-reth/crates/rpc/src/engine.rs b/rust/op-reth/crates/rpc/src/engine.rs index 5d835449215..22b55871453 100644 --- a/rust/op-reth/crates/rpc/src/engine.rs +++ b/rust/op-reth/crates/rpc/src/engine.rs @@ -19,7 +19,7 @@ use reth_storage_api::{BalProvider, BlockReader, HeaderProvider, StateProviderFa use reth_transaction_pool::TransactionPool; use tracing::{debug, trace}; -/// UPSTREAM-MIRROR(set): reth@rev:0fbe428 `reth_rpc_engine_api::capabilities::CAPABILITIES` +/// UPSTREAM-MIRROR(set): reth@v2.7.0 `reth_rpc_engine_api::capabilities::CAPABILITIES` /// /// Advertised capabilities must stay in step with the methods declared on [`OpEngineApi`]. /// The list of all supported Engine capabilities available over the engine endpoint. @@ -50,7 +50,7 @@ pub const OP_ENGINE_CAPABILITIES: &[&str] = &[ /// #[cfg_attr(not(feature = "client"), rpc(server, namespace = "engine"), server_bounds(Engine::PayloadAttributes: jsonrpsee::core::DeserializeOwned))] #[cfg_attr(feature = "client", rpc(server, client, namespace = "engine", client_bounds(Engine::PayloadAttributes: jsonrpsee::core::Serialize + Clone), server_bounds(Engine::PayloadAttributes: jsonrpsee::core::DeserializeOwned)))] -/// UPSTREAM-MIRROR(set): reth@rev:0fbe428 `reth_rpc_api::EngineApi` +/// UPSTREAM-MIRROR(set): reth@v2.7.0 `reth_rpc_api::EngineApi` /// /// Re-declares the engine RPC surface rather than extending upstream's trait. A method added /// upstream produces no diff here, so compare the method sets on each bump and update diff --git a/rust/op-reth/crates/rpc/src/eth/mod.rs b/rust/op-reth/crates/rpc/src/eth/mod.rs index 1321648d4a9..0468debfd1d 100644 --- a/rust/op-reth/crates/rpc/src/eth/mod.rs +++ b/rust/op-reth/crates/rpc/src/eth/mod.rs @@ -8,6 +8,7 @@ pub mod transaction; mod block; mod call; mod pending_block; +mod pending_state; use crate::{ OpEthApiError, SequencerClient, @@ -43,7 +44,8 @@ use reth_rpc_eth_api::{ }, }; use reth_rpc_eth_types::{ - EthStateCache, FeeHistoryCache, GasPriceOracle, logs_utils::matching_block_logs_with_tx_hashes, + EthApiSettings, EthStateCache, FeeHistoryCache, GasPriceOracle, + logs_utils::matching_block_logs_with_tx_hashes, }; use reth_storage_api::ProviderHeader; use reth_tasks::{ @@ -263,6 +265,10 @@ where type NetworkTypes = Rpc::Network; type RpcConvert = Rpc; + fn eth_api_settings(&self) -> &EthApiSettings { + self.inner.eth_api.eth_api_settings() + } + fn converter(&self) -> &Self::RpcConvert { self.inner.eth_api.converter() } @@ -417,6 +423,8 @@ where { } +// Upstream's `FullEthApi` requires this helper trait even when its RPC methods are not served. +// op-reth explicitly removes the untested BAL endpoints in `op-reth/crates/node/src/node.rs`. impl GetBlockAccessList for OpEthApi where N: RpcNodeCore, diff --git a/rust/op-reth/crates/rpc/src/eth/pending_block.rs b/rust/op-reth/crates/rpc/src/eth/pending_block.rs index 0c76edaca11..7efe73a9340 100644 --- a/rust/op-reth/crates/rpc/src/eth/pending_block.rs +++ b/rust/op-reth/crates/rpc/src/eth/pending_block.rs @@ -1,9 +1,9 @@ //! Loads OP pending block for a RPC response. +use super::pending_state::PendingStateProvider; use crate::{OpEthApi, OpEthApiError}; use alloy_eips::BlockNumberOrTag; use alloy_primitives::B256; -use reth_chain_state::BlockState; use reth_optimism_flashblocks::PendingFlashBlock; use reth_rpc_eth_api::{ FromEvmError, RpcConvert, RpcNodeCore, RpcNodeCoreExt, @@ -52,14 +52,15 @@ where return Ok(None); }; let canonical_anchor_hash = pending_state_history_lookup_hash(&pending_block); - let state = BlockState::from(pending_block.pending); - let anchor_historical = self .provider() .history_by_block_hash(canonical_anchor_hash) .map_err(Self::Error::from_eth_err)?; - Ok(Some(Box::new(state.state_provider(anchor_historical)) as StateProviderBox)) + Ok(Some(Box::new(PendingStateProvider::new( + anchor_historical, + vec![pending_block.pending.executed_block], + )) as StateProviderBox)) } /// Returns the locally built pending block @@ -81,7 +82,7 @@ where .get_block_and_receipts(latest.hash()) .await .map_err(Self::Error::from_eth_err)? - .map(|(block, receipts)| BlockAndReceipts { block, receipts }); + .map(|(block, receipts)| BlockAndReceipts { block, receipts: receipts.into() }); Ok(latest) } } diff --git a/rust/op-reth/crates/rpc/src/eth/pending_state.rs b/rust/op-reth/crates/rpc/src/eth/pending_state.rs new file mode 100644 index 00000000000..b3073713914 --- /dev/null +++ b/rust/op-reth/crates/rpc/src/eth/pending_state.rs @@ -0,0 +1,383 @@ +//! State overlay for speculative flashblocks anchored to canonical history. + +use alloy_consensus::BlockHeader; +use alloy_primitives::{ + Address, B256, BlockNumber, Bytes, StorageKey, StorageValue, U256, keccak256, +}; +use reth_chain_state::ExecutedBlock; +use reth_errors::ProviderResult; +use reth_primitives_traits::{Account, Bytecode, NodePrimitives}; +use reth_storage_api::{ + AccountReader, BlockHashReader, BytecodeReader, HashedPostStateProvider, StateProofProvider, + StateProvider, StateProviderBox, StateRootProvider, StorageRootProvider, +}; +use reth_trie_common::{ + AccountProof, DecodedMultiProofV2, HashedPostState, HashedStorage, MultiProof, + MultiProofTargets, MultiProofTargetsV2, StorageMultiProof, TrieInput, updates::TrieUpdates, +}; +use revm::database::BundleState; +use std::{fmt, sync::OnceLock}; + +/// Overlays executed flashblock state on its canonical anchor. +/// +/// UPSTREAM-MIRROR(port): reth@pre-26923 `reth_chain_state::MemoryOverlayStateProviderRef` +/// +/// Ported from the provider removed in paradigmxyz/reth#26923. The replacement +/// `StateProviderFactory::state_with_block_appended` requires the appended block's parent to +/// equal the anchor. Speculative flashblocks instead carry accumulated state rooted at a +/// canonical anchor that can differ from their immediate, speculative parent. +/// Only the owned storage of the original reference provider is needed here. +pub(super) struct PendingStateProvider { + historical: StateProviderBox, + /// Executed blocks, newest to oldest. + in_memory: Vec>, + trie_input: OnceLock, +} + +impl fmt::Debug for PendingStateProvider { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + f.debug_struct("PendingStateProvider") + .field("in_memory", &self.in_memory) + .finish_non_exhaustive() + } +} + +impl PendingStateProvider { + pub(super) const fn new( + historical: StateProviderBox, + in_memory: Vec>, + ) -> Self { + Self { historical, in_memory, trie_input: OnceLock::new() } + } + + fn trie_input(&self) -> &TrieInput { + self.trie_input.get_or_init(|| { + let mut input = TrieInput::default(); + for block in self.in_memory.iter().rev() { + let data = block.trie_data(); + input.nodes.extend_from_sorted(&data.sorted.trie_updates); + input.state.extend_from_sorted(&data.sorted.hashed_state); + } + input + }) + } + + fn merged_hashed_storage(&self, address: Address, storage: HashedStorage) -> HashedStorage { + let state = &self.trie_input().state; + let mut hashed = state.storages.get(&keccak256(address)).cloned().unwrap_or_default(); + hashed.extend(&storage); + hashed + } +} + +impl BlockHashReader for PendingStateProvider { + fn block_hash(&self, number: BlockNumber) -> ProviderResult> { + for block in &self.in_memory { + if block.recovered_block().number() == number { + return Ok(Some(block.recovered_block().hash())); + } + } + self.historical.block_hash(number) + } + + fn canonical_hashes_range( + &self, + start: BlockNumber, + end: BlockNumber, + ) -> ProviderResult> { + let range = start..end; + let mut earliest_block_number = None; + let mut in_memory_hashes = Vec::with_capacity(range.size_hint().0); + for block in &self.in_memory { + let block_num = block.recovered_block().number(); + if range.contains(&block_num) { + in_memory_hashes.push(block.recovered_block().hash()); + earliest_block_number = Some(block_num); + } + } + // The overlay is newest to oldest; return hashes in ascending block order. + in_memory_hashes.reverse(); + let mut hashes = + self.historical.canonical_hashes_range(start, earliest_block_number.unwrap_or(end))?; + hashes.append(&mut in_memory_hashes); + Ok(hashes) + } +} + +impl AccountReader for PendingStateProvider { + fn basic_account(&self, address: &Address) -> ProviderResult> { + for block in &self.in_memory { + if let Some(account) = block.execution_output.account(address) { + return Ok(account); + } + } + self.historical.basic_account(address) + } +} + +impl StateRootProvider for PendingStateProvider { + fn state_root(&self, state: HashedPostState) -> ProviderResult { + self.state_root_from_nodes(TrieInput::from_state(state)) + } + + fn state_root_from_nodes(&self, mut input: TrieInput) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.historical.state_root_from_nodes(input) + } + + fn state_root_with_updates( + &self, + state: HashedPostState, + ) -> ProviderResult<(B256, TrieUpdates)> { + self.state_root_from_nodes_with_updates(TrieInput::from_state(state)) + } + + fn state_root_from_nodes_with_updates( + &self, + mut input: TrieInput, + ) -> ProviderResult<(B256, TrieUpdates)> { + input.prepend_self(self.trie_input().clone()); + self.historical.state_root_from_nodes_with_updates(input) + } +} + +impl StorageRootProvider for PendingStateProvider { + fn storage_root(&self, address: Address, storage: HashedStorage) -> ProviderResult { + let merged = self.merged_hashed_storage(address, storage); + self.historical.storage_root(address, merged) + } + + fn storage_proof( + &self, + address: Address, + slot: B256, + storage: HashedStorage, + ) -> ProviderResult { + let merged = self.merged_hashed_storage(address, storage); + self.historical.storage_proof(address, slot, merged) + } + + fn storage_multiproof( + &self, + address: Address, + slots: &[B256], + storage: HashedStorage, + ) -> ProviderResult { + let merged = self.merged_hashed_storage(address, storage); + self.historical.storage_multiproof(address, slots, merged) + } +} + +impl StateProofProvider for PendingStateProvider { + fn proof( + &self, + mut input: TrieInput, + address: Address, + slots: &[B256], + ) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.historical.proof(input, address, slots) + } + + fn multiproof( + &self, + mut input: TrieInput, + targets: MultiProofTargets, + ) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.historical.multiproof(input, targets) + } + + fn multiproof_v2( + &self, + mut input: TrieInput, + targets: MultiProofTargetsV2, + ) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.historical.multiproof_v2(input, targets) + } + + fn witness( + &self, + mut input: TrieInput, + target: HashedPostState, + mode: reth_trie_common::ExecutionWitnessMode, + ) -> ProviderResult> { + input.prepend_self(self.trie_input().clone()); + self.historical.witness(input, target, mode) + } +} + +impl HashedPostStateProvider for PendingStateProvider { + fn hashed_post_state(&self, bundle_state: &BundleState) -> ProviderResult { + let mut hashed_state = self.historical.hashed_post_state(bundle_state)?; + for (address, account) in bundle_state.state() { + if !account.was_destroyed() || account.original_info.is_none() { + continue; + } + let hashed_address = keccak256(address); + let Some(parent_storage) = self.trie_input().state.storages.get(&hashed_address) else { + continue; + }; + let storage = &mut hashed_state.storages.entry(hashed_address).or_default().storage; + for hashed_slot in parent_storage.storage.keys() { + storage.entry(*hashed_slot).or_insert(U256::ZERO); + } + } + Ok(hashed_state) + } +} + +impl StateProvider for PendingStateProvider { + fn storage( + &self, + address: Address, + storage_key: StorageKey, + ) -> ProviderResult> { + for block in &self.in_memory { + if let Some(value) = block.execution_output.storage(&address, storage_key.into()) { + return Ok(Some(value)); + } + } + self.historical.storage(address, storage_key) + } +} + +impl BytecodeReader for PendingStateProvider { + fn bytecode_by_hash(&self, code_hash: &B256) -> ProviderResult> { + for block in &self.in_memory { + if let Some(contract) = block.execution_output.bytecode(code_hash) { + return Ok(Some(contract)); + } + } + self.historical.bytecode_by_hash(code_hash) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use alloy_consensus::{Block, Header}; + use reth_optimism_primitives::OpPrimitives; + use reth_primitives_traits::RecoveredBlock; + use reth_revm::test_utils::StateProviderTest; + use reth_storage_api::noop::NoopProvider; + use revm::{ + database::{AccountStatus, BundleAccount, states::StorageSlot}, + state::AccountInfo, + }; + use std::sync::Arc; + + #[test] + fn speculative_state_overlays_canonical_history() { + let changed = Address::with_last_byte(1); + let untouched = Address::with_last_byte(2); + let mut historical = StateProviderTest::default(); + historical.insert_account( + changed, + Account { balance: U256::from(10), ..Default::default() }, + None, + std::iter::once((B256::ZERO, U256::from(1))).collect(), + ); + historical.insert_account( + untouched, + Account { balance: U256::from(30), ..Default::default() }, + None, + std::iter::once((B256::ZERO, U256::from(3))).collect(), + ); + + // The pending block's immediate parent is speculative, not the canonical anchor + // whose provider is supplied above. The accumulated bundle must still overlay it. + let mut block = ExecutedBlock:: { + recovered_block: Arc::new(RecoveredBlock::new_unhashed( + Block { + header: Header { + parent_hash: B256::repeat_byte(0x11), + number: 2, + ..Default::default() + }, + body: Default::default(), + }, + vec![], + )), + ..Default::default() + }; + Arc::make_mut(&mut block.execution_output).state.state.insert( + changed, + BundleAccount::new( + Some(AccountInfo { balance: U256::from(10), ..Default::default() }), + Some(AccountInfo { balance: U256::from(20), ..Default::default() }), + std::iter::once(( + U256::ZERO, + StorageSlot::new_changed(U256::from(1), U256::from(2)), + )) + .collect(), + AccountStatus::Changed, + ), + ); + let provider = PendingStateProvider::new(Box::new(historical), vec![block]); + assert_eq!(provider.account_balance(&changed).unwrap(), Some(U256::from(20))); + assert_eq!(provider.storage(changed, B256::ZERO).unwrap(), Some(U256::from(2))); + assert_eq!(provider.account_balance(&untouched).unwrap(), Some(U256::from(30))); + assert_eq!(provider.storage(untouched, B256::ZERO).unwrap(), Some(U256::from(3))); + } + + #[test] + fn destroyed_account_zeroes_overlay_slots_without_overwriting_recreated_values() { + let address = Address::with_last_byte(1); + let untouched = Address::with_last_byte(2); + let old_slot = keccak256(B256::from(U256::from(1))); + let recreated_slot = keccak256(B256::from(U256::from(2))); + let provider = PendingStateProvider::::new( + Box::new(StateProviderTest::default()), + Vec::new(), + ); + let mut overlay = HashedPostState::default(); + overlay.storages.insert( + keccak256(address), + HashedStorage::from_iter([ + (old_slot, U256::from(11)), + (recreated_slot, U256::from(22)), + ]), + ); + overlay + .storages + .insert(keccak256(untouched), HashedStorage::from_iter([(old_slot, U256::from(33))])); + provider.trie_input.set(TrieInput::from_state(overlay)).unwrap(); + let mut bundle = BundleState::default(); + bundle.state.insert( + address, + BundleAccount::new( + Some(AccountInfo::default()), + Some(AccountInfo::default()), + std::iter::once(( + U256::from(2), + StorageSlot::new_changed(U256::from(22), U256::from(99)), + )) + .collect(), + AccountStatus::DestroyedChanged, + ), + ); + let state = provider.hashed_post_state(&bundle).unwrap(); + let storage = &state.storages[&keccak256(address)].storage; + assert_eq!(storage[&old_slot], U256::ZERO); + assert_eq!(storage[&recreated_slot], U256::from(99)); + assert!(!state.storages.contains_key(&keccak256(untouched))); + } + + #[test] + fn created_and_destroyed_account_skips_trie_aggregation() { + let address = Address::with_last_byte(1); + let provider = PendingStateProvider::::new( + Box::new(NoopProvider::default()), + Vec::new(), + ); + let mut bundle_state = BundleState::default(); + bundle_state.state.insert( + address, + BundleAccount::new(None, None, Default::default(), AccountStatus::Destroyed), + ); + provider.hashed_post_state(&bundle_state).unwrap(); + assert!(provider.trie_input.get().is_none()); + } +} diff --git a/rust/op-reth/crates/rpc/src/eth/proofs.rs b/rust/op-reth/crates/rpc/src/eth/proofs.rs index ec04f421257..d907aec5d3e 100644 --- a/rust/op-reth/crates/rpc/src/eth/proofs.rs +++ b/rust/op-reth/crates/rpc/src/eth/proofs.rs @@ -9,14 +9,16 @@ use async_trait::async_trait; use jsonrpsee::proc_macros::rpc; use jsonrpsee_core::RpcResult; use jsonrpsee_types::error::ErrorObject; +use reth_errors::RethError; use reth_optimism_trie::{OpProofsStorage, OpProofsStore}; use reth_provider::StateProofProvider; use reth_rpc_api::eth::helpers::FullEthApi; -use std::time::Instant; +use reth_rpc_eth_api::FromEthApiError; +use reth_rpc_eth_types::EthApiError; /// The `eth_` proof methods served from the historical proofs storage. /// -/// UPSTREAM-MIRROR(set): reth@rev:0fbe428 `reth_rpc_eth_api::EthApi` +/// UPSTREAM-MIRROR(set): reth@v2.7.0 `reth_rpc_eth_api::EthApi` /// /// Re-declares the proof methods that are answered from historical proofs rather than live state. /// A proof method added to upstream's `EthApi` produces no diff here, so diff the two method sets @@ -39,7 +41,8 @@ pub trait EthApiOverride { #[derive(Debug)] /// Overrides applied to the `eth_` namespace of the RPC API for historical proofs ExEx. pub struct EthApiExt { - state_provider_factory: OpStateProviderFactory, + eth_api: Eth, + preimage_store: OpProofsStorage

, metrics: EthApiExtMetrics, } @@ -51,11 +54,45 @@ where { /// Creates a new instance of the `EthApiExt`. pub fn new(eth_api: Eth, preimage_store: OpProofsStorage

) -> Self { - let metrics = EthApiExtMetrics::default(); - Self { - state_provider_factory: OpStateProviderFactory::new(eth_api, preimage_store), - metrics, - } + Self { eth_api, preimage_store, metrics: EthApiExtMetrics::default() } + } + + /// UPSTREAM-MIRROR(copy): reth@v2.7.0 + /// `reth_rpc_eth_api::helpers::state::EthState::get_proof` + /// + /// Uses the OP proofs-history state provider while preserving upstream permit and blocking-task + /// behavior. + async fn get_proof_inner( + &self, + address: Address, + keys: Vec, + block_id: BlockId, + ) -> Result { + let permit = self + .eth_api + .acquire_owned_tracing() + .await + .map_err(RethError::other) + .map_err(EthApiError::Internal)?; + let preimage_store = self.preimage_store.clone(); + + self.eth_api + .spawn_blocking_io_fut(move |eth_api| async move { + // Hold the proof permit for the full lifetime of the blocking task, including + // after the requesting future is cancelled. + let _permit = permit; + let state_provider_factory = OpStateProviderFactory::new(eth_api, preimage_store); + let state = state_provider_factory + .state_provider(block_id) + .await + .map_err(Eth::Error::from_eth_err)?; + let storage_keys = keys.iter().map(|key| key.as_b256()).collect::>(); + let proof = state + .proof(Default::default(), address, &storage_keys) + .map_err(Eth::Error::from_eth_err)?; + Ok(proof.into_eip1186_response(keys)) + }) + .await } } @@ -72,32 +109,9 @@ where keys: Vec, block_number: Option, ) -> RpcResult { - let start = Instant::now(); - self.metrics.get_proof_requests.increment(1); - - let storage_keys = keys.iter().map(|key| key.as_b256()).collect::>(); - - let result = async { - let proof = self - .state_provider_factory - .state_provider(block_number) - .await - .map_err(Into::into)? - .proof(Default::default(), address, &storage_keys) - .map_err(Into::into)?; - - Ok(proof.into_eip1186_response(keys)) - } - .await; - - match &result { - Ok(_) => { - self.metrics.get_proof_latency.record(start.elapsed().as_secs_f64()); - self.metrics.get_proof_successful_responses.increment(1); - } - Err(_) => self.metrics.get_proof_failures.increment(1), - } - - result + self.metrics + .record_get_proof(self.get_proof_inner(address, keys, block_number.unwrap_or_default())) + .await + .map_err(Into::into) } } diff --git a/rust/op-reth/crates/rpc/src/eth/transaction.rs b/rust/op-reth/crates/rpc/src/eth/transaction.rs index 45e8ea0d328..44259ce55bb 100644 --- a/rust/op-reth/crates/rpc/src/eth/transaction.rs +++ b/rust/op-reth/crates/rpc/src/eth/transaction.rs @@ -79,7 +79,7 @@ where Ok(hash) } - /// UPSTREAM-MIRROR(override): reth@rev:0fbe428 + /// UPSTREAM-MIRROR(override): reth@v2.7.0 /// `reth_rpc_eth_api::helpers::EthTransactions::send_raw_transaction_sync` /// /// Derived from the upstream default: the timeout computation is taken verbatim and the @@ -171,7 +171,7 @@ where /// /// With flashblocks, we should also lookup the pending block for the transaction /// because this is considered confirmed/mined. - /// UPSTREAM-MIRROR(override): reth@rev:0fbe428 + /// UPSTREAM-MIRROR(override): reth@v2.7.0 /// `reth_rpc_eth_api::helpers::EthTransactions::transaction_receipt` /// /// Extends the upstream default with a flashblock receipt lookup. @@ -208,7 +208,7 @@ where OpEthApiError: FromEvmError, Rpc: RpcConvert, { - /// UPSTREAM-MIRROR(override): reth@rev:0fbe428 + /// UPSTREAM-MIRROR(override): reth@v2.7.0 /// `reth_rpc_eth_api::helpers::LoadTransaction::transaction_by_hash` /// /// Inserts a flashblock lookup between upstream's disk and pool lookups, and does not diff --git a/rust/op-reth/crates/rpc/src/metrics.rs b/rust/op-reth/crates/rpc/src/metrics.rs index 17ac94f6aa6..e478c87bceb 100644 --- a/rust/op-reth/crates/rpc/src/metrics.rs +++ b/rust/op-reth/crates/rpc/src/metrics.rs @@ -28,16 +28,38 @@ impl SequencerMetrics { #[metrics(scope = "optimism_rpc.eth_api_ext")] pub struct EthApiExtMetrics { /// How long it takes to handle a `eth_getProof` request successfully - pub(crate) get_proof_latency: Histogram, + get_proof_latency: Histogram, /// Total number of `eth_getProof` requests - pub(crate) get_proof_requests: Counter, + get_proof_requests: Counter, /// Total number of successful `eth_getProof` responses - pub(crate) get_proof_successful_responses: Counter, + get_proof_successful_responses: Counter, /// Total number of failures handling `eth_getProof` requests - pub(crate) get_proof_failures: Counter, + get_proof_failures: Counter, +} + +impl EthApiExtMetrics { + /// Records an `eth_getProof` request while preserving the existing metric semantics. + pub(crate) async fn record_get_proof(&self, f: F) -> Result + where + F: Future>, + { + let start = Instant::now(); + self.get_proof_requests.increment(1); + let result = f.await; + + match &result { + Ok(_) => { + self.get_proof_latency.record(start.elapsed().as_secs_f64()); + self.get_proof_successful_responses.increment(1); + } + Err(_) => self.get_proof_failures.increment(1), + } + + result + } } /// Types of debug apis diff --git a/rust/op-reth/crates/rpc/src/state.rs b/rust/op-reth/crates/rpc/src/state.rs index 90c2109a59b..ef8b255a201 100644 --- a/rust/op-reth/crates/rpc/src/state.rs +++ b/rust/op-reth/crates/rpc/src/state.rs @@ -2,7 +2,6 @@ use alloy_eips::BlockId; use derive_more::Constructor; -use jsonrpsee_types::error::ErrorObject; use reth_optimism_trie::{ OpProofsStorage, OpProofsStorageError, OpProofsStore, api::OpProofsProviderRO, provider::OpProofsStateProviderRef, @@ -20,16 +19,14 @@ pub struct OpStateProviderFactory { impl<'a, Eth, P> OpStateProviderFactory where - Eth: FullEthApi + Send + Sync + 'static, - ErrorObject<'static>: From, + Eth: FullEthApi + 'static, P: OpProofsStore + Clone + 'a, { /// Creates a state provider for the given block id. pub async fn state_provider( &'a self, - block_id: Option, + block_id: BlockId, ) -> ProviderResult> { - let block_id = block_id.unwrap_or_default(); // Check whether the distance to the block exceeds the maximum configured window. let block_number = self .eth_api diff --git a/rust/op-reth/crates/rpc/src/witness.rs b/rust/op-reth/crates/rpc/src/witness.rs index c99f9b4169a..87c3a151ff6 100644 --- a/rust/op-reth/crates/rpc/src/witness.rs +++ b/rust/op-reth/crates/rpc/src/witness.rs @@ -41,7 +41,7 @@ pub trait DebugExecutionWitnessApi { ) -> RpcResult; } use reth_storage_api::{ - BlockReaderIdExt, NodePrimitivesProvider, StateProviderFactory, TransactionVariant, + BlockReaderIdExt, StateProvider, StateProviderFactory, TransactionVariant, errors::{ProviderError, ProviderResult}, }; use reth_tasks::Runtime; @@ -93,7 +93,7 @@ impl OpDebugWitnessApi OpDebugWitnessApi where - Provider: NodePrimitivesProvider> + Provider: StateProviderFactory> + BlockReaderIdExt, { /// Fetches the parent header by hash. @@ -116,7 +116,7 @@ where ::_Header, >, Header = ::BlockHeader, - > + NodePrimitivesProvider, + > + StateProviderFactory, { fn replay_block_by_request( &self, @@ -149,8 +149,7 @@ where Transaction: OpPooledTx::SignedTx>, > + 'static, Provider: BlockReaderIdExt

::BlockHeader> - + NodePrimitivesProvider - + StateProviderFactory + + StateProviderFactory + ChainSpecProvider + Clone + 'static, @@ -209,8 +208,7 @@ where ::_Header, >, Header = ::BlockHeader, - > + NodePrimitivesProvider - + StateProviderFactory + > + StateProviderFactory + ChainSpecProvider + Clone + 'static, @@ -239,7 +237,7 @@ where .provider .state_by_block_hash(block.header().parent_hash()) .to_rpc_result()?; - let db = StateProviderDatabase::new(&state_provider); + let db = StateProviderDatabase::new((&state_provider).into_evm_state_provider()); replay_block(&this.inner.evm_config, db, &block, config) .map_err(|err| internal_rpc_err(err.to_string())) }; diff --git a/rust/op-reth/crates/trie/src/backfill/tests.rs b/rust/op-reth/crates/trie/src/backfill/tests.rs index fd9891a4dea..2cede3ede91 100644 --- a/rust/op-reth/crates/trie/src/backfill/tests.rs +++ b/rust/op-reth/crates/trie/src/backfill/tests.rs @@ -25,8 +25,9 @@ use reth_db_common::init::init_genesis; use reth_evm::{ConfigureEvm, execute::Executor}; use reth_evm_ethereum::EthEvmConfig; use reth_provider::{ - DatabaseProviderFactory, HashedPostStateProvider, LatestStateProviderRef, StateRootProvider, - StorageSettingsCache, test_utils::create_test_provider_factory_with_chain_spec, + DatabaseProviderFactory, HashedPostStateProvider, LatestStateProviderRef, StateProvider, + StateRootProvider, StorageSettingsCache, + test_utils::create_test_provider_factory_with_chain_spec, }; use reth_revm::database::StateProviderDatabase; use reth_trie::{HashedPostState, StateRoot}; @@ -208,7 +209,9 @@ fn backfill_then_forward_write_preserves_state_roots() { // updates + hashed post-state needed to build a `BlockStateDiff`. let (exec, hashed_state, trie_updates) = { let provider = provider_factory.provider().unwrap(); - let db = StateProviderDatabase::new(LatestStateProviderRef::new(&provider)); + let db = StateProviderDatabase::new( + LatestStateProviderRef::new(&provider).into_evm_state_provider(), + ); let evm_config = EthEvmConfig::ethereum(chain_spec.clone()); let block_executor = evm_config.batch_executor(db); let exec = block_executor.execute(&block).unwrap(); diff --git a/rust/op-reth/crates/trie/src/db/store.rs b/rust/op-reth/crates/trie/src/db/store.rs index 30814cc0aba..9c3b94eaa0a 100644 --- a/rust/op-reth/crates/trie/src/db/store.rs +++ b/rust/op-reth/crates/trie/src/db/store.rs @@ -11,8 +11,8 @@ use crate::{ MdbxAccountCursor, MdbxStorageCursor, MdbxTrieCursor, models::{ AccountTrieHistory, BlockChangeSet, ChangeSet, HashedAccountHistory, - HashedStorageHistory, HashedStorageKey, MaybeDeleted, StorageTrieHistory, - StorageTrieKey, StorageValue, VersionedValue, kv::IntoKV, + HashedStorageHistory, HashedStorageKey, StorageTrieHistory, StorageTrieKey, + StorageValue, VersionedValue, kv::IntoKV, }, }, }; @@ -28,7 +28,6 @@ use reth_db::{ transaction::{DbTx, DbTxMut}, }; use reth_primitives_traits::Account; -use reth_trie::{hashed_cursor::HashedCursor, trie_cursor::TrieCursor}; use reth_trie_common::{ BranchNodeCompact, HashedPostState, Nibbles, StoredNibbles, updates::{StorageTrieUpdates, TrieUpdates}, @@ -414,38 +413,6 @@ impl MdbxProofsProvider { let mut storage_trie_keys = Vec::::with_capacity(storage_trie_len); for (hashed_address, nodes) in sorted_trie_updates.storage_tries_ref() { - // Handle wiped - mark all storage trie as deleted at the current block number - if nodes.is_deleted && append_mode { - let cursor = self.tx.cursor_dup_read::()?; - let mut ro = MdbxTrieCursor::new(cursor, block_number - 1, Some(*hashed_address)); - - // Merge old tombstones with new nodes in sorted key order. - // A BTreeMap ensures each path appears once and append_dup - // sees strictly increasing keys. - let mut merged: std::collections::BTreeMap> = - std::collections::BTreeMap::new(); - - // Old paths → tombstones - while let Some((path, _node)) = ro.next()? { - merged.insert(path, None); - } - - // New nodes override tombstones or add fresh entries - for (path, node) in nodes.storage_nodes_ref().iter().cloned() { - merged.insert(path, node); - } - - let mut cur = self.tx.cursor_dup_write::()?; - for (path, value) in merged { - let key = StorageTrieKey::new(*hashed_address, StoredNibbles::from(path)); - let vv = VersionedValue { block_number, value: MaybeDeleted(value) }; - cur.append_dup(key.clone(), vv)?; - storage_trie_keys.push(key); - } - - continue; - } - let keys = self.persist_history_batch( block_number, nodes @@ -460,36 +427,6 @@ impl MdbxProofsProvider { let mut hashed_storage_keys = Vec::::with_capacity(hashed_storage_len); for (hashed_address, storage) in sorted_post_state.storages { - if append_mode && storage.is_wiped() { - let cursor = self.tx.cursor_dup_read::()?; - let mut ro = MdbxStorageCursor::new(cursor, block_number - 1, hashed_address); - - // Merge old tombstones with new slot values in sorted key - // order. A BTreeMap ensures each slot appears once and - // append_dup sees strictly increasing keys. - let mut merged: std::collections::BTreeMap> = - std::collections::BTreeMap::new(); - - // Old slots → tombstones - while let Some((slot, _val)) = ro.next()? { - merged.insert(slot, None); - } - - // New slots override tombstones or add fresh entries - for (slot, val) in storage.storage_slots_ref() { - merged.insert(*slot, Some(StorageValue(*val))); - } - - let mut cur = self.tx.cursor_dup_write::()?; - for (slot, value) in merged { - let key = HashedStorageKey::new(hashed_address, slot); - let vv = VersionedValue { block_number, value: MaybeDeleted(value) }; - cur.append_dup(key.clone(), vv)?; - hashed_storage_keys.push(key); - } - - continue; - } let keys = self.persist_history_batch( block_number, storage @@ -981,7 +918,7 @@ impl OpProofsStore for MdbxProofsStorage { } } -/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 `reth_db::database_metrics::DatabaseMetrics` +/// UPSTREAM-MIRROR(copy): reth@v2.7.0 `reth_db::database_metrics::DatabaseMetrics` /// /// This implementation is copied from the /// [`DatabaseMetrics`](reth_db::database_metrics::DatabaseMetrics) implementation for @@ -1084,7 +1021,7 @@ mod tests { OpProofsInitProvider, OpProofsProviderRO, OpProofsProviderRw, db::{ StorageTrieKey, - models::{AccountTrieHistory, StorageTrieHistory}, + models::{AccountTrieHistory, MaybeDeleted, StorageTrieHistory}, }, }; use alloy_eips::NumHash; @@ -2967,7 +2904,7 @@ mod tests { } #[test] - fn store_trie_updates_wiped_storage_trie_nodes() { + fn store_trie_updates_deleted_storage_trie_nodes() { use reth_trie::updates::StorageTrieUpdates; let dir = TempDir::new().unwrap(); @@ -2987,16 +2924,15 @@ mod tests { .store_storage_branches(addr_wiped, vec![(p1, Some(n1)), (p2, Some(n2))]) .expect("seed wiped addr trie nodes"); - // Build a BlockStateDiff that wipes addr_wiped's storage trie, and - // also adds a normal storage-trie node for addr_live. + // Build a BlockStateDiff that deletes addr_wiped's storage trie nodes and also adds a + // normal storage-trie node for addr_live. const BLOCK: BlockWithParent = BlockWithParent::new(B256::ZERO, NumHash::new(123, B256::ZERO)); let mut diff_trie_updates = TrieUpdates::default(); - // Wipe for addr_wiped - let mut wiped_updates = StorageTrieUpdates::default(); - wiped_updates.set_deleted(true); - diff_trie_updates.storage_tries.insert(addr_wiped, wiped_updates); + let mut deleted_updates = StorageTrieUpdates::default(); + deleted_updates.removed_nodes.extend([p1, p2]); + diff_trie_updates.storage_tries.insert(addr_wiped, deleted_updates); // Normal update for addr_live let live_path = Nibbles::from_nibbles_unchecked([0xEE, 0xFF]); @@ -3045,12 +2981,12 @@ mod tests { } #[test] - fn store_trie_updates_wiped_storage() { + fn store_trie_updates_deleted_storage() { let dir = TempDir::new().unwrap(); let store = MdbxProofsStorage::new(dir.path()).expect("env"); store.set_earliest_block_number(0, B256::ZERO).expect("set earliest"); - // We'll pre-seed storage at block 0, then issue a wipe at BLOCK. + // Pre-seed storage at block 0, then delete it at BLOCK. const BLOCK: BlockWithParent = BlockWithParent::new(B256::ZERO, NumHash::new(42, B256::ZERO)); @@ -3063,12 +2999,9 @@ mod tests { // Seed prior storage (block_number = 0 in store_hashed_storages) store.store_hashed_storages(addr, vec![(s1, v1), (s2, v2)]).expect("seed"); - // Build BlockStateDiff that marks this address as wiped at BLOCK let mut diff_post_state = HashedPostState::default(); - - let wiped = reth_trie::HashedStorage::new(true); - - diff_post_state.storages.insert(addr, wiped); + let deleted = reth_trie::HashedStorage::from_iter([(s1, U256::ZERO), (s2, U256::ZERO)]); + diff_post_state.storages.insert(addr, deleted); // Execute let diff = BlockStateDiff { @@ -3088,8 +3021,8 @@ mod tests { cur.seek_by_key_subkey(key, BLOCK.block.number).expect("seek").expect("exists"); assert_eq!(vv.block_number, BLOCK.block.number); assert!( - vv.value.0.is_none(), - "expected deletion tombstone for slot {:?} at block {}", + vv.value.0.is_some_and(|value| value.0.is_zero()), + "expected zero value for slot {:?} at block {}", slot, BLOCK.block.number, ); @@ -3097,7 +3030,7 @@ mod tests { } #[test] - fn store_trie_updates_wiped_and_non_wiped_mixed_order() { + fn store_trie_updates_deleted_and_live_mixed_order() { let dir = TempDir::new().unwrap(); let store = MdbxProofsStorage::new(dir.path()).expect("env"); store.set_earliest_block_number(0, B256::ZERO).expect("set earliest"); @@ -3122,14 +3055,13 @@ mod tests { .expect("seed wiped addr"); store.store_hashed_storages(addr_live, vec![(ls1, lv1_old)]).expect("seed live addr"); - // Build diff: wiped first (by address sort), then non-wiped with a write + // Build diff: deleted slots first (by address sort), then a live write. const BLOCK: BlockWithParent = BlockWithParent::new(B256::ZERO, NumHash::new(77, B256::ZERO)); let mut diff_post_state = HashedPostState::default(); - // Wiped storage for addr_wiped - let wiped = reth_trie::HashedStorage::new(true); - diff_post_state.storages.insert(addr_wiped, wiped); + let deleted = reth_trie::HashedStorage::from_iter([(ws1, U256::ZERO), (ws2, U256::ZERO)]); + diff_post_state.storages.insert(addr_wiped, deleted); // Non-wiped storage for addr_live (append new value) let mut live = reth_trie::HashedStorage::default(); @@ -3153,8 +3085,8 @@ mod tests { cur.seek_by_key_subkey(key, BLOCK.block.number).expect("seek").expect("exists"); assert_eq!(vv.block_number, BLOCK.block.number); assert!( - vv.value.0.is_none(), - "expected deletion tombstone for wiped slot {:?} at block {}", + vv.value.0.is_some_and(|value| value.0.is_zero()), + "expected zero value for deleted slot {:?} at block {}", slot, BLOCK.block.number, ); @@ -3881,18 +3813,18 @@ mod tests { // ============= Wipe + re-add regression tests ============= - /// Regression: wiped storage with overlapping new slots must write the new - /// values (not just tombstones) and must not panic on `append_dup` ordering. + /// Regression: deleting storage with overlapping new slots must write the new values and must + /// not panic on `append_dup` ordering. #[test] - fn store_trie_updates_wiped_storage_with_readd() { + fn store_trie_updates_deleted_storage_with_readd() { let dir = TempDir::new().unwrap(); let store = MdbxProofsStorage::new(dir.path()).expect("env"); store.set_earliest_block_number(0, B256::ZERO).expect("set earliest"); let addr = B256::from([0x55; 32]); let old_slot = B256::from([0x01; 32]); - let shared_slot = B256::from([0x02; 32]); // exists before AND after wipe - let new_slot = B256::from([0x03; 32]); // only exists after wipe + let shared_slot = B256::from([0x02; 32]); + let new_slot = B256::from([0x03; 32]); // Seed prior storage store @@ -3902,12 +3834,14 @@ mod tests { ) .expect("seed"); - // Build diff: wipe + re-create shared_slot + add new_slot + // Delete old_slot, update shared_slot, and add new_slot. let mut post_state = HashedPostState::default(); - let mut wiped = reth_trie::HashedStorage::new(true); - wiped.storage.insert(shared_slot, U256::from(999u64)); - wiped.storage.insert(new_slot, U256::from(888u64)); - post_state.storages.insert(addr, wiped); + let storage = reth_trie::HashedStorage::from_iter([ + (old_slot, U256::ZERO), + (shared_slot, U256::from(999u64)), + (new_slot, U256::from(888u64)), + ]); + post_state.storages.insert(addr, storage); const BLOCK: BlockWithParent = BlockWithParent::new(B256::ZERO, NumHash::new(42, B256::ZERO)); @@ -3917,7 +3851,7 @@ mod tests { }; store.store_trie_updates(BLOCK, diff).expect("store"); - // Verify: old_slot has tombstone + // Verify: old_slot has a zero value. let tx = store.env.tx().expect("tx"); let mut cur = tx.new_cursor::().expect("cursor"); @@ -3925,7 +3859,7 @@ mod tests { let vv = cur.seek_by_key_subkey(key_old, BLOCK.block.number).expect("seek").expect("exists"); assert_eq!(vv.block_number, BLOCK.block.number); - assert!(vv.value.0.is_none(), "old_slot should be tombstoned"); + assert!(vv.value.0.is_some_and(|value| value.0.is_zero())); // Verify: shared_slot has the NEW value (not tombstone) let key_shared = HashedStorageKey::new(addr, shared_slot); @@ -3944,10 +3878,9 @@ mod tests { assert_eq!(inner.0, U256::from(888u64), "new_slot should have new value"); } - /// Regression: wiped storage trie with overlapping new nodes must write the - /// new nodes (not just tombstones) and must not panic on `append_dup` ordering. + /// Regression: deleting storage trie nodes while adding new nodes must preserve the new nodes. #[test] - fn store_trie_updates_wiped_storage_trie_with_readd() { + fn store_trie_updates_deleted_storage_trie_with_readd() { use reth_trie::updates::StorageTrieUpdates; let dir = TempDir::new().unwrap(); @@ -3971,13 +3904,13 @@ mod tests { ) .expect("seed"); - // Build diff: wipe + re-create shared_path + add new_path + // Delete old_path, update shared_path, and add new_path. let mut trie_updates = TrieUpdates::default(); - let mut wiped = StorageTrieUpdates::default(); - wiped.set_deleted(true); - wiped.storage_nodes.insert(shared_path, n_shared_new.clone()); - wiped.storage_nodes.insert(new_path, n_new.clone()); - trie_updates.storage_tries.insert(addr, wiped); + let mut updates = StorageTrieUpdates::default(); + updates.removed_nodes.insert(old_path); + updates.storage_nodes.insert(shared_path, n_shared_new.clone()); + updates.storage_nodes.insert(new_path, n_new.clone()); + trie_updates.storage_tries.insert(addr, updates); const BLOCK: BlockWithParent = BlockWithParent::new(B256::ZERO, NumHash::new(123, B256::ZERO)); diff --git a/rust/op-reth/crates/trie/src/db/store_v2/backfill.rs b/rust/op-reth/crates/trie/src/db/store_v2/backfill.rs index bfe12396196..3abe6b0fb6d 100644 --- a/rust/op-reth/crates/trie/src/db/store_v2/backfill.rs +++ b/rust/op-reth/crates/trie/src/db/store_v2/backfill.rs @@ -21,7 +21,7 @@ use alloy_eips::{BlockNumHash, eip1898::BlockWithParent}; use alloy_primitives::{B256, BlockNumber}; use reth_db::{ BlockNumberList, - cursor::{DbCursorRO, DbCursorRW, DbDupCursorRO, DbDupCursorRW}, + cursor::{DbCursorRO, DbCursorRW, DbDupCursorRO}, models::sharded_key::ShardedKey, table::Table, transaction::{DbTx, DbTxMut}, @@ -378,10 +378,6 @@ impl MdbxProofsProviderV2()?; for (hashed_address, nodes) in trie_updates.storage_tries_ref() { - if nodes.is_deleted && cur.seek_exact(*hashed_address)?.is_some() { - cur.delete_current_duplicates()?; - count += 1; - } for (nibbles, maybe_node) in nodes.storage_nodes_ref() { let subkey = StoredNibblesSubKey(*nibbles); let existing = cur @@ -434,10 +430,6 @@ impl MdbxProofsProviderV2()?; for (hashed_addr, storage) in hashed_post_state.account_storages() { - if storage.wiped && cur.seek_exact(*hashed_addr)?.is_some() { - cur.delete_current_duplicates()?; - count += 1; - } for (slot, value) in &storage.storage_slots { let existing = cur .seek_by_key_subkey(*hashed_addr, *slot)? diff --git a/rust/op-reth/crates/trie/src/db/store_v2/snapshot_tests.rs b/rust/op-reth/crates/trie/src/db/store_v2/snapshot_tests.rs index bc9ec5a3ab6..c9c5fb57a7c 100644 --- a/rust/op-reth/crates/trie/src/db/store_v2/snapshot_tests.rs +++ b/rust/op-reth/crates/trie/src/db/store_v2/snapshot_tests.rs @@ -552,7 +552,7 @@ fn write_update_snapshot_deletes_destroyed_account_leaf() { } #[test] -fn write_update_snapshot_wipes_all_storage_slots() { +fn write_update_snapshot_deletes_all_explicit_storage_slots() { let db = setup_db(); let old_anchor = anchor(10, 0x10); let new_anchor = anchor(9, 0x09); @@ -575,14 +575,17 @@ fn write_update_snapshot_wipes_all_storage_slots() { { let provider = MdbxProofsProviderV2::new(db.tx_mut().expect("rw")); let mut storages: B256Map = B256Map::default(); - storages.insert(addr, HashedStorageSorted { storage_slots: vec![], wiped: true }); + storages.insert( + addr, + HashedStorageSorted { storage_slots: vec![(slot_1, U256::ZERO), (slot_2, U256::ZERO)] }, + ); let sorted_post_state = HashedPostStateSorted::new(Vec::new(), storages); let diff = BlockStateDiff { sorted_trie_updates: TrieUpdates::default().into_sorted(), sorted_post_state, }; let counts = provider.update_snapshot(new_anchor, &diff).expect("update"); - assert_eq!(counts.hashed_storages_written_total, 1, "wipe counts once per address"); + assert_eq!(counts.hashed_storages_written_total, 2); OpProofsBackfillProvider::commit(provider).expect("commit"); } @@ -590,16 +593,16 @@ fn write_update_snapshot_wipes_all_storage_slots() { let mut cur = tx.cursor_dup_read::().expect("cur"); assert!( cur.seek_by_key_subkey(addr, slot_1).expect("seek").is_none_or(|e| e.key != slot_1), - "slot 1 must be wiped", + "slot 1 must be deleted", ); assert!( cur.seek_by_key_subkey(addr, slot_2).expect("seek").is_none_or(|e| e.key != slot_2), - "slot 2 must be wiped (delete_current_duplicates drops every dup, not just the first)", + "slot 2 must be deleted", ); } #[test] -fn write_update_snapshot_wipes_then_adds_slots_in_same_block() { +fn write_update_snapshot_deletes_then_adds_slots_in_same_block() { let db = setup_db(); let old_anchor = anchor(10, 0x10); let new_anchor = anchor(9, 0x09); @@ -631,8 +634,12 @@ fn write_update_snapshot_wipes_then_adds_slots_in_same_block() { storages.insert( addr, HashedStorageSorted { - storage_slots: vec![(slot_new_a, new_value_a), (slot_new_b, new_value_b)], - wiped: true, + storage_slots: vec![ + (slot_old_1, U256::ZERO), + (slot_old_2, U256::ZERO), + (slot_new_a, new_value_a), + (slot_new_b, new_value_b), + ], }, ); let sorted_post_state = HashedPostStateSorted::new(Vec::new(), storages); @@ -641,15 +648,14 @@ fn write_update_snapshot_wipes_then_adds_slots_in_same_block() { sorted_post_state, }; let counts = provider.update_snapshot(new_anchor, &diff).expect("update"); - // The wipe counts once + one per new slot. - assert_eq!(counts.hashed_storages_written_total, 3); + assert_eq!(counts.hashed_storages_written_total, 4); OpProofsBackfillProvider::commit(provider).expect("commit"); } let tx = db.tx().expect("ro"); let mut cur = tx.cursor_dup_read::().expect("cur"); - // Old slots are gone (wipe phase). + // Old slots are gone. assert!( cur.seek_by_key_subkey(addr, slot_old_1).expect("seek").is_none_or(|e| e.key != slot_old_1), "old slot 1 must be wiped", @@ -695,10 +701,7 @@ fn write_update_snapshot_deletes_zero_value_storage_slot() { { let provider = MdbxProofsProviderV2::new(db.tx_mut().expect("rw")); let mut storages: B256Map = B256Map::default(); - storages.insert( - addr, - HashedStorageSorted { storage_slots: vec![(slot, U256::ZERO)], wiped: false }, - ); + storages.insert(addr, HashedStorageSorted { storage_slots: vec![(slot, U256::ZERO)] }); let sorted_post_state = HashedPostStateSorted::new(Vec::new(), storages); let diff = BlockStateDiff { sorted_trie_updates: TrieUpdates::default().into_sorted(), @@ -720,7 +723,7 @@ fn write_update_snapshot_deletes_zero_value_storage_slot() { } #[test] -fn write_update_snapshot_deletes_storage_trie_when_is_deleted() { +fn write_update_snapshot_deletes_explicit_storage_trie_node() { let db = setup_db(); let old_anchor = anchor(10, 0x10); let new_anchor = anchor(9, 0x09); @@ -739,14 +742,15 @@ fn write_update_snapshot_deletes_storage_trie_when_is_deleted() { { let provider = MdbxProofsProviderV2::new(db.tx_mut().expect("rw")); let mut updates = TrieUpdates::default(); - let st = StorageTrieUpdates { is_deleted: true, ..Default::default() }; + let mut st = StorageTrieUpdates::default(); + st.removed_nodes.insert(path); updates.storage_tries.insert(addr, st); let diff = BlockStateDiff { sorted_trie_updates: updates.into_sorted(), sorted_post_state: HashedPostStateSorted::default(), }; let counts = provider.update_snapshot(new_anchor, &diff).expect("update"); - assert_eq!(counts.storage_trie_updates_written_total, 1, "is_deleted counts once"); + assert_eq!(counts.storage_trie_updates_written_total, 1); OpProofsBackfillProvider::commit(provider).expect("commit"); } @@ -756,7 +760,7 @@ fn write_update_snapshot_deletes_storage_trie_when_is_deleted() { cur.seek_by_key_subkey(addr, StoredNibblesSubKey(path)) .expect("seek") .is_none_or(|e| e.nibbles != StoredNibblesSubKey(path)), - "is_deleted must drop every storage-trie row under the address", + "the explicitly removed storage-trie node must be deleted", ); } diff --git a/rust/op-reth/crates/trie/src/db/store_v2/tests.rs b/rust/op-reth/crates/trie/src/db/store_v2/tests.rs index 50481d3baff..9c9913fcf06 100644 --- a/rust/op-reth/crates/trie/src/db/store_v2/tests.rs +++ b/rust/op-reth/crates/trie/src/db/store_v2/tests.rs @@ -689,7 +689,7 @@ fn store_trie_updates_deleted_storage_trie() { } #[test] -fn store_trie_updates_wiped_storage_trie_nodes() { +fn store_trie_updates_deleted_storage_trie_nodes() { let db = setup_db(); let addr_wiped = B256::from([0x10; 32]); @@ -710,11 +710,11 @@ fn store_trie_updates_wiped_storage_trie_nodes() { OpProofsInitProvider::commit(provider).expect("commit"); } - // Build diff that wipes addr_wiped's storage trie and adds a node for addr_live + // Delete addr_wiped's storage trie nodes and add a node for addr_live. let mut trie_updates = TrieUpdates::default(); - let mut wiped_updates = StorageTrieUpdates::default(); - wiped_updates.set_deleted(true); - trie_updates.storage_tries.insert(addr_wiped, wiped_updates); + let mut deleted_updates = StorageTrieUpdates::default(); + deleted_updates.removed_nodes.extend([p1, p2]); + trie_updates.storage_tries.insert(addr_wiped, deleted_updates); let live_path = Nibbles::from_nibbles_unchecked([0xEE, 0xFF]); let live_node = BranchNodeCompact::default(); @@ -744,7 +744,7 @@ fn store_trie_updates_wiped_storage_trie_nodes() { } #[test] -fn store_trie_updates_wiped_storage() { +fn store_trie_updates_deleted_storage() { let db = setup_db(); let addr = B256::from([0x55; 32]); @@ -762,9 +762,11 @@ fn store_trie_updates_wiped_storage() { OpProofsInitProvider::commit(provider).expect("commit"); } - // Build diff that wipes storage + // Delete both storage slots. let mut post_state = HashedPostState::default(); - post_state.storages.insert(addr, HashedStorage::new(true)); + post_state + .storages + .insert(addr, HashedStorage::from_iter([(s1, U256::ZERO), (s2, U256::ZERO)])); let diff = BlockStateDiff { sorted_trie_updates: TrieUpdates::default().into_sorted(), sorted_post_state: post_state.into_sorted(), @@ -796,7 +798,7 @@ fn store_trie_updates_wiped_storage() { } #[test] -fn store_trie_updates_wiped_and_non_wiped_mixed_order() { +fn store_trie_updates_deleted_and_live_mixed_order() { let db = setup_db(); let addr_wiped = B256::from([0x01; 32]); @@ -817,9 +819,9 @@ fn store_trie_updates_wiped_and_non_wiped_mixed_order() { OpProofsInitProvider::commit(provider).expect("commit"); } - // Build diff: wipe addr_wiped, update addr_live + // Delete addr_wiped's slot and update addr_live. let mut post_state = HashedPostState::default(); - post_state.storages.insert(addr_wiped, HashedStorage::new(true)); + post_state.storages.insert(addr_wiped, HashedStorage::from_iter([(ws1, U256::ZERO)])); let mut live_storage = HashedStorage::default(); live_storage.storage.insert(ls1, lv1_new); post_state.storages.insert(addr_live, live_storage); @@ -1790,10 +1792,9 @@ fn hashed_storages_no_duplicates_multiple_slots() { assert!(slots.iter().all(|(k, _)| *k != slot_b), "slot_b should be gone"); } -/// Regression: wipe followed by re-add in same block must leave exactly the -/// new slots, no ghosts from pre-wipe state. +/// Regression: deleting one slot while adding another must not leave duplicate entries. #[test] -fn hashed_storages_wipe_then_readd_no_duplicates() { +fn hashed_storages_delete_then_add_no_duplicates() { let db = setup_db(); let addr = B256::from([0xEE; 32]); @@ -1811,11 +1812,11 @@ fn hashed_storages_wipe_then_readd_no_duplicates() { assert_eq!(count_hashed_storage_entries(&db, addr), 1); - // Block 1: wipe + write new_slot + // Block 1: delete old_slot and write new_slot. { let mut post_state = HashedPostState::default(); - let mut storage = HashedStorage::new(true); // wiped = true - storage.storage.insert(new_slot, U256::from(42u64)); + let storage = + HashedStorage::from_iter([(old_slot, U256::ZERO), (new_slot, U256::from(42u64))]); post_state.storages.insert(addr, storage); let diff = BlockStateDiff { @@ -1825,16 +1826,15 @@ fn hashed_storages_wipe_then_readd_no_duplicates() { store_block(&db, make_block_ref(1, B256::repeat_byte(0x01), B256::ZERO), diff); } - // Exactly 1 entry: only new_slot, old_slot wiped + // Exactly 1 entry: only new_slot remains. let slots = collect_hashed_storage_slots(&db, addr); - assert_eq!(slots.len(), 1, "after wipe+add: exactly 1 entry"); + assert_eq!(slots.len(), 1, "after delete+add: exactly 1 entry"); assert_eq!(slots[0], (new_slot, U256::from(42u64))); - // Block 2: wipe + re-add the same new_slot with different value + // Block 2: update new_slot. { let mut post_state = HashedPostState::default(); - let mut storage = HashedStorage::new(true); - storage.storage.insert(new_slot, U256::from(84u64)); + let storage = HashedStorage::from_iter([(new_slot, U256::from(84u64))]); post_state.storages.insert(addr, storage); let diff = BlockStateDiff { @@ -1846,7 +1846,7 @@ fn hashed_storages_wipe_then_readd_no_duplicates() { // Still exactly 1 entry let slots = collect_hashed_storage_slots(&db, addr); - assert_eq!(slots.len(), 1, "after second wipe+add: exactly 1 entry"); + assert_eq!(slots.len(), 1, "after update: exactly 1 entry"); assert_eq!(slots[0], (new_slot, U256::from(84u64))); } diff --git a/rust/op-reth/crates/trie/src/db/store_v2/write.rs b/rust/op-reth/crates/trie/src/db/store_v2/write.rs index 0173611aecc..329a622e25e 100644 --- a/rust/op-reth/crates/trie/src/db/store_v2/write.rs +++ b/rust/op-reth/crates/trie/src/db/store_v2/write.rs @@ -184,51 +184,6 @@ fn append_storage_trie_entry( Ok(()) } -/// Snapshot all existing storage-trie nodes for `hashed_address` into the changeset and -/// collector, then delete them from the state table. -/// -/// Returns the set of nibble subkeys that were snapshotted so the caller can avoid -/// double-recording changeset entries for those nodes in the subsequent per-node loop. -/// -/// Used for the `is_deleted` (full-wipe) path in [`MdbxProofsProviderV2::write_storage_trie`]. -fn snapshot_and_wipe_storage_trie( - state_cursor: &mut ( - impl DbCursorRO - + DbDupCursorRO - + DbDupCursorRW - ), - cs_cursor: &mut impl DbDupCursorRW, - cs_key: BlockNumberHashedAddress, - collector: &mut HistoryCollector, -) -> OpProofsStorageResult> { - let hashed_address = cs_key.0.1; - let mut wiped_nibbles = BTreeSet::new(); - if let Some((_key, first_entry)) = state_cursor.seek_exact(hashed_address)? { - wiped_nibbles.insert(first_entry.nibbles.clone()); - append_storage_trie_entry( - cs_cursor, - cs_key, - first_entry.nibbles, - Some(first_entry.node), - collector, - )?; - while let Some((_, entry)) = state_cursor.next_dup()? { - wiped_nibbles.insert(entry.nibbles.clone()); - append_storage_trie_entry( - cs_cursor, - cs_key, - entry.nibbles, - Some(entry.node), - collector, - )?; - } - if state_cursor.seek_exact(hashed_address)?.is_some() { - state_cursor.delete_current_duplicates()?; - } - } - Ok(wiped_nibbles) -} - /// Write a single storage-trie node update: snapshot the old node into the changeset, /// record in the history collector, then apply the new value (upsert or delete). /// @@ -273,36 +228,6 @@ fn append_hashed_storage_entry( Ok(()) } -/// Snapshot all existing hashed-storage slots for `hashed_address` into the changeset and -/// collector, delete them from the state table, and return the set of slot keys that were wiped. -/// -/// Used for the `is_wiped` (full-wipe) path in [`MdbxProofsProviderV2::write_hashed_storages`]. -fn snapshot_and_wipe_hashed_storage( - state_cursor: &mut ( - impl DbCursorRO - + DbDupCursorRO - + DbDupCursorRW - ), - cs_cursor: &mut impl DbDupCursorRW, - cs_key: BlockNumberHashedAddress, - collector: &mut HistoryCollector, -) -> OpProofsStorageResult { - let hashed_address = cs_key.0.1; - let mut wiped_slots = alloy_primitives::map::B256Set::default(); - if let Some(entry) = state_cursor.seek_by_key_subkey(hashed_address, B256::ZERO)? { - append_hashed_storage_entry(cs_cursor, cs_key, entry, collector)?; - wiped_slots.insert(entry.key); - while let Some(entry) = state_cursor.next_dup_val()? { - append_hashed_storage_entry(cs_cursor, cs_key, entry, collector)?; - wiped_slots.insert(entry.key); - } - if state_cursor.seek_exact(hashed_address)?.is_some() { - state_cursor.delete_current_duplicates()?; - } - } - Ok(wiped_slots) -} - /// Write a single hashed-storage slot update: snapshot the old value into the changeset, /// record in the history collector, then apply the new value (upsert or delete). /// @@ -685,9 +610,6 @@ impl MdbxProofsProviderV2 { } /// Write storage trie branch-node updates for one block. - /// - /// Handles the `is_deleted` wipe path (snapshot all existing nodes into - /// the changeset before clearing) as well as per-node updates. fn write_storage_trie( block_number: BlockNumber, updates: &TrieUpdatesSorted, @@ -700,48 +622,16 @@ impl MdbxProofsProviderV2 { for (hashed_address, nodes) in updates.storage_tries_ref() { let cs_key = BlockNumberHashedAddress((block_number, *hashed_address)); - - if nodes.is_deleted { - let wiped_nibbles = - snapshot_and_wipe_storage_trie(state_cursor, cs_cursor, cs_key, collector)?; + for (nibbles, maybe_node) in nodes.storage_nodes_ref() { + write_storage_trie_node( + state_cursor, + cs_cursor, + cs_key, + StoredNibblesSubKey(*nibbles), + maybe_node, + collector, + )?; count += 1; - - // After a wipe the state table is empty for this address, so there is no - // old node to seek or delete. Nodes whose nibbles were already snapshotted - // above must not be recorded again (that would create conflicting duplicate - // changeset entries). Brand-new nibbles get a `None` old-value entry so - // that unwind knows to delete them. - for (nibbles, maybe_node) in nodes.storage_nodes_ref() { - let subkey = StoredNibblesSubKey(*nibbles); - if !wiped_nibbles.contains(&subkey) { - append_storage_trie_entry( - cs_cursor, - cs_key, - subkey.clone(), - None, - collector, - )?; - } - if let Some(node) = maybe_node { - state_cursor.upsert( - *hashed_address, - &StorageTrieEntry { nibbles: subkey, node: node.clone() }, - )?; - } - count += 1; - } - } else { - for (nibbles, maybe_node) in nodes.storage_nodes_ref() { - write_storage_trie_node( - state_cursor, - cs_cursor, - cs_key, - StoredNibblesSubKey(*nibbles), - maybe_node, - collector, - )?; - count += 1; - } } } Ok(count) @@ -787,9 +677,6 @@ impl MdbxProofsProviderV2 { } /// Write hashed-storage updates for one block. - /// - /// Handles the `is_wiped` path (snapshot all existing slots into the - /// changeset before clearing) as well as per-slot updates. fn write_hashed_storages( block_number: BlockNumber, post_state: &HashedPostStateSorted, @@ -802,44 +689,16 @@ impl MdbxProofsProviderV2 { for (hashed_address, storage) in &post_state.storages { let cs_key = BlockNumberHashedAddress((block_number, *hashed_address)); - - if storage.is_wiped() { - // Snapshot + wipe existing slots; track what was wiped so the - // new-slots loop below doesn't double-append changeset entries. - let wiped_slots = - snapshot_and_wipe_hashed_storage(state_cursor, cs_cursor, cs_key, collector)?; - - // Write new slots. Slots not seen during the wipe get a zero - // old-value entry in the changeset. - for (storage_key, value) in storage.storage_slots_ref() { - if !wiped_slots.contains(storage_key) { - append_hashed_storage_entry( - cs_cursor, - cs_key, - StorageEntry { key: *storage_key, value: U256::ZERO }, - collector, - )?; - } - if *value != U256::ZERO { - state_cursor.upsert( - *hashed_address, - &StorageEntry { key: *storage_key, value: *value }, - )?; - } - count += 1; - } - } else { - for (storage_key, value) in storage.storage_slots_ref() { - write_hashed_storage_slot( - state_cursor, - cs_cursor, - cs_key, - *storage_key, - *value, - collector, - )?; - count += 1; - } + for (storage_key, value) in storage.storage_slots_ref() { + write_hashed_storage_slot( + state_cursor, + cs_cursor, + cs_key, + *storage_key, + *value, + collector, + )?; + count += 1; } } Ok(count) diff --git a/rust/op-reth/crates/trie/src/engine/buffer/overlay.rs b/rust/op-reth/crates/trie/src/engine/buffer/overlay.rs index 74c30b43fcf..0aa13217fb8 100644 --- a/rust/op-reth/crates/trie/src/engine/buffer/overlay.rs +++ b/rust/op-reth/crates/trie/src/engine/buffer/overlay.rs @@ -10,8 +10,9 @@ use reth_provider::{ }; use reth_revm::db::BundleState; use reth_trie::{ - AccountProof, ExecutionWitnessMode, HashedPostState, HashedStorage, MultiProof, - MultiProofTargets, StorageMultiProof, TrieInput, updates::TrieUpdates, + AccountProof, DecodedMultiProofV2, ExecutionWitnessMode, HashedPostState, HashedStorage, + MultiProof, MultiProofTargets, MultiProofTargetsV2, StorageMultiProof, TrieInput, + updates::TrieUpdates, }; use std::{ fmt::Debug, @@ -97,16 +98,11 @@ where // Check buffer via trie_input cache let state = &self.trie_input().state; - // Check for storage updates or wipes in the overlay - if let Some(account_storage) = state.storages.get(&hashed_address) { - // Check specific slot - if let Some(value) = account_storage.storage.get(&hashed_slot) { - return Ok(Some(*value)); - } - // If the whole storage was wiped in the overlay (e.g. reused address), we return 0 - if account_storage.wiped { - return Ok(Some(StorageValue::ZERO)); - } + // Check for storage updates in the overlay + if let Some(account_storage) = state.storages.get(&hashed_address) && + let Some(value) = account_storage.storage.get(&hashed_slot) + { + return Ok(Some(*value)); } // Check if account was destroyed in the overlay (implicit storage wipe) @@ -220,6 +216,15 @@ where self.inner.multiproof(input, targets) } + fn multiproof_v2( + &self, + mut input: TrieInput, + targets: MultiProofTargetsV2, + ) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.inner.multiproof_v2(input, targets) + } + fn witness( &self, mut input: TrieInput, @@ -281,10 +286,12 @@ impl<'a, P> HashedPostStateProvider for MemoryOverlayOpProofsStateProviderRef<'a where P: OpProofsProviderRO + Clone, { - /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 + /// UPSTREAM-MIRROR(port): reth@pre-26923 /// `reth_chain_state::MemoryOverlayStateProviderRef::hashed_post_state` /// - /// Uses the OP proofs-buffer trie input instead of upstream's executed-block overlay. + /// Ported from the provider removed in paradigmxyz/reth#26923. Uses the OP proofs-buffer + /// trie input instead of upstream's executed-block overlay; the storage-zeroing behavior + /// remains covered by the destroyed-account tests below. fn hashed_post_state(&self, bundle_state: &BundleState) -> ProviderResult { let mut hashed_state = self.inner.hashed_post_state(bundle_state)?; diff --git a/rust/op-reth/crates/trie/src/engine/tasks/execute_block.rs b/rust/op-reth/crates/trie/src/engine/tasks/execute_block.rs index 1f0914d4336..aeb3d157f77 100644 --- a/rust/op-reth/crates/trie/src/engine/tasks/execute_block.rs +++ b/rust/op-reth/crates/trie/src/engine/tasks/execute_block.rs @@ -8,7 +8,7 @@ use reth_evm::{ConfigureEvm, execute::Executor}; use reth_primitives_traits::{AlloyBlockHeader, BlockBody, NodePrimitives, RecoveredBlock}; use reth_provider::{ BlockHashReader, BlockReader, DatabaseProviderFactory, HashedPostStateProvider, ProviderError, - StateProviderFactory, StateReader, StateRootProvider, + StateProvider, StateProviderFactory, StateReader, StateRootProvider, }; use reth_revm::database::StateProviderDatabase; use reth_trie_common::EMPTY_ROOT_HASH; @@ -125,7 +125,7 @@ where ); let state_provider = state.memory.state_provider(block.parent_hash(), inner_provider); - let db = StateProviderDatabase::new(&state_provider); + let db = StateProviderDatabase::new((&state_provider).into_evm_state_provider()); let block_executor = state.evm_config.batch_executor(db); let execution_result = block_executor.execute(block)?; let execution_duration = start.elapsed(); diff --git a/rust/op-reth/crates/trie/src/in_memory.rs b/rust/op-reth/crates/trie/src/in_memory.rs index 59da731ace8..9efb2b63839 100644 --- a/rust/op-reth/crates/trie/src/in_memory.rs +++ b/rust/op-reth/crates/trie/src/in_memory.rs @@ -98,38 +98,9 @@ impl InMemoryStorageInner { } for (hashed_address, storage) in &block_state_diff.sorted_post_state.storages { - // Handle wiped storage: iterate all existing values and mark them as deleted - // This is an expensive operation and should never happen for blocks going forward. - if storage.wiped { - // Collect latest values for each slot up to the current block - let mut slot_to_latest: std::collections::BTreeMap = - std::collections::BTreeMap::new(); - - for ((block, address, slot), value) in &self.hashed_storages { - if *block < block_number && *address == *hashed_address { - if let Some((existing_block, _)) = slot_to_latest.get(slot) { - if *block > *existing_block { - slot_to_latest.insert(*slot, (*block, *value)); - } - } else { - slot_to_latest.insert(*slot, (*block, *value)); - } - } - } - - // Store zero values for all non-zero slots to mark them as deleted - for (slot, (_, value)) in slot_to_latest { - if !value.is_zero() { - self.hashed_storages - .insert((block_number, *hashed_address, slot), U256::ZERO); - result.hashed_storages_written_total += 1; - } - } - } else { - for (slot, value) in storage.storage_slots_ref() { - self.hashed_storages.insert((block_number, *hashed_address, *slot), *value); - result.hashed_storages_written_total += 1; - } + for (slot, value) in storage.storage_slots_ref() { + self.hashed_storages.insert((block_number, *hashed_address, *slot), *value); + result.hashed_storages_written_total += 1; } } diff --git a/rust/op-reth/crates/trie/src/proof.rs b/rust/op-reth/crates/trie/src/proof.rs index 075ac6ef757..cbdd2160434 100644 --- a/rust/op-reth/crates/trie/src/proof.rs +++ b/rust/op-reth/crates/trie/src/proof.rs @@ -17,8 +17,9 @@ use reth_trie::{ witness::TrieWitness, }; use reth_trie_common::{ - AccountProof, HashedPostState, HashedPostStateSorted, HashedStorage, MultiProof, - MultiProofTargets, StorageMultiProof, StorageProof, TrieInput, updates::TrieUpdates, + AccountProof, DecodedMultiProofV2, HashedPostState, HashedPostStateSorted, HashedStorage, + MultiProof, MultiProofTargets, MultiProofTargetsV2, StorageMultiProof, StorageProof, TrieInput, + updates::TrieUpdates, }; /// Extends [`Proof`] with operations specific for working with [`crate::OpProofsStorage`]. @@ -42,6 +43,14 @@ pub trait DatabaseProof

{ input: TrieInput, targets: MultiProofTargets, ) -> Result; + + /// Generates the state [`DecodedMultiProofV2`] for target hashed account and storage keys. + fn overlay_multiproof_v2( + provider: P, + block_number: u64, + input: TrieInput, + targets: MultiProofTargetsV2, + ) -> Result; } impl

DatabaseProof

@@ -101,6 +110,28 @@ where .with_prefix_sets_mut(input.prefix_sets) .multiproof(targets) } + + /// Generates the state [`DecodedMultiProofV2`] for target hashed account and storage keys. + fn overlay_multiproof_v2( + provider: P, + block_number: u64, + input: TrieInput, + targets: MultiProofTargetsV2, + ) -> Result { + let nodes_sorted = input.nodes.into_sorted(); + let state_sorted = input.state.into_sorted(); + Self::from_provider(provider.clone(), block_number) + .with_trie_cursor_factory(InMemoryTrieCursorFactory::new( + OpProofsTrieCursorFactory::new(provider.clone(), block_number), + &nodes_sorted, + )) + .with_hashed_cursor_factory(HashedPostStateCursorFactory::new( + OpProofsHashedAccountCursorFactory::new(provider, block_number), + &state_sorted, + )) + .with_prefix_sets_mut(input.prefix_sets) + .multiproof_v2(targets) + } } /// Extends [`StorageProof`] with operations specific for working with [`crate::OpProofsStorage`]. diff --git a/rust/op-reth/crates/trie/src/provider.rs b/rust/op-reth/crates/trie/src/provider.rs index 2d36ae50d74..6538de7aba5 100644 --- a/rust/op-reth/crates/trie/src/provider.rs +++ b/rust/op-reth/crates/trie/src/provider.rs @@ -25,8 +25,9 @@ use reth_trie::{ witness::TrieWitness, }; use reth_trie_common::{ - AccountProof, HashedPostState, HashedStorage, KeccakKeyHasher, MultiProof, MultiProofTargets, - StorageMultiProof, StorageProof, TrieInput, updates::TrieUpdates, + AccountProof, DecodedMultiProofV2, HashedPostState, HashedStorage, KeccakKeyHasher, MultiProof, + MultiProofTargets, MultiProofTargetsV2, StorageMultiProof, StorageProof, TrieInput, + updates::TrieUpdates, }; use std::fmt::Debug; @@ -177,6 +178,15 @@ where .map_err(ProviderError::from) } + fn multiproof_v2( + &self, + input: TrieInput, + targets: MultiProofTargetsV2, + ) -> ProviderResult { + Proof::overlay_multiproof_v2(self.provider.clone(), self.block_number, input, targets) + .map_err(ProviderError::from) + } + fn witness( &self, input: TrieInput, @@ -193,7 +203,7 @@ impl<'a, P> HashedPostStateProvider for OpProofsStateProviderRef<'a, P> where P: OpProofsProviderRO + Clone, { - /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 + /// UPSTREAM-MIRROR(copy): reth@v2.7.0 /// `reth_provider::LatestStateProviderRef::hashed_post_state` /// /// Mirrors the hashing/zeroing sequence, using historical OP proofs cursors instead of diff --git a/rust/op-reth/crates/trie/src/test_utils.rs b/rust/op-reth/crates/trie/src/test_utils.rs index ddf6f484024..96ad62cd5db 100644 --- a/rust/op-reth/crates/trie/src/test_utils.rs +++ b/rust/op-reth/crates/trie/src/test_utils.rs @@ -22,8 +22,8 @@ use reth_node_api::{NodePrimitives, NodeTypesWithDB}; use reth_primitives_traits::{AlloyBlockHeader, Block as _, RecoveredBlock}; use reth_provider::{ BlockWriter as _, ExecutionOutcome, HashedPostStateProvider, LatestStateProviderRef, - ProviderFactory, StateRootProvider, StorageSettingsCache, providers::ProviderNodeTypes, - test_utils::create_test_provider_factory_with_chain_spec, + ProviderFactory, StateProvider, StateRootProvider, StorageSettingsCache, TrieWriter, + providers::ProviderNodeTypes, test_utils::create_test_provider_factory_with_chain_spec, }; use reth_revm::database::StateProviderDatabase; use secp256k1::{Keypair, Secp256k1, SecretKey}; @@ -150,7 +150,9 @@ where > + NodeTypesWithDB, { let provider = provider_factory.provider().unwrap(); - let db = StateProviderDatabase::new(LatestStateProviderRef::new(&provider)); + let db = StateProviderDatabase::new( + LatestStateProviderRef::new(&provider).into_evm_state_provider(), + ); let evm_config = EthEvmConfig::ethereum(chain_spec.clone()); let block_executor = evm_config.batch_executor(db); let execution_result = block_executor.execute(block).unwrap(); @@ -183,6 +185,9 @@ pub(crate) fn commit_block_to_database( &execution_output.state, ) .unwrap(); + let (_, trie_updates) = LatestStateProviderRef::new(&state_provider) + .state_root_with_updates(hashed_state.clone()) + .unwrap(); let provider_rw = provider_factory.provider_rw().unwrap(); provider_rw .append_blocks_with_state( @@ -191,6 +196,8 @@ pub(crate) fn commit_block_to_database( hashed_state.into_sorted(), ) .unwrap(); + // Reth's append helper leaves trie persistence to the caller (reth#27307). + provider_rw.write_trie_updates(trie_updates).unwrap(); provider_rw.commit().unwrap(); } @@ -331,6 +338,47 @@ pub(crate) fn build_chain_with_storage_writes_and_initialize_storage( (provider_factory, storage, last_number, last_hash) } +#[test] +fn committed_fixture_persists_trie_nodes() { + use reth_trie::trie_cursor::{TrieCursor, TrieCursorFactory}; + use reth_trie_db::DatabaseTrieCursorFactory; + + let key_pair = deterministic_keypair(); + let sender = public_key_to_address(key_pair.public_key()); + let chain_spec = chain_spec_with_address(sender); + let factory = create_test_provider_factory_with_chain_spec(chain_spec.clone()); + init_genesis(&factory).unwrap(); + let mut parent = chain_spec.genesis_hash(); + + for number in 1..=2 { + let mut block = build_storage_call_block(number, parent, &chain_spec, key_pair, number - 1); + let output = execute_block(&mut block, &factory, &chain_spec); + let expected_nodes: Vec<_> = { + let provider = factory.provider().unwrap(); + let state = LatestStateProviderRef::new(&provider); + let hashed = state.hashed_post_state(&output.state).unwrap(); + let (_, updates) = state.state_root_with_updates(hashed).unwrap(); + // The writer deliberately omits the root node; check actual persisted branches. + updates.account_nodes.into_iter().filter(|(path, _)| !path.is_empty()).collect() + }; + assert!(!expected_nodes.is_empty(), "fixture must update stored account branches"); + commit_block_to_database(&block, &output, &factory); + let provider = factory.provider().unwrap(); + reth_trie_db::with_adapter!(provider, |A| { + let cursors = DatabaseTrieCursorFactory::<_, A>::new(provider.tx_ref()); + let mut cursor = cursors.account_trie_cursor().unwrap(); + for (path, node) in expected_nodes { + assert_eq!( + cursor.seek_exact(path).unwrap().map(|(_, stored)| stored), + Some(node), + "fixture block {number} must persist its updated trie branches", + ); + } + }); + parent = block.hash(); + } +} + /// Fixtures for `HashedPostStateProvider` tests over the proofs storage: persisted storage /// seeding, bundles with destroyed accounts, and a provider whose storage reads fail. pub(crate) mod destroyed_accounts { diff --git a/rust/op-reth/crates/trie/tests/lib.rs b/rust/op-reth/crates/trie/tests/lib.rs index 7573ee33a6c..15aff21146f 100644 --- a/rust/op-reth/crates/trie/tests/lib.rs +++ b/rust/op-reth/crates/trie/tests/lib.rs @@ -1308,15 +1308,12 @@ fn test_large_batch_operations(storage: S) -> Result<(), OpPro Ok(()) } -/// Test wiped storage in [`HashedPostState`] -/// -/// When `store_trie_updates` receives a [`HashedPostState`] with wiped=true for a storage entry, -/// it should iterate all existing values for that address and create deletion entries for them. +/// Test explicit storage deletions in [`HashedPostState`]. #[test_case(InMemoryProofsStorage::new(); "InMemory")] #[test_case(create_mdbx_proofs_storage(); "Mdbx")] #[test_case(create_mdbx_proofs_storage_v2(); "MdbxV2")] #[serial] -fn test_store_trie_updates_with_wiped_storage( +fn test_store_trie_updates_with_deleted_storage( storage: S, ) -> Result<(), OpProofsStorageError> { use reth_trie::HashedStorage; @@ -1349,17 +1346,18 @@ fn test_store_trie_updates_with_wiped_storage( assert_eq!(found_slots[2], (B256::repeat_byte(0x30), U256::from(300))); assert_eq!(found_slots[3], (B256::repeat_byte(0x40), U256::from(400))); - // Now create a HashedPostState with wiped=true for this address at block 100 + // Delete every storage slot at block 100. let mut post_state = HashedPostState::default(); - let wiped_storage = HashedStorage::new(true); // wiped=true, empty storage map - post_state.storages.insert(hashed_address, wiped_storage); + let deleted_storage = + HashedStorage::from_iter(storage_slots.iter().map(|(slot, _)| (*slot, U256::ZERO))); + post_state.storages.insert(hashed_address, deleted_storage); let block_state_diff = BlockStateDiff { sorted_trie_updates: TrieUpdatesSorted::default(), sorted_post_state: post_state.into_sorted(), }; - // Store the wiped state + // Store the deleted state. let provider_rw = storage.provider_rw().expect("provider rw"); provider_rw.store_trie_updates(block_ref, block_state_diff)?; provider_rw.commit()?; @@ -1474,7 +1472,7 @@ fn test_store_trie_updates_comprehensive( // Add storage for an address let storage_addr = B256::repeat_byte(0x50); - let mut hashed_storage = HashedStorage::new(false); + let mut hashed_storage = HashedStorage::default(); hashed_storage.storage.insert(B256::repeat_byte(0x01), U256::from(111)); hashed_storage.storage.insert(B256::repeat_byte(0x02), U256::from(222)); hashed_storage.storage.insert(B256::repeat_byte(0x03), U256::ZERO); // Deleted storage @@ -1645,7 +1643,7 @@ fn test_replace_updates_applies_all_updates( initial_trie_updates_100.account_nodes.insert(common_branch_path, initial_branch.clone()); let mut initial_post_state_100 = HashedPostState::default(); - let mut initial_storage_100 = HashedStorage::new(false); + let mut initial_storage_100 = HashedStorage::default(); initial_storage_100.storage.insert(initial_storage_slot, initial_storage_value); initial_post_state_100.storages.insert(initial_storage_addr, initial_storage_100); @@ -1734,7 +1732,7 @@ fn test_replace_updates_applies_all_updates( let mut new_post_state = HashedPostState::default(); new_post_state.accounts.insert(new_account_addr, Some(new_account)); - let mut new_storage = HashedStorage::new(false); + let mut new_storage = HashedStorage::default(); new_storage.storage.insert(new_storage_slot, new_storage_value); new_post_state.storages.insert(new_storage_addr, new_storage); diff --git a/rust/op-reth/crates/trie/tests/live.rs b/rust/op-reth/crates/trie/tests/live.rs index f26c8090798..0c4c1a5aac0 100644 --- a/rust/op-reth/crates/trie/tests/live.rs +++ b/rust/op-reth/crates/trie/tests/live.rs @@ -20,7 +20,7 @@ use reth_optimism_trie::{ use reth_primitives_traits::{Block as _, RecoveredBlock}; use reth_provider::{ BlockWriter as _, ExecutionOutcome, HashedPostStateProvider, LatestStateProviderRef, - ProviderFactory, StateRootProvider, StorageSettingsCache, + ProviderFactory, StateProvider, StateRootProvider, StorageSettingsCache, TrieWriter, providers::{BlockchainProvider, ProviderNodeTypes}, test_utils::create_test_provider_factory_with_chain_spec, }; @@ -176,7 +176,9 @@ where > + NodeTypesWithDB, { let provider = provider_factory.provider()?; - let db = StateProviderDatabase::new(LatestStateProviderRef::new(&provider)); + let db = StateProviderDatabase::new( + LatestStateProviderRef::new(&provider).into_evm_state_provider(), + ); let evm_config = EthEvmConfig::ethereum(chain_spec.clone()); let block_executor = evm_config.batch_executor(db); @@ -215,6 +217,8 @@ where &LatestStateProviderRef::new(&state_provider), &execution_output.state, )?; + let (_, trie_updates) = LatestStateProviderRef::new(&state_provider) + .state_root_with_updates(hashed_state.clone())?; let provider_rw = provider_factory.provider_rw()?; provider_rw.append_blocks_with_state( @@ -222,6 +226,8 @@ where &execution_outcome, hashed_state.into_sorted(), )?; + // Reth's append helper leaves trie persistence to the caller (reth#27307). + provider_rw.write_trie_updates(trie_updates)?; provider_rw.commit()?; Ok(()) diff --git a/rust/op-reth/crates/txpool/src/pool.rs b/rust/op-reth/crates/txpool/src/pool.rs index 298cc27cdca..fda20dbad70 100644 --- a/rust/op-reth/crates/txpool/src/pool.rs +++ b/rust/op-reth/crates/txpool/src/pool.rs @@ -12,7 +12,7 @@ use std::{ }; use alloy_consensus::Transaction; -use alloy_eips::eip7594::BlobTransactionSidecarVariant; +use alloy_eips::eip7594::{BlobCellMask, BlobTransactionSidecarVariant}; use alloy_primitives::{Address, B256, TxHash}; use metrics::Counter; use reth_eth_wire_types::HandleMempoolData; @@ -362,6 +362,7 @@ where delegate!(fn queued_transactions(&self) -> Vec>>); delegate!(fn pending_and_queued_txn_count(&self) -> (usize, usize)); delegate!(fn all_transactions(&self) -> AllPoolTransactions); + delegate!(fn all_transactions_by_sender(&self, sender: Address) -> AllPoolTransactions); delegate!(fn all_transaction_hashes(&self) -> Vec); delegate!(fn remove_transactions(&self, hashes: Vec) -> Vec>>); delegate!(fn remove_transactions_and_descendants(&self, hashes: Vec) -> Vec>>); @@ -403,7 +404,7 @@ where delegate!(fn get_blobs_for_versioned_hashes_v1(&self, versioned_hashes: &[B256]) -> Result>, BlobStoreError>); delegate!(fn get_blobs_for_versioned_hashes_v2(&self, versioned_hashes: &[B256]) -> Result>, BlobStoreError>); delegate!(fn get_blobs_for_versioned_hashes_v3(&self, versioned_hashes: &[B256]) -> Result>, BlobStoreError>); - delegate!(fn get_blobs_for_versioned_hashes_v4(&self, versioned_hashes: &[B256], indices_bitarray: alloy_primitives::B128) -> Result>, BlobStoreError>); + delegate!(fn get_blobs_for_versioned_hashes_v4(&self, versioned_hashes: &[B256], cell_mask: BlobCellMask) -> Result>, BlobStoreError>); delegate!(fn has_blobs_for_versioned_hashes(&self, versioned_hashes: &[B256]) -> Result, BlobStoreError>); } diff --git a/rust/op-reth/crates/txpool/src/validator.rs b/rust/op-reth/crates/txpool/src/validator.rs index 6e9cbb614b5..c478ab44cf8 100644 --- a/rust/op-reth/crates/txpool/src/validator.rs +++ b/rust/op-reth/crates/txpool/src/validator.rs @@ -354,7 +354,7 @@ where } } -/// UPSTREAM-MIRROR(delegate): reth@rev:0fbe428 +/// UPSTREAM-MIRROR(delegate): reth@v2.7.0 /// `reth_transaction_pool::validate::EthTransactionValidator` /// /// Wraps the Ethereum validator. Re-check newly defaulted batch methods and upstream overrides; diff --git a/rust/op-revm/src/api/exec.rs b/rust/op-revm/src/api/exec.rs index 4d3c05f18ee..a3006fd109a 100644 --- a/rust/op-revm/src/api/exec.rs +++ b/rust/op-revm/src/api/exec.rs @@ -48,7 +48,7 @@ impl OpContextTr for T where /// Type alias for the error type of the `OpEvm`. pub type OpError = EVMError<<::Db as Database>::Error, OpTransactionError>; -/// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `revm_handler::api::ExecuteEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 `revm_handler::api::ExecuteEvm` /// /// Copies upstream's `ExecuteEvm` implementation with `OpHandler` substituted for /// `MainnetHandler`. Re-diff the bodies when the upstream implementation changes. @@ -95,7 +95,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `revm_handler::api::ExecuteCommitEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 `revm_handler::api::ExecuteCommitEvm` /// /// Copies the upstream commit implementation for the OP EVM. impl ExecuteCommitEvm @@ -109,7 +109,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@42.0.1 `revm_inspector::mainnet_inspect::InspectEvm` +/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.3 `revm_inspector::mainnet_inspect::InspectEvm` /// /// Copies the upstream inspector implementation with `OpHandler`. impl InspectEvm @@ -132,7 +132,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@42.0.1 `revm_inspector::mainnet_inspect::InspectCommitEvm` +/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.3 `revm_inspector::mainnet_inspect::InspectCommitEvm` /// /// Mirrors the upstream marker implementation for inspector commits. impl InspectCommitEvm @@ -144,7 +144,7 @@ where { } -/// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `revm_handler::system_call::SystemCallEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 `revm_handler::system_call::SystemCallEvm` /// /// Copies upstream system-call setup with `OpHandler`. impl SystemCallEvm @@ -169,7 +169,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@42.0.1 +/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.3 /// `revm_inspector::mainnet_inspect::InspectSystemCallEvm` /// /// Copies upstream inspected system-call setup with `OpHandler`. diff --git a/rust/op-revm/src/evm.rs b/rust/op-revm/src/evm.rs index 84ddcc2ec5f..d96a6b67670 100644 --- a/rust/op-revm/src/evm.rs +++ b/rust/op-revm/src/evm.rs @@ -64,7 +64,7 @@ impl OpEvm { } } -/// UPSTREAM-MIRROR(delegate): revm-inspector@42.0.1 `revm_inspector::InspectorEvmTr` +/// UPSTREAM-MIRROR(delegate): revm-inspector@43.0.3 `revm_inspector::InspectorEvmTr` /// /// Forwards inspector EVM access to the inner mainnet-shaped EVM. impl InspectorEvmTr for OpEvm @@ -103,7 +103,7 @@ where } } -/// UPSTREAM-MIRROR(delegate): revm-handler@42.0.1 `revm_handler::EvmTr` +/// UPSTREAM-MIRROR(delegate): revm-handler@43.0.3 `revm_handler::EvmTr` /// /// Forwards selected EVM operations to the inner EVM. Re-check newly defaulted methods and /// upstream overrides that this wrapper would otherwise miss. diff --git a/rust/op-revm/src/handler.rs b/rust/op-revm/src/handler.rs index 739848dc6b1..c743dd26e3b 100644 --- a/rust/op-revm/src/handler.rs +++ b/rust/op-revm/src/handler.rs @@ -80,7 +80,7 @@ where type Error = ERROR; type HaltReason = OpHaltReason; - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::validate_env` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::validate_env` /// /// Deposits return before `validation::validate_env`; non-deposits add the /// `enveloped_tx` requirement and then delegate. Re-check changes to the upstream @@ -110,10 +110,10 @@ where self.mainnet.validate_env(evm) } - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 /// `revm_handler::Handler::validate_against_state_and_deduct_caller` /// - /// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 + /// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 /// `revm_handler::pre_execution::validate_against_state_and_deduct_caller` /// /// The non-deposit arm copies the upstream helper with the L1-fee deduction inserted @@ -199,7 +199,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::tx_gas` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::tx_gas` /// /// Deposits are force-included from L1 and are exempt from EIP-7825's per-transaction gas /// limit cap (), so @@ -221,7 +221,7 @@ where GasTracker::new(tx_gas_limit, remaining, reservoir) } - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::last_frame_result` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::last_frame_result` /// /// Structure and comments are taken verbatim from the upstream default: the frame is /// settled into the transaction-level gas exactly as upstream does, and the @@ -299,7 +299,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::reimburse_caller` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::reimburse_caller` /// /// Delegates to upstream `post_execution::reimburse_caller`, adding the operator-fee /// refund for non-deposits. Re-check that the upstream helper's signature and semantics @@ -321,7 +321,7 @@ where reimburse_caller(evm.ctx(), frame_result.gas(), additional_refund).map_err(From::from) } - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::refund` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::refund` /// /// Same as upstream except that pre-Regolith deposits get no refund at all. fn refund( @@ -346,7 +346,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::reward_beneficiary` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::reward_beneficiary` /// /// Returns early for deposits, otherwise calls the upstream implementation and then pays /// the three OP vaults. Re-check on any change to how upstream computes the beneficiary @@ -400,7 +400,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::execution_result` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::execution_result` /// /// Reproduces the upstream teardown (`take_error`, `post_execution::output`, `commit_tx`, /// clearing local state and the frame stack) with the post-Regolith halted-deposit @@ -433,7 +433,7 @@ where Ok(exec_result) } - /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::catch_error` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::catch_error` /// /// Re-derive upstream error-path cleanup, currently `journal.discard_tx()`, /// when the default or journal semantics change. diff --git a/rust/op-revm/src/precompiles.rs b/rust/op-revm/src/precompiles.rs index 23e510389a0..84fbfc8c875 100644 --- a/rust/op-revm/src/precompiles.rs +++ b/rust/op-revm/src/precompiles.rs @@ -48,7 +48,7 @@ impl OpPrecompiles { } } -/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Fjord extends the upstream Cancun set with P256 verification. Re-check the /// inherited address set and gas parameters on each bump. @@ -63,7 +63,7 @@ pub fn fjord() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Granite replaces the inherited pairing implementation. /// Returns precompiles for Granite spec. @@ -77,7 +77,7 @@ pub fn granite() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Isthmus extends the inherited set with Prague BLS precompiles and OP pricing. /// Returns precompiles for isthmus spec. @@ -97,7 +97,7 @@ pub fn isthmus() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Karst replaces the inherited Osaka-sensitive precompiles. /// Returns precompiles for karst spec. @@ -117,7 +117,7 @@ pub fn karst() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Jovian replaces variable-input precompiles in the inherited set. /// Returns precompiles for jovian spec. diff --git a/rust/op-revm/src/spec.rs b/rust/op-revm/src/spec.rs index 84d3a7de3f5..5143b7be06b 100644 --- a/rust/op-revm/src/spec.rs +++ b/rust/op-revm/src/spec.rs @@ -34,7 +34,7 @@ pub enum OpSpecId { } impl OpSpecId { - /// UPSTREAM-MIRROR(set): revm-primitives@42.0.0 `revm_primitives::hardfork::SpecId` + /// UPSTREAM-MIRROR(set): revm-primitives@43.0.0 `revm_primitives::hardfork::SpecId` /// /// Maps each OP fork onto the L1 fork whose semantics it activates. A new upstream /// `SpecId` needs a decision here: which OP fork (if any) turns it on. diff --git a/rust/op-revm/src/transaction/abstraction.rs b/rust/op-revm/src/transaction/abstraction.rs index 6c129c3fe47..3c332c68083 100644 --- a/rust/op-revm/src/transaction/abstraction.rs +++ b/rust/op-revm/src/transaction/abstraction.rs @@ -95,7 +95,7 @@ impl SystemCallTx for OpTransaction { } } -/// UPSTREAM-MIRROR(delegate): revm-context-interface@42.0.0 `revm_context_interface::Transaction` +/// UPSTREAM-MIRROR(delegate): revm-context-interface@43.0.2 `revm_context_interface::Transaction` /// /// Forwards the primitive getters to `self.base` and overrides `tx_type` and /// `effective_gas_price` for deposits. Everything not listed here inherits the upstream