diff --git a/docs/ai/reth-update-review.md b/docs/ai/reth-update-review.md index 11480872b7a..f7304431f30 100644 --- a/docs/ai/reth-update-review.md +++ b/docs/ai/reth-update-review.md @@ -96,7 +96,7 @@ Each one encodes an assumption. Name the assumption, then check it against the l `DEPOSIT_TRANSACTION_TYPE` before reaching `validation::validate_env`, because deposits are pre-verified on L1 ( [specs.optimism.io/protocol/deposits](https://specs.optimism.io/protocol/deposits.html)). -Read the upstream body to keep this current; as of `revm` 41 it means a deposit is not +Read the upstream body to keep this current; as of `revm` 42 it means a deposit is not checked for: - `prevrandao` present (Merge+) and `excess_blob_gas` present (Cancun+) on the block diff --git a/docs/ai/reth-upstream-mirrors.md b/docs/ai/reth-upstream-mirrors.md index 19e66992caf..5eacf3c8745 100644 --- a/docs/ai/reth-upstream-mirrors.md +++ b/docs/ai/reth-upstream-mirrors.md @@ -69,6 +69,11 @@ Statuses: `current`, `stale` (review it), `frozen` (an intentionally old `port`), and the tag errors `ahead`, `unknown-crate`, `ambiguous-version`, and `malformed`. +A crate can resolve to several incompatible versions at once, when an unrelated +dependency pulls an older line. The version a tag is checked against is then the +one inside the range `rust/Cargo.toml` asks for — what our own crates build +against. `ambiguous-version` is reported only when that still leaves a choice. + ## Using it on a bump 1. Bump the pin and refresh the lockfiles as usual (`rust/UPDATING-RETH.md`). diff --git a/rust/Cargo.lock b/rust/Cargo.lock index a644baa4042..6ba3162bac1 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -159,16 +159,16 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ff0c4adba2abdcd9fb5829ae5f4394c06f8585ed283a9ba79aa33763c802e1" +checksum = "0b836b372d3b742b7c083d2617d6e68563cd5dadbd8752c461a935a756551e69" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "alloy-trie", - "alloy-tx-macros 2.1.1", + "alloy-tx-macros 2.5.0", "arbitrary", "auto_impl", "borsh", @@ -201,47 +201,49 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cdf48932b1db3216175e19a2b476d89d53076e004850ee7983c6807ba0fde74" +checksum = "b1befb37485ea71e8599e32ffd76c98af7c3720a34741d30abd87f41c3148407" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "arbitrary", "serde", ] [[package]] name = "alloy-contract" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee5c8b5baa015ef1d07a33983794e1539cce36954846a9bc6e1050d8a1ebf9b7" +checksum = "b432cf09e307820b39ec5b856b25f396d8fde6089358f0c1d96d9654ad1e0b7d" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 2.1.1", - "alloy-network-primitives 2.1.1", + "alloy-network 2.4.2", + "alloy-network-primitives 2.4.2", "alloy-primitives", "alloy-provider", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-sol-types", "alloy-transport", "futures", "futures-util", "serde_json", "thiserror 2.0.18", + "tokio", "tracing", + "wasmtimer", ] [[package]] name = "alloy-dyn-abi" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a475bb02d9cef2dbb99065c1664ab3fe1f9352e21d6d5ed3f02cdbfc06ed1abc" +checksum = "14b3b9990889736af898bd4e51f7d0c0228d6a9b9c3a5fecb3e6b25a7abc791c" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -329,6 +331,20 @@ dependencies = [ "thiserror 2.0.18", ] +[[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", + "arbitrary", + "borsh", + "serde", + "thiserror 2.0.18", +] + [[package]] name = "alloy-eips" version = "1.8.3" @@ -354,17 +370,18 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4c0453065b9206acc0f869a258dc8dcbbd595e144b4446f2c493a24a814d1f" +checksum = "e01905444bd2fc330673f11d2466c0f54e8488f7ce3132b6a5e6497916fca765" dependencies = [ "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", "alloy-eip7928 0.4.5", + "alloy-eip8141", "alloy-primitives", "alloy-rlp", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "arbitrary", "auto_impl", "borsh", @@ -380,16 +397,16 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.37.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde665074b478c97047dc2a461b4916cac77922d690e5b7415d1941ae7ff7bf" +checksum = "6b307a52f91f7f3aad56b5cb4f54e5eb17dd0b3f4b2c82823301499fe1c6fdaf" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-hardforks", "alloy-primitives", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-sol-types", "auto_impl", "derive_more 2.1.1", @@ -400,13 +417,13 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027ba57264c5d05e4ff52e6090b3592e7526f5d5f5a844add6bbdd17c071c911" +checksum = "0680a2f7d4bbc6f48c0cb43368fa544918a1fa291e772bdb47c834ade338f363" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "alloy-trie", "borsh", "serde", @@ -429,9 +446,9 @@ dependencies = [ [[package]] name = "alloy-json-abi" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c36c9d7f9021601b04bfef14a4b64849f6d73116a4e91e071d7fbfe10247901" +checksum = "858acd7fdad1e4a7057fd9c1b39c1f2cd6bcd57ebf3c56e2853c02ead049e816" dependencies = [ "alloy-primitives", "alloy-sol-type-parser", @@ -456,9 +473,9 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4691c60de5d628533752cd07e102d17c47874c06c04c91af33960fd94c484f4" +checksum = "fff9cb760601d352d1e59aab5803c3fb6dc99824b6883f5c7a781aacd4b54c66" dependencies = [ "alloy-primitives", "alloy-sol-types", @@ -497,20 +514,20 @@ dependencies = [ [[package]] name = "alloy-network" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d912bb639bf4ac31e83095afe9e907c8b9774ce0c405966228368309fcfc45f" +checksum = "f263c8d752b15e19b7c2d3cbad00338ec2d7cc923a46cd1ff98aea2fa333166b" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-consensus-any 2.1.1", - "alloy-eips 2.1.1", - "alloy-json-rpc 2.1.1", - "alloy-network-primitives 2.1.1", + "alloy-consensus 2.4.2", + "alloy-consensus-any 2.4.2", + "alloy-eips 2.5.0", + "alloy-json-rpc 2.5.0", + "alloy-network-primitives 2.4.2", "alloy-primitives", - "alloy-rpc-types-any 2.1.1", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", - "alloy-signer 2.1.1", + "alloy-rpc-types-any 2.4.2", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", + "alloy-signer 2.5.0", "alloy-sol-types", "async-trait", "auto_impl", @@ -536,14 +553,14 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d875a11bd98595f57f73890f2e36f4a1cca0fa670623e59c9fb08b2389979c36" +checksum = "8795eecf50374a0dd942caff57922c59333c9991ead9eccbbc1709f55d73c7c2" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "serde", ] @@ -551,8 +568,8 @@ dependencies = [ name = "alloy-op-evm" version = "0.32.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-hardforks", "alloy-op-hardforks", @@ -579,9 +596,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4885c1409b6936c4898e646ef58baf6ec54edaf6d8179f79df805a7b85b7cf3e" +checksum = "d5e9dbd49258ac3ab893a481d46be29b58be7f734dcac46cd80b6b13ee36566c" dependencies = [ "alloy-rlp", "arbitrary", @@ -612,24 +629,24 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7d526d184d392a8fbcf4293e457789b307bb70646e4f8b902989a246529450" +checksum = "ef487e44dfae9c87cb732989d3f43682f65aefb11a0f56045b26be357f671fcf" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-json-rpc 2.1.1", - "alloy-network 2.1.1", - "alloy-network-primitives 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-json-rpc 2.5.0", + "alloy-network 2.4.2", + "alloy-network-primitives 2.4.2", "alloy-primitives", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-rpc-types-trace", - "alloy-signer 2.1.1", + "alloy-signer 2.5.0", "alloy-sol-types", "alloy-transport", "alloy-transport-http", @@ -642,7 +659,8 @@ dependencies = [ "either", "futures", "futures-utils-wasm", - "lru 0.16.4", + "http 1.4.0", + "lru 0.18.2", "parking_lot", "pin-project", "reqwest 0.13.2", @@ -657,11 +675,11 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fa5976a77e32a63152e937fa90d0dae1f8142b41a9a99a6386d6ea58934cfa6" +checksum = "fcf12a49e488baefa21619f3ec2ce39f20857153aa1e91619fb5c1ce4d69d893" dependencies = [ - "alloy-json-rpc 2.1.1", + "alloy-json-rpc 2.5.0", "alloy-primitives", "alloy-transport", "auto_impl", @@ -701,11 +719,11 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755447dc13a04c6fa6db8dedb5d32ab5edfa4dd7aa34487ff192a3d873e0e8cf" +checksum = "98267c2d47f9c185b575bac3f772a8ca66bcbd712693535e50980c12eab80a42" dependencies = [ - "alloy-json-rpc 2.1.1", + "alloy-json-rpc 2.5.0", "alloy-primitives", "alloy-pubsub", "alloy-transport", @@ -727,23 +745,23 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96deb317fe224e98a8ae17a7ed7ea63478867385bf50b7abd53642b24cfd811a" +checksum = "637fed69eda26e19fb42314006570519003c1bfc338c54165e610a657e3b46ff" dependencies = [ "alloy-primitives", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "serde", ] [[package]] name = "alloy-rpc-types-admin" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3279cb55f7069c2fb1dbcd9ab2c6e79a02d63c92fd0b850addea0a3715d6b05f" +checksum = "f91f1a1fa4d3c95ea5dba30c02d8987f0c052137dd7f1d55086cf36270517cbc" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -753,13 +771,13 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f89d27756bf3effdac25d07692724e840ce90ca1ff956a6b47dd2ae1612f597" +checksum = "848bfe2315338ec605863073aae54a90fcea9cec7e6855a9e93d988bf42e9740" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "serde", ] @@ -776,26 +794,26 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "911a513723ef0b90c3b072f65eebf54d6ebc8b651d06734e252d024bd89b88ac" +checksum = "1176430031ba27abfb51b95516cf71e8ce3ff4172c72f3136627f0f89813a739" dependencies = [ - "alloy-consensus-any 2.1.1", - "alloy-network-primitives 2.1.1", + "alloy-consensus-any 2.4.2", + "alloy-network-primitives 2.4.2", "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "serde", "serde_json", ] [[package]] name = "alloy-rpc-types-beacon" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81133671b8da58169589aac996f3c4da23bbdee85b13ecee7098065f3eae718a" +checksum = "c20f226662436bbdc221c9156a1f445c257da5e695b39a26878aa8b2644f710e" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "derive_more 2.1.1", @@ -811,9 +829,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-debug" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e9c1f9ac81c56b2d96901201db7eb95c4e9fc3c21237a4690f8c652aa62089" +checksum = "ce17ebd75d90c490897ca320e34bd5c95e0d8620d35ba5842aee9e7b5a90ea21" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -824,15 +842,15 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1f682c4881aa7000ac7cc86d7aeeb3b09836a77a90b329820140233651aeea" +checksum = "0a43d7b6b86be4885c7a76f1dfcde9651af2d419ff571e8ee7257de47101203b" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "arbitrary", "derive_more 2.1.1", "ethereum_ssz", @@ -857,7 +875,7 @@ dependencies = [ "alloy-rlp", "alloy-serde 1.8.3", "alloy-sol-types", - "itertools 0.13.0", + "itertools 0.14.0", "serde", "serde_json", "serde_with", @@ -866,20 +884,20 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1bd19904581ee2075b61faabab1a4cefa8b96d8f2c85343adeae8ecf615e2b" +checksum = "756eb5803e70985be4066b636194ccb5f6629e5d141817c1f0c50cea8350bf5c" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-consensus-any 2.1.1", - "alloy-eips 2.1.1", - "alloy-network-primitives 2.1.1", + "alloy-consensus 2.4.2", + "alloy-consensus-any 2.4.2", + "alloy-eips 2.5.0", + "alloy-network-primitives 2.4.2", "alloy-primitives", "alloy-rlp", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "alloy-sol-types", "arbitrary", - "itertools 0.13.0", + "itertools 0.14.0", "serde", "serde_json", "serde_with", @@ -888,28 +906,28 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54c635f0c45a871b55c276653e3838d1687d86282eeaf3d83a1914e02563b3f2" +checksum = "c833a9b946d827d2b2aa8cad8e92279a4340ec1b7cf666f3e1ee6ef4684e0159" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "serde", "serde_json", ] [[package]] name = "alloy-rpc-types-trace" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "796729a4e1783904c6040f11a503c4d55ddb16f69dc199ad15e50c4ad039f371" +checksum = "1933d60c2f51b8906103484ea2ca2218357264dbf16f948f7c2dd4ac5818e1d8" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "serde", "serde_json", "thiserror 2.0.18", @@ -917,13 +935,13 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8533c450895de79eb581875bfc317d1a239ae71aba79e20ee158fa153268f163" +checksum = "2eb5d708e45799bd963d7e3bd8d04110e90983833ed02f91a9099811ed39ce6d" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "serde", ] @@ -940,9 +958,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e97b3e0b9f816b25083045dcfa69431bd059a078e828e4d82d296d1949b96c" +checksum = "4f44f297d3b9e3ca2c3039e3c0ed69acde9b35edda15381cf78f725b7263fbe2" dependencies = [ "alloy-primitives", "arbitrary", @@ -967,9 +985,9 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6913d06ccc0d9c6ab67e2f82e2fbe292706da1f91442f30cded2d04b56bf0d58" +checksum = "e7de6fd34b5ba1789d482fa800dd97219b34765d6b07633a989a24d2dace770e" dependencies = [ "alloy-primitives", "async-trait", @@ -1017,14 +1035,14 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c880813cd26bd1ddf8c2236e31295896efd1fcc5cc761d8894ae894503aeea53" +checksum = "58c81472fb0b73cbb18106e323e33e3f249f56318a330a8e0f6aa6e913e3519a" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-network 2.1.1", + "alloy-consensus 2.4.2", + "alloy-network 2.4.2", "alloy-primitives", - "alloy-signer 2.1.1", + "alloy-signer 2.5.0", "async-trait", "coins-bip32", "coins-bip39", @@ -1036,13 +1054,13 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840128ed2b2971d6d4668a553fe403a82683d3acc646c73e75887e7157408033" +checksum = "60dd79f578c3912f1fc2a150dbeb8110b8cfb976c60f98ebf6de9d5da5965a2b" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error2", + "proc-macro-error3", "proc-macro2", "quote", "syn 2.0.117", @@ -1050,16 +1068,16 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ec265e5d65d725175f6ca7711c970824c90ef9c0d1f1973711d4150ee612dd" +checksum = "9edb8520f2f94275e1caa73c85207dcc78ec402a9a4c429240f9a0783a8f16c0" dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", "heck", "indexmap 2.14.0", - "proc-macro-error2", + "proc-macro-error3", "proc-macro2", "quote", "sha3 0.11.0", @@ -1069,9 +1087,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89bf01077f18650876cfa682eb1f949967b5cde03f1a51c955c469d2c9b4aa67" +checksum = "66af2d9344882172993be5f5cbfd349fdfa52cb548f7af8715b446fb35ef6001" dependencies = [ "alloy-json-abi", "const-hex", @@ -1087,9 +1105,9 @@ dependencies = [ [[package]] name = "alloy-sol-type-parser" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "857b470ecdd2ed38beaf82ad1a38c516a8ff75266750f38b9eeed001d575241b" +checksum = "77c2a8abc3334044013b23d5e438cc5dc802e5544cc42b713d0840d5185967cc" dependencies = [ "serde", "winnow 1.0.1", @@ -1097,9 +1115,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384cf252de0db2dec52821eac037a7f57e2aa33fe5b900ce6fe39973402341f1" +checksum = "3e6f87cf007caa54e95455875fbd25879b008d0d9c7c340a2c258b3a3400a28c" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -1109,11 +1127,11 @@ dependencies = [ [[package]] name = "alloy-transport" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "999adfe5c91035c6bf4c4210e0eb8d0caed79d76fbf5e1b70d78721f6097ac04" +checksum = "e10be13ab13ddadcfaec3320cc6cee83548a1ae32ada214ff864604cbf5c6f77" dependencies = [ - "alloy-json-rpc 2.1.1", + "alloy-json-rpc 2.5.0", "auto_impl", "base64 0.22.1", "derive_more 2.1.1", @@ -1132,18 +1150,18 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e79a2c1793afc61eed9ca0963da370a988b27d2bbfa67c78013e262d47424c4" +checksum = "e38c841f63141cad3f1a4378cedf121914b32932cf09b66c6006d4a906112136" dependencies = [ - "alloy-json-rpc 2.1.1", + "alloy-json-rpc 2.5.0", "alloy-rpc-types-engine", "alloy-transport", "http-body-util", "hyper", "hyper-tls", "hyper-util", - "itertools 0.13.0", + "itertools 0.14.0", "jsonwebtoken", "reqwest 0.13.2", "serde_json", @@ -1154,16 +1172,17 @@ dependencies = [ [[package]] name = "alloy-transport-ipc" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24422d5159996688b0c094babf1969cb0197d453902da483711c92c1624fea2" +checksum = "a757d266eb7927d59a04878c99b450df0da49125e61d641f48fa7c6a82dd4418" dependencies = [ - "alloy-json-rpc 2.1.1", + "alloy-json-rpc 2.5.0", "alloy-pubsub", "alloy-transport", "bytes", "futures", "interprocess", + "memchr", "pin-project", "serde", "serde_json", @@ -1174,9 +1193,9 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bea36621cd4e4f06c1243e556b32fdc9c4db7b9b09b72a95a87383c0ffcc625" +checksum = "8c799e5804cadb4a09e0ff21be230cc1025e5a21e02a41aa9c0022fdb41f830f" dependencies = [ "alloy-pubsub", "alloy-transport", @@ -1185,7 +1204,7 @@ dependencies = [ "rustls", "serde_json", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.29.0", "tracing", "url", "ws_stream_wasm", @@ -1225,9 +1244,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "2.1.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406bc1183f6843e0aba09f7b3365e828b597213d60793ba5cb41befc863e3a78" +checksum = "60fa90c57738ace5b38106c9f743f3d6d47de09a82e82ecfc42702c1acf116ee" dependencies = [ "darling", "proc-macro2", @@ -1380,22 +1399,34 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3df4dcc01ff89867cd86b0da835f23c3f02738353aaee7dde7495af71363b8d5" dependencies = [ - "ark-ec", + "ark-ec 0.5.0", "ark-ff 0.5.0", "ark-serialize 0.5.0", "ark-std 0.5.0", ] +[[package]] +name = "ark-bls12-381" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be2ede2c0c96fa37d5d3484e8a59fec566c4a52b8c84bf993eaa6c67d7225a4c" +dependencies = [ + "ark-ec 0.6.0", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", +] + [[package]] name = "ark-bn254" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" +checksum = "6bc66f96ebe2a17a499475b4f94791d379817592ef494171586967ffdc6f95db" dependencies = [ - "ark-ec", - "ark-ff 0.5.0", + "ark-ec 0.6.0", + "ark-ff 0.6.0", "ark-r1cs-std", - "ark-std 0.5.0", + "ark-std 0.6.0", ] [[package]] @@ -1406,7 +1437,7 @@ checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" dependencies = [ "ahash", "ark-ff 0.5.0", - "ark-poly", + "ark-poly 0.5.0", "ark-serialize 0.5.0", "ark-std 0.5.0", "educe", @@ -1419,6 +1450,27 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8352a2b2aedf6ba2cc38f7520fc51191d518dde96175c729af19f2d059f191c4" +dependencies = [ + "ahash", + "ark-ff 0.6.0", + "ark-poly 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "educe", + "fnv", + "hashbrown 0.17.0", + "itertools 0.14.0", + "num-bigint 0.4.6", + "num-integer", + "num-traits", + "zeroize", +] + [[package]] name = "ark-ff" version = "0.3.0" @@ -1600,17 +1652,33 @@ dependencies = [ "hashbrown 0.15.5", ] +[[package]] +name = "ark-poly" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f55af10b672002b8d953e230282c51206842e20e5791a94432219b4201de5c" +dependencies = [ + "ahash", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "educe", + "fnv", + "hashbrown 0.17.0", +] + [[package]] name = "ark-r1cs-std" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "941551ef1df4c7a401de7068758db6503598e6f01850bdb2cfdb614a1f9dbea1" +checksum = "291f1c6628bfcac79b0dc2adbe401aa9100e2e96daa971645e0b18fc94de9a98" dependencies = [ - "ark-ec", - "ark-ff 0.5.0", + "ark-ec 0.6.0", + "ark-ff 0.6.0", "ark-relations", - "ark-std 0.5.0", + "ark-std 0.6.0", "educe", + "itertools 0.14.0", "num-bigint 0.4.6", "num-integer", "num-traits", @@ -1619,14 +1687,18 @@ dependencies = [ [[package]] name = "ark-relations" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec46ddc93e7af44bcab5230937635b06fb5744464dd6a7e7b083e80ebd274384" +checksum = "fe4c11c797a64b8a23e22bf4e77bf582ac27bb21395e3183a9a506ba2561e9f9" dependencies = [ - "ark-ff 0.5.0", - "ark-std 0.5.0", + "ark-ff 0.6.0", + "ark-poly 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "foldhash 0.1.5", + "indexmap 2.14.0", "tracing", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] @@ -2605,7 +2677,7 @@ dependencies = [ "bitflags 2.11.1", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", "regex", @@ -2817,7 +2889,7 @@ dependencies = [ "hashbrown 0.16.1", "indexmap 2.14.0", "once_cell", - "phf", + "phf 0.13.1", "rustc-hash", "static_assertions", ] @@ -3075,9 +3147,9 @@ dependencies = [ [[package]] name = "c-kzg" -version = "2.1.7" +version = "2.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6648ed1e4ea8e8a1a4a2c78e1cda29a3fd500bc622899c340d8525ea9a76b24a" +checksum = "38d04308254695569fdb9bfe3bacc1c91837a670d0806605eb82d63748fbd3a6" dependencies = [ "arbitrary", "blst", @@ -3423,7 +3495,7 @@ dependencies = [ "const-hex", "digest 0.10.7", "generic-array 0.14.7", - "ripemd", + "ripemd 0.1.3", "serde", "sha2 0.10.9", "sha3 0.10.8", @@ -3443,7 +3515,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c" dependencies = [ "lazy_static", - "windows-sys 0.59.0", + "windows-sys 0.48.0", ] [[package]] @@ -4032,7 +4104,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de" dependencies = [ "data-encoding", - "syn 1.0.109", + "syn 2.0.117", ] [[package]] @@ -4756,7 +4828,7 @@ dependencies = [ "kona-disc", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -4799,7 +4871,7 @@ dependencies = [ "op-alloy-rpc-types-engine", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -4820,7 +4892,7 @@ dependencies = [ "kona-executor", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "url", ] @@ -5940,7 +6012,7 @@ dependencies = [ "libc", "percent-encoding", "pin-project-lite", - "socket2 0.6.5", + "socket2 0.5.10", "system-configuration", "tokio", "tower-layer", @@ -6812,15 +6884,15 @@ dependencies = [ "thiserror 2.0.18", "tracing", "tracing-appender", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] name = "kona-client" version = "1.0.2" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", "alloy-primitives", @@ -6859,8 +6931,8 @@ dependencies = [ name = "kona-derive" version = "0.4.5" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", @@ -6881,7 +6953,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -6910,7 +6982,7 @@ dependencies = [ name = "kona-driver" version = "0.4.0" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-evm", "alloy-primitives", "async-trait", @@ -6929,15 +7001,15 @@ dependencies = [ name = "kona-engine" version = "0.1.2" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-hardforks", - "alloy-network 2.1.1", + "alloy-network 2.4.2", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-transport", "alloy-transport-http", "arbitrary", @@ -6970,8 +7042,8 @@ dependencies = [ name = "kona-executor" version = "0.4.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", "alloy-op-hardforks", @@ -7007,8 +7079,8 @@ name = "kona-genesis" version = "0.4.5" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", "alloy-op-hardforks", @@ -7030,8 +7102,8 @@ name = "kona-gossip" version = "0.1.2" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", @@ -7071,7 +7143,7 @@ dependencies = [ name = "kona-hardforks" version = "0.4.5" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "anyhow", "kona-genesis", @@ -7087,16 +7159,16 @@ dependencies = [ name = "kona-host" version = "1.0.2" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-json-rpc 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-json-rpc 2.5.0", "alloy-op-evm", "alloy-primitives", "alloy-provider", "alloy-rlp", "alloy-rpc-client", "alloy-rpc-types", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "alloy-transport", "alloy-transport-http", "anyhow", @@ -7130,18 +7202,18 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] name = "kona-interop" version = "0.4.5" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "alloy-sol-types", "arbitrary", "async-trait", @@ -7166,7 +7238,7 @@ version = "0.1.2" name = "kona-mpt" version = "0.3.0" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-provider", "alloy-rlp", @@ -7192,8 +7264,8 @@ dependencies = [ "alloy-primitives", "alloy-provider", "alloy-rpc-types-engine", - "alloy-signer 2.1.1", - "alloy-signer-local 2.1.1", + "alloy-signer 2.5.0", + "alloy-signer-local 2.4.2", "alloy-transport", "alloy-transport-http", "anyhow", @@ -7236,7 +7308,7 @@ dependencies = [ "tokio-stream", "tokio-util", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "url", ] @@ -7245,15 +7317,15 @@ name = "kona-node-service" version = "0.1.3" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", - "alloy-signer 2.1.1", - "alloy-signer-local 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-signer 2.5.0", + "alloy-signer-local 2.4.2", "alloy-transport", "alloy-transport-http", "anyhow", @@ -7303,7 +7375,7 @@ dependencies = [ name = "kona-peers" version = "0.1.2" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rlp", "arbitrary", @@ -7347,14 +7419,14 @@ dependencies = [ name = "kona-proof" version = "0.3.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", "alloy-primitives", "alloy-rlp", "alloy-trie", - "ark-bls12-381", + "ark-bls12-381 0.5.0", "ark-ff 0.5.0", "async-trait", "c-kzg", @@ -7387,8 +7459,8 @@ dependencies = [ name = "kona-proof-interop" version = "0.2.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", "alloy-primitives", @@ -7422,15 +7494,15 @@ name = "kona-protocol" version = "0.4.5" dependencies = [ "alloc-no-stdlib", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-hardforks", "alloy-op-hardforks", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "alloy-sol-types", "ambassador", "arbitrary", @@ -7455,7 +7527,7 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "unsigned-varint", ] @@ -7463,14 +7535,14 @@ dependencies = [ name = "kona-providers-alloy" version = "0.3.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "alloy-transport", "alloy-transport-http", "async-trait", @@ -7492,7 +7564,7 @@ dependencies = [ "serde_json", "thiserror 2.0.18", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.28.0", "tower 0.5.3", "tracing", ] @@ -7501,8 +7573,8 @@ dependencies = [ name = "kona-providers-local" version = "0.1.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "async-trait", "kona-derive", @@ -7522,7 +7594,7 @@ name = "kona-registry" version = "0.4.5" dependencies = [ "alloy-chains", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", "alloy-op-hardforks", @@ -7539,7 +7611,7 @@ dependencies = [ name = "kona-rpc" version = "0.3.2" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-client", "alloy-rpc-types-engine", @@ -7571,7 +7643,7 @@ dependencies = [ name = "kona-safedb" version = "0.1.0" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "kona-protocol", "rocksdb", @@ -7597,8 +7669,8 @@ version = "0.1.2" dependencies = [ "alloy-primitives", "alloy-rpc-client", - "alloy-signer 2.1.1", - "alloy-signer-local 2.1.1", + "alloy-signer 2.5.0", + "alloy-signer-local 2.4.2", "alloy-transport", "alloy-transport-http", "derive_more 2.1.1", @@ -7621,8 +7693,8 @@ version = "0.0.1" name = "kona-sp1-client-utils" version = "0.0.1" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", "alloy-primitives", @@ -7660,8 +7732,8 @@ name = "kona-sp1-ethereum-client-utils" version = "0.0.1" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-op-evm", "alloy-primitives", "alloy-rlp", @@ -7690,8 +7762,8 @@ dependencies = [ name = "kona-sp1-host-utils" version = "0.0.1" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "anyhow", "async-trait", @@ -7718,22 +7790,22 @@ dependencies = [ "strum", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] name = "kona-sp1-proposer" version = "0.1.0" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-contract", - "alloy-eips 2.1.1", - "alloy-network 2.1.1", + "alloy-eips 2.5.0", + "alloy-network 2.4.2", "alloy-primitives", "alloy-provider", "alloy-rpc-client", - "alloy-rpc-types-eth 2.1.1", - "alloy-signer-local 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-signer-local 2.4.2", "alloy-sol-types", "alloy-transport-http", "anyhow", @@ -7788,7 +7860,7 @@ dependencies = [ "sp1-sdk", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -7842,7 +7914,7 @@ dependencies = [ "tempfile", "tokio", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "url", ] @@ -8443,7 +8515,7 @@ dependencies = [ "generator", "scoped-tls", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -9218,7 +9290,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ - "proc-macro-crate 3.5.0", + "proc-macro-crate 1.3.1", "proc-macro2", "quote", "syn 2.0.117", @@ -9334,14 +9406,14 @@ dependencies = [ name = "op-alloy-consensus" version = "2.0.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-network 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-network 2.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", - "alloy-signer 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", + "alloy-signer 2.5.0", "arbitrary", "bincode 2.0.1", "bytes", @@ -9367,10 +9439,10 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" name = "op-alloy-network" version = "2.0.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-network 2.1.1", + "alloy-consensus 2.4.2", + "alloy-network 2.4.2", "alloy-provider", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "op-alloy-consensus", "op-alloy-rpc-types", ] @@ -9379,7 +9451,7 @@ dependencies = [ name = "op-alloy-provider" version = "2.0.0" dependencies = [ - "alloy-network 2.1.1", + "alloy-network 2.4.2", "alloy-primitives", "alloy-provider", "alloy-rpc-types-engine", @@ -9400,14 +9472,14 @@ dependencies = [ name = "op-alloy-rpc-types" version = "2.0.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-network 2.1.1", - "alloy-network-primitives 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-network 2.4.2", + "alloy-network-primitives 2.4.2", "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", - "alloy-signer 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", + "alloy-signer 2.5.0", "arbitrary", "derive_more 2.1.1", "jsonrpsee", @@ -9424,12 +9496,12 @@ dependencies = [ name = "op-alloy-rpc-types-engine" version = "2.0.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "arbitrary", "arbtest", "ethereum_ssz", @@ -9483,7 +9555,7 @@ dependencies = [ name = "op-reth-sdm-fixture" version = "0.0.0" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-evm", "alloy-op-evm", "alloy-primitives", @@ -9520,8 +9592,8 @@ dependencies = [ name = "op-reth-test-engine" version = "0.1.0" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", "reth-db", @@ -9539,7 +9611,7 @@ dependencies = [ name = "op-revm" version = "20.0.0" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-sol-types", "auto_impl", @@ -9651,7 +9723,7 @@ dependencies = [ "opentelemetry 0.32.0", "tracing", "tracing-core", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -10204,8 +10276,18 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" dependencies = [ - "phf_macros", - "phf_shared", + "phf_macros 0.13.1", + "phf_shared 0.13.1", +] + +[[package]] +name = "phf" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "010378780309880b08997fae13be7834dba947d36393bd372f2b1556deb2a2f6" +dependencies = [ + "phf_macros 0.14.0", + "phf_shared 0.14.0", "serde", ] @@ -10216,7 +10298,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" dependencies = [ "fastrand", - "phf_shared", + "phf_shared 0.13.1", +] + +[[package]] +name = "phf_generator" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aeb62e0959d5a1bebc965f4d15d9e2b7cea002b6b0f5ba8cde6cc26738467100" +dependencies = [ + "fastrand", + "phf_shared 0.14.0", ] [[package]] @@ -10225,8 +10317,21 @@ version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef" dependencies = [ - "phf_generator", - "phf_shared", + "phf_generator 0.13.1", + "phf_shared 0.13.1", + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "phf_macros" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fa8d0ca26d424d27630da600c6624696e7dec8bf7b3b492b383c5dc49e5e085" +dependencies = [ + "phf_generator 0.14.0", + "phf_shared 0.14.0", "proc-macro2", "quote", "syn 2.0.117", @@ -10241,6 +10346,15 @@ dependencies = [ "siphasher", ] +[[package]] +name = "phf_shared" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6fd9027e2d9319be6349febd1db4e8d02aa544921200c9b777720ac34a3aa89" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.13" @@ -10519,6 +10633,16 @@ dependencies = [ "quote", ] +[[package]] +name = "proc-macro-error-attr3" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82366fd7d8b7a440d66d13418820c69df9b3908bcb1a0476d7f5ce5d12f5a04d" +dependencies = [ + "proc-macro2", + "quote", +] + [[package]] name = "proc-macro-error2" version = "2.0.1" @@ -10531,6 +10655,18 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "proc-macro-error3" +version = "3.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b511283ea8a74b4b39447b128c5d00f03a356b7424554b13e298a5550100d9ac" +dependencies = [ + "proc-macro-error-attr3", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "proc-macro2" version = "1.0.106" @@ -10665,7 +10801,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" dependencies = [ "heck", - "itertools 0.10.5", + "itertools 0.12.1", "log", "multimap", "once_cell", @@ -10697,7 +10833,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.117", @@ -10710,7 +10846,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.10.5", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.117", @@ -10789,7 +10925,7 @@ dependencies = [ "quinn-udp", "rustc-hash", "rustls", - "socket2 0.6.5", + "socket2 0.5.10", "thiserror 2.0.18", "tokio", "tracing", @@ -10828,7 +10964,7 @@ dependencies = [ "cfg_aliases", "libc", "once_cell", - "socket2 0.6.5", + "socket2 0.5.10", "tracing", "windows-sys 0.60.2", ] @@ -11343,11 +11479,11 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "reth-basic-payload-builder" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "futures-core", "futures-util", @@ -11370,20 +11506,19 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", - "alloy-signer 2.1.1", - "alloy-signer-local 2.1.1", + "alloy-signer 2.5.0", + "alloy-signer-local 2.4.2", "derive_more 2.1.1", "metrics", "parking_lot", "pin-project", "rand 0.9.4", - "rayon", "reth-chainspec", "reth-errors", "reth-ethereum-primitives", @@ -11391,7 +11526,6 @@ dependencies = [ "reth-metrics", "reth-primitives-traits", "reth-storage-api", - "reth-tasks", "reth-trie", "reth-trie-sparse", "revm", @@ -11403,12 +11537,12 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", "alloy-primitives", @@ -11423,8 +11557,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-genesis", "clap", @@ -11436,12 +11570,12 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "arbitrary", @@ -11525,8 +11659,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "reth-tasks", "tokio", @@ -11535,10 +11669,10 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "cfg-if", "eyre", @@ -11556,12 +11690,12 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb43f4858fef4e3b42b80954d2edf1ff67c8ad7498347083cdc7d0f6eff2f081" +checksum = "1f0dd7f542fbcae0e490ebe13f3eababcc05547375246ff7f62700b533cf3f01" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", "alloy-trie", @@ -11577,9 +11711,9 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5798ae4d6b264764bc0d742468bd32c7fb515e774645d4930f95ff6311f3ae14" +checksum = "e7e508fcbb8cb775639dbbb56b81b62756d4322f28e76c60a52aa32575f993fe" dependencies = [ "proc-macro2", "quote", @@ -11588,11 +11722,12 @@ dependencies = [ [[package]] name = "reth-config" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "eyre", "humantime-serde", + "reth-network-peers", "reth-network-types", "reth-prune-types", "reth-stages-types", @@ -11604,10 +11739,10 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-eip7928 0.4.5", "alloy-primitives", "auto_impl", @@ -11618,11 +11753,11 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "reth-chainspec", "reth-consensus", @@ -11631,12 +11766,12 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-json-rpc 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-json-rpc 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-types-engine", @@ -11656,8 +11791,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "derive_more 2.1.1", @@ -11685,10 +11820,10 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "arbitrary", "arrayvec", @@ -11711,10 +11846,10 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-genesis", "alloy-primitives", "boyer-moore-magiclen", @@ -11741,10 +11876,10 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "arbitrary", "bytes", @@ -11756,8 +11891,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -11781,8 +11916,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -11805,8 +11940,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "dashmap", @@ -11829,11 +11964,11 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "async-compression", @@ -11864,19 +11999,19 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-network 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-network 2.4.2", "alloy-primitives", "alloy-provider", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", - "alloy-signer 2.1.1", - "alloy-signer-local 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-signer 2.5.0", + "alloy-signer-local 2.4.2", "derive_more 2.1.1", "eyre", "futures-util", @@ -11921,8 +12056,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "aes", "alloy-primitives", @@ -11948,10 +12083,10 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rpc-types-engine", "eyre", @@ -11971,11 +12106,11 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", @@ -11998,12 +12133,12 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", "alloy-rlp", @@ -12014,6 +12149,7 @@ dependencies = [ "indexmap 2.14.0", "metrics", "moka", + "parking_lot", "rayon", "reth-chain-state", "reth-chainspec", @@ -12037,11 +12173,11 @@ dependencies = [ "reth-stages", "reth-stages-api", "reth-static-file", + "reth-storage-overlay", "reth-tasks", "reth-tracing", "reth-trie", "reth-trie-common", - "reth-trie-db", "reth-trie-parallel", "reth-trie-sparse", "revm", @@ -12053,10 +12189,10 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", @@ -12083,11 +12219,11 @@ dependencies = [ [[package]] name = "reth-era" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-beacon", @@ -12101,8 +12237,8 @@ dependencies = [ [[package]] name = "reth-era-downloader" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "bytes", @@ -12117,14 +12253,15 @@ dependencies = [ [[package]] name = "reth-era-utils" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rlp", "eyre", "futures-util", + "reth-codecs", "reth-db-api", "reth-era", "reth-era-downloader", @@ -12140,8 +12277,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -12151,8 +12288,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-chains", "alloy-primitives", @@ -12180,16 +12317,17 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-hardforks", "alloy-primitives", "alloy-rlp", + "alloy-trie", "arbitrary", "bytes", "derive_more 2.1.1", @@ -12205,11 +12343,11 @@ dependencies = [ [[package]] name = "reth-ethereum" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "reth-chainspec", "reth-cli-util", "reth-codecs", @@ -12246,8 +12384,8 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "clap", "eyre", @@ -12269,11 +12407,11 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "reth-chainspec", "reth-consensus", @@ -12285,10 +12423,10 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "reth-engine-primitives", @@ -12301,8 +12439,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -12315,11 +12453,11 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", @@ -12345,13 +12483,13 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "reth-codecs", "reth-primitives-traits", "serde", @@ -12359,8 +12497,8 @@ dependencies = [ [[package]] name = "reth-etl" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "rayon", "reth-db-api", @@ -12369,16 +12507,17 @@ dependencies = [ [[package]] name = "reth-evm" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", "auto_impl", "derive_more 2.1.1", + "fixed-cache", "futures-util", "metrics", "rayon", @@ -12394,11 +12533,11 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", "alloy-rpc-types-engine", @@ -12414,8 +12553,8 @@ dependencies = [ [[package]] name = "reth-execution-cache" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "fixed-cache", @@ -12432,8 +12571,8 @@ dependencies = [ [[package]] name = "reth-execution-errors" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-evm", "alloy-primitives", @@ -12445,11 +12584,11 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", "alloy-rlp", @@ -12464,11 +12603,11 @@ dependencies = [ [[package]] name = "reth-exex" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "eyre", "futures", @@ -12502,10 +12641,10 @@ dependencies = [ [[package]] name = "reth-exex-test-utils" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "eyre", "futures-util", "reth-chainspec", @@ -12534,10 +12673,10 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "reth-chain-state", "reth-execution-types", @@ -12548,8 +12687,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "serde", "serde_json", @@ -12558,10 +12697,10 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-debug", @@ -12584,8 +12723,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "bytes", "futures", @@ -12604,8 +12743,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "bitflags 2.11.1", "byteorder", @@ -12621,8 +12760,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "bindgen", "cc", @@ -12630,10 +12769,11 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "futures", + "libc", "metrics", "metrics-derive", "reth-primitives-traits", @@ -12643,8 +12783,8 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "ipnet", @@ -12652,8 +12792,8 @@ dependencies = [ [[package]] name = "reth-net-nat" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "futures-util", "if-addrs 0.14.0", @@ -12666,11 +12806,11 @@ dependencies = [ [[package]] name = "reth-network" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "aquamarine", @@ -12696,6 +12836,7 @@ dependencies = [ "reth-eth-wire-types", "reth-ethereum-forks", "reth-ethereum-primitives", + "reth-evm", "reth-evm-ethereum", "reth-fs-util", "reth-metrics", @@ -12724,13 +12865,13 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rpc-types-admin", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "auto_impl", "derive_more 2.1.1", "enr", @@ -12749,12 +12890,12 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "auto_impl", "derive_more 2.1.1", @@ -12773,8 +12914,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -12788,8 +12929,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -12802,8 +12943,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "anyhow", "bincode 1.3.3", @@ -12819,8 +12960,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -12843,11 +12984,11 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-types", @@ -12897,11 +13038,11 @@ dependencies = [ "reth-rpc-layer", "reth-stages", "reth-static-file", + "reth-storage-overlay", "reth-tasks", "reth-tokio-util", "reth-tracing", "reth-transaction-pool", - "reth-trie-db", "secp256k1 0.30.0", "serde_json", "tokio", @@ -12911,11 +13052,11 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "clap", @@ -12966,15 +13107,15 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-network 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-network 2.4.2", "alloy-primitives", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "ethereum_ssz", "ethereum_ssz_derive", "eyre", @@ -13015,10 +13156,10 @@ dependencies = [ [[package]] name = "reth-node-ethstats" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "chrono", "futures-util", @@ -13032,18 +13173,18 @@ dependencies = [ "thiserror 2.0.18", "tokio", "tokio-stream", - "tokio-tungstenite", + "tokio-tungstenite 0.29.0", "tracing", "url", ] [[package]] name = "reth-node-events" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "derive_more 2.1.1", @@ -13063,8 +13204,8 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "bytes", "eyre", @@ -13092,8 +13233,8 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "reth-chainspec", "reth-db-api", @@ -13148,8 +13289,8 @@ name = "reth-optimism-chainspec" version = "1.11.3" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", "alloy-op-hardforks", @@ -13180,7 +13321,7 @@ dependencies = [ name = "reth-optimism-cli" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-genesis", "alloy-primitives", "clap", @@ -13224,8 +13365,8 @@ name = "reth-optimism-consensus" version = "1.11.3" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-trie", "op-alloy-consensus", @@ -13254,13 +13395,13 @@ dependencies = [ name = "reth-optimism-evm" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", "alloy-op-evm", "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "op-alloy-consensus", "op-alloy-rpc-types", "op-alloy-rpc-types-engine", @@ -13286,8 +13427,8 @@ dependencies = [ name = "reth-optimism-exex" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "eyre", "futures", "futures-util", @@ -13313,13 +13454,13 @@ dependencies = [ name = "reth-optimism-flashblocks" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-network 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-network 2.4.2", "alloy-primitives", "alloy-rpc-types", "alloy-rpc-types-engine", - "alloy-signer-local 2.1.1", + "alloy-signer-local 2.4.2", "brotli", "derive_more 2.1.1", "eyre", @@ -13351,7 +13492,7 @@ dependencies = [ "serde_json", "test-case", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.28.0", "tracing", "url", ] @@ -13370,18 +13511,18 @@ dependencies = [ name = "reth-optimism-node" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-genesis", - "alloy-network 2.1.1", + "alloy-network 2.4.2", "alloy-op-evm", "alloy-op-hardforks", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-admin", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-rpc-types-trace", - "alloy-signer-local 2.1.1", + "alloy-signer-local 2.4.2", "clap", "eyre", "futures", @@ -13394,6 +13535,7 @@ dependencies = [ "op-alloy-network", "op-alloy-rpc-types-engine", "op-revm", + "reth-basic-payload-builder", "reth-chain-state", "reth-chainspec", "reth-consensus", @@ -13407,6 +13549,7 @@ dependencies = [ "reth-node-api", "reth-node-builder", "reth-node-core", + "reth-node-metrics", "reth-optimism-chainspec", "reth-optimism-consensus", "reth-optimism-evm", @@ -13426,11 +13569,13 @@ dependencies = [ "reth-revm", "reth-rpc", "reth-rpc-api", + "reth-rpc-builder", "reth-rpc-engine-api", "reth-rpc-eth-api", "reth-rpc-eth-types", "reth-rpc-server-types", "reth-stages-types", + "reth-storage-overlay", "reth-tasks", "reth-tracing", "reth-transaction-pool", @@ -13448,14 +13593,14 @@ dependencies = [ name = "reth-optimism-payload-builder" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "derive_more 2.1.1", "op-alloy-consensus", "op-alloy-rpc-types-engine", @@ -13489,8 +13634,8 @@ dependencies = [ name = "reth-optimism-post-exec-replay" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "op-alloy-consensus", "reth-evm", @@ -13508,8 +13653,8 @@ dependencies = [ name = "reth-optimism-primitives" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "arbitrary", @@ -13535,20 +13680,19 @@ dependencies = [ name = "reth-optimism-rpc" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", - "alloy-json-rpc 2.1.1", + "alloy-json-rpc 2.5.0", "alloy-op-evm", "alloy-op-hardforks", "alloy-primitives", - "alloy-rlp", "alloy-rpc-client", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "alloy-transport", "alloy-transport-http", "async-trait", @@ -13611,7 +13755,7 @@ dependencies = [ name = "reth-optimism-storage" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "reth-codecs", "reth-optimism-primitives", "reth-prune-types", @@ -13623,8 +13767,8 @@ dependencies = [ name = "reth-optimism-trie" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", "auto_impl", @@ -13671,13 +13815,13 @@ dependencies = [ name = "reth-optimism-txpool" version = "1.11.3" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", - "alloy-json-rpc 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", + "alloy-json-rpc 2.5.0", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "async-trait", "c-kzg", "derive_more 2.1.1", @@ -13713,10 +13857,10 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rpc-types", "derive_more 2.1.1", @@ -13737,8 +13881,8 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "pin-project", "reth-payload-primitives", @@ -13749,11 +13893,11 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", @@ -13772,36 +13916,36 @@ dependencies = [ [[package]] name = "reth-payload-util" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "reth-transaction-pool", ] [[package]] name = "reth-payload-validator" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-rpc-types-engine", "reth-primitives-traits", ] [[package]] name = "reth-primitives-traits" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f59c928b2865af5bcdbce94800270b7f7798f27a22ca0aabdd2b7d3e6587c9ce" +checksum = "4666a8d5b246650b23e6767a45e46334d352557f473e91c2ea7211cc29291cca" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-trie", "arbitrary", "byteorder", @@ -13825,17 +13969,18 @@ dependencies = [ [[package]] name = "reth-provider" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", "alloy-rpc-types-engine", "eyre", "itertools 0.14.0", + "libc", "metrics", "notify", "parking_lot", @@ -13859,6 +14004,7 @@ dependencies = [ "reth-static-file-types", "reth-storage-api", "reth-storage-errors", + "reth-storage-overlay", "reth-tasks", "reth-tokio-util", "reth-trie", @@ -13873,10 +14019,10 @@ dependencies = [ [[package]] name = "reth-prune" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "itertools 0.14.0", "metrics", @@ -13900,8 +14046,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "arbitrary", @@ -13916,8 +14062,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -13931,16 +14077,16 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-dyn-abi", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", - "alloy-network 2.1.1", + "alloy-network 2.4.2", "alloy-primitives", "alloy-rlp", "alloy-rpc-client", @@ -13949,13 +14095,13 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 2.1.1", - "alloy-signer 2.1.1", - "alloy-signer-local 2.1.1", + "alloy-serde 2.5.0", + "alloy-signer 2.5.0", + "alloy-signer-local 2.4.2", "async-trait", "derive_more 2.1.1", "dyn-clone", @@ -13972,7 +14118,6 @@ dependencies = [ "reth-engine-primitives", "reth-errors", "reth-ethereum-engine-primitives", - "reth-ethereum-primitives", "reth-evm", "reth-evm-ethereum", "reth-execution-types", @@ -14008,12 +14153,12 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-genesis", - "alloy-json-rpc 2.1.1", + "alloy-json-rpc 2.5.0", "alloy-primitives", "alloy-rpc-types", "alloy-rpc-types-admin", @@ -14021,11 +14166,11 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "jsonrpsee", "reth-chain-state", "reth-engine-primitives", @@ -14038,10 +14183,10 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-network 2.1.1", + "alloy-network 2.4.2", "alloy-provider", "dyn-clone", "http 1.4.0", @@ -14081,15 +14226,15 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-evm", - "alloy-json-rpc 2.1.1", - "alloy-network 2.1.1", + "alloy-json-rpc 2.5.0", + "alloy-network 2.4.2", "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "auto_impl", "dyn-clone", "jsonrpsee-types", @@ -14101,10 +14246,10 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", @@ -14132,21 +14277,21 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-dyn-abi", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-evm", - "alloy-json-rpc 2.1.1", - "alloy-network 2.1.1", + "alloy-json-rpc 2.5.0", + "alloy-network 2.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-rpc-types-mev", - "alloy-serde 2.1.1", + "alloy-serde 2.5.0", "async-trait", "auto_impl", "dyn-clone", @@ -14179,19 +14324,19 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-chains", - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-evm", - "alloy-network 2.1.1", + "alloy-network 2.4.2", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "alloy-sol-types", "alloy-transport", "derive_more 2.1.1", @@ -14230,8 +14375,8 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-rpc-types-engine", "http 1.4.0", @@ -14244,10 +14389,10 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "jsonrpsee-core", @@ -14260,25 +14405,25 @@ dependencies = [ [[package]] name = "reth-rpc-traits" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace77dbcdd59c014fda4565ebfec76cd1fe6f5d98584b4655e8d22a947b9eee3" +checksum = "b417a50d3fa9b58bb1a22e46fb47e0866006f24abffa1fbe75ae60116b5b2efa" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-network 2.1.1", + "alloy-consensus 2.4.2", + "alloy-network 2.4.2", "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", - "alloy-signer 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-signer 2.5.0", "reth-primitives-traits", "thiserror 2.0.18", ] [[package]] name = "reth-stages" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rlp", "eyre", @@ -14326,10 +14471,10 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "aquamarine", "auto_impl", @@ -14354,8 +14499,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "arbitrary", @@ -14368,8 +14513,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "parking_lot", @@ -14388,8 +14533,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "clap", @@ -14403,12 +14548,12 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-eip7928 0.4.5", - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", @@ -14429,10 +14574,10 @@ dependencies = [ [[package]] name = "reth-storage-errors" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "derive_more 2.1.1", @@ -14444,10 +14589,37 @@ dependencies = [ "thiserror 2.0.18", ] +[[package]] +name = "reth-storage-overlay" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" +dependencies = [ + "alloy-eips 2.5.0", + "alloy-primitives", + "metrics", + "parking_lot", + "rayon", + "reth-chain-state", + "reth-db-api", + "reth-errors", + "reth-ethereum-primitives", + "reth-metrics", + "reth-primitives-traits", + "reth-prune-types", + "reth-stages-types", + "reth-storage-api", + "reth-storage-errors", + "reth-tasks", + "reth-trie", + "reth-trie-common", + "reth-trie-db", + "tracing", +] + [[package]] name = "reth-tasks" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "crossbeam-utils", "dashmap", @@ -14467,11 +14639,11 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", "rand 0.8.6", @@ -14483,8 +14655,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "tokio", "tokio-stream", @@ -14493,8 +14665,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "clap", "eyre", @@ -14506,15 +14678,15 @@ dependencies = [ "tracing-journald", "tracing-logfmt", "tracing-samply", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "tracing-tracy", "tracy-client", ] [[package]] name = "reth-tracing-otlp" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "base64 0.22.1", "clap", @@ -14526,17 +14698,17 @@ dependencies = [ "opentelemetry_sdk", "tracing", "tracing-opentelemetry", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "url", ] [[package]] name = "reth-transaction-pool" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "aquamarine", @@ -14577,11 +14749,11 @@ dependencies = [ [[package]] name = "reth-trie" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", - "alloy-eips 2.1.1", + "alloy-consensus 2.4.2", + "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-trie", @@ -14596,20 +14768,21 @@ dependencies = [ "reth-storage-errors", "reth-trie-common", "reth-trie-sparse", + "revm", "tracing", "triehash", ] [[package]] name = "reth-trie-common" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ - "alloy-consensus 2.1.1", + "alloy-consensus 2.4.2", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.1.1", - "alloy-serde 2.1.1", + "alloy-rpc-types-eth 2.4.2", + "alloy-serde 2.5.0", "alloy-trie", "arbitrary", "arrayvec", @@ -14629,15 +14802,12 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", - "metrics", - "parking_lot", "reth-db-api", "reth-execution-errors", - "reth-metrics", "reth-primitives-traits", "reth-storage-api", "reth-storage-errors", @@ -14648,8 +14818,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-evm", "alloy-primitives", @@ -14672,8 +14842,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "2.4.0" -source = "git+https://github.com/op-rs/reth?rev=aef8d3ef92117f91455e16969f0adf5bf7c6e9e1#aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" +version = "2.5.2" +source = "git+https://github.com/ethereum-optimism/reth?rev=0fbe428518594611bdd3fdd822eb5968823c8e66#0fbe428518594611bdd3fdd822eb5968823c8e66" dependencies = [ "alloy-primitives", "alloy-trie", @@ -14694,18 +14864,18 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bd4ae4f54a2ba813eef082910bc646bd31cab8ed134308fa71f1068331fb84" +checksum = "80addacffc5df9398c55919f8993922d2b688f2aa5753708fdd658ca3cc63e39" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "41.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d51c254839fb36357d0b02d02e46ba57e683d7b017e2da33b47ae74685a9e59" +checksum = "b7c7fcd426beab3b91300a6d0d5eb8d583c0fad0fba451126e19fd51443eca62" dependencies = [ "revm-bytecode", "revm-context", @@ -14722,21 +14892,21 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33493cf6d996e9242db4f2002caef48ec9aa8c4f3fff3b18aed10ef3942eec7" +checksum = "537356bdec80dbc04e4e6bb688b3441ff7cf18eecdcf3cac23150633c46467f1" dependencies = [ "bitvec", - "phf", + "phf 0.14.0", "revm-primitives", "serde", ] [[package]] name = "revm-context" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e48fc736d9542c082ea5305be44b6a14b53a615f0147ad57f62189fd813068" +checksum = "cc6512f05f83378e29b2b016fa5bd7f5a533e3625548be4113732e1a536c2564" dependencies = [ "bitvec", "cfg-if", @@ -14751,9 +14921,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac68282a454318246817486835a446519291dd0a8167d09de14c7e96f2147696" +checksum = "103fff818b10311034c0c11ff8760294ee0e3c320daab3c5717990fe8ee2617b" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -14767,11 +14937,11 @@ dependencies = [ [[package]] name = "revm-database" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d761681a43e48408ea23f7f66ff56ff7b6128cadb8f9135d1b94787d0c0fc6b4" +checksum = "df72760eab0852100e748c7cb03ce0221626d60ac14534118c84c5cc894fb4c9" dependencies = [ - "alloy-eips 2.1.1", + "alloy-eips 2.5.0", "derive_more 2.1.1", "either", "revm-bytecode", @@ -14783,9 +14953,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e37d62fa60b45987b408486c84ebef4af4e7ddf1b3b96b4955a7263fd4e92" +checksum = "d9286c059a11be1dee814cafdc3a3ade57521c8caa050785a52c19a9d894f400" dependencies = [ "auto_impl", "either", @@ -14807,9 +14977,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "41.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e043ebfc0899c435e44475796285898e4f822e637bd67856da79cc170bd9df" +checksum = "09126175c3fa482e71e80cc28c6bb17e681911e472b94d4f7f73dd6780411798" dependencies = [ "auto_impl", "derive-where", @@ -14826,9 +14996,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "41.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e470b2a5e177918944d8cd26174455b61b8fbfbbe7fe411d28b4097e410d11e" +checksum = "4aa55b208b52f0c083ea68147c78866eeecadd7c0071a614f477de316b60648e" dependencies = [ "auto_impl", "either", @@ -14844,12 +15014,12 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.41.2" +version = "0.42.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54e22e1aa328f78e8c3dea6a3a860a3a3c3a77c4a7e775e3fdd3dcbb24a152ac" +checksum = "90c136a072540987ee442e9824631835520b13e5756f20780a637ba2e11f9c28" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.1.1", + "alloy-rpc-types-eth 2.4.2", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", @@ -14864,9 +15034,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5547f653f9e4c47b4f9a9075a0b7c0faea5fa29b7873f392733a943837825d" +checksum = "fd310927437752ce4bac6997b385772823b84843f04c82e151993bec1265a5ed" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -14877,15 +15047,15 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "41.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d785931e4b8750cf9d79c808c22f05979c8d191baafc8badd4651db82584c1c" +checksum = "f2431091420999795df6a200b9f7933defe3d654710560a895e6bcabbd9954a5" dependencies = [ - "ark-bls12-381", + "ark-bls12-381 0.6.0", "ark-bn254", - "ark-ec", - "ark-ff 0.5.0", - "ark-serialize 0.5.0", + "ark-ec 0.6.0", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", "arrayref", "aurora-engine-modexp", "aws-lc-rs", @@ -14897,17 +15067,17 @@ dependencies = [ "p256", "revm-context-interface", "revm-primitives", - "ripemd", + "ripemd 0.2.0", "secp256k1 0.31.1", - "sha2 0.10.9", + "sha2 0.11.0", "substrate-bn", ] [[package]] name = "revm-primitives" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f39151a31afe93d97f7ac894dd9dcc989368d5ccba19ce079bfc1d73b77452" +checksum = "2ef5564c1bce219fd08beca43d4f39fdcbc19193fa4f604c0c6b58950a13194a" dependencies = [ "alloy-primitives", "once_cell", @@ -14916,9 +15086,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ef2fffc28acc41e8ef7525f2b1d16288a10f80579a1b33e7e62abc9892314a" +checksum = "2c4ae66db3abfcb565854dbfc95513bfa440b3dc390ddf8e50b0363d12a6fa79" dependencies = [ "alloy-eip7928 0.4.5", "bitflags 2.11.1", @@ -14967,6 +15137,15 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "ripemd" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dd4211456b4172d7e44261920c25acf07367c4f04bb5f5d54fc21b090d9b159" +dependencies = [ + "digest 0.11.3", +] + [[package]] name = "rkyv" version = "0.8.17" @@ -16395,7 +16574,7 @@ checksum = "6ae66a23b4bcf032f26afb748bf59b4520357861435123953e400c917bc9f2b5" dependencies = [ "p3-util", "tracing-forest", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -16611,7 +16790,7 @@ dependencies = [ "serde", "sp1-core-executor", "sp1-jit", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -16654,7 +16833,7 @@ dependencies = [ "tokio", "tracing", "tracing-forest", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "typenum", ] @@ -16845,7 +17024,7 @@ dependencies = [ "tokio", "tonic 0.12.3", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -17263,9 +17442,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec005042c7d952febc1a3ef5b0f6674e9054aa836877a31c90b20e25b3d31744" +checksum = "eb6a2e3c7f7a3e4e83d1752cec5d1e357ced0cf96e85419b6a07f227db3def3a" dependencies = [ "paste", "proc-macro2", @@ -17742,7 +17921,23 @@ dependencies = [ "rustls-pki-types", "tokio", "tokio-rustls", - "tungstenite", + "tungstenite 0.28.0", +] + +[[package]] +name = "tokio-tungstenite" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f72a05e828585856dacd553fba484c242c46e391fb0e58917c942ee9202915c" +dependencies = [ + "futures-util", + "log", + "rustls", + "rustls-native-certs", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tungstenite 0.29.0", "webpki-roots 0.26.11", ] @@ -18039,7 +18234,7 @@ dependencies = [ "symlink", "thiserror 2.0.18", "time", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -18061,7 +18256,7 @@ checksum = "bf0a738ed5d6450a9fb96e86a23ad808de2b727fd1394585da5cdd6788ffe724" dependencies = [ "serde_json", "tracing-core", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -18084,7 +18279,7 @@ dependencies = [ "smallvec", "thiserror 1.0.69", "tracing", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -18105,7 +18300,7 @@ checksum = "2d3a81ed245bfb62592b1e2bc153e77656d94ee6a0497683a65a12ccaf2438d0" dependencies = [ "libc", "tracing-core", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -18128,7 +18323,7 @@ dependencies = [ "time", "tracing", "tracing-core", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -18143,7 +18338,7 @@ dependencies = [ "tracing", "tracing-core", "tracing-log", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "web-time", ] @@ -18160,7 +18355,7 @@ dependencies = [ "memmap2", "smallvec", "tracing-core", - "tracing-subscriber 0.3.23", + "tracing-subscriber", ] [[package]] @@ -18173,15 +18368,6 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "tracing-core", -] - [[package]] name = "tracing-subscriber" version = "0.3.23" @@ -18210,7 +18396,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eaa1852afa96e0fe9e44caa53dc0bd2d9d05e0f2611ce09f97f8677af56e4ba" dependencies = [ "tracing-core", - "tracing-subscriber 0.3.23", + "tracing-subscriber", "tracy-client", ] @@ -18233,7 +18419,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5f7c95348f20c1c913d72157b3c6dee6ea3e30b3d19502c5a7f6d3f160dacbf" dependencies = [ "cc", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -18306,6 +18492,24 @@ dependencies = [ "utf-8", ] +[[package]] +name = "tungstenite" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c01152af293afb9c7c2a57e4b559c5620b421f6d133261c60dd2d0cdb38e6b8" +dependencies = [ + "bytes", + "data-encoding", + "http 1.4.0", + "httparse", + "log", + "rand 0.9.4", + "rustls", + "rustls-pki-types", + "sha1", + "thiserror 2.0.18", +] + [[package]] name = "twirp-rs" version = "0.13.0-succinct" @@ -18894,7 +19098,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.48.0", ] [[package]] diff --git a/rust/Cargo.toml b/rust/Cargo.toml index ad7b9f7d2b6..0a5e61fdf85 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -350,150 +350,151 @@ 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.5.0", default-features = false, features = [ +reth-codecs = { version = "0.6.0", default-features = false, features = [ "alloy", ] } -reth-codecs-derive = "0.5.0" -reth-primitives-traits = { version = "0.5.0", default-features = false } -reth-rpc-traits = { version = "0.5.0", default-features = false } -reth-zstd-compressors = { version = "0.5.0", default-features = false } +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 CRATES (git) ==================== -reth = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-basic-payload-builder = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-chain-state = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-chainspec = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-cli = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-cli-commands = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-cli-runner = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-cli-util = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-consensus = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-consensus-common = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-db = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-db-api = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-db-common = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-downloaders = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-e2e-test-utils = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-engine-local = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-engine-primitives = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-errors = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-eth-wire = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-eth-wire-types = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-ethereum = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-ethereum-cli = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-ethereum-consensus = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-ethereum-forks = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-ethereum-primitives = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-evm = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-evm-ethereum = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-exex = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-exex-test-utils = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-execution-errors = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-execution-types = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-fs-util = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-metrics = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-network = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-network-api = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-network-peers = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-node-api = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-node-builder = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-node-core = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-node-ethereum = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-node-events = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-node-metrics = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-payload-builder = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-payload-builder-primitives = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-payload-primitives = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-payload-util = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-payload-validator = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-provider = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-prune = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-prune-types = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-revm = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-rpc = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-rpc-api = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-rpc-builder = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-rpc-engine-api = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-rpc-eth-api = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-rpc-eth-types = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-rpc-server-types = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-stages = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-stages-types = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-static-file = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-static-file-types = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-storage-api = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-storage-errors = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-tasks = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-tracing = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-transaction-pool = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-trie = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } -reth-trie-common = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1", default-features = false } -reth-trie-db = { git = "https://github.com/op-rs/reth", rev = "aef8d3ef92117f91455e16969f0adf5bf7c6e9e1" } +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" } # ==================== REVM (latest: op-reth versions) ==================== -revm = { version = "41.0.0", default-features = false } -revm-bytecode = { version = "41.0.0", default-features = false } -revm-database = { version = "41.0.0", default-features = false } -revm-state = { version = "41.0.0", default-features = false } -revm-primitives = { version = "41.0.0", default-features = false } -revm-interpreter = { version = "41.0.0", default-features = false } -revm-database-interface = { version = "41.0.0", default-features = false } +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 } op-revm = { version = "20.0.0", path = "op-revm/", default-features = false } -revm-inspectors = "0.41.0" +revm-inspectors = "0.42.0" # ==================== ALLOY ==================== alloy-chains = { version = "0.2.33", default-features = false } -alloy-dyn-abi = "1.6.0" +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.37.0", default-features = false } -alloy-primitives = { version = "1.6.0", default-features = false, features = [ +alloy-evm = { version = "0.38.0", default-features = false } +alloy-primitives = { version = "1.6.1", default-features = false, features = [ "map-foldhash", ] } alloy-rlp = { version = "0.3.16", default-features = false, features = [ "core-net", ] } -alloy-sol-macro = "1.6.0" -alloy-sol-types = { version = "1.6.0", default-features = false } +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.1.1", default-features = false } -alloy-contract = { version = "2.1.1", default-features = false } -alloy-eips = { version = "2.1.1", default-features = false } -alloy-genesis = { version = "2.1.1", default-features = false } -alloy-json-rpc = { version = "2.1.1", default-features = false } -alloy-network = { version = "2.1.1", default-features = false } -alloy-network-primitives = { version = "2.1.1", default-features = false } -alloy-node-bindings = { version = "2.1.1", default-features = false } -alloy-provider = { version = "2.1.1", features = [ +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 = [ "reqwest", "debug-api", ], default-features = false } -alloy-pubsub = { version = "2.1.1", default-features = false } -alloy-rpc-client = { version = "2.1.1", default-features = false } -alloy-rpc-types = { version = "2.1.1", features = [ +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 = [ "eth", ], default-features = false } -alloy-rpc-types-admin = { version = "2.1.1", default-features = false } -alloy-rpc-types-anvil = { version = "2.1.1", default-features = false } -alloy-rpc-types-beacon = { version = "2.1.1", default-features = false } -alloy-rpc-types-debug = { version = "2.1.1", default-features = false } -alloy-rpc-types-engine = { version = "2.1.1", default-features = false } -alloy-rpc-types-eth = { version = "2.1.1", default-features = false } -alloy-rpc-types-mev = { version = "2.1.1", default-features = false } -alloy-rpc-types-trace = { version = "2.1.1", default-features = false } -alloy-rpc-types-txpool = { version = "2.1.1", default-features = false } -alloy-serde = { version = "2.1.1", default-features = false } -alloy-signer = { version = "2.1.1", default-features = false } -alloy-signer-local = { version = "2.1.1", default-features = false } -alloy-transport = { version = "2.1.1" } -alloy-transport-http = { version = "2.1.1", features = [ +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-signer-local = { version = "2.3.0", default-features = false } +alloy-transport = { version = "2.3.0" } +alloy-transport-http = { version = "2.3.0", features = [ "reqwest-rustls-tls", ], default-features = false } -alloy-transport-ipc = { version = "2.1.1", default-features = false } -alloy-transport-ws = { version = "2.1.1", default-features = false } +alloy-transport-ipc = { version = "2.3.0", default-features = false } +alloy-transport-ws = { version = "2.3.0", default-features = false } # ==================== OP-ALLOY (from crates.io) ==================== op-alloy = { version = "2.0.0", path = "op-alloy/crates/op-alloy", default-features = false } @@ -547,7 +548,12 @@ kzg-rs = { version = "0.2.6", features = ["rkyv", "serde"] } sha2 = { version = "0.10.9", default-features = false } secp256k1 = { version = "0.31.1", default-features = false } ark-ff = { version = "0.5.0", default-features = false } -ark-bls12-381 = { version = "0.5.0", default-features = false } +# `scalar_field` gates `Fr`, which kona-proof uses for blob point evaluation. Declare it +# explicitly: it used to arrive via feature unification with revm-precompile, which has since +# moved to ark-bls12-381 0.6. +ark-bls12-381 = { version = "0.5.0", default-features = false, features = [ + "scalar_field", +] } # ==================== SERIALIZATION ==================== bincode = { version = "2.0.1", features = ["serde"] } diff --git a/rust/UPDATING-RETH.md b/rust/UPDATING-RETH.md index ede1a170d0d..c3192beef9f 100644 --- a/rust/UPDATING-RETH.md +++ b/rust/UPDATING-RETH.md @@ -77,6 +77,21 @@ main's CI actually validated. Pin that commit with `rev = ""`. Verify every reth workspace dependency uses the same repository and ref; the mirror checker rejects split pins. + Use `ethereum-optimism/reth`'s `optimism` branch for maintenance backports. + Rebuild it from the selected upstream release, replay the required runtime + patches, then replay the fork's CircleCI/Actions support as one final commit. + Keep those CI changes squashed so subsequent rebuilds need only one CI + cherry-pick. Preserve the original branch tip locally and use an explicit + force-with-lease when publishing a rebuilt branch. + Update the maintenance-push compact-codec comparison base in the fork's + `.github/workflows/compact.yml` to the selected release too; comparing against + `main` can test unsupported future formats. Check the fork's own lockfile + advisories separately: downstream lockfile fixes do not repair the fork's CI. + + Merging a fix into upstream `main` does not establish that a patch release + contains it. Check the selected tag's ancestry or patch equivalence before + removing any backport; a newer tag can still omit the required fix. + The lockfiles record the resolved commit, so builds remain reproducible. 4. Sync shared dependency versions to the new rev's pins. reth and the OP Stack @@ -215,6 +230,12 @@ main's CI actually validated. deny-list in `op-reth/crates/cli/src/lib.rs`, e.g. `--minimal`) must stay rejected — they render with a `[hidden]` marker in the snapshot. + Report removed flags and changed defaults in the PR's migration notes. The + [published CLI reference](../docs/public-docs/scripts/gen-op-reth-cli/README.md) + intentionally documents a finalized release, not `develop`. Do not regenerate + it from an unreleased dependency bump; update it through the release generator + after the next finalized tag. + ## 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 3b6d7ae1f07..135f9e5c798 100644 --- a/rust/alloy-op-evm/src/block/mod.rs +++ b/rust/alloy-op-evm/src/block/mod.rs @@ -782,7 +782,7 @@ fn validate_block_gas( Ok(()) } -/// UPSTREAM-MIRROR(copy): alloy-evm@0.37.1 `alloy_evm::eth::block::EthBlockExecutor` +/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.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 diff --git a/rust/alloy-op-evm/src/env.rs b/rust/alloy-op-evm/src/env.rs index fb92eb001ce..f844c8711dc 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.37.1 `alloy_evm::eth::env::EvmEnvInput` +/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.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,9 +120,11 @@ pub fn evm_env_for_op_next_block( ) } -/// UPSTREAM-MIRROR(copy): alloy-evm@0.37.1 `alloy_evm::eth::env::EvmEnv::for_eth` +/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::env::EvmEnv::for_eth` /// -/// Copies upstream environment construction with OP fork mapping and blob semantics. +/// 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 +/// spec-derived EIP-7825 fallback, which `OpEvm::transact_raw` lifts for deposits. fn evm_env_for_op( input: EvmEnvInput, chain_spec: impl OpHardforks, diff --git a/rust/alloy-op-evm/src/lib.rs b/rust/alloy-op-evm/src/lib.rs index fd3442982da..2b1ff8af02a 100644 --- a/rust/alloy-op-evm/src/lib.rs +++ b/rust/alloy-op-evm/src/lib.rs @@ -297,10 +297,11 @@ impl DerefMut for OpEvm { } } -/// UPSTREAM-MIRROR(copy): alloy-evm@0.37.1 `alloy_evm::eth::EthEvm` +/// UPSTREAM-MIRROR(copy): alloy-evm@0.38.0 `alloy_evm::eth::EthEvm` /// -/// Mirrors upstream's `Evm` impl for `EthEvm`, adding the OP transaction wrapper and the -/// post-exec refund tracking in `transact_raw`. A method added to the `Evm` trait, or a +/// Mirrors upstream's `Evm` impl for `EthEvm`, adding the OP transaction wrapper, the post-exec +/// transaction short-circuit, the post-exec refund tracking and the deposit exemption from the +/// EIP-7825 transaction gas-limit cap in `transact_raw`. A method added to the `Evm` trait, or a /// changed body in upstream's impl, needs mirroring here. impl Evm for OpEvm where diff --git a/rust/alloy-op-evm/src/tests.rs b/rust/alloy-op-evm/src/tests.rs index 827d5cf6c45..b136252567b 100644 --- a/rust/alloy-op-evm/src/tests.rs +++ b/rust/alloy-op-evm/src/tests.rs @@ -5,7 +5,7 @@ use alloy_evm::{ evm::EvmFactoryExt, precompiles::{Precompile, PrecompileInput}, }; -use alloy_primitives::{Signature, TxKind, U256}; +use alloy_primitives::{B256, Signature, TxKind, U256}; use core::convert::Infallible; use op_revm::{ OpTransactionError, @@ -238,6 +238,124 @@ fn non_deposit_above_tx_gas_limit_cap_is_rejected() { ); } +/// Runtime that reads 16 distinct cold storage slots (`PUSH1 n; SLOAD; POP` x16, then `STOP`), +/// costing ~33.7k gas — comfortably more than the capped budget in the test below and +/// comfortably less than the uncapped one. +fn cold_sload_burner_runtime() -> Bytes { + let mut code = Vec::new(); + for slot in 0u8..16 { + code.extend_from_slice(&[0x60, slot, 0x54, 0x50]); + } + code.push(0x00); + Bytes::from(code) +} + +/// Deposits are force-included from L1 and must not be clamped by the EIP-7825 per-transaction +/// gas cap, so `transact_raw` lifts the cap for the duration of a deposit. +/// +/// The cap is not enforced by a rejection on this path — deposits skip `validate_env`, which is +/// where `TxGasLimitGreaterThanCap` is raised — so the exemption is only observable in how much +/// gas the first frame actually receives: `initial_gas_and_reservoir` splits the limit at +/// `min(gas_limit, cap)`, and OP does not override the `validate_initial_tx_gas` path that feeds +/// it. This test therefore measures execution, not the error type: the deposit runs a payload +/// that costs more than the capped budget and must still complete. +#[test] +fn deposit_above_tx_gas_limit_cap_receives_the_full_gas_limit() { + let caller = Address::ZERO; + let target = Address::from([0x44; 20]); + + // An explicit low cap keeps the burner payload cheap while reproducing the real shape: + // capped budget = 30_000 - 21_000 intrinsic = 9_000 gas, which the payload exceeds. + const CAP: u64 = 30_000; + const DEPOSIT_GAS_LIMIT: u64 = 200_000; + + let mut db = InMemoryDB::default(); + let runtime = cold_sload_burner_runtime(); + db.insert_account_info( + target, + AccountInfo { + code_hash: alloy_primitives::keccak256(&runtime), + code: Some(revm::bytecode::Bytecode::new_raw(runtime)), + ..Default::default() + }, + ); + + let mut cfg = CfgEnv::new_with_spec(OpSpecId::KARST); + cfg.tx_gas_limit_cap = Some(CAP); + let mut evm = OpEvmFactory::::default() + .create_evm(db, EvmEnv::new(cfg, BlockEnv { gas_limit: 60_000_000, ..Default::default() })); + + let deposit = OpTx(OpTransaction { + base: TxEnv { + gas_limit: DEPOSIT_GAS_LIMIT, + kind: TxKind::Call(target), + caller, + ..Default::default() + }, + enveloped_tx: None, + deposit: op_revm::transaction::deposit::DepositTransactionParts::new( + B256::from([0x11; 32]), + None, + false, + ), + }); + + let result = evm.transact_raw(deposit).expect("a deposit must not be rejected"); + assert!( + result.result.is_success(), + "the deposit must receive its full gas limit, not the capped budget; got {:?}", + result.result, + ); + assert!( + result.result.tx_gas_used() > CAP, + "the payload must actually exceed the cap or this test proves nothing; used {}", + result.result.tx_gas_used(), + ); + + // The exemption is scoped to the deposit: the previous cap must be back afterwards. + assert_eq!(evm.inner.0.ctx.cfg.tx_gas_limit_cap, Some(CAP)); +} + +/// The cap is saved and restored around a deposit as an `Option>`, so it must +/// round-trip whichever resting state the field is in — including `None`, which is the +/// production shape (the env builder leaves the raw field unset and lets revm derive the +/// effective cap from the spec). +#[test] +fn deposit_cap_exemption_round_trips_every_resting_state() { + let caller = Address::ZERO; + let target = Address::from([0x55; 20]); + + for resting in [None, Some(TX_GAS_LIMIT_CAP), Some(u64::MAX)] { + let mut cfg = CfgEnv::new_with_spec(OpSpecId::KARST); + cfg.tx_gas_limit_cap = resting; + let mut evm = OpEvmFactory::::default().create_evm( + EmptyDB::default(), + EvmEnv::new(cfg, BlockEnv { gas_limit: 60_000_000, ..Default::default() }), + ); + + let deposit = OpTx(OpTransaction { + base: TxEnv { + gas_limit: 100_000, + kind: TxKind::Call(target), + caller, + ..Default::default() + }, + enveloped_tx: None, + deposit: op_revm::transaction::deposit::DepositTransactionParts::new( + B256::from([0x22; 32]), + None, + false, + ), + }); + evm.transact_raw(deposit).expect("deposit executes"); + + assert_eq!( + evm.inner.0.ctx.cfg.tx_gas_limit_cap, resting, + "cap must be restored to its resting state {resting:?}", + ); + } +} + #[test] fn op_evm_factory_uses_configured_refund_policy_and_snapshot() { let caller = Address::ZERO; diff --git a/rust/alloy-op-evm/src/tx.rs b/rust/alloy-op-evm/src/tx.rs index 5d7e6f05c7d..c561ba67d7f 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@41.0.0 `revm_context_interface::Transaction` +/// UPSTREAM-MIRROR(delegate): revm-context-interface@42.0.0 `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/deny.toml b/rust/deny.toml index 2388397c9c6..11074761f69 100644 --- a/rust/deny.toml +++ b/rust/deny.toml @@ -106,8 +106,8 @@ registries = [] [sources] allow-git = [ "https://github.com/paradigmxyz/reth", - # Our fork of paradigmxyz/reth, used to carry changes before they land upstream. - "https://github.com/op-rs/reth", + # Maintenance fork carrying patches not yet included in the selected upstream release. + "https://github.com/ethereum-optimism/reth", "https://github.com/alloy-rs/alloy", "https://github.com/alloy-rs/hardforks", "https://github.com/alloy-rs/evm", 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 cb06d48791e..3602e6f4f40 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@41.0.0 `revm_handler::EthPrecompiles::run` + /// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `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/crates/protocol/registry/src/l1/mod.rs b/rust/kona/crates/protocol/registry/src/l1/mod.rs index da89f903632..0cc3374f3fd 100644 --- a/rust/kona/crates/protocol/registry/src/l1/mod.rs +++ b/rust/kona/crates/protocol/registry/src/l1/mod.rs @@ -119,6 +119,7 @@ impl L1Config { prague_time: alloy_hardforks::EthereumHardfork::Prague.mainnet_activation_timestamp(), osaka_time: alloy_hardforks::EthereumHardfork::Osaka.mainnet_activation_timestamp(), amsterdam_time: None, + bogota_time: None, bpo1_time: alloy_hardforks::EthereumHardfork::Bpo1.mainnet_activation_timestamp(), bpo2_time: alloy_hardforks::EthereumHardfork::Bpo2.mainnet_activation_timestamp(), bpo3_time: alloy_hardforks::EthereumHardfork::Bpo3.mainnet_activation_timestamp(), @@ -175,6 +176,7 @@ impl L1Config { prague_time: alloy_hardforks::EthereumHardfork::Prague.sepolia_activation_timestamp(), osaka_time: alloy_hardforks::EthereumHardfork::Osaka.sepolia_activation_timestamp(), amsterdam_time: None, + bogota_time: None, bpo1_time: alloy_hardforks::EthereumHardfork::Bpo1.sepolia_activation_timestamp(), bpo2_time: alloy_hardforks::EthereumHardfork::Bpo2.sepolia_activation_timestamp(), bpo3_time: alloy_hardforks::EthereumHardfork::Bpo3.sepolia_activation_timestamp(), @@ -221,6 +223,7 @@ impl L1Config { prague_time: alloy_hardforks::EthereumHardfork::Prague.holesky_activation_timestamp(), osaka_time: alloy_hardforks::EthereumHardfork::Osaka.holesky_activation_timestamp(), amsterdam_time: None, + bogota_time: None, bpo1_time: alloy_hardforks::EthereumHardfork::Bpo1.holesky_activation_timestamp(), bpo2_time: alloy_hardforks::EthereumHardfork::Bpo2.holesky_activation_timestamp(), bpo3_time: alloy_hardforks::EthereumHardfork::Bpo3.holesky_activation_timestamp(), diff --git a/rust/kona/sp1/programs/Cargo.lock b/rust/kona/sp1/programs/Cargo.lock index 4d528b6dec3..28e7e5e2410 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.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6ff0c4adba2abdcd9fb5829ae5f4394c06f8585ed283a9ba79aa33763c802e1" +checksum = "0b836b372d3b742b7c083d2617d6e68563cd5dadbd8752c461a935a756551e69" dependencies = [ "alloy-eips", "alloy-primitives", @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cdf48932b1db3216175e19a2b476d89d53076e004850ee7983c6807ba0fde74" +checksum = "b1befb37485ea71e8599e32ffd76c98af7c3720a34741d30abd87f41c3148407" dependencies = [ "alloy-consensus", "alloy-eips", @@ -146,9 +146,9 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea4c0453065b9206acc0f869a258dc8dcbbd595e144b4446f2c493a24a814d1f" +checksum = "ca3e76d47e8de277cb55e7e77fa38adde835162fc01cddbe1b258b5e0a86035b" dependencies = [ "alloy-eip2124", "alloy-eip2930", @@ -163,14 +163,14 @@ dependencies = [ "either", "serde", "serde_with", - "sha2", + "sha2 0.10.9", ] [[package]] name = "alloy-evm" -version = "0.37.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde665074b478c97047dc2a461b4916cac77922d690e5b7415d1941ae7ff7bf" +checksum = "6b307a52f91f7f3aad56b5cb4f54e5eb17dd0b3f4b2c82823301499fe1c6fdaf" dependencies = [ "alloy-consensus", "alloy-eips", @@ -186,9 +186,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "027ba57264c5d05e4ff52e6090b3592e7526f5d5f5a844add6bbdd17c071c911" +checksum = "0680a2f7d4bbc6f48c0cb43368fa544918a1fa291e772bdb47c834ade338f363" dependencies = [ "alloy-eips", "alloy-primitives", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d875a11bd98595f57f73890f2e36f4a1cca0fa670623e59c9fb08b2389979c36" +checksum = "8795eecf50374a0dd942caff57922c59333c9991ead9eccbbc1709f55d73c7c2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -253,9 +253,9 @@ dependencies = [ [[package]] name = "alloy-primitives" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4885c1409b6936c4898e646ef58baf6ec54edaf6d8179f79df805a7b85b7cf3e" +checksum = "d5e9dbd49258ac3ab893a481d46be29b58be7f734dcac46cd80b6b13ee36566c" dependencies = [ "alloy-rlp", "bytes", @@ -270,7 +270,6 @@ dependencies = [ "paste", "rand 0.9.4", "ruint", - "rustc-hash", "serde", "sha3", ] @@ -299,9 +298,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1f682c4881aa7000ac7cc86d7aeeb3b09836a77a90b329820140233651aeea" +checksum = "0a43d7b6b86be4885c7a76f1dfcde9651af2d419ff571e8ee7257de47101203b" dependencies = [ "alloy-consensus", "alloy-eips", @@ -316,9 +315,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e1bd19904581ee2075b61faabab1a4cefa8b96d8f2c85343adeae8ecf615e2b" +checksum = "756eb5803e70985be4066b636194ccb5f6629e5d141817c1f0c50cea8350bf5c" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -328,7 +327,7 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.14.0", + "itertools 0.13.0", "serde", "serde_json", "thiserror", @@ -336,9 +335,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e97b3e0b9f816b25083045dcfa69431bd059a078e828e4d82d296d1949b96c" +checksum = "cc142e40df0c3eb5983b1637a68ab33471d8d22b8f402c9ed8260411a4e89d86" dependencies = [ "alloy-primitives", "serde", @@ -347,13 +346,13 @@ dependencies = [ [[package]] name = "alloy-sol-macro" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "840128ed2b2971d6d4668a553fe403a82683d3acc646c73e75887e7157408033" +checksum = "60dd79f578c3912f1fc2a150dbeb8110b8cfb976c60f98ebf6de9d5da5965a2b" dependencies = [ "alloy-sol-macro-expander", "alloy-sol-macro-input", - "proc-macro-error2", + "proc-macro-error3", "proc-macro2", "quote", "syn 2.0.117", @@ -361,15 +360,15 @@ dependencies = [ [[package]] name = "alloy-sol-macro-expander" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63ec265e5d65d725175f6ca7711c970824c90ef9c0d1f1973711d4150ee612dd" +checksum = "9edb8520f2f94275e1caa73c85207dcc78ec402a9a4c429240f9a0783a8f16c0" dependencies = [ "alloy-sol-macro-input", "const-hex", "heck", "indexmap", - "proc-macro-error2", + "proc-macro-error3", "proc-macro2", "quote", "sha3", @@ -379,9 +378,9 @@ dependencies = [ [[package]] name = "alloy-sol-macro-input" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89bf01077f18650876cfa682eb1f949967b5cde03f1a51c955c469d2c9b4aa67" +checksum = "66af2d9344882172993be5f5cbfd349fdfa52cb548f7af8715b446fb35ef6001" dependencies = [ "const-hex", "dunce", @@ -395,9 +394,9 @@ dependencies = [ [[package]] name = "alloy-sol-types" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384cf252de0db2dec52821eac037a7f57e2aa33fe5b900ce6fe39973402341f1" +checksum = "3e6f87cf007caa54e95455875fbd25879b008d0d9c7c340a2c258b3a3400a28c" dependencies = [ "alloy-primitives", "alloy-sol-macro", @@ -421,9 +420,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "2.1.1" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406bc1183f6843e0aba09f7b3365e828b597213d60793ba5cb41befc863e3a78" +checksum = "25484345e4d89c259235e200d4f895eba33e70f125f4e8bb37a7aa69a97bd656" dependencies = [ "darling", "proc-macro2", @@ -455,21 +454,33 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3df4dcc01ff89867cd86b0da835f23c3f02738353aaee7dde7495af71363b8d5" dependencies = [ - "ark-ec", - "ark-ff", - "ark-serialize", - "ark-std", + "ark-ec 0.5.0", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", +] + +[[package]] +name = "ark-bls12-381" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be2ede2c0c96fa37d5d3484e8a59fec566c4a52b8c84bf993eaa6c67d7225a4c" +dependencies = [ + "ark-ec 0.6.0", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", ] [[package]] name = "ark-bn254" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc" +checksum = "6bc66f96ebe2a17a499475b4f94791d379817592ef494171586967ffdc6f95db" dependencies = [ - "ark-ec", - "ark-ff", - "ark-std", + "ark-ec 0.6.0", + "ark-ff 0.6.0", + "ark-std 0.6.0", ] [[package]] @@ -479,10 +490,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce" dependencies = [ "ahash", - "ark-ff", - "ark-poly", - "ark-serialize", - "ark-std", + "ark-ff 0.5.0", + "ark-poly 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", "educe", "fnv", "hashbrown 0.15.5", @@ -493,16 +504,37 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ec" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8352a2b2aedf6ba2cc38f7520fc51191d518dde96175c729af19f2d059f191c4" +dependencies = [ + "ahash", + "ark-ff 0.6.0", + "ark-poly 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "educe", + "fnv", + "hashbrown 0.17.0", + "itertools 0.14.0", + "num-bigint 0.4.6", + "num-integer", + "num-traits", + "zeroize", +] + [[package]] name = "ark-ff" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" dependencies = [ - "ark-ff-asm", - "ark-ff-macros", - "ark-serialize", - "ark-std", + "ark-ff-asm 0.5.0", + "ark-ff-macros 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", "arrayvec", "digest 0.10.7", "educe", @@ -513,6 +545,23 @@ dependencies = [ "zeroize", ] +[[package]] +name = "ark-ff" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7a806ac6c8307b929df4645776290a50ee2aac754ad09d8bdf73391309e43af" +dependencies = [ + "ark-ff-asm 0.6.0", + "ark-ff-macros 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "digest 0.10.7", + "educe", + "num-bigint 0.4.6", + "num-traits", + "zeroize", +] + [[package]] name = "ark-ff-asm" version = "0.5.0" @@ -523,6 +572,16 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "ark-ff-asm" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1479009684adc073dff49a1025d3a7065b317a9ead25aaaca38cdc70058ba8a2" +dependencies = [ + "quote", + "syn 2.0.117", +] + [[package]] name = "ark-ff-macros" version = "0.5.0" @@ -536,6 +595,19 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "ark-ff-macros" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a0691ed21ef00ef89c1e9bda832eba493dda3ec2f8d892fb25b705f73f06bb8" +dependencies = [ + "num-bigint 0.4.6", + "num-traits", + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "ark-poly" version = "0.5.0" @@ -543,27 +615,54 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27" dependencies = [ "ahash", - "ark-ff", - "ark-serialize", - "ark-std", + "ark-ff 0.5.0", + "ark-serialize 0.5.0", + "ark-std 0.5.0", "educe", "fnv", "hashbrown 0.15.5", ] +[[package]] +name = "ark-poly" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75f55af10b672002b8d953e230282c51206842e20e5791a94432219b4201de5c" +dependencies = [ + "ahash", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", + "ark-std 0.6.0", + "educe", + "fnv", + "hashbrown 0.17.0", +] + [[package]] name = "ark-serialize" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" dependencies = [ - "ark-serialize-derive", - "ark-std", + "ark-serialize-derive 0.5.0", + "ark-std 0.5.0", "arrayvec", "digest 0.10.7", "num-bigint 0.4.6", ] +[[package]] +name = "ark-serialize" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a74dd304fd536fb95d0a328e72be759209cc496a9da094c5bc56e5fea4f9e86b" +dependencies = [ + "ark-serialize-derive 0.6.0", + "ark-std 0.6.0", + "digest 0.10.7", + "num-bigint 0.4.6", +] + [[package]] name = "ark-serialize-derive" version = "0.5.0" @@ -575,6 +674,17 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "ark-serialize-derive" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f153690697a2b91e5e1251ff98411ee5371500a111a0fd317a70e588eb300f9" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "ark-std" version = "0.5.0" @@ -585,6 +695,16 @@ dependencies = [ "rand 0.8.6", ] +[[package]] +name = "ark-std" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "367c9c827ed431bff6868b7aa926e05b16eb46603cc8b6e768e4a5553fa1d155" +dependencies = [ + "num-traits", + "rand 0.8.6", +] + [[package]] name = "arrayref" version = "0.3.9" @@ -1460,7 +1580,7 @@ dependencies = [ "elliptic-curve", "hex", "serdect", - "sha2", + "sha2 0.10.9", "sp1-lib", ] @@ -1626,8 +1746,8 @@ dependencies = [ "alloy-primitives", "alloy-rlp", "alloy-trie", - "ark-bls12-381", - "ark-ff", + "ark-bls12-381 0.5.0", + "ark-ff 0.5.0", "async-trait", "kona-derive", "kona-driver", @@ -1759,7 +1879,7 @@ dependencies = [ "rkyv", "serde", "serde_json", - "sha2", + "sha2 0.10.9", "spin 0.10.0", "tracing", ] @@ -1802,7 +1922,7 @@ dependencies = [ "kona-sp1-build-info", "kona-sp1-client-utils", "kona-sp1-range-vkeys", - "sha2", + "sha2 0.10.9", "sp1-lib", "sp1-zkvm", ] @@ -1832,7 +1952,7 @@ dependencies = [ "rkyv", "serde", "serde_arrays", - "sha2", + "sha2 0.10.9", "sp1_bls12_381", "spin 0.9.8", ] @@ -2146,7 +2266,7 @@ dependencies = [ "alloy-serde", "op-alloy-consensus", "serde", - "sha2", + "sha2 0.10.9", "thiserror", ] @@ -2169,7 +2289,7 @@ dependencies = [ "elliptic-curve", "hex", "primeorder", - "sha2", + "sha2 0.10.9", "sp1-lib", ] @@ -2377,22 +2497,22 @@ dependencies = [ ] [[package]] -name = "proc-macro-error-attr2" -version = "2.0.0" +name = "proc-macro-error-attr3" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +checksum = "82366fd7d8b7a440d66d13418820c69df9b3908bcb1a0476d7f5ce5d12f5a04d" dependencies = [ "proc-macro2", "quote", ] [[package]] -name = "proc-macro-error2" -version = "2.0.1" +name = "proc-macro-error3" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +checksum = "b511283ea8a74b4b39447b128c5d00f03a356b7424554b13e298a5550100d9ac" dependencies = [ - "proc-macro-error-attr2", + "proc-macro-error-attr3", "proc-macro2", "quote", "syn 2.0.117", @@ -2552,9 +2672,9 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb43f4858fef4e3b42b80954d2edf1ff67c8ad7498347083cdc7d0f6eff2f081" +checksum = "1f0dd7f542fbcae0e490ebe13f3eababcc05547375246ff7f62700b533cf3f01" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2570,9 +2690,9 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5798ae4d6b264764bc0d742468bd32c7fb515e774645d4930f95ff6311f3ae14" +checksum = "e7e508fcbb8cb775639dbbb56b81b62756d4322f28e76c60a52aa32575f993fe" dependencies = [ "proc-macro2", "quote", @@ -2581,18 +2701,18 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "0.5.2" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1bd4ae4f54a2ba813eef082910bc646bd31cab8ed134308fa71f1068331fb84" +checksum = "80addacffc5df9398c55919f8993922d2b688f2aa5753708fdd658ca3cc63e39" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "41.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d51c254839fb36357d0b02d02e46ba57e683d7b017e2da33b47ae74685a9e59" +checksum = "b7c7fcd426beab3b91300a6d0d5eb8d583c0fad0fba451126e19fd51443eca62" dependencies = [ "revm-bytecode", "revm-context", @@ -2609,9 +2729,9 @@ dependencies = [ [[package]] name = "revm-bytecode" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33493cf6d996e9242db4f2002caef48ec9aa8c4f3fff3b18aed10ef3942eec7" +checksum = "537356bdec80dbc04e4e6bb688b3441ff7cf18eecdcf3cac23150633c46467f1" dependencies = [ "bitvec", "revm-primitives", @@ -2619,9 +2739,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86e48fc736d9542c082ea5305be44b6a14b53a615f0147ad57f62189fd813068" +checksum = "cc6512f05f83378e29b2b016fa5bd7f5a533e3625548be4113732e1a536c2564" dependencies = [ "bitvec", "cfg-if", @@ -2635,9 +2755,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac68282a454318246817486835a446519291dd0a8167d09de14c7e96f2147696" +checksum = "103fff818b10311034c0c11ff8760294ee0e3c320daab3c5717990fe8ee2617b" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -2650,9 +2770,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d761681a43e48408ea23f7f66ff56ff7b6128cadb8f9135d1b94787d0c0fc6b4" +checksum = "df72760eab0852100e748c7cb03ce0221626d60ac14534118c84c5cc894fb4c9" dependencies = [ "derive_more", "either", @@ -2664,9 +2784,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b96e37d62fa60b45987b408486c84ebef4af4e7ddf1b3b96b4955a7263fd4e92" +checksum = "d9286c059a11be1dee814cafdc3a3ade57521c8caa050785a52c19a9d894f400" dependencies = [ "auto_impl", "either", @@ -2677,9 +2797,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "41.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5e043ebfc0899c435e44475796285898e4f822e637bd67856da79cc170bd9df" +checksum = "09126175c3fa482e71e80cc28c6bb17e681911e472b94d4f7f73dd6780411798" dependencies = [ "auto_impl", "derive-where", @@ -2695,9 +2815,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "41.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e470b2a5e177918944d8cd26174455b61b8fbfbbe7fe411d28b4097e410d11e" +checksum = "4aa55b208b52f0c083ea68147c78866eeecadd7c0071a614f477de316b60648e" dependencies = [ "auto_impl", "either", @@ -2711,9 +2831,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa5547f653f9e4c47b4f9a9075a0b7c0faea5fa29b7873f392733a943837825d" +checksum = "fd310927437752ce4bac6997b385772823b84843f04c82e151993bec1265a5ed" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -2723,15 +2843,15 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "41.0.0" +version = "42.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d785931e4b8750cf9d79c808c22f05979c8d191baafc8badd4651db82584c1c" +checksum = "f2431091420999795df6a200b9f7933defe3d654710560a895e6bcabbd9954a5" dependencies = [ - "ark-bls12-381", + "ark-bls12-381 0.6.0", "ark-bn254", - "ark-ec", - "ark-ff", - "ark-serialize", + "ark-ec 0.6.0", + "ark-ff 0.6.0", + "ark-serialize 0.6.0", "arrayref", "aurora-engine-modexp", "cfg-if", @@ -2740,15 +2860,15 @@ dependencies = [ "revm-context-interface", "revm-primitives", "ripemd", - "sha2", + "sha2 0.11.0", "substrate-bn", ] [[package]] name = "revm-primitives" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66f39151a31afe93d97f7ac894dd9dcc989368d5ccba19ce079bfc1d73b77452" +checksum = "2ef5564c1bce219fd08beca43d4f39fdcbc19193fa4f604c0c6b58950a13194a" dependencies = [ "alloy-primitives", "once_cell", @@ -2756,9 +2876,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "41.0.0" +version = "42.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73ef2fffc28acc41e8ef7525f2b1d16288a10f80579a1b33e7e62abc9892314a" +checksum = "2c4ae66db3abfcb565854dbfc95513bfa440b3dc390ddf8e50b0363d12a6fa79" dependencies = [ "alloy-eip7928", "bitflags", @@ -2788,11 +2908,11 @@ dependencies = [ [[package]] name = "ripemd" -version = "0.1.3" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f" +checksum = "4dd4211456b4172d7e44261920c25acf07367c4f04bb5f5d54fc21b090d9b159" dependencies = [ - "digest 0.10.7", + "digest 0.11.3", ] [[package]] @@ -2861,12 +2981,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18" -[[package]] -name = "rustc-hash" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" - [[package]] name = "rustc-hex" version = "2.1.0" @@ -3039,6 +3153,16 @@ dependencies = [ "digest 0.10.7", ] +[[package]] +name = "sha2" +version = "0.11.0" +source = "git+https://github.com/sp1-patches/RustCrypto-hashes?tag=patch-sha2-0.11.0-sp1-6.2.0#8993e08b9f7c47cd4a056decbf85d2d7ab3fe77c" +dependencies = [ + "cfg-if", + "cpufeatures 0.3.0", + "digest 0.11.3", +] + [[package]] name = "sha3" version = "0.11.0" @@ -3182,7 +3306,7 @@ dependencies = [ "lazy_static", "num-bigint 0.4.6", "serde", - "sha2", + "sha2 0.10.9", "slop-algebra", "slop-bn254", "slop-challenger", @@ -3205,7 +3329,7 @@ dependencies = [ "getrandom 0.3.4", "libm", "rand 0.8.6", - "sha2", + "sha2 0.10.9", "slop-algebra", "sp1-lib", "sp1-primitives", @@ -3343,9 +3467,9 @@ dependencies = [ [[package]] name = "syn-solidity" -version = "1.6.0" +version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec005042c7d952febc1a3ef5b0f6674e9054aa836877a31c90b20e25b3d31744" +checksum = "eb6a2e3c7f7a3e4e83d1752cec5d1e357ced0cf96e85419b6a07f227db3def3a" dependencies = [ "paste", "proc-macro2", diff --git a/rust/kona/sp1/programs/Cargo.toml b/rust/kona/sp1/programs/Cargo.toml index 0bea0b7ab6c..40cff940492 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 = "41.0.0", default-features = false, features = ["bn"] } +revm = { version = "42.0.1", default-features = false, features = ["bn"] } sp1-lib = { version = "6.8.0", features = ["verify"] } sp1-zkvm = { version = "6.8.0", features = ["verify"] } @@ -135,6 +135,8 @@ 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. +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" } k256 = { git = "https://github.com/sp1-patches/elliptic-curves", tag = "patch-k256-13.4-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 e3c33b16694..80f9bd22f41 100644 --- a/rust/op-alloy/crates/consensus/src/receipts/envelope.rs +++ b/rust/op-alloy/crates/consensus/src/receipts/envelope.rs @@ -10,6 +10,15 @@ 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` +/// +/// 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 +/// keep upstream's EIP-2718/RLP dispatch and JSON representation, so re-diff the variant list, +/// the encode/decode arms and the serde attributes. One deliberate difference: JSON stays as +/// strict as the derive and rejects a receipt without a `type` field, where upstream defaults it +/// to legacy for Geth-derived chains that omit the field; no OP client does. +/// /// Receipt envelope, as defined in [EIP-2718], modified for OP Stack chains. /// /// This enum distinguishes between tagged and untagged legacy receipts, as the diff --git a/rust/op-alloy/crates/consensus/src/receipts/receipt.rs b/rust/op-alloy/crates/consensus/src/receipts/receipt.rs index 56b9e8f403b..72c29eb9018 100644 --- a/rust/op-alloy/crates/consensus/src/receipts/receipt.rs +++ b/rust/op-alloy/crates/consensus/src/receipts/receipt.rs @@ -13,6 +13,14 @@ 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` +/// +/// 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 +/// `PostExec` and `Deposit` variants. Re-diff the variant list and the EIP-2718/RLP dispatch +/// against the envelope; the bloom is threaded through the `*_with_bloom` helpers instead. JSON +/// deliberately stays strict about a missing `type` field, as on [`OpReceiptEnvelope`]. +/// /// Typed Optimism transaction receipt. /// /// Receipt containing result of transaction execution. diff --git a/rust/op-alloy/crates/consensus/src/transaction/canonical.rs b/rust/op-alloy/crates/consensus/src/transaction/canonical.rs index 6e21f46af15..fe5f14e7b69 100644 --- a/rust/op-alloy/crates/consensus/src/transaction/canonical.rs +++ b/rust/op-alloy/crates/consensus/src/transaction/canonical.rs @@ -7,11 +7,10 @@ use alloy_eips::{ /// Decodes an EIP-2718 transaction and requires `bytes` to be its canonical encoding. /// -/// Plain `decode_2718_exact` accepts inputs that re-encode differently, such as a typed -/// transaction body without its type byte or a legacy transaction carrying a `0x00` tag. Where the -/// bytes are consensus input they must be rejected rather than normalised, so anything that does -/// not round-trip is an error. The re-encode is one linear pass per transaction, far cheaper than -/// the signer recovery that follows it. +/// Plain `decode_2718_exact` accepts inputs that re-encode differently, such as a legacy +/// transaction carrying a `0x00` tag. Where the bytes are consensus input they must be rejected +/// rather than normalised, so anything that does not round-trip is an error. The re-encode is one +/// linear pass per transaction, far cheaper than the signer recovery that follows it. pub fn decode_2718_canonical(bytes: &[u8]) -> Eip2718Result { let tx = T::decode_2718_exact(bytes)?; // Length first: it is free and skips the re-encode allocation on a mismatch. diff --git a/rust/op-alloy/crates/rpc-types-engine/src/attributes.rs b/rust/op-alloy/crates/rpc-types-engine/src/attributes.rs index 078d82368ec..645a186635f 100644 --- a/rust/op-alloy/crates/rpc-types-engine/src/attributes.rs +++ b/rust/op-alloy/crates/rpc-types-engine/src/attributes.rs @@ -473,30 +473,28 @@ mod test { assert_eq!(attributes, round_trip); } - /// A transaction that decodes but does not re-encode to the same bytes (here: an EIP-1559 - /// body with its type byte stripped) must be rejected, not silently canonicalised. + /// A legacy transaction with a `0x00` type tag decodes but does not re-encode to the same + /// bytes. It must be rejected, not silently canonicalised. #[test] fn decoded_transactions_reject_non_canonical_encoding() { use alloy_consensus::SignableTransaction; use alloy_eips::Encodable2718; - let typed = alloy_consensus::TxEip1559 { - chain_id: 10, + let legacy = alloy_consensus::TxLegacy { + chain_id: Some(10), nonce: 1, gas_limit: 21_000, - max_fee_per_gas: 2, - max_priority_fee_per_gas: 1, + gas_price: 2, to: Address::ZERO.into(), value: Default::default(), - access_list: Default::default(), input: Default::default(), } .into_signed(alloy_primitives::Signature::test_signature()) .encoded_2718(); - assert_eq!(typed[0], 0x02); - let bare = Bytes::copy_from_slice(&typed[1..]); + let mut tagged = vec![0x00]; + tagged.extend_from_slice(&legacy); - let attrs = OpPayloadAttributes { transactions: Some(vec![bare]), ..Default::default() }; - let err = attrs.decoded_transactions().next().unwrap().unwrap_err(); - assert!(err.to_string().contains("non-canonical"), "{err}"); + let attrs = + OpPayloadAttributes { transactions: Some(vec![tagged.into()]), ..Default::default() }; + attrs.decoded_transactions().next().unwrap().unwrap_err(); } } diff --git a/rust/op-alloy/crates/rpc-types-engine/src/flashblock/payload.rs b/rust/op-alloy/crates/rpc-types-engine/src/flashblock/payload.rs index 896d56023d6..8710550b155 100644 --- a/rust/op-alloy/crates/rpc-types-engine/src/flashblock/payload.rs +++ b/rust/op-alloy/crates/rpc-types-engine/src/flashblock/payload.rs @@ -194,35 +194,35 @@ mod tests { assert_eq!(payload.metadata, OpFlashblockPayloadMetadata::default()); } - /// A transaction that decodes but does not re-encode to the same bytes (here: an EIP-1559 - /// body with its type byte stripped) must be rejected, not silently canonicalised. + /// A legacy transaction with a `0x00` type tag decodes but does not re-encode to the same + /// bytes. It must be rejected, not silently canonicalised. #[test] fn decoded_transaction_rejects_non_canonical_encoding() { use alloy_consensus::SignableTransaction; use alloy_primitives::Address; use op_alloy_consensus::OpTxEnvelope; - let typed = alloy_consensus::TxEip1559 { - chain_id: 10, + let legacy = alloy_consensus::TxLegacy { + chain_id: Some(10), nonce: 1, gas_limit: 21_000, - max_fee_per_gas: 2, - max_priority_fee_per_gas: 1, + gas_price: 2, to: Address::ZERO.into(), value: Default::default(), - access_list: Default::default(), input: Default::default(), } .into_signed(alloy_primitives::Signature::test_signature()) .encoded_2718(); - assert_eq!(typed[0], 0x02); - let bare = Bytes::copy_from_slice(&typed[1..]); + let mut tagged = vec![0x00]; + tagged.extend_from_slice(&legacy); let payload = OpFlashblockPayload { - diff: OpFlashblockPayloadDelta { transactions: vec![bare], ..Default::default() }, + diff: OpFlashblockPayloadDelta { + transactions: vec![tagged.into()], + ..Default::default() + }, ..Default::default() }; - let err = payload.decoded_transaction::().next().unwrap().unwrap_err(); - assert!(err.to_string().contains("non-canonical"), "{err}"); + payload.decoded_transaction::().next().unwrap().unwrap_err(); #[cfg(feature = "k256")] assert!(payload.recover_transactions::().next().unwrap().is_err()); } 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 0d681cc87c9..325ffc34908 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,6 +14,13 @@ use alloy_rpc_types_engine::{ ExecutionPayloadV3, }; +/// UPSTREAM-MIRROR(copy): alloy-rpc-types-engine@2.4.2 `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 +/// carries a transparent SSZ encoding. Re-diff the visitor's accepted field set and its version +/// selection whenever upstream gains or reshapes a payload version. +/// /// A versioned OP execution payload. /// /// V1 through V3 use the corresponding Alloy execution payload types. V4 uses the OP-specific diff --git a/rust/op-reth/crates/cli/tests/snapshots/cli.snap b/rust/op-reth/crates/cli/tests/snapshots/cli.snap index 2c8358b24ca..ae5b76b073c 100644 --- a/rust/op-reth/crates/cli/tests/snapshots/cli.snap +++ b/rust/op-reth/crates/cli/tests/snapshots/cli.snap @@ -65,9 +65,9 @@ arg: --discovery.v5.port.ipv6 [action: Set] [num-args: arg: --discovery.v5.lookup-interval [action: Set] [num-args: 1] [default: 20] help: The interval in seconds at which to carry out periodic lookup queries, for the whole run of the program arg: --discovery.v5.bootstrap.lookup-interval [action: Set] [num-args: 1] [default: 5] help: The interval in seconds at which to carry out boost lookup queries, for a fixed number of times, at bootstrap arg: --discovery.v5.bootstrap.lookup-countdown [action: Set] [num-args: 1] [default: 200] help: The number of times to carry out boost lookup queries at bootstrap -arg: --trusted-peers [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs of trusted peers for P2P connections +arg: --trusted-peers [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs or ENRs of trusted peers for P2P connections arg: --trusted-only [action: SetTrue] [num-args: 0] help: Connect to or accept from trusted peers only -arg: --bootnodes [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs for P2P discovery bootstrap +arg: --bootnodes [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs or ENRs for P2P discovery bootstrap arg: --dns-retries [action: Set] [num-args: 1] [default: 0] help: Amount of DNS resolution requests retries to perform when peering arg: --peers-file [action: Set] [num-args: 1] [conflicts: --no-persist-peers] help: The path to the known peers file. Connected peers are dumped to this file on nodes\nshutdown, and read on startup. Cannot be used with `--no-persist-peers`. arg: --identity [action: Set] [num-args: 1] [default: ] help: Custom node identity @@ -142,7 +142,7 @@ arg: --builder.disallow [action: Set] [num-args: 1] help: Path to file co 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 revm block access lists 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-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: --gpo.blocks [action: Set] [num-args: 1] [default: 20] help: Number of recent blocks to check for gas price @@ -151,7 +151,7 @@ arg: --gpo.maxprice [action: Set] [num-args: 1] [default: 5000000000 arg: --gpo.percentile [action: Set] [num-args: 1] [default: 60] help: The percentile of gas prices to use for the estimate arg: --gpo.default-suggested-fee [action: Set] [num-args: 1] help: The default gas price to use if there are no blocks to use arg: --rpc.send-raw-transaction-sync-timeout [action: Set] [num-args: 1] [default: 30s] help: Timeout for `send_raw_transaction_sync` RPC method -arg: --testing.skip-invalid-transactions [action: SetTrue] [num-args: 0] [default: true] help: Skip invalid transactions in `testing_buildBlockV1` instead of failing +arg: --testing.skip-invalid-transactions [action: SetTrue] [num-args: 0] [default: false] help: Skip invalid transactions in `testing_buildBlockV1` instead of failing arg: --testing.gas-limit [action: Set] [num-args: 1] [hidden] help: Override the gas limit used by `testing_buildBlockV1` arg: --rpc.force-blob-sidecar-upcasting [action: SetTrue] [num-args: 0] [default: false] help: Force upcasting EIP-4844 blob sidecars to EIP-7594 format when Osaka is active arg: --txpool.pending-max-count [action: Set] [num-args: 1] [aliases: txpool.pending_max_count] [default: 10000] help: Max number of transactions in the pending sub-pool @@ -217,9 +217,10 @@ arg: --db.sync-mode [action: Set] [num-args: 1] help: Controls how a 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.disable-metrics [action: SetTrue] [num-args: 0] help: Disable built-in database metrics -arg: --dev [action: SetTrue] [num-args: 0] [aliases: auto-mine] help: Start the node in dev mode +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 arg: --dev.block-time [action: Set] [num-args: 1] [conflicts: --dev.block-max-transactions] help: Interval between blocks. +arg: --dev.finality-depth [action: Set] [num-args: 1] [default: 64] help: Number of confirmations required before a block is finalized. arg: --dev.payload-wait-time [action: Set] [num-args: 1] help: Time to wait after initiating payload building before resolving. arg: --dev.mnemonic [action: Set] [num-args: 1] [default: test test test test test test test test test test test junk] [requires: [(IsPresent, "dev")]] help: Derive dev accounts from a fixed mnemonic instead of random ones. arg: --full [action: SetTrue] [num-args: 0] [default: false] [conflicts: --minimal] help: Run full node. Only the most recent [`MINIMUM_UNWIND_SAFE_DISTANCE`] block states are stored @@ -246,14 +247,16 @@ 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: 2] 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 canonical-minus-persisted gap before engine API processing stalls -arg: --engine.memory-block-buffer-target [action: Set] [num-args: 1] [default: 0] help: Configure the target number of blocks to keep in memory +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-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.memory-block-buffer-target [action: Set] [num-args: 1] help: Configure the target number of blocks to keep in memory 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.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 @@ -271,8 +274,6 @@ arg: --engine.storage-worker-count [action: Set] [num-arg arg: --engine.account-worker-count [action: Set] [num-args: 1] help: Configure the number of account proof workers in the Tokio blocking pool. If not specified, defaults to the same count as storage workers arg: --engine.prewarming-threads [action: Set] [num-args: 1] help: Configure the number of prewarming threads. If not specified, defaults to available parallelism arg: --engine.disable-cache-metrics [action: SetTrue] [num-args: 0] [default: false] help: Disable cache metrics recording, which can take up to 50ms with large cached state -arg: --engine.sparse-trie-max-hot-slots [action: Set] [num-args: 1] [aliases: engine.sparse-trie-max-storage-tries] [default: 1500] help: LFU hot-slot capacity: max storage slots retained across sparse trie prune cycles -arg: --engine.sparse-trie-max-hot-accounts [action: Set] [num-args: 1] [default: 1000] help: LFU hot-account capacity: max account addresses retained across sparse trie prune cycles arg: --engine.slow-block-threshold [action: Set] [num-args: 1] help: Configure the slow block logging threshold in milliseconds arg: --engine.disable-sparse-trie-cache-pruning [action: SetTrue] [num-args: 0] [default: false] help: Fully disable sparse trie cache pruning. When set, the cached sparse trie is preserved without any node pruning or storage trie eviction between blocks. Useful for benchmarking the effects of retaining the full trie cache arg: --engine.state-root-task-timeout [action: Set] [num-args: 1] [default: 4s] help: Configure the timeout for the state root task before spawning a sequential fallback. If the state root task takes longer than this, a sequential computation starts in parallel and whichever finishes first is used @@ -664,9 +665,9 @@ arg: --discovery.v5.port.ipv6 [action: Set] [num-args: arg: --discovery.v5.lookup-interval [action: Set] [num-args: 1] [default: 20] help: The interval in seconds at which to carry out periodic lookup queries, for the whole run of the program arg: --discovery.v5.bootstrap.lookup-interval [action: Set] [num-args: 1] [default: 5] help: The interval in seconds at which to carry out boost lookup queries, for a fixed number of times, at bootstrap arg: --discovery.v5.bootstrap.lookup-countdown [action: Set] [num-args: 1] [default: 200] help: The number of times to carry out boost lookup queries at bootstrap -arg: --trusted-peers [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs of trusted peers for P2P connections +arg: --trusted-peers [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs or ENRs of trusted peers for P2P connections arg: --trusted-only [action: SetTrue] [num-args: 0] help: Connect to or accept from trusted peers only -arg: --bootnodes [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs for P2P discovery bootstrap +arg: --bootnodes [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs or ENRs for P2P discovery bootstrap arg: --dns-retries [action: Set] [num-args: 1] [default: 0] help: Amount of DNS resolution requests retries to perform when peering arg: --peers-file [action: Set] [num-args: 1] [conflicts: --no-persist-peers] help: The path to the known peers file. Connected peers are dumped to this file on nodes\nshutdown, and read on startup. Cannot be used with `--no-persist-peers`. arg: --identity [action: Set] [num-args: 1] [default: ] help: Custom node identity @@ -841,9 +842,9 @@ arg: --discovery.v5.port.ipv6 [action: Set] [num-args: arg: --discovery.v5.lookup-interval [action: Set] [num-args: 1] [default: 20] help: The interval in seconds at which to carry out periodic lookup queries, for the whole run of the program arg: --discovery.v5.bootstrap.lookup-interval [action: Set] [num-args: 1] [default: 5] help: The interval in seconds at which to carry out boost lookup queries, for a fixed number of times, at bootstrap arg: --discovery.v5.bootstrap.lookup-countdown [action: Set] [num-args: 1] [default: 200] help: The number of times to carry out boost lookup queries at bootstrap -arg: --trusted-peers [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs of trusted peers for P2P connections +arg: --trusted-peers [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs or ENRs of trusted peers for P2P connections arg: --trusted-only [action: SetTrue] [num-args: 0] help: Connect to or accept from trusted peers only -arg: --bootnodes [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs for P2P discovery bootstrap +arg: --bootnodes [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs or ENRs for P2P discovery bootstrap arg: --dns-retries [action: Set] [num-args: 1] [default: 0] help: Amount of DNS resolution requests retries to perform when peering arg: --peers-file [action: Set] [num-args: 1] [conflicts: --no-persist-peers] help: The path to the known peers file. Connected peers are dumped to this file on nodes\nshutdown, and read on startup. Cannot be used with `--no-persist-peers`. arg: --identity [action: Set] [num-args: 1] [default: ] help: Custom node identity @@ -900,9 +901,9 @@ arg: --discovery.v5.port.ipv6 [action: Set] [num-args: arg: --discovery.v5.lookup-interval [action: Set] [num-args: 1] [default: 20] help: The interval in seconds at which to carry out periodic lookup queries, for the whole run of the program arg: --discovery.v5.bootstrap.lookup-interval [action: Set] [num-args: 1] [default: 5] help: The interval in seconds at which to carry out boost lookup queries, for a fixed number of times, at bootstrap arg: --discovery.v5.bootstrap.lookup-countdown [action: Set] [num-args: 1] [default: 200] help: The number of times to carry out boost lookup queries at bootstrap -arg: --trusted-peers [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs of trusted peers for P2P connections +arg: --trusted-peers [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs or ENRs of trusted peers for P2P connections arg: --trusted-only [action: SetTrue] [num-args: 0] help: Connect to or accept from trusted peers only -arg: --bootnodes [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs for P2P discovery bootstrap +arg: --bootnodes [action: Append] [num-args: 1] [value-delimiter: ','] help: Comma separated enode URLs or ENRs for P2P discovery bootstrap arg: --dns-retries [action: Set] [num-args: 1] [default: 0] help: Amount of DNS resolution requests retries to perform when peering arg: --peers-file [action: Set] [num-args: 1] [conflicts: --no-persist-peers] help: The path to the known peers file. Connected peers are dumped to this file on nodes\nshutdown, and read on startup. Cannot be used with `--no-persist-peers`. arg: --identity [action: Set] [num-args: 1] [default: ] help: Custom node identity diff --git a/rust/op-reth/crates/consensus/src/validation/isthmus.rs b/rust/op-reth/crates/consensus/src/validation/isthmus.rs index cf9309b9268..3ab3fb8fd9d 100644 --- a/rust/op-reth/crates/consensus/src/validation/isthmus.rs +++ b/rust/op-reth/crates/consensus/src/validation/isthmus.rs @@ -34,8 +34,8 @@ pub fn withdrawals_root( .state() .get(&L2_TO_L1_MESSAGE_PASSER_ADDRESS) .map(|acc| { + // The MessagePasser predeploy cannot be destroyed, so its storage is never wiped. HashedStorage::from_plain_storage( - acc.status, acc.storage.iter().map(|(slot, value)| (slot, &value.present_value)), ) }) @@ -150,7 +150,6 @@ mod test { // create account storage let init_storage = HashedStorage::from_iter( - false, [ "50000000000000000000000000000004253371b55351a08cb3267d4d265530b6", "512428ed685fff57294d1a9cbb147b18ae5db9cf6ae4b312fa1946ba0561882e", diff --git a/rust/op-reth/crates/consensus/src/validation/mod.rs b/rust/op-reth/crates/consensus/src/validation/mod.rs index d4a3d6d9f11..ebb5273046b 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:aef8d3e +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 /// `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:aef8d3e +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 /// `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:aef8d3e `reth_ethereum_consensus::validation::verify_receipts` +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 `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:aef8d3e +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 /// `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/src/build.rs b/rust/op-reth/crates/evm/src/build.rs index d7be6511ead..07e999a1fd2 100644 --- a/rust/op-reth/crates/evm/src/build.rs +++ b/rust/op-reth/crates/evm/src/build.rs @@ -30,7 +30,7 @@ impl OpBlockAssembler { } impl OpBlockAssembler { - /// UPSTREAM-MIRROR(copy): reth@rev:aef8d3e + /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 /// `reth_evm_ethereum::EthBlockAssembler::assemble_block` /// /// Copies upstream block assembly with OP receipt roots, withdrawals, and DA fields. diff --git a/rust/op-reth/crates/evm/src/config.rs b/rust/op-reth/crates/evm/src/config.rs index 6b2b0464764..0515a63aecf 100644 --- a/rust/op-reth/crates/evm/src/config.rs +++ b/rust/op-reth/crates/evm/src/config.rs @@ -25,10 +25,11 @@ pub struct OpNextBlockEnvAttributes { impl reth_rpc_eth_api::helpers::pending_block::BuildPendingEnv for OpNextBlockEnvAttributes { - /// UPSTREAM-MIRROR(copy): reth@rev:aef8d3e + /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 /// `reth_rpc_eth_api::helpers::pending_block::NextBlockEnvAttributes::build_pending_env` /// - /// Copies upstream pending-environment defaults for the OP attribute type. + /// Copies upstream pending-environment defaults for the OP attribute type, except that + /// `parent_beacon_block_root` carries the parent's actual root where upstream zeroes it. fn build_pending_env( parent: &crate::SealedHeader, block_overrides: Option<&alloy_rpc_types_eth::BlockOverrides>, diff --git a/rust/op-reth/crates/evm/src/lib.rs b/rust/op-reth/crates/evm/src/lib.rs index 6eb85621f8a..ebe246ea463 100644 --- a/rust/op-reth/crates/evm/src/lib.rs +++ b/rust/op-reth/crates/evm/src/lib.rs @@ -222,7 +222,7 @@ where } } -/// UPSTREAM-MIRROR(copy): reth@rev:aef8d3e `reth_evm_ethereum::EthEvmConfig` +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 `reth_evm_ethereum::EthEvmConfig` /// /// Mirrors upstream `ConfigureEvm` plumbing with OP environments and execution context. impl ConfigureEvm for OpEvmConfig @@ -322,9 +322,12 @@ where } } -/// UPSTREAM-MIRROR(copy): reth@rev:aef8d3e `reth_evm_ethereum::EthEvmConfig` +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 `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 +/// an optional `SenderRecoveryCache`, which only memoizes `try_recover` and so returns the same +/// signer. #[cfg(feature = "std")] impl ConfigureEngineEvm for OpEvmConfig where diff --git a/rust/op-reth/crates/flashblocks/src/worker.rs b/rust/op-reth/crates/flashblocks/src/worker.rs index 927f78b91ca..056d3bea27e 100644 --- a/rust/op-reth/crates/flashblocks/src/worker.rs +++ b/rust/op-reth/crates/flashblocks/src/worker.rs @@ -328,14 +328,16 @@ where let (hashed_state, state_root) = if args.compute_state_root { trace!(target: "flashblocks", "Computing block state root"); - let hashed_state = state_provider.hashed_post_state(&db.bundle_state); + let hashed_state = + state_provider.hashed_post_state(&db.bundle_state).map_err(RethError::other)?; let (state_root, _) = state_provider .state_root_with_updates(hashed_state.clone()) .map_err(RethError::other)?; (hashed_state, state_root) } else { let noop_provider = NoopProvider::default(); - let hashed_state = noop_provider.hashed_post_state(&db.bundle_state); + let hashed_state = + noop_provider.hashed_post_state(&db.bundle_state).map_err(RethError::other)?; let (state_root, _) = noop_provider .state_root_with_updates(hashed_state.clone()) .map_err(RethError::other)?; diff --git a/rust/op-reth/crates/hardforks/src/lib.rs b/rust/op-reth/crates/hardforks/src/lib.rs index ab620e2b6df..7d15cadc1d2 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:aef8d3e `reth_ethereum_forks::DEV_HARDFORKS` +/// UPSTREAM-MIRROR(set): reth@rev:0fbe428 `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 7377bcc4ead..522c3213908 100644 --- a/rust/op-reth/crates/node/Cargo.toml +++ b/rust/op-reth/crates/node/Cargo.toml @@ -31,6 +31,7 @@ reth-node-core.workspace = true reth-rpc-engine-api.workspace = true reth-rpc-api.workspace = true +reth-rpc-builder.workspace = true reth-db.workspace = true reth-db-api.workspace = true reth-chain-state.workspace = true @@ -89,6 +90,8 @@ 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 @@ -101,6 +104,7 @@ reth-rpc.workspace = true reth-rpc-eth-api.workspace = true reth-rpc-eth-types.workspace = true reth-stages-types.workspace = true +reth-storage-overlay.workspace = true reth-trie-db.workspace = true alloy-network.workspace = true diff --git a/rust/op-reth/crates/node/src/engine.rs b/rust/op-reth/crates/node/src/engine.rs index d05325faa4a..61bf6d044a4 100644 --- a/rust/op-reth/crates/node/src/engine.rs +++ b/rust/op-reth/crates/node/src/engine.rs @@ -22,7 +22,7 @@ use reth_optimism_payload_builder::{ OpExecData, OpExecutionPayloadValidator, OpPayloadAttrs, OpPayloadTypes, }; use reth_optimism_primitives::{L2_TO_L1_MESSAGE_PASSER_ADDRESS, OpBlock}; -use reth_primitives_traits::{Block, RecoveredBlock, SealedBlock, SignedTransaction}; +use reth_primitives_traits::{Block, RecoveredBlock, SealedBlock, SealedHeader, SignedTransaction}; use reth_provider::{ProviderResult, StateProviderBox, StateProviderFactory}; use reth_trie_common::{HashedPostState, KeyHasher}; use std::{marker::PhantomData, sync::Arc}; @@ -136,6 +136,7 @@ where &self, state_updates: impl FnOnce() -> &'a HashedPostState, block: &RecoveredBlock, + _parent_header: &SealedHeader<::Header>, parent_state: impl FnOnce() -> ProviderResult, ) -> Result<(), InsertBlockErrorKind> { if self.chain_spec().is_isthmus_active_at_timestamp(block.timestamp()) { @@ -541,6 +542,9 @@ mod test { &validator, || &hashed_state, &block, + // The validator reads the parent *state*, not the parent header; any sealed + // header satisfies the signature. + &SealedHeader::new(Header::default(), unavailable_parent), || NoopProvider::default().latest(), ); diff --git a/rust/op-reth/crates/node/src/node.rs b/rust/op-reth/crates/node/src/node.rs index cc47ae7781b..7e25ee141fe 100644 --- a/rust/op-reth/crates/node/src/node.rs +++ b/rust/op-reth/crates/node/src/node.rs @@ -60,6 +60,7 @@ use reth_rpc_api::{ DebugApiServer, EthConfigApiServer, L2EthApiExtServer, eth::{RpcTypes, helpers::config::EthConfigHandler}, }; +use reth_rpc_builder::{TransportRpcModules, auth::AuthRpcModule}; use reth_rpc_server_types::RethRpcModule; use reth_tracing::tracing::{debug, info}; use reth_transaction_pool::{ @@ -667,6 +668,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"]; + +/// 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) { + for &method in UNSERVED_RPC_METHODS { + modules.remove_method_from_configured(method); + auth_module.remove_auth_method(method); + } +} + impl NodeAddOns for OpAddOns where @@ -826,6 +842,11 @@ where )?; } + // Runs before the `extend_rpc_modules` hooks, so a method an override there + // re-declares — see `reth_optimism_rpc::eth::proofs::EthApiOverride` — is put + // back and stays served. + remove_unserved_rpc_methods(modules, auth_module); + Ok(()) }) .await @@ -1746,6 +1767,66 @@ pub type OpNetworkPrimitives = BasicNetworkPrimitives); + + impl IntoEngineApiRpcModule for TestEngineModule { + fn into_rpc_module(self) -> RpcModule<()> { + self.0 + } + } + + fn module_serving_unserved_methods() -> RpcModule<()> { + let mut module = RpcModule::new(()); + for &method in UNSERVED_RPC_METHODS { + module.register_method(method, |_, _, _| Ok::<_, ErrorObjectOwned>(())).unwrap(); + } + module + } + + /// The methods reach an OP node only because upstream installs them, so pin which ones the + /// node drops rather than only that the removal runs. + #[test] + fn eth_get_multi_proof_is_unserved() { + assert!(UNSERVED_RPC_METHODS.contains(&"eth_getMultiProof")); + } + + #[test] + fn unserved_methods_are_removed_from_every_transport() { + let mut modules = TransportRpcModules::default() + .with_http(module_serving_unserved_methods()) + .with_ws(module_serving_unserved_methods()) + .with_ipc(module_serving_unserved_methods()); + let mut auth_module = + AuthRpcModule::new(TestEngineModule(module_serving_unserved_methods())); + + remove_unserved_rpc_methods(&mut modules, &mut auth_module); + + for (transport, methods) in [ + ("http", modules.http_methods(|_| true)), + ("ws", modules.ws_methods(|_| true)), + ("ipc", modules.ipc_methods(|_| true)), + ] { + let served = methods.expect("transport is configured"); + for &method in UNSERVED_RPC_METHODS { + assert!( + !served.method_names().any(|name| name == method), + "{method} is still served over {transport}" + ); + } + } + + let auth_methods = auth_module.module_mut(); + for &method in UNSERVED_RPC_METHODS { + assert!( + !auth_methods.method_names().any(|name| name == method), + "{method} is still served over the auth server" + ); + } + } #[test] fn standard_pool_builder_forwards_base_config() { diff --git a/rust/op-reth/crates/node/src/rpc.rs b/rust/op-reth/crates/node/src/rpc.rs index 1a43a9bba13..4826341105c 100644 --- a/rust/op-reth/crates/node/src/rpc.rs +++ b/rust/op-reth/crates/node/src/rpc.rs @@ -23,8 +23,8 @@ //! use reth_provider::providers::BlockchainProvider; //! use reth_rpc::TraceApi; //! use reth_rpc_eth_types::{EthConfig, EthStateCache}; +//! use reth_storage_overlay::OverlayManager; //! use reth_tasks::{RuntimeBuilder, pool::BlockingTaskGuard}; -//! use reth_trie_db::ChangesetCache; //! use std::sync::Arc; //! //! #[tokio::main] @@ -39,7 +39,7 @@ //! .with_loaded_toml_config(sepolia) //! .unwrap() //! .attach(Arc::new(db)) -//! .with_provider_factory::<_, OpEvmConfig>(ChangesetCache::new(), None, &[]) +//! .with_provider_factory::<_, OpEvmConfig>(OverlayManager::default(), None, &[]) //! .await //! .unwrap() //! .with_genesis() diff --git a/rust/op-reth/crates/node/tests/it/main.rs b/rust/op-reth/crates/node/tests/it/main.rs index d44168c9a77..10382155c42 100644 --- a/rust/op-reth/crates/node/tests/it/main.rs +++ b/rust/op-reth/crates/node/tests/it/main.rs @@ -18,4 +18,6 @@ mod estimate_gas_7825; mod p2p_version; +mod payload_handoff; + const fn main() {} diff --git a/rust/op-reth/crates/node/tests/it/payload_handoff.rs b/rust/op-reth/crates/node/tests/it/payload_handoff.rs new file mode 100644 index 00000000000..d37d86dc1ed --- /dev/null +++ b/rust/op-reth/crates/node/tests/it/payload_handoff.rs @@ -0,0 +1,382 @@ +//! 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/src/builder.rs b/rust/op-reth/crates/payload/src/builder.rs index 85db244f048..cffd5a1a177 100644 --- a/rust/op-reth/crates/payload/src/builder.rs +++ b/rust/op-reth/crates/payload/src/builder.rs @@ -47,7 +47,9 @@ use reth_revm::{ cancelled::CancelOnDrop, database::StateProviderDatabase, db::State, witness::ExecutionWitnessRecord, }; -use reth_storage_api::{StateProvider, StateProviderFactory, errors::ProviderError}; +use reth_storage_api::{ + HeaderProvider, StateProvider, StateProviderFactory, errors::ProviderError, +}; use reth_transaction_pool::{BestTransactionsAttributes, PoolTransaction, TransactionPool}; use revm::context::{Block, BlockEnv}; use std::{marker::PhantomData, sync::Arc}; @@ -284,7 +286,10 @@ where &self, parent: SealedHeader, attributes: Attrs::RpcPayloadAttributes, - ) -> Result { + ) -> Result + where + Client: HeaderProvider, + { let attributes = Attrs::try_new(parent.hash(), attributes, 3)?; let payload_id = attributes.payload_id(); @@ -306,7 +311,7 @@ where let state_provider = self.client.state_by_block_hash(ctx.parent().hash())?; let builder = OpBuilder::new(|_| NoopPayloadTransactions::::default()); - builder.witness(state_provider, &ctx) + builder.witness(state_provider, &self.client, &ctx) } } @@ -551,7 +556,6 @@ impl OpBuilder<'_, Txs> { execution_output: Arc::new(execution_outcome), hashed_state: Arc::new(hashed_state), trie_updates: Arc::new(trie_updates), - changed_paths: None, }; let no_tx_pool = ctx.attributes().no_tx_pool(); @@ -570,12 +574,14 @@ impl OpBuilder<'_, Txs> { } /// Builds the payload and returns its [`ExecutionWitness`] based on the state after execution. - pub fn witness( + pub fn witness( self, state_provider: impl StateProvider, + headers_provider: &HP, ctx: &OpPayloadBuilderCtx, ) -> Result where + HP: HeaderProvider + ?Sized, Evm: ConfigurePostExecEvm< Primitives = N, NextBlockEnvCtx: BuildNextEnv, @@ -602,15 +608,12 @@ impl OpBuilder<'_, Txs> { _ = db.load_cache_account(L2_TO_L1_MESSAGE_PASSER_ADDRESS)?; } - let ExecutionWitnessRecord { hashed_state, codes, keys, lowest_block_number: _ } = - ExecutionWitnessRecord::from_executed_state(&db, Default::default()); - let state = state_provider.witness(Default::default(), hashed_state, Default::default())?; - Ok(ExecutionWitness { - state: state.into_iter().collect(), - codes, - keys, - ..Default::default() - }) + Ok(ExecutionWitnessRecord::new(&db).into_execution_witness( + &state_provider, + headers_provider, + ctx.parent().number() + 1, + Default::default(), + )?) } } diff --git a/rust/op-reth/crates/payload/src/lib.rs b/rust/op-reth/crates/payload/src/lib.rs index c5eb3e3f08f..6fc73d07ab6 100644 --- a/rust/op-reth/crates/payload/src/lib.rs +++ b/rust/op-reth/crates/payload/src/lib.rs @@ -83,7 +83,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:aef8d3e + /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 /// `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 bd4277d4184..1440f07f93d 100644 --- a/rust/op-reth/crates/payload/src/payload.rs +++ b/rust/op-reth/crates/payload/src/payload.rs @@ -447,7 +447,7 @@ impl BuiltPayload for OpBuiltPayload { } } -/// UPSTREAM-MIRROR(copy): reth@rev:aef8d3e +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 /// `reth_ethereum_engine_primitives::EthBuiltPayload::into_execution_data` /// /// Counterpart to `OpPayloadTypes::block_to_payload`; the two conversion paths are kept @@ -819,27 +819,25 @@ mod tests { assert_eq!(extra_data.unwrap_err(), EIP1559ParamError::MinBaseFeeNotSet); } - /// A transaction that decodes but does not re-encode to the same bytes (here: an EIP-1559 - /// body with its type byte stripped) must be rejected, not silently canonicalised. + /// A legacy transaction with a `0x00` type tag decodes but does not re-encode to the same + /// bytes. It must be rejected, not silently canonicalised. #[test] fn try_new_rejects_non_canonical_transaction_encoding() { use alloy_consensus::SignableTransaction; use alloy_eips::eip2718::Encodable2718; - let typed = alloy_consensus::TxEip1559 { - chain_id: 10, + let legacy = alloy_consensus::TxLegacy { + chain_id: Some(10), nonce: 1, gas_limit: 21_000, - max_fee_per_gas: 2, - max_priority_fee_per_gas: 1, + gas_price: 2, to: Address::ZERO.into(), value: Default::default(), - access_list: Default::default(), input: Default::default(), } .into_signed(alloy_primitives::Signature::test_signature()) .encoded_2718(); - assert_eq!(typed[0], 0x02); - let bare = Bytes::copy_from_slice(&typed[1..]); + let mut tagged = vec![0x00]; + tagged.extend_from_slice(&legacy); let attrs = OpPayloadAttributes { payload_attributes: PayloadAttributes { @@ -851,25 +849,19 @@ mod tests { slot_number: None, target_gas_limit: None, }, - transactions: Some(vec![bare]), + transactions: Some(vec![tagged.into()]), no_tx_pool: Some(true), gas_limit: Some(30_000_000), eip_1559_params: None, min_base_fee: None, }; - let err = OpPayloadBuilderAttributes::::try_new( - B256::ZERO, - attrs.clone(), - 3, - ) - .unwrap_err(); - assert!(err.to_string().contains("non-canonical"), "{err}"); - let err = OpPayloadBuilderAttributes::::from_rpc_attrs( + OpPayloadBuilderAttributes::::try_new(B256::ZERO, attrs.clone(), 3) + .unwrap_err(); + OpPayloadBuilderAttributes::::from_rpc_attrs( B256::ZERO, PayloadId::new([0; 8]), attrs, ) .unwrap_err(); - assert!(err.to_string().contains("non-canonical"), "{err}"); } } diff --git a/rust/op-reth/crates/payload/src/validator.rs b/rust/op-reth/crates/payload/src/validator.rs index 2a93cf45b35..9a41c8d3913 100644 --- a/rust/op-reth/crates/payload/src/validator.rs +++ b/rust/op-reth/crates/payload/src/validator.rs @@ -37,7 +37,7 @@ where } } -/// UPSTREAM-MIRROR(copy): reth@rev:aef8d3e +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 /// `reth_ethereum_payload_builder::validator::ensure_well_formed_payload` /// /// Copies upstream's ordered payload checks with OP payload fields and fork activation. diff --git a/rust/op-reth/crates/rpc/Cargo.toml b/rust/op-reth/crates/rpc/Cargo.toml index 4ce83d302cd..1a59c2078cf 100644 --- a/rust/op-reth/crates/rpc/Cargo.toml +++ b/rust/op-reth/crates/rpc/Cargo.toml @@ -49,7 +49,6 @@ alloy-eips.workspace = true alloy-hardforks.workspace = true alloy-json-rpc.workspace = true alloy-primitives.workspace = true -alloy-rlp.workspace = true alloy-rpc-client.workspace = true alloy-rpc-types-eth.workspace = true alloy-rpc-types-debug.workspace = true diff --git a/rust/op-reth/crates/rpc/src/debug.rs b/rust/op-reth/crates/rpc/src/debug.rs index 65120a76a3c..71b5ffa426e 100644 --- a/rust/op-reth/crates/rpc/src/debug.rs +++ b/rust/op-reth/crates/rpc/src/debug.rs @@ -5,9 +5,8 @@ use crate::{ state::OpStateProviderFactory, }; use alloy_consensus::BlockHeader; -use alloy_eips::{BlockId, BlockNumberOrTag}; +use alloy_eips::BlockId; use alloy_primitives::{B256, Sealed}; -use alloy_rlp::Encodable; use alloy_rpc_types_debug::ExecutionWitness; use async_trait::async_trait; use jsonrpsee::proc_macros::rpc; @@ -62,8 +61,11 @@ pub trait DebugApiOverride { ) -> RpcResult; /// Returns the execution witness for a given block. + /// + /// Takes the same [`BlockId`] as upstream's `debug_executionWitness`, so installing the + /// proofs ExEx does not narrow the accepted parameter to a number or tag. #[method(name = "executionWitness")] - async fn execution_witness(&self, block: BlockNumberOrTag) -> RpcResult; + async fn execution_witness(&self, block: BlockId) -> RpcResult; /// Returns the current proofs sync status. #[method(name = "proofsSyncStatus")] @@ -242,7 +244,9 @@ where >::default() }); - builder.witness(state_provider, &ctx).map_err(PayloadBuilderError::other) + builder + .witness(state_provider, &this.provider, &ctx) + .map_err(PayloadBuilderError::other) }; let _ = tx.send(result.await); @@ -255,7 +259,7 @@ where .await } - async fn execution_witness(&self, block_id: BlockNumberOrTag) -> RpcResult { + async fn execution_witness(&self, block_id: BlockId) -> RpcResult { self.inner .metrics .record_operation_async(DebugApis::DebugExecutionWitness, async { @@ -264,56 +268,37 @@ where let block = self .inner .eth_api - .recovered_block(block_id.into()) + .recovered_block(block_id) .await? - .ok_or(EthApiError::HeaderNotFound(block_id.into()))?; + .ok_or(EthApiError::HeaderNotFound(block_id))?; let this = self.inner.clone(); let block_number = block.header().number(); let state_provider = this .state_provider_factory - .state_provider(Some(BlockId::Number(block.parent_num_hash().number.into()))) + .state_provider(Some(BlockId::Hash(block.parent_hash().into()))) .await .map_err(EthApiError::from)?; let db = StateProviderDatabase::new(&state_provider); let block_executor = this.eth_api.evm_config().executor(db); - let mut witness_record = ExecutionWitnessRecord::default(); - + let mut witness = None; let _ = block_executor .execute_with_state_closure(&block, |statedb: &State<_>| { - witness_record.record_executed_state(statedb, Default::default()); + witness = + Some(ExecutionWitnessRecord::new(statedb).into_execution_witness( + &state_provider, + &this.provider, + block_number, + Default::default(), + )); }) .map_err(EthApiError::from)?; - let ExecutionWitnessRecord { hashed_state, codes, keys, lowest_block_number } = - witness_record; - - let state = state_provider - .witness(Default::default(), hashed_state, Default::default()) + let exec_witness = witness + .expect("state closure is called after successful execution") .map_err(EthApiError::from)?; - let mut exec_witness = - ExecutionWitness { state, codes, keys, ..Default::default() }; - - // If there were no calls to the BLOCKHASH opcode, return only the - // parent header. - let smallest = - lowest_block_number.unwrap_or_else(|| block_number.saturating_sub(1)); - - let range = smallest..block_number; - exec_witness.headers = self - .inner - .provider - .headers_range(range) - .map_err(EthApiError::from)? - .into_iter() - .map(|header| { - let mut serialized_header = Vec::new(); - header.encode(&mut serialized_header); - serialized_header.into() - }) - .collect(); Ok(exec_witness) }) @@ -336,3 +321,64 @@ where } } } + +#[cfg(test)] +mod tests { + use super::*; + use alloy_primitives::b256; + use serde_json::json; + use std::sync::Mutex; + + const BLOCK_HASH: B256 = + b256!("0x1111111111111111111111111111111111111111111111111111111111111111"); + + /// Stand-in for [`DebugApiExt`] that records the decoded argument instead of re-executing a + /// block, so these tests pin the RPC parameter shape rather than the witness contents. + #[derive(Debug, Default)] + struct RecordingDebugApi { + seen: Arc>>, + } + + #[async_trait] + impl DebugApiOverrideServer for RecordingDebugApi { + async fn execute_payload( + &self, + _parent_block_hash: B256, + _attributes: serde_json::Value, + ) -> RpcResult { + unimplemented!("not exercised by these tests") + } + + async fn execution_witness(&self, block: BlockId) -> RpcResult { + *self.seen.lock().unwrap() = Some(block); + Ok(ExecutionWitness::default()) + } + + async fn proofs_sync_status(&self) -> RpcResult { + unimplemented!("not exercised by these tests") + } + } + + async fn decoded_block(param: serde_json::Value) -> BlockId { + let seen = Arc::>>::default(); + let module = RecordingDebugApi { seen: seen.clone() }.into_rpc(); + let _: ExecutionWitness = module + .call("debug_executionWitness", [param]) + .await + .expect("debug_executionWitness should accept the parameter"); + seen.lock().unwrap().expect("handler should have run") + } + + /// The override must accept every `debug_executionWitness` parameter the stock handler + /// does, so a caller sees one method shape whether or not the proofs ExEx is installed. + #[tokio::test] + async fn execution_witness_accepts_every_block_id_form() { + assert_eq!(decoded_block(json!(BLOCK_HASH)).await, BlockId::from(BLOCK_HASH)); + assert_eq!( + decoded_block(json!({ "blockHash": BLOCK_HASH })).await, + BlockId::from(BLOCK_HASH) + ); + assert_eq!(decoded_block(json!("0x2a")).await, BlockId::from(42)); + assert_eq!(decoded_block(json!("latest")).await, BlockId::latest()); + } +} diff --git a/rust/op-reth/crates/rpc/src/engine.rs b/rust/op-reth/crates/rpc/src/engine.rs index ce671839c84..5d835449215 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:aef8d3e `reth_rpc_engine_api::capabilities::CAPABILITIES` +/// UPSTREAM-MIRROR(set): reth@rev:0fbe428 `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:aef8d3e `reth_rpc_api::EngineApi` +/// UPSTREAM-MIRROR(set): reth@rev:0fbe428 `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 3325077490c..1321648d4a9 100644 --- a/rust/op-reth/crates/rpc/src/eth/mod.rs +++ b/rust/op-reth/crates/rpc/src/eth/mod.rs @@ -13,11 +13,12 @@ use crate::{ OpEthApiError, SequencerClient, eth::{receipt::OpReceiptConverter, transaction::OpTxInfoMapper}, }; -use alloy_eips::BlockNumHash; +use alloy_consensus::Header; use alloy_primitives::U256; -use alloy_rpc_types_eth::{Filter, Log}; +use alloy_rpc_types_eth::Filter; use eyre::WrapErr; use futures::StreamExt; +use op_alloy_consensus::OpReceipt; use op_alloy_network::Optimism; use op_alloy_rpc_types_engine::OpFlashblockPayloadBase; pub use receipt::{OpReceiptBuilder, OpReceiptFieldsBuilder}; @@ -31,10 +32,10 @@ use reth_optimism_flashblocks::{ FlashBlockConsensusClient, FlashBlockRx, FlashBlockService, FlashblockCachedReceipt, FlashblocksListeners, PendingBlockRx, PendingFlashBlock, WsFlashBlockStream, }; -use reth_primitives_traits::NodePrimitives; +use reth_primitives_traits::{NodePrimitives, SealedHeader}; use reth_rpc::eth::core::EthApiInner; use reth_rpc_eth_api::{ - EthApiTypes, FromEvmError, FullEthApiServer, RpcConvert, RpcConverter, RpcNodeCore, + EthApiTypes, FromEvmError, FullEthApiServer, RpcConvert, RpcConverter, RpcLog, RpcNodeCore, RpcNodeCoreExt, RpcTypes, helpers::{ EthApiSpec, EthFees, EthState, EthSubscriptions, LoadFee, LoadPendingBlock, LoadState, @@ -57,7 +58,7 @@ use std::{ }; use tokio::{sync::watch, time}; use tokio_stream::{Stream, wrappers::BroadcastStream}; -use tracing::info; +use tracing::{info, warn}; /// Maximum duration to wait for a fresh flashblock when one is being built. const MAX_FLASHBLOCK_WAIT_DURATION: Duration = Duration::from_millis(50); @@ -140,7 +141,12 @@ impl OpEthApi { pub fn flashblock_receipts_stream( &self, filter: Filter, - ) -> Option + Send + Unpin> { + ) -> Option> + Send + Unpin> + where + Rpc: RpcConvert + Clone, + N::Primitives: NodePrimitives, + { + let converter = Rpc::clone(self.converter()); self.subscribe_received_flashblocks().map(|rx| { BroadcastStream::new(rx) .scan( @@ -165,13 +171,29 @@ impl OpEthApi { let receipts = fb.metadata.receipts.iter().map(|(tx, receipt)| (*tx, receipt)); - let all_logs = matching_block_logs_with_tx_hashes( + // A flashblock is a payload, not a sealed block: only the number, + // hash and timestamp the log fields need are known here, so the header + // handed to the converter carries exactly those. Everything else is + // zeroed and must not be read. + let header = SealedHeader::new( + Header { number: block_number, timestamp, ..Default::default() }, + fb.diff.block_hash, + ); + + let all_logs = match matching_block_logs_with_tx_hashes( + &converter, &filter, - BlockNumHash::new(block_number, fb.diff.block_hash), - timestamp, + &header, receipts, false, - ); + ) { + Ok(logs) => logs, + // Unreachable with the current OP converter: `convert_log` always returns `Ok`. + Err(err) => { + warn!(target: "rpc::eth", %err, "failed to convert flashblock logs"); + Vec::new() + } + }; futures::future::ready(Some(all_logs)) }, diff --git a/rust/op-reth/crates/rpc/src/eth/proofs.rs b/rust/op-reth/crates/rpc/src/eth/proofs.rs index 07522c96b20..ec04f421257 100644 --- a/rust/op-reth/crates/rpc/src/eth/proofs.rs +++ b/rust/op-reth/crates/rpc/src/eth/proofs.rs @@ -14,6 +14,14 @@ use reth_provider::StateProofProvider; use reth_rpc_api::eth::helpers::FullEthApi; use std::time::Instant; +/// The `eth_` proof methods served from the historical proofs storage. +/// +/// UPSTREAM-MIRROR(set): reth@rev:0fbe428 `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 +/// on each bump: every new one must either be declared here or dropped from the served surface in +/// `reth_optimism_node::node`, so that a proofs-history node never answers it from live state. #[cfg_attr(not(test), rpc(server, namespace = "eth"))] #[cfg_attr(test, rpc(server, client, namespace = "eth"))] pub trait EthApiOverride { diff --git a/rust/op-reth/crates/rpc/src/eth/receipt.rs b/rust/op-reth/crates/rpc/src/eth/receipt.rs index 7481c039a99..401d25212fa 100644 --- a/rust/op-reth/crates/rpc/src/eth/receipt.rs +++ b/rust/op-reth/crates/rpc/src/eth/receipt.rs @@ -11,7 +11,7 @@ use reth_chainspec::{ChainSpecProvider, EthChainSpec}; use reth_node_api::NodePrimitives; use reth_optimism_evm::RethL1BlockInfo; use reth_optimism_forks::OpHardforks; -use reth_primitives_traits::{BlockBody, SealedBlock}; +use reth_primitives_traits::{BlockBody, SealedBlock, SealedHeaderFor}; use reth_rpc_eth_api::{ RpcConvert, helpers::LoadReceipt, @@ -48,8 +48,18 @@ where BlockReader + ChainSpecProvider + Debug + 'static, { type RpcReceipt = OpTransactionReceipt; + type RpcLog = Log; type Error = OpEthApiError; + fn convert_log( + &self, + log: Log, + _receipt: &N::Receipt, + _header: &SealedHeaderFor, + ) -> Result { + Ok(log) + } + fn convert_receipts( &self, inputs: Vec>, diff --git a/rust/op-reth/crates/rpc/src/eth/transaction.rs b/rust/op-reth/crates/rpc/src/eth/transaction.rs index df8f9d7d45c..45e8ea0d328 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:aef8d3e + /// UPSTREAM-MIRROR(override): reth@rev:0fbe428 /// `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:aef8d3e + /// UPSTREAM-MIRROR(override): reth@rev:0fbe428 /// `reth_rpc_eth_api::helpers::EthTransactions::transaction_receipt` /// /// Extends the upstream default with a flashblock receipt lookup. @@ -194,8 +194,10 @@ where return Ok(Some(receipt)); } } - let Some((tx, meta, receipt, all_receipts)) = tx_receipt else { return Ok(None) }; - self.build_transaction_receipt(tx, meta, receipt, all_receipts).await.map(Some) + let Some((tx, meta, receipt, all_receipts, block)) = tx_receipt else { + return Ok(None); + }; + self.build_transaction_receipt(tx, meta, receipt, all_receipts, block).await.map(Some) } } } @@ -206,10 +208,11 @@ where OpEthApiError: FromEvmError, Rpc: RpcConvert, { - /// UPSTREAM-MIRROR(override): reth@rev:aef8d3e + /// UPSTREAM-MIRROR(override): reth@rev:0fbe428 /// `reth_rpc_eth_api::helpers::LoadTransaction::transaction_by_hash` /// - /// Extends the upstream disk/cache/pool lookup with flashblocks. + /// Inserts a flashblock lookup between upstream's disk and pool lookups, and does not + /// reproduce upstream's leading RPC-cache lookup. async fn transaction_by_hash( &self, hash: B256, diff --git a/rust/op-reth/crates/rpc/src/state.rs b/rust/op-reth/crates/rpc/src/state.rs index 0f40a942ed0..90c2109a59b 100644 --- a/rust/op-reth/crates/rpc/src/state.rs +++ b/rust/op-reth/crates/rpc/src/state.rs @@ -7,7 +7,7 @@ use reth_optimism_trie::{ OpProofsStorage, OpProofsStorageError, OpProofsStore, api::OpProofsProviderRO, provider::OpProofsStateProviderRef, }; -use reth_provider::{BlockIdReader, ProviderError, ProviderResult, StateProvider}; +use reth_provider::{BlockHashReader, BlockIdReader, ProviderError, ProviderResult, StateProvider}; use reth_rpc_api::eth::helpers::FullEthApi; use reth_rpc_eth_types::EthApiError; @@ -38,6 +38,14 @@ where .ok_or(EthApiError::HeaderNotFound(block_id)) .map_err(ProviderError::other)?; + // The proofs storage is canonical-only and is overlaid by block number, so a hash that + // names a non-canonical block would be served canonical state for its height. + if let BlockId::Hash(hash) = block_id && + self.eth_api.provider().block_hash(block_number)? != Some(hash.block_hash) + { + return Err(ProviderError::other(EthApiError::HeaderNotFound(block_id))); + } + let historical_provider = self.eth_api.state_at_block_id(block_id).await.map_err(ProviderError::other)?; diff --git a/rust/op-reth/crates/trie/src/backfill/changesets.rs b/rust/op-reth/crates/trie/src/backfill/changesets.rs index c102053245f..3d95c6676c2 100644 --- a/rust/op-reth/crates/trie/src/backfill/changesets.rs +++ b/rust/op-reth/crates/trie/src/backfill/changesets.rs @@ -21,7 +21,7 @@ use reth_trie::{ trie_cursor::TrieCursorFactory, }; use reth_trie_common::{HashedPostStateSorted, updates::TrieUpdatesSorted}; -use reth_trie_db::from_reverts_auto; +use reth_trie_db::DatabaseHashedPostState; /// Compute the backfill diff for `block_number`: /// - `HashedPostStateSorted` — per-block leaf revert (state before block N ran), reused as @@ -51,7 +51,8 @@ where { // Per-block leaf revert: doubles as `post_state` for `prepend_block` and // as the state overlay for the trie@N-1 reconstruction below. - let individual_state_revert = from_reverts_auto(reth_provider, block_number..=block_number)?; + let individual_state_revert = + HashedPostStateSorted::from_reverts(reth_provider, block_number..=block_number)?; // Reth prunes the per-block changesets together with the body. An empty revert means either: // (a) the block genuinely changed nothing — header[N].state_root == header[N-1].state_root, or diff --git a/rust/op-reth/crates/trie/src/backfill/tests.rs b/rust/op-reth/crates/trie/src/backfill/tests.rs index a0df442fdd9..fd9891a4dea 100644 --- a/rust/op-reth/crates/trie/src/backfill/tests.rs +++ b/rust/op-reth/crates/trie/src/backfill/tests.rs @@ -213,7 +213,7 @@ fn backfill_then_forward_write_preserves_state_roots() { let block_executor = evm_config.batch_executor(db); let exec = block_executor.execute(&block).unwrap(); let hashed_state = - LatestStateProviderRef::new(&provider).hashed_post_state(&exec.state); + LatestStateProviderRef::new(&provider).hashed_post_state(&exec.state).unwrap(); let (state_root, trie_updates) = LatestStateProviderRef::new(&provider) .state_root_with_updates(hashed_state.clone()) .unwrap(); diff --git a/rust/op-reth/crates/trie/src/db/store.rs b/rust/op-reth/crates/trie/src/db/store.rs index 42c0f430cfa..30814cc0aba 100644 --- a/rust/op-reth/crates/trie/src/db/store.rs +++ b/rust/op-reth/crates/trie/src/db/store.rs @@ -981,7 +981,7 @@ impl OpProofsStore for MdbxProofsStorage { } } -/// UPSTREAM-MIRROR(copy): reth@rev:aef8d3e `reth_db::database_metrics::DatabaseMetrics` +/// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 `reth_db::database_metrics::DatabaseMetrics` /// /// This implementation is copied from the /// [`DatabaseMetrics`](reth_db::database_metrics::DatabaseMetrics) implementation for 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 0bbbf1270db..74c30b43fcf 100644 --- a/rust/op-reth/crates/trie/src/engine/buffer/overlay.rs +++ b/rust/op-reth/crates/trie/src/engine/buffer/overlay.rs @@ -2,7 +2,7 @@ use crate::{BlockStateDiff, api::OpProofsProviderRO, provider::OpProofsStateProviderRef}; use alloy_eips::eip1898::BlockWithParent; -use alloy_primitives::{Address, B256, BlockNumber, Bytes, StorageValue, keccak256}; +use alloy_primitives::{Address, B256, BlockNumber, Bytes, StorageValue, U256, keccak256}; use reth_primitives_traits::{Account, Bytecode}; use reth_provider::{ AccountReader, BlockHashReader, BytecodeReader, HashedPostStateProvider, ProviderResult, @@ -281,7 +281,158 @@ impl<'a, P> HashedPostStateProvider for MemoryOverlayOpProofsStateProviderRef<'a where P: OpProofsProviderRO + Clone, { - fn hashed_post_state(&self, bundle_state: &BundleState) -> HashedPostState { - self.inner.hashed_post_state(bundle_state) + /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 + /// `reth_chain_state::MemoryOverlayStateProviderRef::hashed_post_state` + /// + /// Uses the OP proofs-buffer trie input instead of upstream's executed-block overlay. + fn hashed_post_state(&self, bundle_state: &BundleState) -> ProviderResult { + let mut hashed_state = self.inner.hashed_post_state(bundle_state)?; + + // `self.inner` zeroes destroyed accounts' storage against the *persisted* proofs + // storage only. Slots written by blocks still in the buffer live in the overlay, so + // zero those too, or a destroyed account stays partially wiped and the state root is + // wrong. + for (address, account) in bundle_state.state() { + // Accounts created in this bundle cannot have parent storage to zero. + 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) + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::{ + InMemoryProofsStorage, + api::OpProofsStore, + engine::buffer::state::TrieBufferState, + test_utils::{ + create_storage, + destroyed_accounts::{ + FailingStorageProvider, StorageFailure, assert_injected_error, bundle, + created_and_destroyed, destroyed, destroyed_and_recreated, hashed_storage, + seed_initial_storage, storage_diff, + }, + }, + }; + use alloy_eips::NumHash; + use reth_provider::noop::NoopProvider; + + const DESTROYED: Address = Address::repeat_byte(0x01); + const UNTOUCHED: Address = Address::repeat_byte(0x02); + + /// Hashed post state of `bundle` on top of block 1, which is buffered with the plain + /// `buffered` storage writes and whose parent is the persisted block 0 of `provider`. + fn hashed_post_state( + provider: P, + buffered: &[(Address, &[(u64, u64)])], + bundle: &BundleState, + ) -> ProviderResult { + let block = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::repeat_byte(1))); + let buffer = TrieBufferState::new(); + buffer.insert(block, storage_diff(buffered)); + let inner = OpProofsStateProviderRef::new(Box::new(NoopProvider::default()), provider, 0); + buffer.state_provider(block.block.hash, inner).hashed_post_state(bundle) + } + + /// A destroyed account's persisted and buffered slots all come back as explicit zeros; + /// buffered slots of untouched accounts are not zeroed. + #[test] + fn destroyed_account_zeroes_persisted_and_buffered_slots() { + fn check(store: &S) { + seed_initial_storage(store, &[(DESTROYED, &[(1, 11)])]); + let buffered: &[(Address, &[(u64, u64)])] = + &[(DESTROYED, &[(2, 22)]), (UNTOUCHED, &[(3, 33)])]; + let bundle = bundle([(DESTROYED, destroyed())]); + + let state = hashed_post_state(store.provider_ro().unwrap(), buffered, &bundle).unwrap(); + + assert_eq!( + state.storages.get(&keccak256(DESTROYED)), + Some(&hashed_storage(&[(1, 0), (2, 0)])) + ); + assert!(!state.storages.contains_key(&keccak256(UNTOUCHED))); + } + check(&InMemoryProofsStorage::new()); + check(&*create_storage()); + } + + /// A slot present only in the buffer, not in persisted storage, comes back as an explicit + /// zero. + #[test] + fn destroyed_account_zeroes_buffer_only_slots() { + let store = InMemoryProofsStorage::new(); + seed_initial_storage(&store, &[]); + let bundle = bundle([(DESTROYED, destroyed())]); + + let state = + hashed_post_state(store.provider_ro().unwrap(), &[(DESTROYED, &[(2, 22)])], &bundle) + .unwrap(); + + assert_eq!(state.storages.get(&keccak256(DESTROYED)), Some(&hashed_storage(&[(2, 0)]))); + } + + /// Slots written by the recreated account keep the bundle's value, whether they were + /// persisted or buffered; the remaining old slots are zeroed. + #[test] + fn recreated_account_keeps_bundle_values() { + let store = InMemoryProofsStorage::new(); + seed_initial_storage(&store, &[(DESTROYED, &[(1, 11), (2, 22)])]); + let buffered: &[(Address, &[(u64, u64)])] = &[(DESTROYED, &[(3, 33), (4, 44)])]; + let bundle = bundle([(DESTROYED, destroyed_and_recreated(&[(1, 91), (3, 93)]))]); + + let state = hashed_post_state(store.provider_ro().unwrap(), buffered, &bundle).unwrap(); + + assert_eq!( + state.storages.get(&keccak256(DESTROYED)), + Some(&hashed_storage(&[(1, 91), (2, 0), (3, 93), (4, 0)])) + ); + } + + /// An account created and destroyed within the bundle has no parent storage: neither its + /// persisted nor its buffered storage is read or zeroed. + #[test] + fn created_and_destroyed_account_skips_parent_scan() { + let buffered: &[(Address, &[(u64, u64)])] = &[(DESTROYED, &[(2, 22)])]; + let bundle = bundle([(DESTROYED, created_and_destroyed())]); + + let store = InMemoryProofsStorage::new(); + seed_initial_storage(&store, &[(DESTROYED, &[(1, 11)])]); + let state = hashed_post_state(store.provider_ro().unwrap(), buffered, &bundle).unwrap(); + assert!(!state.storages.contains_key(&keccak256(DESTROYED))); + + for failure in [StorageFailure::Open, StorageFailure::Seek] { + let state = + hashed_post_state(FailingStorageProvider::new(failure), buffered, &bundle).unwrap(); + assert!(state.storages.is_empty()); + } + } + + /// A failing persisted storage cursor fails the whole call, even when the buffer holds + /// slots for the destroyed account. + #[test] + fn storage_cursor_error_propagates() { + let buffered: &[(Address, &[(u64, u64)])] = &[(DESTROYED, &[(2, 22)])]; + let bundle = bundle([(DESTROYED, destroyed())]); + for failure in [StorageFailure::Open, StorageFailure::Seek] { + assert_injected_error(hashed_post_state( + FailingStorageProvider::new(failure), + buffered, + &bundle, + )); + } } } 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 7b74f120c42..1f0914d4336 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 @@ -130,7 +130,7 @@ where let execution_result = block_executor.execute(block)?; let execution_duration = start.elapsed(); - let hashed_state = state_provider.hashed_post_state(&execution_result.state); + let hashed_state = state_provider.hashed_post_state(&execution_result.state)?; let (state_root, trie_updates) = state_provider.state_root_with_updates(hashed_state.clone())?; let state_root_duration = start.elapsed() - execution_duration; diff --git a/rust/op-reth/crates/trie/src/provider.rs b/rust/op-reth/crates/trie/src/provider.rs index 17af634e6bb..2d36ae50d74 100644 --- a/rust/op-reth/crates/trie/src/provider.rs +++ b/rust/op-reth/crates/trie/src/provider.rs @@ -1,7 +1,7 @@ //! Provider for external proofs storage use crate::{ - OpProofsProviderRO, OpProofsStorageError, + OpProofsHashedAccountCursorFactory, OpProofsProviderRO, OpProofsStorageError, proof::{ DatabaseProof, DatabaseStateRoot, DatabaseStorageProof, DatabaseStorageRoot, DatabaseTrieWitness, @@ -20,7 +20,7 @@ use reth_revm::{ }; use reth_trie::{ ExecutionWitnessMode, StateRoot, StorageRoot, - hashed_cursor::HashedCursor, + hashed_cursor::{HashedCursor, zero_destroyed_account_storage}, proof::{self, Proof}, witness::TrieWitness, }; @@ -189,9 +189,27 @@ where } } -impl<'a, P> HashedPostStateProvider for OpProofsStateProviderRef<'a, P> { - fn hashed_post_state(&self, bundle_state: &BundleState) -> HashedPostState { - HashedPostState::from_bundle_state::(bundle_state.state()) +impl<'a, P> HashedPostStateProvider for OpProofsStateProviderRef<'a, P> +where + P: OpProofsProviderRO + Clone, +{ + /// UPSTREAM-MIRROR(copy): reth@rev:0fbe428 + /// `reth_provider::LatestStateProviderRef::hashed_post_state` + /// + /// Mirrors the hashing/zeroing sequence, using historical OP proofs cursors instead of + /// upstream's database cursors. The deletion algorithm itself is delegated upstream. + fn hashed_post_state(&self, bundle_state: &BundleState) -> ProviderResult { + let mut hashed_state = + HashedPostState::from_bundle_state::(bundle_state.state()); + // `from_bundle_state` no longer marks destroyed accounts' storage as wiped, so the + // deletions have to be materialized as explicit zero-valued slots against the parent + // state — here the proofs storage at `block_number`. + zero_destroyed_account_storage( + &OpProofsHashedAccountCursorFactory::new(self.provider.clone(), self.block_number), + bundle_state.state(), + &mut hashed_state, + )?; + Ok(hashed_state) } } @@ -233,12 +251,112 @@ impl<'a, P> BytecodeReader for OpProofsStateProviderRef<'a, P> { } } -#[cfg(all(test, not(feature = "metrics")))] +#[cfg(test)] mod tests { use super::*; - use crate::{InMemoryProofsStorage, api::OpProofsStore}; + use crate::{ + InMemoryProofsStorage, + api::OpProofsStore, + test_utils::{ + create_storage, + destroyed_accounts::{ + FailingStorageProvider, StorageFailure, assert_injected_error, bundle, + created_and_destroyed, destroyed, destroyed_and_recreated, hashed_storage, + seed_initial_storage, + }, + }, + }; use reth_provider::noop::NoopProvider; + const DESTROYED: Address = Address::repeat_byte(0x01); + const DESTROYED_TOO: Address = Address::repeat_byte(0x02); + const UNTOUCHED: Address = Address::repeat_byte(0x03); + + fn hashed_post_state( + provider: P, + bundle: &BundleState, + ) -> ProviderResult { + OpProofsStateProviderRef::new(Box::new(NoopProvider::default()), provider, 0) + .hashed_post_state(bundle) + } + + /// Persisted slots of pre-existing destroyed accounts come back as explicit zeros, for every + /// destroyed account sharing the storage cursor; untouched accounts get no storage entry. + #[test] + fn destroyed_account_zeroes_persisted_slots() { + fn check(store: &S) { + seed_initial_storage( + store, + &[ + (DESTROYED, &[(1, 11), (2, 22)]), + (DESTROYED_TOO, &[(3, 33)]), + (UNTOUCHED, &[(1, 44)]), + ], + ); + let bundle = bundle([(DESTROYED, destroyed()), (DESTROYED_TOO, destroyed())]); + + let state = hashed_post_state(store.provider_ro().unwrap(), &bundle).unwrap(); + + assert_eq!( + state.storages.get(&keccak256(DESTROYED)), + Some(&hashed_storage(&[(1, 0), (2, 0)])) + ); + assert_eq!( + state.storages.get(&keccak256(DESTROYED_TOO)), + Some(&hashed_storage(&[(3, 0)])) + ); + assert!(!state.storages.contains_key(&keccak256(UNTOUCHED))); + } + check(&InMemoryProofsStorage::new()); + check(&*create_storage()); + } + + /// A slot written by the recreated account keeps the bundle's value; other persisted slots + /// are zeroed. + #[test] + fn recreated_account_keeps_bundle_values() { + fn check(store: &S) { + seed_initial_storage(store, &[(DESTROYED, &[(1, 11), (2, 22)])]); + let bundle = bundle([(DESTROYED, destroyed_and_recreated(&[(1, 99)]))]); + + let state = hashed_post_state(store.provider_ro().unwrap(), &bundle).unwrap(); + + assert_eq!( + state.storages.get(&keccak256(DESTROYED)), + Some(&hashed_storage(&[(1, 99), (2, 0)])) + ); + } + check(&InMemoryProofsStorage::new()); + check(&*create_storage()); + } + + /// An account created and destroyed within the bundle has no parent storage: its persisted + /// storage is neither read nor zeroed. + #[test] + fn created_and_destroyed_account_skips_parent_scan() { + let bundle = bundle([(DESTROYED, created_and_destroyed())]); + + let store = InMemoryProofsStorage::new(); + seed_initial_storage(&store, &[(DESTROYED, &[(1, 11)])]); + let state = hashed_post_state(store.provider_ro().unwrap(), &bundle).unwrap(); + assert!(!state.storages.contains_key(&keccak256(DESTROYED))); + + for failure in [StorageFailure::Open, StorageFailure::Seek] { + let state = hashed_post_state(FailingStorageProvider::new(failure), &bundle).unwrap(); + assert!(state.storages.is_empty()); + } + } + + /// A storage cursor that fails to open or to seek fails the whole call. + #[test] + fn storage_cursor_error_propagates() { + let bundle = bundle([(DESTROYED, destroyed())]); + for failure in [StorageFailure::Open, StorageFailure::Seek] { + assert_injected_error(hashed_post_state(FailingStorageProvider::new(failure), &bundle)); + } + } + + #[cfg(not(feature = "metrics"))] #[test] fn test_op_proofs_state_provider_ref_debug() { let latest: Box = Box::new(NoopProvider::default()); diff --git a/rust/op-reth/crates/trie/src/test_utils.rs b/rust/op-reth/crates/trie/src/test_utils.rs index a81fa3ebd99..ddf6f484024 100644 --- a/rust/op-reth/crates/trie/src/test_utils.rs +++ b/rust/op-reth/crates/trie/src/test_utils.rs @@ -156,7 +156,7 @@ where let execution_result = block_executor.execute(block).unwrap(); let hashed_state = - LatestStateProviderRef::new(&provider).hashed_post_state(&execution_result.state); + LatestStateProviderRef::new(&provider).hashed_post_state(&execution_result.state).unwrap(); let state_root = LatestStateProviderRef::new(&provider).state_root(hashed_state).unwrap(); block.set_state_root(state_root); execution_result @@ -181,7 +181,8 @@ pub(crate) fn commit_block_to_database( let hashed_state = HashedPostStateProvider::hashed_post_state( &LatestStateProviderRef::new(&state_provider), &execution_output.state, - ); + ) + .unwrap(); let provider_rw = provider_factory.provider_rw().unwrap(); provider_rw .append_blocks_with_state( @@ -329,3 +330,242 @@ pub(crate) fn build_chain_with_storage_writes_and_initialize_storage( (provider_factory, storage, last_number, last_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 { + use crate::{ + OpProofsStorageError, OpProofsStorageResult, + api::{ + BlockStateDiff, OpProofsInitProvider, OpProofsProviderRO, OpProofsStore, + ProofWindowRange, + }, + in_memory::{ + InMemoryAccountCursor, InMemoryProofsProvider, InMemoryProofsStorage, + InMemoryTrieCursor, + }, + }; + use alloy_eips::{BlockNumHash, NumHash}; + use alloy_primitives::{Address, B256, U256, keccak256}; + use reth_db::DatabaseError; + use reth_provider::{ProviderError, ProviderResult}; + use reth_revm::{ + db::{AccountStatus, BundleAccount, BundleState, states::StorageSlot}, + state::AccountInfo, + }; + use reth_trie::{ + HashedPostState, HashedStorage, + hashed_cursor::{HashedCursor, HashedStorageCursor}, + }; + + /// Hashed storage key of the plain slot `slot`. + pub(crate) fn hashed_slot(slot: u64) -> B256 { + keccak256(B256::from(U256::from(slot))) + } + + /// Non-wiped [`HashedStorage`] holding the plain `(slot, value)` pairs. + pub(crate) fn hashed_storage(slots: &[(u64, u64)]) -> HashedStorage { + HashedStorage::from_iter( + slots.iter().map(|&(slot, value)| (hashed_slot(slot), U256::from(value))), + ) + } + + /// Commits `storages` as the initial state of `store`, anchored at block 0. + pub(crate) fn seed_initial_storage( + store: &S, + storages: &[(Address, &[(u64, u64)])], + ) { + let provider = store.initialization_provider().unwrap(); + for (address, slots) in storages { + // The MDBX init writer appends, so slots must arrive in key order. + let mut slots: Vec<_> = hashed_storage(slots).storage.into_iter().collect(); + slots.sort_unstable(); + provider.store_hashed_storages(keccak256(address), slots).unwrap(); + } + provider.set_initial_state_anchor(BlockNumHash::new(0, B256::ZERO)).unwrap(); + provider.commit_initial_state().unwrap(); + OpProofsInitProvider::commit(provider).unwrap(); + } + + /// Block diff writing the plain `(slot, value)` storage of each address. + pub(crate) fn storage_diff(storages: &[(Address, &[(u64, u64)])]) -> BlockStateDiff { + let mut post_state = HashedPostState::default(); + for (address, slots) in storages { + post_state.storages.insert(keccak256(address), hashed_storage(slots)); + } + BlockStateDiff { sorted_post_state: post_state.into_sorted(), ..Default::default() } + } + + /// Bundle holding `accounts`. + pub(crate) fn bundle( + accounts: impl IntoIterator, + ) -> BundleState { + let mut bundle = BundleState::default(); + bundle.state.extend(accounts); + bundle + } + + /// Pre-existing account that self-destructed. + pub(crate) fn destroyed() -> BundleAccount { + BundleAccount::new( + Some(AccountInfo::default()), + None, + Default::default(), + AccountStatus::Destroyed, + ) + } + + /// Pre-existing account that self-destructed and was recreated with the plain + /// `(slot, value)` storage. + pub(crate) fn destroyed_and_recreated(storage: &[(u64, u64)]) -> BundleAccount { + let storage = storage + .iter() + .map(|&(slot, value)| { + (U256::from(slot), StorageSlot::new_changed(U256::ZERO, U256::from(value))) + }) + .collect(); + BundleAccount::new( + Some(AccountInfo::default()), + Some(AccountInfo::default()), + storage, + AccountStatus::DestroyedChanged, + ) + } + + /// Account created and self-destructed within the bundle. + pub(crate) fn created_and_destroyed() -> BundleAccount { + BundleAccount::new(None, None, Default::default(), AccountStatus::Destroyed) + } + + /// Storage key carried by [`injected_error`]. + const INJECTED_KEY: B256 = B256::repeat_byte(0xEE); + + /// Error with which [`FailingStorageProvider`] fails hashed storage reads. + pub(crate) const fn injected_error() -> OpProofsStorageError { + OpProofsStorageError::MissingHashedStorageHistory { + hashed_address: B256::ZERO, + hashed_storage_key: INJECTED_KEY, + block_number: 0, + } + } + + /// Asserts that `result` failed with [`injected_error`]. + pub(crate) fn assert_injected_error(result: ProviderResult) { + let err = result.expect_err("storage read failure must surface"); + let ProviderError::Database(err) = err else { panic!("unexpected error: {err:?}") }; + assert!( + matches!( + OpProofsStorageError::from(err.clone()), + OpProofsStorageError::MissingHashedStorageHistory { hashed_storage_key, .. } + if hashed_storage_key == INJECTED_KEY + ), + "unexpected error: {err:?}" + ); + } + + /// Stage at which [`FailingStorageProvider`] fails a hashed storage read. + #[derive(Debug, Clone, Copy)] + pub(crate) enum StorageFailure { + /// Opening the storage cursor fails. + Open, + /// Seeking the opened storage cursor fails. + Seek, + } + + /// [`OpProofsProviderRO`] delegating to an [`InMemoryProofsProvider`], except that every + /// hashed storage read fails with [`injected_error`]. + #[derive(Debug, Clone)] + pub(crate) struct FailingStorageProvider { + inner: InMemoryProofsProvider, + failure: StorageFailure, + } + + impl FailingStorageProvider { + /// Creates a provider over an empty in-memory store that fails at `failure`. + pub(crate) fn new(failure: StorageFailure) -> Self { + Self { inner: InMemoryProofsStorage::new().provider_ro().unwrap(), failure } + } + } + + /// Hashed storage cursor whose reads fail with [`injected_error`]. + #[derive(Debug)] + pub(crate) struct FailingStorageCursor; + + impl HashedCursor for FailingStorageCursor { + type Value = U256; + + fn seek(&mut self, _key: B256) -> Result, DatabaseError> { + Err(injected_error().into()) + } + + fn next(&mut self) -> Result, DatabaseError> { + Err(injected_error().into()) + } + + fn reset(&mut self) {} + } + + impl HashedStorageCursor for FailingStorageCursor { + fn is_storage_empty(&mut self) -> Result { + Err(injected_error().into()) + } + + fn set_hashed_address(&mut self, _hashed_address: B256) {} + } + + impl OpProofsProviderRO for FailingStorageProvider { + type StorageTrieCursor<'tx> = InMemoryTrieCursor; + type AccountTrieCursor<'tx> = InMemoryTrieCursor; + type StorageCursor<'tx> = FailingStorageCursor; + type AccountHashedCursor<'tx> = InMemoryAccountCursor; + + fn get_earliest_block(&self) -> OpProofsStorageResult { + self.inner.get_earliest_block() + } + + fn get_latest_block(&self) -> OpProofsStorageResult { + self.inner.get_latest_block() + } + + fn get_proof_window(&self) -> OpProofsStorageResult { + self.inner.get_proof_window() + } + + fn storage_trie_cursor<'tx>( + &self, + hashed_address: B256, + max_block_number: u64, + ) -> OpProofsStorageResult> { + self.inner.storage_trie_cursor(hashed_address, max_block_number) + } + + fn account_trie_cursor<'tx>( + &self, + max_block_number: u64, + ) -> OpProofsStorageResult> { + self.inner.account_trie_cursor(max_block_number) + } + + fn storage_hashed_cursor<'tx>( + &self, + _hashed_address: B256, + _max_block_number: u64, + ) -> OpProofsStorageResult> { + match self.failure { + StorageFailure::Open => Err(injected_error()), + StorageFailure::Seek => Ok(FailingStorageCursor), + } + } + + fn account_hashed_cursor<'tx>( + &self, + max_block_number: u64, + ) -> OpProofsStorageResult> { + self.inner.account_hashed_cursor(max_block_number) + } + + fn fetch_trie_updates(&self, block_number: u64) -> OpProofsStorageResult { + self.inner.fetch_trie_updates(block_number) + } + } +} diff --git a/rust/op-reth/crates/trie/tests/live.rs b/rust/op-reth/crates/trie/tests/live.rs index 3d3ec99e267..f26c8090798 100644 --- a/rust/op-reth/crates/trie/tests/live.rs +++ b/rust/op-reth/crates/trie/tests/live.rs @@ -183,7 +183,7 @@ where let execution_result = block_executor.execute(block)?; let hashed_state = - LatestStateProviderRef::new(&provider).hashed_post_state(&execution_result.state); + LatestStateProviderRef::new(&provider).hashed_post_state(&execution_result.state)?; let state_root = LatestStateProviderRef::new(&provider).state_root(hashed_state)?; block.set_state_root(state_root); @@ -214,7 +214,7 @@ where let hashed_state = HashedPostStateProvider::hashed_post_state( &LatestStateProviderRef::new(&state_provider), &execution_output.state, - ); + )?; let provider_rw = provider_factory.provider_rw()?; provider_rw.append_blocks_with_state( diff --git a/rust/op-reth/crates/txpool/src/validator.rs b/rust/op-reth/crates/txpool/src/validator.rs index da0966e9cfd..ab36c4828e6 100644 --- a/rust/op-reth/crates/txpool/src/validator.rs +++ b/rust/op-reth/crates/txpool/src/validator.rs @@ -343,7 +343,7 @@ where } } -/// UPSTREAM-MIRROR(delegate): reth@rev:aef8d3e +/// UPSTREAM-MIRROR(delegate): reth@rev:0fbe428 /// `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 7cf8df633b0..4d3c05f18ee 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@41.0.0 `revm_handler::api::ExecuteEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `revm_handler::api::ExecuteEvm` /// /// Copies upstream's `ExecuteEvm` implementation with `OpHandler` substituted for /// `MainnetHandler`. Re-diff the bodies when the upstream implementation changes. @@ -82,14 +82,20 @@ where &mut self, ) -> Result, Self::Error> { let mut h = OpHandler::<_, _, EthFrame>::new(); - h.run(self).map(|result| { - let state = self.finalize(); - ExecResultAndState::new(result, state) - }) + h.run(self) + // finalize (clear) the journal on error; on success the `map` + // branch below finalizes it. + .inspect_err(|_| { + let _ = self.finalize(); + }) + .map(|result| { + let state = self.finalize(); + ExecResultAndState::new(result, state) + }) } } -/// UPSTREAM-MIRROR(copy): revm-handler@41.0.0 `revm_handler::api::ExecuteCommitEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `revm_handler::api::ExecuteCommitEvm` /// /// Copies the upstream commit implementation for the OP EVM. impl ExecuteCommitEvm @@ -103,7 +109,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@41.0.0 `revm_inspector::mainnet_inspect::InspectEvm` +/// UPSTREAM-MIRROR(copy): revm-inspector@42.0.1 `revm_inspector::mainnet_inspect::InspectEvm` /// /// Copies the upstream inspector implementation with `OpHandler`. impl InspectEvm @@ -126,7 +132,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@41.0.0 `revm_inspector::mainnet_inspect::InspectCommitEvm` +/// UPSTREAM-MIRROR(copy): revm-inspector@42.0.1 `revm_inspector::mainnet_inspect::InspectCommitEvm` /// /// Mirrors the upstream marker implementation for inspector commits. impl InspectCommitEvm @@ -138,7 +144,7 @@ where { } -/// UPSTREAM-MIRROR(copy): revm-handler@41.0.0 `revm_handler::system_call::SystemCallEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 `revm_handler::system_call::SystemCallEvm` /// /// Copies upstream system-call setup with `OpHandler`. impl SystemCallEvm @@ -163,7 +169,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@41.0.0 +/// UPSTREAM-MIRROR(copy): revm-inspector@42.0.1 /// `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 dbc66bb1989..84ddcc2ec5f 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@41.0.0 `revm_inspector::InspectorEvmTr` +/// UPSTREAM-MIRROR(delegate): revm-inspector@42.0.1 `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@41.0.0 `revm_handler::EvmTr` +/// UPSTREAM-MIRROR(delegate): revm-handler@42.0.1 `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 85173101a45..1f0d9f8e7ed 100644 --- a/rust/op-revm/src/handler.rs +++ b/rust/op-revm/src/handler.rs @@ -20,15 +20,16 @@ use revm::{ handler::{ EthFrame, EvmTr, FrameResult, Handler, MainnetHandler, evm::FrameTr, + handle_reservoir_remaining_gas, handler::EvmTrError, post_execution::{self, reimburse_caller}, pre_execution::{calculate_caller_fee, validate_account_nonce_and_code_with_components}, }, inspector::{Inspector, InspectorEvmTr, InspectorHandler}, interpreter::{ - Gas, InitialAndFloorGas, interpreter::EthInterpreter, interpreter_action::FrameInit, + GasTracker, InitialAndFloorGas, interpreter::EthInterpreter, interpreter_action::FrameInit, }, - primitives::{U256, hardfork::SpecId}, + primitives::U256, }; use std::{boxed::Box, vec::Vec}; @@ -79,7 +80,7 @@ where type Error = ERROR; type HaltReason = OpHaltReason; - /// UPSTREAM-MIRROR(override): revm-handler@41.0.0 `revm_handler::Handler::validate_env` + /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `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 @@ -109,10 +110,10 @@ where self.mainnet.validate_env(evm) } - /// UPSTREAM-MIRROR(override): revm-handler@41.0.0 + /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 /// `revm_handler::Handler::validate_against_state_and_deduct_caller` /// - /// UPSTREAM-MIRROR(copy): revm-handler@41.0.0 + /// UPSTREAM-MIRROR(copy): revm-handler@42.0.1 /// `revm_handler::pre_execution::validate_against_state_and_deduct_caller` /// /// The non-deposit arm copies the upstream helper with the L1-fee deduction inserted @@ -198,109 +199,85 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@41.0.0 `revm_handler::Handler::last_frame_result` + /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::last_frame_result` /// - /// Structure, locals and several comment blocks are taken verbatim from the upstream - /// default, with the Bedrock/Regolith deposit branches spliced into the ok and revert - /// arms. Re-derive as (old upstream default -> new upstream default) applied onto this - /// body, leaving the deposit branches byte-identical. + /// 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 + /// Bedrock/Regolith deposit rules are applied on top of the settled result. Re-derive as + /// (old upstream default -> new upstream default) applied onto this body, leaving the + /// deposit branch byte-identical. fn last_frame_result( &mut self, evm: &mut Self::Evm, - _original_reservoir: u64, frame_result: &mut <::Frame as FrameTr>::FrameResult, + parent_gas: &mut GasTracker, ) -> Result<(), Self::Error> { let ctx = evm.ctx(); let tx = ctx.tx(); let is_deposit = tx.tx_type() == DEPOSIT_TRANSACTION_TYPE; + let is_system_transaction = tx.is_system_transaction(); let tx_gas_limit = tx.gas_limit(); let is_regolith = ctx.cfg().spec().is_enabled_in(OpSpecId::REGOLITH); - let instruction_result = frame_result.interpreter_result().result; - // Detect a failed top-level CREATE so the intrinsic `create_state_gas` - // charged at tx entry can be unwound below. Mirrors the `create_failed` - // condition used in `EthFrame::return_result` for nested creates. - let create_failed = - matches!(frame_result, FrameResult::Create(_)) && !instruction_result.is_ok(); - let gas = frame_result.gas_mut(); - let remaining = gas.remaining(); - let refunded = gas.refunded(); - let reservoir = gas.reservoir(); - let state_gas_spent = gas.state_gas_spent(); - - // Spend the gas limit. Gas is reimbursed when the tx returns successfully. - *gas = Gas::new_spent_with_reservoir(tx_gas_limit, reservoir); - - if instruction_result.is_ok() { - // On Optimism, deposit transactions report gas usage uniquely to other - // transactions due to them being pre-paid on L1. - // - // Hardfork Behavior: - // - Bedrock (success path): - // - Deposit transactions (non-system) report their gas limit as the usage. No - // refunds. - // - Deposit transactions (system) report 0 gas used. No refunds. - // - Regular transactions report gas usage as normal. - // - Regolith (success path): - // - Deposit transactions (all) report their gas used as normal. Refunds enabled. - // - Regular transactions report their gas used as normal. - if !is_deposit || is_regolith { - // Return unused regular gas and unused reservoir gas. - gas.erase_cost(remaining); - gas.record_refund(refunded); - } else if is_deposit && tx.is_system_transaction() { + let instruction_result = frame_result.instruction_result(); + + // All regular gas was forwarded to the first frame: consume it on the + // transaction-level gas; the settle below returns the frame's unused part. + parent_gas.spend_all(); + + // Settle the frame into the transaction-level gas like a parent frame. + handle_reservoir_remaining_gas( + instruction_result, + parent_gas, + frame_result.gas_mut().tracker_mut(), + ); + + // Refund the EIP-2780 refundable first-frame charge when no account + // leaf was created, exactly like `EthFrame::return_result` refunds + // the upfront CALL/CREATE state charges of inner frames. + if let Some(charge) = frame_result.refundable_state_gas(evm.ctx().cfg().gas_params()) { + parent_gas.refill_reservoir(charge); + // Unlike an inner frame's caller, the transaction ends here: an + // exceptional halt consumes all regular gas, including the + // spilled portion the refill just credited back to `remaining`. + if instruction_result.is_halt() { + parent_gas.spend_all(); + } + } + + // On Optimism, deposit transactions report gas usage uniquely to other + // transactions due to them being pre-paid on L1. + // + // Hardfork Behavior: + // - Bedrock: + // - Deposit transactions (non-system) report their gas limit as the usage. No refunds. + // - Deposit transactions (system) report 0 gas used. No refunds. + // - Regular transactions report gas usage as normal. + // - Regolith: + // - Deposit transactions (all) report their gas used as normal. Refunds enabled. + // - Regular transactions report their gas used as normal. + // + // The settle and refund above already returned the frame's unused regular gas and its + // refund counter; a pre-Regolith deposit gets neither, so take both back. This runs last + // so that no upstream credit, present or future, can hand gas back to such a deposit. + if is_deposit && !is_regolith { + parent_gas.spend_all(); + parent_gas.set_refunded(0); + if is_system_transaction && instruction_result.is_ok() { // System transactions were a special type of deposit transaction in // the Bedrock hardfork that did not incur any gas costs. - gas.erase_cost(tx_gas_limit); - } - } else if instruction_result.is_revert() { - // On Optimism, deposit transactions report gas usage uniquely to other - // transactions due to them being pre-paid on L1. - // - // Hardfork Behavior: - // - Bedrock (revert path): - // - Deposit transactions (all) report the gas limit as the amount of gas used on - // failure. No refunds. - // - Regular transactions receive a refund on remaining gas as normal. - // - Regolith (revert path): - // - Deposit transactions (all) report the actual gas used as the amount of gas used - // on failure. Refunds on remaining gas enabled. - // - Regular transactions receive a refund on remaining gas as normal. - if !is_deposit || is_regolith { - // Return unused regular gas. - gas.erase_cost(remaining); + parent_gas.erase_cost(tx_gas_limit); } } - if instruction_result.is_ok() { - // Restore state_gas_spent on successful paths (lost by the Gas overwrite above; - // the reservoir is carried over by the constructor). - gas.set_state_gas_spent(state_gas_spent); - } else { - // On failure - zero execution state gas: [bal-devnet notes]() - // and [specs]() - // - // State changes rolled back, so recover the pre-tx reservoir value: signed - // `reservoir + state_gas_spent` (state_gas_spent can be negative when 0→x→0 - // restoration refilled more than this tx charged). - gas.set_state_gas_spent(0); - gas.set_reservoir(reservoir.saturating_add_signed(state_gas_spent)); - } - - // EIP-8037: for a failed top-level CREATE (or one that self-destructs in init - // code, see EIP-6780), refund the intrinsic `create_state_gas` to the reservoir. - // At the top level the charge is deducted in `initial_gas_and_reservoir` rather - // than via `record_state_cost`, so it would otherwise stay consumed when the - // deployment is rolled back or erased. - if create_failed && evm.ctx().cfg().is_amsterdam_eip8037_enabled() { - let state_gas_charged = evm.ctx().cfg().gas_params().create_state_gas(); - gas.refill_reservoir(state_gas_charged); - } + // The frame result carries the transaction-level gas onward to the + // post-execution phase. + *frame_result.gas_mut().tracker_mut() = *parent_gas; Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@41.0.0 `revm_handler::Handler::reimburse_caller` + /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `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 @@ -322,7 +299,7 @@ where reimburse_caller(evm.ctx(), frame_result.gas(), additional_refund).map_err(From::from) } - /// UPSTREAM-MIRROR(override): revm-handler@41.0.0 `revm_handler::Handler::refund` + /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::refund` /// /// Same as upstream except that pre-Regolith deposits get no refund at all. fn refund( @@ -330,7 +307,7 @@ where evm: &mut Self::Evm, frame_result: &mut <::Frame as FrameTr>::FrameResult, eip7702_refund: i64, - ) { + ) -> Result<(), Self::Error> { frame_result.gas_mut().record_refund(eip7702_refund); let is_deposit = evm.ctx().tx().tx_type() == DEPOSIT_TRANSACTION_TYPE; @@ -339,13 +316,15 @@ where // Prior to Regolith, deposit transactions did not receive gas refunds. let is_gas_refund_disabled = is_deposit && !is_regolith; if !is_gas_refund_disabled { - frame_result.gas_mut().set_final_refund( - evm.ctx().cfg().spec().into_eth_spec().is_enabled_in(SpecId::LONDON), - ); + frame_result + .gas_mut() + .set_final_refund(evm.ctx().cfg().gas_params().max_refund_quotient()); } + + Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@41.0.0 `revm_handler::Handler::reward_beneficiary` + /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `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 @@ -399,7 +378,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@41.0.0 `revm_handler::Handler::execution_result` + /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `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 @@ -432,7 +411,7 @@ where Ok(exec_result) } - /// UPSTREAM-MIRROR(override): revm-handler@41.0.0 `revm_handler::Handler::catch_error` + /// UPSTREAM-MIRROR(override): revm-handler@42.0.1 `revm_handler::Handler::catch_error` /// /// Re-derive upstream error-path cleanup, currently `journal.discard_tx()`, /// when the default or journal semantics change. @@ -576,8 +555,8 @@ mod tests { database::InMemoryDB, database_interface::EmptyDB, handler::EthFrame, - interpreter::{CallOutcome, CreateOutcome, InstructionResult, InterpreterResult}, - primitives::{Address, B256, Bytes, bytes}, + interpreter::{CallOutcome, CreateOutcome, Gas, InstructionResult, InterpreterResult}, + primitives::{Address, B256, Bytes, bytes, hardfork::SpecId}, state::AccountInfo, }; use rstest::rstest; @@ -599,29 +578,44 @@ mod tests { let mut handler = OpHandler::<_, EVMError<_, OpTransactionError>, EthFrame>::new(); - handler.last_frame_result(&mut evm, 0, &mut exec_result).unwrap(); - handler.refund(&mut evm, &mut exec_result, 0); + // The transaction-level gas the handler settles the frame into, built the same way + // `Handler::run` does for a transaction with no intrinsic gas. + let mut tx_gas = handler.tx_gas(&mut evm, &InitialAndFloorGas::new(0, 0)); + + handler.last_frame_result(&mut evm, &mut exec_result, &mut tx_gas).unwrap(); + handler.refund(&mut evm, &mut exec_result, 0).unwrap(); *exec_result.gas() } /// Like [`call_last_frame_return`], but wraps the result in a top-level CREATE frame. + /// + /// `charged_create_state_gas` is what the CREATE path records when it charged the + /// conditional EIP-8037 `create_state_gas`; the refund is driven off that flag. fn create_last_frame_return( ctx: OpContext, instruction_result: InstructionResult, gas: Gas, + created_address: Option
, + charged_create_state_gas: bool, ) -> Gas { let mut evm = ctx.build_op(); - let mut exec_result = FrameResult::Create(CreateOutcome::new( + let mut outcome = CreateOutcome::new( InterpreterResult { result: instruction_result, output: Bytes::new(), gas }, - None, - )); + created_address, + ); + outcome.charged_create_state_gas = charged_create_state_gas; + let mut exec_result = FrameResult::Create(outcome); let mut handler = OpHandler::<_, EVMError<_, OpTransactionError>, EthFrame>::new(); - handler.last_frame_result(&mut evm, 0, &mut exec_result).unwrap(); - handler.refund(&mut evm, &mut exec_result, 0); + // The transaction-level gas the handler settles the frame into, built the same way + // `Handler::run` does for a transaction with no intrinsic gas. + let mut tx_gas = handler.tx_gas(&mut evm, &InitialAndFloorGas::new(0, 0)); + + handler.last_frame_result(&mut evm, &mut exec_result, &mut tx_gas).unwrap(); + handler.refund(&mut evm, &mut exec_result, 0).unwrap(); *exec_result.gas() } @@ -654,7 +648,13 @@ mod tests { .with_tx(OpTransaction::builder().base(TxEnv::builder().gas_limit(100)).build_fill()) .with_cfg(cfg); - let gas = create_last_frame_return(ctx, InstructionResult::Revert, gas_with_state_usage()); + let gas = create_last_frame_return( + ctx, + InstructionResult::Revert, + gas_with_state_usage(), + None, + true, + ); // Unused regular gas is returned on revert. assert_eq!(gas.remaining(), 90); assert_eq!(gas.total_gas_spent(), 10); @@ -673,7 +673,14 @@ mod tests { .with_tx(OpTransaction::builder().base(TxEnv::builder().gas_limit(100)).build_fill()) .with_cfg(CfgEnv::new_with_spec(OpSpecId::KARST)); - let gas = create_last_frame_return(ctx, InstructionResult::Revert, gas_with_state_usage()); + // Without EIP-8037 the CREATE never charges `create_state_gas`. + let gas = create_last_frame_return( + ctx, + InstructionResult::Revert, + gas_with_state_usage(), + None, + false, + ); assert_eq!(gas.remaining(), 90); assert_eq!(gas.total_gas_spent(), 10); // No EIP-8037: the pre-tx reservoir is recovered, but no create_state_gas refund. @@ -687,7 +694,13 @@ mod tests { .with_tx(OpTransaction::builder().base(TxEnv::builder().gas_limit(100)).build_fill()) .with_cfg(amsterdam_cfg()); - let gas = create_last_frame_return(ctx, InstructionResult::Return, gas_with_state_usage()); + let gas = create_last_frame_return( + ctx, + InstructionResult::Return, + gas_with_state_usage(), + Some(Address::repeat_byte(0x11)), + true, + ); assert_eq!(gas.remaining(), 90); assert_eq!(gas.total_gas_spent(), 10); // Success: state gas was genuinely consumed — no recovery, no refill. @@ -780,6 +793,24 @@ mod tests { assert_eq!(gas.refunded(), 0); } + #[test] + fn test_revert_gas_deposit_tx_pre_regolith() { + let ctx = Context::op() + .with_tx( + OpTransaction::builder() + .base(TxEnv::builder().gas_limit(100)) + .source_hash(B256::from([1u8; 32])) + .build_fill(), + ) + .with_cfg(CfgEnv::new_with_spec(OpSpecId::BEDROCK)); + let gas = call_last_frame_return(ctx, InstructionResult::Revert, Gas::new(90)); + // Pre-Regolith deposits are pre-paid on L1: a revert still reports the gas limit as + // used, so the frame's unused gas is not returned. + assert_eq!(gas.remaining(), 0); + assert_eq!(gas.total_gas_spent(), 100); + assert_eq!(gas.refunded(), 0); + } + #[test] fn test_consume_gas_sys_deposit_tx() { let ctx = Context::op() diff --git a/rust/op-revm/src/l1block.rs b/rust/op-revm/src/l1block.rs index 7c3db365cdd..f8cbebf48f4 100644 --- a/rust/op-revm/src/l1block.rs +++ b/rust/op-revm/src/l1block.rs @@ -214,8 +214,13 @@ impl L1BlockInfo { let operator_cost_gas_limit = self.operator_fee_charge_inner(U256::from(gas.limit()), spec_id); // Exclude reservoir gas (EIP-8037) from used gas — reservoir is unused and reimbursed. + // revm 42 can credit `remaining` from the reservoir after the fact, so the sum can + // exceed the limit. let operator_cost_gas_used = self.operator_fee_charge_inner( - U256::from(gas.limit() - (gas.remaining() + gas.reservoir() + gas.refunded() as u64)), + U256::from( + gas.limit() + .saturating_sub(gas.remaining() + gas.reservoir() + gas.refunded() as u64), + ), spec_id, ); @@ -680,4 +685,20 @@ mod tests { assert_eq!(refunded, U256::from(100)) } + + /// Reservoir gas is credited on top of the regular budget, so `remaining + reservoir` can + /// exceed the limit and the used-gas expression goes negative. + #[test] + fn test_operator_fee_refund_with_unspent_reservoir() { + let gas = Gas::new_with_regular_gas_and_reservoir(50000, 100); + + let l1_block_info = L1BlockInfo { + operator_fee_scalar: Some(U256::from(2000)), + operator_fee_constant: Some(U256::from(5)), + ..Default::default() + }; + + // Nothing was spent, so the whole limit-based charge is refunded. + assert_eq!(l1_block_info.operator_fee_refund(&gas, OpSpecId::ISTHMUS), U256::from(100)); + } } diff --git a/rust/op-revm/src/precompiles.rs b/rust/op-revm/src/precompiles.rs index 949e20cc9f5..23e510389a0 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@41.0.0 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `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@41.0.0 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `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@41.0.0 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `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@41.0.0 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `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@41.0.0 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@42.0.1 `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 5b16448b121..84d3a7de3f5 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@41.0.0 `revm_primitives::hardfork::SpecId` + /// UPSTREAM-MIRROR(set): revm-primitives@42.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 15bbc88c639..6c129c3fe47 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@41.0.0 `revm_context_interface::Transaction` +/// UPSTREAM-MIRROR(delegate): revm-context-interface@42.0.0 `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 diff --git a/rust/revm-ee-tests/src/op_revm_tests.rs b/rust/revm-ee-tests/src/op_revm_tests.rs index 9fd6c24e5b8..a15e8a9de92 100644 --- a/rust/revm-ee-tests/src/op_revm_tests.rs +++ b/rust/revm-ee-tests/src/op_revm_tests.rs @@ -102,7 +102,7 @@ fn p256verify_test_tx() const SPEC_ID: OpSpecId = OpSpecId::FJORD; let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &[], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &[], false, 0, 0, 0, None).initial_total_gas(); Context::op() .with_tx( @@ -134,7 +134,7 @@ fn test_tx_call_p256verify() { fn test_halted_tx_call_p256verify() { const SPEC_ID: OpSpecId = OpSpecId::FJORD; let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &[], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &[], false, 0, 0, 0, None).initial_total_gas(); let original_gas_limit = initial_total_gas + secp256r1::P256VERIFY_BASE_GAS_FEE; let ctx = Context::op() @@ -170,7 +170,7 @@ fn bn254_pair_test_tx( { let input = Bytes::from([1; GRANITE_MAX_INPUT_SIZE + 2]); let initial_total_gas = - calculate_initial_tx_gas(spec.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(spec.into(), &input[..], false, 0, 0, 0, None).initial_total_gas(); Context::op() .with_tx( @@ -301,7 +301,8 @@ fn g1_msm_test_tx() let input = Bytes::from([1; bls12_381_const::G1_MSM_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let gs1_msm_gas = bls12_381_utils::msm_required_gas( 1, &bls12_381_const::DISCOUNT_TABLE_G1_MSM, @@ -331,7 +332,8 @@ fn test_halted_tx_call_bls12_381_g1_msm_input_wrong_size() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::G1_MSM_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let gs1_msm_gas = bls12_381_utils::msm_required_gas( 1, &bls12_381_const::DISCOUNT_TABLE_G1_MSM, @@ -378,7 +380,8 @@ fn test_halted_tx_call_bls12_381_g1_msm_out_of_gas() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::G1_MSM_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let gs1_msm_gas = bls12_381_utils::msm_required_gas( 1, &bls12_381_const::DISCOUNT_TABLE_G1_MSM, @@ -517,7 +520,8 @@ fn g2_msm_test_tx() let input = Bytes::from([1; bls12_381_const::G2_MSM_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let gs2_msm_gas = bls12_381_utils::msm_required_gas( 1, &bls12_381_const::DISCOUNT_TABLE_G2_MSM, @@ -547,7 +551,8 @@ fn test_halted_tx_call_bls12_381_g2_msm_input_wrong_size() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::G2_MSM_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let gs2_msm_gas = bls12_381_utils::msm_required_gas( 1, &bls12_381_const::DISCOUNT_TABLE_G2_MSM, @@ -594,7 +599,8 @@ fn test_halted_tx_call_bls12_381_g2_msm_out_of_gas() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::G2_MSM_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let gs2_msm_gas = bls12_381_utils::msm_required_gas( 1, &bls12_381_const::DISCOUNT_TABLE_G2_MSM, @@ -662,7 +668,8 @@ fn bl12_381_pairing_test_tx() let input = Bytes::from([1; bls12_381_const::PAIRING_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let pairing_gas: u64 = bls12_381_const::PAIRING_MULTIPLIER_BASE + bls12_381_const::PAIRING_OFFSET_BASE; @@ -690,7 +697,8 @@ fn test_halted_tx_call_bls12_381_pairing_input_wrong_size() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::PAIRING_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let pairing_gas: u64 = bls12_381_const::PAIRING_MULTIPLIER_BASE + bls12_381_const::PAIRING_OFFSET_BASE; @@ -734,7 +742,8 @@ fn test_halted_tx_call_bls12_381_pairing_out_of_gas() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::PAIRING_INPUT_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let pairing_gas: u64 = bls12_381_const::PAIRING_MULTIPLIER_BASE + bls12_381_const::PAIRING_OFFSET_BASE; @@ -797,7 +806,8 @@ fn test_halted_tx_call_bls12_381_map_fp_to_g1_out_of_gas() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::PADDED_FP_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let ctx = Context::op() .with_tx( @@ -841,7 +851,8 @@ fn test_halted_tx_call_bls12_381_map_fp_to_g1_input_wrong_size() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::PADDED_FP_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let ctx = Context::op() .with_tx( @@ -883,7 +894,8 @@ fn test_halted_tx_call_bls12_381_map_fp2_to_g2_out_of_gas() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::PADDED_FP2_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let ctx = Context::op() .with_tx( @@ -958,7 +970,8 @@ fn test_halted_tx_call_bls12_381_map_fp2_to_g2_input_wrong_size() { const SPEC_ID: OpSpecId = OpSpecId::ISTHMUS; let input = Bytes::from([1; bls12_381_const::PADDED_FP2_LENGTH]); let initial_total_gas = - calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0).initial_total_gas(); + calculate_initial_tx_gas(SPEC_ID.into(), &input[..], false, 0, 0, 0, None) + .initial_total_gas(); let ctx = Context::op() .with_tx( diff --git a/rust/scripts/test_upstream_mirrors.py b/rust/scripts/test_upstream_mirrors.py index 861df8c1823..53e692133ec 100755 --- a/rust/scripts/test_upstream_mirrors.py +++ b/rust/scripts/test_upstream_mirrors.py @@ -241,11 +241,12 @@ class ClassificationTests(unittest.TestCase): def mirror(version: str, *, crate: str = "revm-handler", kind: str = "override"): return mirrors.Mirror(kind, crate, version, "upstream::symbol", "src/file.rs", 10) - def classify(self, mirror, locked=None): + def classify(self, mirror, locked=None, requirements=None): mirrors.classify( [mirror], locked=locked or {"revm-handler": {"41.0.0"}}, reth_info=self.RETH_INFO, + requirements=requirements or {}, ) return mirror @@ -260,6 +261,27 @@ def test_duplicate_locked_versions_are_ambiguous(self) -> None: "ambiguous-version", ) + def test_duplicate_locked_versions_resolve_to_the_workspace_range(self) -> None: + locked = {"alloy-consensus": {"1.8.3", "2.1.1"}} + # `1.8` selects the 1.x line, which the 2.1.1 tag is then ahead of. + for requirement, expected in (("2.0.0", "current"), ("1.8", "ahead")): + with self.subTest(requirement=requirement): + mirror = self.classify( + self.mirror("2.1.1", crate="alloy-consensus"), + locked, + {"alloy-consensus": requirement}, + ) + self.assertEqual(mirror.status, expected) + + def test_unselective_workspace_requirements_stay_ambiguous(self) -> None: + locked = {"tiny": {"0.1.0", "0.2.0"}} + for requirement in ("0", "*", ">=0.1, <0.3", "3.0.0"): + with self.subTest(requirement=requirement): + mirror = self.classify( + self.mirror("0.2.0", crate="tiny"), locked, {"tiny": requirement} + ) + self.assertEqual(mirror.status, "ambiguous-version") + def test_semver_statuses(self) -> None: for version, expected in ( ("40.0.0", "stale"), diff --git a/rust/scripts/upstream-mirrors.py b/rust/scripts/upstream-mirrors.py index d0a886ae6fe..a789585530a 100755 --- a/rust/scripts/upstream-mirrors.py +++ b/rust/scripts/upstream-mirrors.py @@ -47,6 +47,8 @@ DOC_RE = re.compile(r"^\s*(///|//!)\s?(.*)$") KINDS = {"override", "copy", "delegate", "set", "port"} +REQUIREMENT_RE = re.compile(r"\s*[\^=]?\s*(?P[0-9]+(?:\.[0-9]+){0,2})\s*") + SEMVER_RE = re.compile( r"^(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)\.(0|[1-9][0-9]*)" r"(?:-([0-9A-Za-z-]+(?:\.[0-9A-Za-z-]+)*))?" @@ -258,6 +260,64 @@ def reth_pin(manifest_path: Path | None = None) -> tuple[str, str]: return token, repo +def workspace_requirements(manifest_path: Path | None = None) -> dict[str, str]: + """The version requirement each crates.io dependency is declared with in the workspace.""" + path = manifest_path or RUST_ROOT / "Cargo.toml" + with path.open("rb") as manifest_file: + manifest = tomllib.load(manifest_file) + + requirements: dict[str, str] = {} + for name, dependency in manifest.get("workspace", {}).get("dependencies", {}).items(): + if isinstance(dependency, str): + requirements[name] = dependency + elif isinstance(dependency, dict) and not dependency.keys() & {"git", "path"}: + version = dependency.get("version") + if isinstance(version, str): + requirements[name] = version + return requirements + + +def compat_class(version: SemVer) -> tuple[int, ...]: + """The range cargo keeps a version inside: crates differing here never unify.""" + if version.major: + return (version.major,) + if version.minor: + return (0, version.minor) + return (0, 0, version.patch) + + +def requirement_compat_class(requirement: str) -> tuple[int, ...] | None: + """The compatibility range a manifest requirement selects, or `None` if it spans more + than one. `2`, `^2.3.0` and `0.38` each pick one; `0`, `*` and `>=1, <3` do not.""" + match = REQUIREMENT_RE.fullmatch(requirement) + if match is None: + return None + parts = [int(part) for part in match.group("version").split(".")] + if parts[0]: + return (parts[0],) + if len(parts) > 1 and parts[1]: + return (0, parts[1]) + if len(parts) > 2: + return (0, 0, parts[2]) + return None + + +def narrow_to_workspace_range(versions: set[str], requirement: str | None) -> set[str]: + """The locked versions the workspace's own requirement accepts, or all of them when the + requirement is absent, unselective, or matches none.""" + wanted = requirement_compat_class(requirement) if requirement else None + if wanted is None: + return versions + selected = set() + for version in versions: + try: + if compat_class(parse_semver(version)) == wanted: + selected.add(version) + except ValueError: + continue + return selected or versions + + def freeze_port(mirror: Mirror) -> None: """A `port` is deliberately behind the pin, so report its staleness as frozen. An overshot version stays an error: it cannot have been verified against the pin.""" @@ -270,8 +330,10 @@ def classify( *, locked: dict[str, set[str]] | None = None, reth_info: tuple[str, str] | None = None, + requirements: dict[str, str] | None = None, ) -> list[Mirror]: locked = locked if locked is not None else locked_versions() + requirements = requirements if requirements is not None else workspace_requirements() reth, reth_repo = reth_info if reth_info is not None else reth_pin() for mirror in mirrors: if mirror.status == Status.MALFORMED: @@ -328,6 +390,11 @@ def classify( mirror.status = Status.UNKNOWN_CRATE mirror.note = "not in rust/Cargo.lock — renamed, dropped, or a typo in the tag" continue + if len(versions) != 1: + # Several incompatible releases of one crate can coexist in the lock when an + # unrelated dependency pulls an older line. A tag mirrors what our own crates + # build against, so narrow to the range the workspace's requirement selects. + versions = narrow_to_workspace_range(versions, requirements.get(mirror.crate)) if len(versions) != 1: mirror.status = Status.AMBIGUOUS_VERSION mirror.pinned = ",".join(sorted(versions))