diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 3bb0d757e4f..00bee0de3ee 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -194,9 +194,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b836b372d3b742b7c083d2617d6e68563cd5dadbd8752c461a935a756551e69" +checksum = "727016fed834c2392d014dd697ea473f3e47bcec31ba31ccffa9c1d18ed904e5" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -236,11 +236,11 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1befb37485ea71e8599e32ffd76c98af7c3720a34741d30abd87f41c3148407" +checksum = "6ea5ae60bbb3ce9dc52685a70a3755ad4432045fd38079b763cfe5127c706134" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -251,18 +251,18 @@ dependencies = [ [[package]] name = "alloy-contract" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b432cf09e307820b39ec5b856b25f396d8fde6089358f0c1d96d9654ad1e0b7d" +checksum = "8c807c974ae5ac07fa98431310b498d85f029da0d2f9a088b3ea673e5e33bb81" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-dyn-abi", "alloy-json-abi", - "alloy-network 2.4.2", - "alloy-network-primitives 2.4.2", + "alloy-network 2.5.0", + "alloy-network-primitives 2.5.0", "alloy-primitives", "alloy-provider", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-sol-types", "alloy-transport", "futures", @@ -308,9 +308,9 @@ dependencies = [ [[package]] name = "alloy-eip2930" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9441120fa82df73e8959ae0e4ab8ade03de2aaae61be313fbf5746277847ce25" +checksum = "e64579d931b3f8eacc7c9ab0b220e87e9c4816e5c724ede1947b55c2f8e92ae5" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -353,9 +353,9 @@ dependencies = [ [[package]] name = "alloy-eip7928" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cb19c9d53b507960f649e5689f7098e556696023fe1b57b67f2181ed54bc5b7" +checksum = "6a12e1dc70236cfb8e79b96dd8544aed47c39e2f45dc6b51c3703e969e052faa" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -412,7 +412,7 @@ dependencies = [ "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", - "alloy-eip7928 0.4.10", + "alloy-eip7928 0.4.11", "alloy-eip8141", "alloy-primitives", "alloy-rlp", @@ -436,12 +436,12 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7b6bd5f7e5ce9858bac99275e3f548c3b63bb3e5806da0142dc0b2f518d3ec4a" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-hardforks", "alloy-primitives", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-sol-types", "auto_impl", "derive_more 2.1.1", @@ -452,9 +452,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0680a2f7d4bbc6f48c0cb43368fa544918a1fa291e772bdb47c834ade338f363" +checksum = "53cfa407c1d874cb306187996e30eb551bd98025e60e913e69e298ed2c8ea045" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -467,9 +467,9 @@ dependencies = [ [[package]] name = "alloy-hardforks" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865371fb677c005f7cb0ea9c2847a1ba4fdb042caf6428b1769fee20368bbfc7" +checksum = "7f03efb8382bf3b19f0bd0b3cdfaa59cb13e57a3a6650f75fae47645873723d5" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -549,18 +549,18 @@ dependencies = [ [[package]] name = "alloy-network" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f263c8d752b15e19b7c2d3cbad00338ec2d7cc923a46cd1ff98aea2fa333166b" +checksum = "e11dfba13dac9e54576bf41e1b7461491367e0bce6a2a4293b9e40ffa3ebd5e9" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-consensus-any 2.4.2", + "alloy-consensus 2.5.0", + "alloy-consensus-any 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", - "alloy-network-primitives 2.4.2", + "alloy-network-primitives 2.5.0", "alloy-primitives", - "alloy-rpc-types-any 2.4.2", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-any 2.5.0", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-signer 2.5.0", "alloy-sol-types", @@ -588,11 +588,11 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8795eecf50374a0dd942caff57922c59333c9991ead9eccbbc1709f55d73c7c2" +checksum = "3819bf6794d25f679d42c3f2b168e12cae08c56bb41d393cb6249b55e6d5933e" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-serde 2.5.0", @@ -603,7 +603,7 @@ dependencies = [ name = "alloy-op-evm" version = "0.32.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-hardforks", @@ -666,22 +666,22 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef487e44dfae9c87cb732989d3f43682f65aefb11a0f56045b26be357f671fcf" +checksum = "9f8250dbbc93fab5b00fe0d3c1db3ede67d2a5fdbae8255de70b34ae39da244b" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", - "alloy-network 2.4.2", - "alloy-network-primitives 2.4.2", + "alloy-network 2.5.0", + "alloy-network-primitives 2.5.0", "alloy-primitives", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-trace", "alloy-signer 2.5.0", "alloy-sol-types", @@ -756,9 +756,9 @@ dependencies = [ [[package]] name = "alloy-rpc-client" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98267c2d47f9c185b575bac3f772a8ca66bcbd712693535e50980c12eab80a42" +checksum = "1f73519dc8f4ab73dafe90ac47aec4b9055c421c762d770d911eed83fcbef28d" dependencies = [ "alloy-json-rpc 2.5.0", "alloy-primitives", @@ -782,23 +782,23 @@ dependencies = [ [[package]] name = "alloy-rpc-types" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "637fed69eda26e19fb42314006570519003c1bfc338c54165e610a657e3b46ff" +checksum = "e30da7fc40ff208becb4ebe462a149045c8613f60ee84f65731a522c67c351fd" dependencies = [ "alloy-primitives", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", ] [[package]] name = "alloy-rpc-types-admin" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f91f1a1fa4d3c95ea5dba30c02d8987f0c052137dd7f1d55086cf36270517cbc" +checksum = "8d217ca58fed01c4c96d66767af04af39d57ee0d3af016aaf686a2d600aa66d0" dependencies = [ "alloy-genesis", "alloy-primitives", @@ -808,12 +808,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-anvil" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "848bfe2315338ec605863073aae54a90fcea9cec7e6855a9e93d988bf42e9740" +checksum = "ad4774d898cc10846f65c426a385071f3e2872876d7f0e7836f1f75ffa54d448" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", ] @@ -831,14 +831,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types-any" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1176430031ba27abfb51b95516cf71e8ce3ff4172c72f3136627f0f89813a739" +checksum = "9c5d320312e4a9481b18185429e57fa161dbf9468414ba5667aff4ebe7bd37e7" dependencies = [ - "alloy-consensus-any 2.4.2", - "alloy-network-primitives 2.4.2", + "alloy-consensus-any 2.5.0", + "alloy-network-primitives 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", "serde_json", @@ -846,9 +846,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-beacon" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20f226662436bbdc221c9156a1f445c257da5e695b39a26878aa8b2644f710e" +checksum = "01f0837510a7e7789f99cf86bc0d0e3b54cfa663f25de803dad613364eef9fd3" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -879,11 +879,11 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a43d7b6b86be4885c7a76f1dfcde9651af2d419ff571e8ee7257de47101203b" +checksum = "77b967576e97165fed3fae1cf6adad964e192293e4ee61d9187afe3ecaa12323" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -921,18 +921,19 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756eb5803e70985be4066b636194ccb5f6629e5d141817c1f0c50cea8350bf5c" +checksum = "32c475e21fe8a8caa02166b326ed22207a1a0597fc9b0dcdfb46e2fe6f80dadf" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-consensus-any 2.4.2", + "alloy-consensus 2.5.0", + "alloy-consensus-any 2.5.0", "alloy-eips 2.5.0", - "alloy-network-primitives 2.4.2", + "alloy-network-primitives 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-serde 2.5.0", "alloy-sol-types", + "alloy-trie", "arbitrary", "itertools 0.14.0", "serde", @@ -943,14 +944,14 @@ dependencies = [ [[package]] name = "alloy-rpc-types-mev" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c833a9b946d827d2b2aa8cad8e92279a4340ec1b7cf666f3e1ee6ef4684e0159" +checksum = "8c230cc2e3f19a76889664522ffc10d746292f43fa1f57a3a9e20fe011346203" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", "serde_json", @@ -958,12 +959,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-trace" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1933d60c2f51b8906103484ea2ca2218357264dbf16f948f7c2dd4ac5818e1d8" +checksum = "e3d8edefcef7d45a3da4bb869bbee1ee4c71b7437b22b87794f0912c89b5702c" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", "serde_json", @@ -972,12 +973,12 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb5d708e45799bd963d7e3bd8d04110e90983833ed02f91a9099811ed39ce6d" +checksum = "2fcacd9928d9788790afcd1d3fd8d0206329d2ef2391070867bafcc20ecf278f" dependencies = [ "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "serde", ] @@ -1056,12 +1057,12 @@ dependencies = [ [[package]] name = "alloy-signer-gcp" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb83214b1e09902a70d7417ea82ab893f6b55f1d31987b4a4ba8514e0292f500" +checksum = "690e7c2edb82601a7e95720a4902a7a611a6cac04e01977b004611fa7795d454" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-network 2.4.2", + "alloy-consensus 2.5.0", + "alloy-network 2.5.0", "alloy-primitives", "alloy-signer 2.5.0", "async-trait", @@ -1090,12 +1091,12 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c81472fb0b73cbb18106e323e33e3f249f56318a330a8e0f6aa6e913e3519a" +checksum = "d6909c09d586c7b55eced688754d57dde8a6bcbae2b83e69a9b9250e74cfd79e" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-network 2.4.2", + "alloy-consensus 2.5.0", + "alloy-network 2.5.0", "alloy-primitives", "alloy-signer 2.5.0", "async-trait", @@ -1205,9 +1206,9 @@ dependencies = [ [[package]] name = "alloy-transport-http" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e38c841f63141cad3f1a4378cedf121914b32932cf09b66c6006d4a906112136" +checksum = "df948f2f9530ed0325d789ad98aa08403aaeaf55ddd6eeaf0cda143e02afab39" dependencies = [ "alloy-json-rpc 2.5.0", "alloy-rpc-types-engine", @@ -1267,9 +1268,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f14b5d9b2c2173980202c6ff470d96e7c5e202c65a9f67884ad565226df7fbb" +checksum = "7895d0d2c946c0ae9253c227db77b9fc707383831058e6a5232fdfc774b28259" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -1381,7 +1382,7 @@ version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -1392,7 +1393,7 @@ checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", "once_cell_polyfill", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -2732,7 +2733,7 @@ dependencies = [ "bitflags 2.11.1", "cexpr", "clang-sys", - "itertools 0.13.0", + "itertools 0.12.1", "proc-macro2", "quote", "regex", @@ -3575,7 +3576,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]] @@ -4228,7 +4229,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]] @@ -4486,7 +4487,7 @@ dependencies = [ "libc", "option-ext", "redox_users 0.5.2", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -4932,7 +4933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -5609,7 +5610,7 @@ dependencies = [ "libc", "log", "rustversion", - "windows-link 0.1.3", + "windows-link 0.2.1", "windows-result 0.4.1", ] @@ -6777,7 +6778,7 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -7223,7 +7224,7 @@ dependencies = [ name = "kona-client" version = "1.0.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -7263,7 +7264,7 @@ dependencies = [ name = "kona-derive" version = "0.4.5" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -7316,7 +7317,7 @@ dependencies = [ name = "kona-driver" version = "0.4.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-evm", "alloy-primitives", "async-trait", @@ -7336,16 +7337,16 @@ dependencies = [ name = "kona-engine" version = "0.1.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-hardforks", "alloy-json-rpc 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-transport", "alloy-transport-http", "arbitrary", @@ -7378,7 +7379,7 @@ dependencies = [ name = "kona-executor" version = "0.4.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -7415,7 +7416,7 @@ name = "kona-genesis" version = "0.4.5" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", @@ -7437,7 +7438,7 @@ name = "kona-gossip" version = "0.1.2" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -7494,7 +7495,7 @@ dependencies = [ name = "kona-host" version = "1.0.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", "alloy-op-evm", @@ -7544,7 +7545,7 @@ dependencies = [ name = "kona-interop" version = "0.4.5" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -7573,7 +7574,7 @@ version = "0.1.2" name = "kona-mpt" version = "0.3.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rlp", @@ -7600,7 +7601,7 @@ dependencies = [ "alloy-provider", "alloy-rpc-types-engine", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "alloy-transport", "alloy-transport-http", "anyhow", @@ -7650,16 +7651,16 @@ name = "kona-node-service" version = "0.1.3" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "alloy-transport", "alloy-transport-http", "anyhow", @@ -7714,7 +7715,7 @@ dependencies = [ name = "kona-peers" version = "0.1.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rlp", "arbitrary", @@ -7759,7 +7760,7 @@ dependencies = [ name = "kona-proof" version = "0.3.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -7799,7 +7800,7 @@ dependencies = [ name = "kona-proof-interop" version = "0.2.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -7834,14 +7835,14 @@ name = "kona-protocol" version = "0.4.5" dependencies = [ "alloc-no-stdlib", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-hardforks", "alloy-op-hardforks", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-sol-types", "ambassador", @@ -7875,13 +7876,13 @@ dependencies = [ name = "kona-providers-alloy" version = "0.3.3" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-transport", "alloy-transport-http", @@ -7913,7 +7914,7 @@ dependencies = [ name = "kona-providers-local" version = "0.1.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "async-trait", @@ -7950,12 +7951,12 @@ dependencies = [ name = "kona-rpc" version = "0.3.2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-client", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "async-trait", "derive_more 2.1.1", "enr 0.14.0", @@ -8014,7 +8015,7 @@ dependencies = [ "alloy-primitives", "alloy-rpc-client", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "alloy-transport", "alloy-transport-http", "backon", @@ -8063,7 +8064,7 @@ version = "0.0.1" name = "kona-sp1-client-utils" version = "0.0.1" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -8106,7 +8107,7 @@ name = "kona-sp1-ethereum-client-utils" version = "0.0.1" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-op-evm", "alloy-primitives", @@ -8136,7 +8137,7 @@ dependencies = [ name = "kona-sp1-host-utils" version = "0.0.1" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-signer 1.8.3", @@ -8176,7 +8177,7 @@ name = "kona-sp1-super-range-executor" version = "0.0.1" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-op-evm", "alloy-primitives", @@ -9537,7 +9538,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -9808,12 +9809,12 @@ dependencies = [ name = "op-alloy-consensus" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-signer 2.5.0", "arbitrary", @@ -9842,10 +9843,10 @@ checksum = "a79f352fc3893dcd670172e615afef993a41798a1d3fc0db88a3e60ef2e70ecc" name = "op-alloy-network" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-network 2.4.2", + "alloy-consensus 2.5.0", + "alloy-network 2.5.0", "alloy-provider", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "op-alloy-consensus", "op-alloy-rpc-types", ] @@ -9854,7 +9855,7 @@ dependencies = [ name = "op-alloy-provider" version = "2.0.0" dependencies = [ - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-types-engine", @@ -9875,12 +9876,12 @@ dependencies = [ name = "op-alloy-rpc-types" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", - "alloy-network-primitives 2.4.2", + "alloy-network 2.5.0", + "alloy-network-primitives 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-signer 2.5.0", "arbitrary", @@ -9899,7 +9900,7 @@ dependencies = [ name = "op-alloy-rpc-types-engine" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -9959,14 +9960,14 @@ dependencies = [ name = "op-reth-test-engine" version = "0.1.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "clap", "futures", "jsonrpsee", @@ -10038,16 +10039,16 @@ version = "0.1.0" name = "op-zk-proposer" version = "0.1.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-contract", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rpc-client", - "alloy-rpc-types-eth 2.4.2", - "alloy-signer-local 2.4.2", + "alloy-rpc-types-eth 2.5.0", + "alloy-signer-local 2.5.0", "alloy-sol-types", "alloy-transport", "alloy-transport-http", @@ -11289,7 +11290,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" dependencies = [ "heck", - "itertools 0.14.0", + "itertools 0.12.1", "log", "multimap", "petgraph", @@ -11323,7 +11324,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" dependencies = [ "anyhow", - "itertools 0.14.0", + "itertools 0.12.1", "proc-macro2", "quote", "syn 2.0.117", @@ -11970,10 +11971,10 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "reth-basic-payload-builder" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "futures-core", @@ -11997,26 +11998,24 @@ dependencies = [ [[package]] name = "reth-chain-state" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "derive_more 2.1.1", "metrics", "parking_lot", "pin-project", "rand 0.9.4", "reth-chainspec", - "reth-errors", "reth-ethereum-primitives", "reth-execution-types", "reth-metrics", "reth-primitives-traits", - "reth-storage-api", "reth-trie", "reth-trie-sparse", "revm", @@ -12028,11 +12027,11 @@ dependencies = [ [[package]] name = "reth-chainspec" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", @@ -12048,8 +12047,8 @@ dependencies = [ [[package]] name = "reth-cli" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-genesis", "clap", @@ -12061,12 +12060,12 @@ dependencies = [ [[package]] name = "reth-cli-commands" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -12151,8 +12150,8 @@ dependencies = [ [[package]] name = "reth-cli-runner" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "reth-tasks", "tokio", @@ -12161,8 +12160,8 @@ dependencies = [ [[package]] name = "reth-cli-util" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -12182,11 +12181,11 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6bac09d9d84a412ae151149ec870d6eb7770335c5eb63f209453d81deff8d39" +checksum = "ef769807575055ccafe9db3a9d7eca3b97ca8213122942e71c47915776ec52b2" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -12203,9 +12202,9 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0101b1f474563c4c48c04fc2477199279a53d9c19b65301c6fd2131cf6e4a330" +checksum = "0652b5da6dcce54dc8bcfb69c5241b0ef09211963f76929d4d63e23767b43bf6" dependencies = [ "proc-macro2", "quote", @@ -12214,8 +12213,8 @@ dependencies = [ [[package]] name = "reth-config" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "eyre", "humantime-serde", @@ -12231,11 +12230,11 @@ dependencies = [ [[package]] name = "reth-consensus" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-primitives", "auto_impl", "reth-execution-types", @@ -12245,10 +12244,10 @@ dependencies = [ [[package]] name = "reth-consensus-common" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "reth-chainspec", @@ -12258,10 +12257,10 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", "alloy-primitives", @@ -12283,8 +12282,8 @@ dependencies = [ [[package]] name = "reth-db" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "derive_more 2.1.1", @@ -12312,10 +12311,10 @@ dependencies = [ [[package]] name = "reth-db-api" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "arbitrary", @@ -12339,10 +12338,10 @@ dependencies = [ [[package]] name = "reth-db-common" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-genesis", "alloy-primitives", "boyer-moore-magiclen", @@ -12369,8 +12368,8 @@ dependencies = [ [[package]] name = "reth-db-models" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -12384,8 +12383,8 @@ dependencies = [ [[package]] name = "reth-discv4" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -12409,8 +12408,8 @@ dependencies = [ [[package]] name = "reth-discv5" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -12433,8 +12432,8 @@ dependencies = [ [[package]] name = "reth-dns-discovery" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "dashmap", @@ -12457,10 +12456,10 @@ dependencies = [ [[package]] name = "reth-downloaders" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -12479,7 +12478,6 @@ dependencies = [ "reth-network-p2p", "reth-network-peers", "reth-primitives-traits", - "reth-provider", "reth-storage-api", "reth-tasks", "reth-testing-utils", @@ -12494,19 +12492,20 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-genesis", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "derive_more 2.1.1", "eyre", "futures-util", @@ -12521,7 +12520,6 @@ dependencies = [ "reth-engine-primitives", "reth-ethereum-primitives", "reth-network-api", - "reth-network-p2p", "reth-network-peers", "reth-node-api", "reth-node-builder", @@ -12540,6 +12538,7 @@ dependencies = [ "reth-tasks", "reth-tokio-util", "reth-tracing", + "reth-transaction-pool", "reth-trie", "reth-trie-db", "revm", @@ -12553,8 +12552,8 @@ dependencies = [ [[package]] name = "reth-ecies" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "aes 0.8.4", "alloy-primitives", @@ -12580,10 +12579,10 @@ dependencies = [ [[package]] name = "reth-engine-local" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "eyre", @@ -12603,10 +12602,10 @@ dependencies = [ [[package]] name = "reth-engine-primitives" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", @@ -12630,11 +12629,11 @@ dependencies = [ [[package]] name = "reth-engine-tree" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", @@ -12686,12 +12685,11 @@ dependencies = [ [[package]] name = "reth-engine-util" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", - "alloy-rlp", "alloy-rpc-types-engine", "eyre", "futures", @@ -12716,10 +12714,10 @@ dependencies = [ [[package]] name = "reth-era" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -12734,8 +12732,8 @@ dependencies = [ [[package]] name = "reth-era-downloader" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "bytes", @@ -12750,10 +12748,10 @@ dependencies = [ [[package]] name = "reth-era-utils" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rlp", "eyre", @@ -12774,8 +12772,8 @@ dependencies = [ [[package]] name = "reth-errors" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -12785,8 +12783,8 @@ dependencies = [ [[package]] name = "reth-eth-wire" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-chains", "alloy-primitives", @@ -12814,12 +12812,12 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-hardforks", "alloy-primitives", @@ -12840,11 +12838,11 @@ dependencies = [ [[package]] name = "reth-ethereum" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "reth-chainspec", "reth-cli-util", "reth-codecs", @@ -12881,8 +12879,8 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "clap", "eyre", @@ -12904,10 +12902,10 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "reth-chainspec", @@ -12920,8 +12918,8 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -12936,8 +12934,8 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -12950,10 +12948,10 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -12980,12 +12978,12 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "reth-codecs", "reth-primitives-traits", "serde", @@ -12993,8 +12991,8 @@ dependencies = [ [[package]] name = "reth-etl" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "rayon", "reth-db-api", @@ -13003,11 +13001,11 @@ dependencies = [ [[package]] name = "reth-evm" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", @@ -13029,10 +13027,10 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", @@ -13049,8 +13047,8 @@ dependencies = [ [[package]] name = "reth-execution-cache" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "fixed-cache", @@ -13059,16 +13057,15 @@ dependencies = [ "reth-errors", "reth-metrics", "reth-primitives-traits", - "reth-provider", "reth-revm", - "reth-trie", + "reth-storage-api", "tracing", ] [[package]] name = "reth-execution-errors" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-evm", "alloy-primitives", @@ -13080,10 +13077,11 @@ dependencies = [ [[package]] name = "reth-execution-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-primitives", @@ -13099,10 +13097,10 @@ dependencies = [ [[package]] name = "reth-exex" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "eyre", @@ -13137,8 +13135,8 @@ dependencies = [ [[package]] name = "reth-exex-test-utils" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "eyre", @@ -13169,8 +13167,8 @@ dependencies = [ [[package]] name = "reth-exex-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -13183,8 +13181,8 @@ dependencies = [ [[package]] name = "reth-fs-util" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "serde", "serde_json", @@ -13193,10 +13191,10 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-debug", @@ -13219,8 +13217,8 @@ dependencies = [ [[package]] name = "reth-ipc" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "bytes", "futures", @@ -13239,8 +13237,8 @@ dependencies = [ [[package]] name = "reth-libmdbx" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "bitflags 2.11.1", "byteorder", @@ -13256,8 +13254,8 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "bindgen", "cc", @@ -13265,8 +13263,8 @@ dependencies = [ [[package]] name = "reth-metrics" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "futures", "libc", @@ -13279,8 +13277,8 @@ dependencies = [ [[package]] name = "reth-net-banlist" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "ipnet", @@ -13288,8 +13286,8 @@ dependencies = [ [[package]] name = "reth-net-nat" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "futures-util", "if-addrs 0.14.0", @@ -13302,10 +13300,10 @@ dependencies = [ [[package]] name = "reth-network" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -13337,6 +13335,7 @@ dependencies = [ "reth-fs-util", "reth-metrics", "reth-net-banlist", + "reth-net-nat", "reth-network-api", "reth-network-p2p", "reth-network-peers", @@ -13361,13 +13360,13 @@ dependencies = [ [[package]] name = "reth-network-api" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rpc-types-admin", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "auto_impl", "derive_more 2.1.1", "enr 0.13.0", @@ -13386,11 +13385,11 @@ dependencies = [ [[package]] name = "reth-network-p2p" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-primitives", "auto_impl", @@ -13410,8 +13409,8 @@ dependencies = [ [[package]] name = "reth-network-peers" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -13425,8 +13424,8 @@ dependencies = [ [[package]] name = "reth-network-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -13439,8 +13438,8 @@ dependencies = [ [[package]] name = "reth-nippy-jar" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "anyhow", "bincode 1.3.3", @@ -13457,8 +13456,8 @@ dependencies = [ [[package]] name = "reth-node-api" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -13481,10 +13480,10 @@ dependencies = [ [[package]] name = "reth-node-builder" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-provider", @@ -13549,10 +13548,10 @@ dependencies = [ [[package]] name = "reth-node-core" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", @@ -13604,16 +13603,16 @@ dependencies = [ [[package]] name = "reth-node-ethereum" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "ethereum_ssz", "ethereum_ssz_derive", "eyre", @@ -13657,10 +13656,10 @@ dependencies = [ [[package]] name = "reth-node-ethstats" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "chrono", "futures-util", @@ -13681,10 +13680,10 @@ dependencies = [ [[package]] name = "reth-node-events" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", @@ -13705,8 +13704,8 @@ dependencies = [ [[package]] name = "reth-node-metrics" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "bytes", "eyre", @@ -13735,8 +13734,8 @@ dependencies = [ [[package]] name = "reth-node-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "reth-chainspec", "reth-db-api", @@ -13791,7 +13790,7 @@ name = "reth-optimism-chainspec" version = "2.0.0" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", @@ -13823,7 +13822,7 @@ dependencies = [ name = "reth-optimism-cli" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-genesis", "alloy-primitives", "clap", @@ -13867,7 +13866,7 @@ name = "reth-optimism-consensus" version = "2.0.0" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-trie", @@ -13905,13 +13904,13 @@ dependencies = [ name = "reth-optimism-evm" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", "alloy-op-evm", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "metrics-exporter-prometheus", "metrics-util", "op-alloy-consensus", @@ -13930,6 +13929,7 @@ dependencies = [ "reth-primitives-traits", "reth-revm", "reth-rpc-eth-api", + "reth-storage-api", "reth-storage-errors", "revm", "rstest", @@ -13942,7 +13942,7 @@ dependencies = [ name = "reth-optimism-exex" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "eyre", "futures", @@ -13970,13 +13970,13 @@ dependencies = [ name = "reth-optimism-flashblocks" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rpc-types", "alloy-rpc-types-engine", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "brotli", "derive_more 2.1.1", "eyre", @@ -14027,18 +14027,18 @@ dependencies = [ name = "reth-optimism-node" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-genesis", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-op-evm", "alloy-op-hardforks", "alloy-primitives", "alloy-rlp", "alloy-rpc-types-admin", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-trace", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "clap", "eyre", "futures", @@ -14107,7 +14107,7 @@ dependencies = [ name = "reth-optimism-payload-builder" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-evm", "alloy-op-evm", @@ -14115,7 +14115,7 @@ dependencies = [ "alloy-rlp", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "derive_more 2.1.1", "metrics-exporter-prometheus", "metrics-util", @@ -14142,6 +14142,7 @@ dependencies = [ "reth-provider", "reth-revm", "reth-storage-api", + "reth-tasks", "reth-transaction-pool", "revm", "rstest", @@ -14156,7 +14157,7 @@ dependencies = [ name = "reth-optimism-post-exec-replay" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "op-alloy-consensus", @@ -14175,7 +14176,7 @@ dependencies = [ name = "reth-optimism-primitives" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -14202,7 +14203,7 @@ dependencies = [ name = "reth-optimism-rpc" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-hardforks", @@ -14213,7 +14214,7 @@ dependencies = [ "alloy-rpc-client", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-transport", "alloy-transport-http", @@ -14235,8 +14236,11 @@ dependencies = [ "reth-basic-payload-builder", "reth-chain-state", "reth-chainspec", + "reth-db-common", "reth-errors", + "reth-ethereum-primitives", "reth-evm", + "reth-execution-types", "reth-metrics", "reth-node-api", "reth-node-builder", @@ -14262,6 +14266,7 @@ dependencies = [ "reth-storage-api", "reth-tasks", "reth-transaction-pool", + "reth-trie", "revm", "rstest", "serde", @@ -14278,7 +14283,7 @@ dependencies = [ name = "reth-optimism-storage" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "reth-codecs", "reth-optimism-primitives", "reth-prune-types", @@ -14290,7 +14295,7 @@ dependencies = [ name = "reth-optimism-trie" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -14339,12 +14344,12 @@ dependencies = [ name = "reth-optimism-txpool" version = "2.0.0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-json-rpc 2.5.0", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "async-trait", "c-kzg", @@ -14383,10 +14388,10 @@ dependencies = [ [[package]] name = "reth-payload-builder" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rpc-types", "derive_more 2.1.1", @@ -14407,8 +14412,8 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "pin-project", "reth-payload-primitives", @@ -14419,10 +14424,10 @@ dependencies = [ [[package]] name = "reth-payload-primitives" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -14442,37 +14447,37 @@ dependencies = [ [[package]] name = "reth-payload-util" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "reth-transaction-pool", ] [[package]] name = "reth-payload-validator" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-rpc-types-engine", "reth-primitives-traits", ] [[package]] name = "reth-primitives-traits" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18341fba74d004c7fad32f784488baaea9adebfde7a4f231a4d8d445aea70347" +checksum = "c6835d57ed17047c8ba42992550b3cd1232cb92deb119715d32f63079fb5844d" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-trie", "arbitrary", "byteorder", @@ -14496,11 +14501,11 @@ dependencies = [ [[package]] name = "reth-provider" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -14533,7 +14538,6 @@ dependencies = [ "reth-storage-errors", "reth-storage-overlay", "reth-tasks", - "reth-tokio-util", "reth-trie", "reth-trie-db", "revm", @@ -14546,10 +14550,10 @@ dependencies = [ [[package]] name = "reth-prune" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "itertools 0.14.0", "metrics", @@ -14573,8 +14577,8 @@ dependencies = [ [[package]] name = "reth-prune-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "arbitrary", @@ -14589,8 +14593,8 @@ dependencies = [ [[package]] name = "reth-revm" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -14604,16 +14608,16 @@ dependencies = [ [[package]] name = "reth-rpc" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-dyn-abi", - "alloy-eip7928 0.4.10", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-genesis", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rlp", "alloy-rpc-client", @@ -14622,13 +14626,13 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", "alloy-serde 2.5.0", "alloy-signer 2.5.0", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "async-trait", "derive_more 2.1.1", "dyn-clone", @@ -14680,8 +14684,8 @@ dependencies = [ [[package]] name = "reth-rpc-api" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-genesis", @@ -14693,7 +14697,7 @@ dependencies = [ "alloy-rpc-types-beacon", "alloy-rpc-types-debug", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-mev", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", @@ -14710,10 +14714,10 @@ dependencies = [ [[package]] name = "reth-rpc-builder" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-provider", "dyn-clone", "http 1.4.0", @@ -14753,15 +14757,15 @@ dependencies = [ [[package]] name = "reth-rpc-convert" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-evm", "alloy-json-rpc 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "auto_impl", "dyn-clone", "jsonrpsee-types", @@ -14773,8 +14777,8 @@ dependencies = [ [[package]] name = "reth-rpc-engine-api" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -14804,19 +14808,19 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-dyn-abi", - "alloy-eip7928 0.4.10", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", "alloy-json-rpc 2.5.0", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-mev", "alloy-serde 2.5.0", "async-trait", @@ -14851,18 +14855,18 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-chains", - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-evm", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-rpc-client", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-sol-types", "alloy-transport", @@ -14901,8 +14905,8 @@ dependencies = [ [[package]] name = "reth-rpc-layer" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-rpc-types-engine", "http 1.4.0", @@ -14917,8 +14921,8 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "alloy-rpc-types-engine", @@ -14932,14 +14936,14 @@ dependencies = [ [[package]] name = "reth-rpc-traits" -version = "0.7.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f410d6bff1fd059ebaec2edeff1326f103f61162158411325d78158f94b2b4a9" +checksum = "8d6c3c55bf695994b2ce87e05eaf49c1135c84d3d1f5e774df6077a8173ebdb0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-network 2.4.2", + "alloy-consensus 2.5.0", + "alloy-network 2.5.0", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-signer 2.5.0", "reth-primitives-traits", "thiserror 2.0.18", @@ -14947,11 +14951,11 @@ dependencies = [ [[package]] name = "reth-stages" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-primitives", "alloy-rlp", "eyre", @@ -14999,8 +15003,8 @@ dependencies = [ [[package]] name = "reth-stages-api" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -15027,8 +15031,8 @@ dependencies = [ [[package]] name = "reth-stages-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "arbitrary", @@ -15041,8 +15045,8 @@ dependencies = [ [[package]] name = "reth-static-file" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "parking_lot", @@ -15061,8 +15065,8 @@ dependencies = [ [[package]] name = "reth-static-file-types" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "clap", @@ -15076,15 +15080,16 @@ dependencies = [ [[package]] name = "reth-storage-api" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", - "alloy-eip7928 0.4.10", + "alloy-consensus 2.5.0", + "alloy-eip7928 0.4.11", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rpc-types-engine", "auto_impl", + "reth-chain-state", "reth-chainspec", "reth-db-api", "reth-db-models", @@ -15094,16 +15099,16 @@ dependencies = [ "reth-prune-types", "reth-stages-types", "reth-storage-errors", - "reth-tokio-util", "reth-trie-common", "revm", "serde_json", + "tokio", ] [[package]] name = "reth-storage-errors" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -15119,8 +15124,8 @@ dependencies = [ [[package]] name = "reth-storage-overlay" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-eips 2.5.0", "alloy-primitives", @@ -15147,8 +15152,8 @@ dependencies = [ [[package]] name = "reth-tasks" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "crossbeam-utils", "dashmap", @@ -15168,10 +15173,10 @@ dependencies = [ [[package]] name = "reth-testing-utils" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-genesis", "alloy-primitives", @@ -15184,8 +15189,8 @@ dependencies = [ [[package]] name = "reth-tokio-util" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "tokio", "tokio-stream", @@ -15194,8 +15199,8 @@ dependencies = [ [[package]] name = "reth-tracing" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "clap", "eyre", @@ -15214,8 +15219,8 @@ dependencies = [ [[package]] name = "reth-tracing-otlp" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "base64 0.22.1", "clap", @@ -15233,10 +15238,10 @@ dependencies = [ [[package]] name = "reth-transaction-pool" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -15278,10 +15283,10 @@ dependencies = [ [[package]] name = "reth-trie" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-eips 2.5.0", "alloy-primitives", "alloy-rlp", @@ -15304,13 +15309,13 @@ dependencies = [ [[package]] name = "reth-trie-common" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ - "alloy-consensus 2.4.2", + "alloy-consensus 2.5.0", "alloy-primitives", "alloy-rlp", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-serde 2.5.0", "alloy-trie", "arbitrary", @@ -15332,8 +15337,8 @@ dependencies = [ [[package]] name = "reth-trie-db" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "reth-db-api", @@ -15348,8 +15353,8 @@ dependencies = [ [[package]] name = "reth-trie-parallel" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-evm", "alloy-primitives", @@ -15371,8 +15376,8 @@ dependencies = [ [[package]] name = "reth-trie-sparse" -version = "2.6.0" -source = "git+https://github.com/ethereum-optimism/reth?tag=op-v2.6.0-4#58c6608d33acce0460c7f0aba253566b41b2a3eb" +version = "2.7.0" +source = "git+https://github.com/ethereum-optimism/reth?rev=0447cebe00d762a2be7508728fa123df2c673aa0#0447cebe00d762a2be7508728fa123df2c673aa0" dependencies = [ "alloy-primitives", "alloy-trie", @@ -15391,18 +15396,18 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbdee2f0ad09dc32b43ab52641f8239766a66de4345834bad27d5cfa2f62864d" +checksum = "253f7d5772f3c8d0dcc3fdac398db6bca4f6f6e602d240c3bc47338dde0910dd" dependencies = [ "zstd 0.13.3", ] [[package]] name = "revm" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f2322f5ea197fac72c2cdc88cb501b2a7db0b0009911133fd3dda45bfceedd" +checksum = "62b2fbb3bdce72fef4f156e2164bdfde44dc3aeebc5b4f31a413fba0c09c524c" dependencies = [ "revm-bytecode", "revm-context", @@ -15431,9 +15436,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16835bc2ead203219a18fcc84c2c71879ad6b890e8a71150cf7f10e4e355dc4" +checksum = "9b06efea511a15ff8309acaa4c283239b444b461bbd2e9f0326c8586f45fb1da" dependencies = [ "bitvec", "cfg-if", @@ -15448,9 +15453,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "43.0.1" +version = "43.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4109bdceaca5ee6e27bf41f6b156f2b15892dc5bb47d3530bc4d3b3060077" +checksum = "3068385c68f6a3bd2e781dd81cefd25c98dd0a574de6c8ec2a90acc33318b2da" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -15464,9 +15469,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "43.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d764afa9a1c9278c05d40461b07319d21ccb39c1bdf0e9dde7e5ea7d9be53d" +checksum = "8db6fb10912d7fba0161e91d4577ce71fa9726ec38a4d420e4242e504a47aa8f" dependencies = [ "alloy-eips 2.5.0", "derive_more 2.1.1", @@ -15480,9 +15485,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "43.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a27e4440c2ef4932afdaa28a1d1ac8601504c7030c1a387b5e307d07d864d1" +checksum = "5581ecadb3d0d1c18a91f1797d6b7c4c17720bea596e9e9ec90b95803db2bc77" dependencies = [ "auto_impl", "corosensei", @@ -15506,9 +15511,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a7409031d87ec281b74efff65d7a4dbea9d80727a55dbc7e4b3fd77b5e03fb" +checksum = "ba5102e9c02b9d27e7c98f449b495a2c2b2ec011209f4eeca16e054520ec5ac4" dependencies = [ "auto_impl", "derive-where", @@ -15525,9 +15530,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a56f37224afd628f7244aa6965609ada04b440ed8ab7a19f55e4291df5a0112" +checksum = "825cf946c1bf3178f6a93aae4e8064a0ebd505bc764a7fe3d49411e7242e4091" dependencies = [ "auto_impl", "either", @@ -15543,19 +15548,22 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.43.0" +version = "0.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b609cb78fcb3a8c10f3190847c9bb0223423cf46e2de30a61ea9e37a3e6736" +checksum = "8c1f17ebaa6be220728837731a3c87d1a542bf31a68138e9364a3a33b149415c" dependencies = [ + "alloy-eip2930", "alloy-primitives", - "alloy-rpc-types-eth 2.4.2", + "alloy-rpc-types-eth 2.5.0", "alloy-rpc-types-trace", "alloy-sol-types", "anstyle", "boa_engine", "boa_gc", "colorchoice", + "num-bigint 0.4.6", "revm", + "ruint", "serde", "serde_json", "thiserror 2.0.18", @@ -15563,9 +15571,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "43.0.1" +version = "43.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "932f7fe05a2cdeb08195dd7e88a09a4da7c3660cdc6e62720839c77ba77f65aa" +checksum = "aa32f5099a266329d1869d6f9bf4bb7894345d2b58c57d05396f67385d65f299" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -15576,9 +15584,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac4dc0279f2a44770faa8c93d008df684440cf573c91b8e0e39d0d581abf7b3d" +checksum = "aa80b8cef09bead8c8b1afa7733b09fc1428f49158d8657c239268409d2a2bf7" dependencies = [ "ark-bls12-381 0.6.0", "ark-bn254", @@ -15615,16 +15623,17 @@ dependencies = [ [[package]] name = "revm-state" -version = "43.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd02082cf1baca01e8bc17456c45136bdc66632395a98db1c1a2afe4c6ea87f" +checksum = "3b2d2ec0be925c4c87ff4afae33af4b9f693d9b011f74d6b4d52267a62df0c49" dependencies = [ - "alloy-eip7928 0.4.10", + "alloy-eip7928 0.4.11", "bitflags 2.11.1", "nonmax", "revm-bytecode", "revm-primitives", "serde", + "triomphe", ] [[package]] @@ -15950,7 +15959,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -16030,7 +16039,7 @@ dependencies = [ "security-framework", "security-framework-sys", "webpki-root-certs 1.0.10", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -17240,7 +17249,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3d1e2c7f27f8d4cb10542a02c49005dbd6e93095799d6f3be745fae9f8fedd4" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] @@ -17871,12 +17880,12 @@ name = "spn-wallet" version = "0.1.0" dependencies = [ "alloy-contract", - "alloy-network 2.4.2", + "alloy-network 2.5.0", "alloy-primitives", "alloy-provider", "alloy-signer 2.5.0", "alloy-signer-gcp", - "alloy-signer-local 2.4.2", + "alloy-signer-local 2.5.0", "alloy-sol-types", "alloy-transport-http", "anyhow", @@ -18195,7 +18204,7 @@ dependencies = [ "getrandom 0.4.2", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -18532,6 +18541,7 @@ dependencies = [ "futures-core", "futures-io", "futures-sink", + "futures-util", "pin-project-lite", "slab", "tokio", @@ -18966,7 +18976,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c5f7c95348f20c1c913d72157b3c6dee6ea3e30b3d19502c5a7f6d3f160dacbf" dependencies = [ "cc", - "windows-targets 0.52.6", + "windows-targets 0.48.5", ] [[package]] @@ -19014,6 +19024,15 @@ dependencies = [ "rlp", ] +[[package]] +name = "triomphe" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d15f4f5898bcfc5d8a8e45ed30b2f108d710c1a2e5489dbf80e078f707181bc" +dependencies = [ + "serde", +] + [[package]] name = "try-lock" version = "0.2.5" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index f247791024f..1972fa12cf4 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -12,75 +12,75 @@ categories = ["cryptography", "cryptography::cryptocurrencies"] [workspace] resolver = "2" members = [ - # Kona - "kona/bin/*", - "kona/crates/proof/*", - "kona/crates/node/*", - "kona/crates/protocol/*", - "kona/crates/providers/*", - "kona/crates/utilities/*", - "kona/examples/*", - "kona/sp1/crates/bls12-381-check", - "kona/sp1/crates/build-info", - "kona/sp1/crates/client", - "kona/sp1/crates/elfs", - "kona/sp1/crates/ethereum/client", - "kona/sp1/crates/host", - "kona/sp1/crates/super-range-executor", - "kona/sp1/crates/proposer", - "kona/sp1/crates/spn-wallet", - "kona/sp1/crates/zkvm-canary", - - # Op-Alloy - "op-alloy/crates/*", - - # Op-Reth - "op-reth/bin/", - "op-reth/bin/proof-bench/", - "op-reth/crates/chainspec/", - "op-reth/crates/cli/", - "op-reth/crates/consensus/", - "op-reth/crates/evm/", - "op-reth/crates/flashblocks/", - "op-reth/crates/hardforks/", - "op-reth/crates/node/", - "op-reth/crates/payload/", - "op-reth/crates/post-exec-replay/", - "op-reth/crates/primitives/", - "op-reth/crates/reth/", - "op-reth/crates/rpc/", - "op-reth/crates/storage/", - "op-reth/crates/exex/", - "op-reth/crates/trie/", - "op-reth/crates/txpool/", - "op-reth/examples/*", - - # Alloy OP EVM - "alloy-op-evm/", - - # Alloy OP Hardforks - "alloy-op-hardforks/", - - # Op-Revm - "op-revm/", - - # Revm execution-environment integration tests - "revm-ee-tests/", - - # Ephemeral OP execution layer the op-e2e action tests run against - "op-reth-test-engine/", - - # Shared build/version metadata (op-reth + kona-node) - "op-version/", - - # Lokahi - "lokahi/", + # Kona + "kona/bin/*", + "kona/crates/proof/*", + "kona/crates/node/*", + "kona/crates/protocol/*", + "kona/crates/providers/*", + "kona/crates/utilities/*", + "kona/examples/*", + "kona/sp1/crates/bls12-381-check", + "kona/sp1/crates/build-info", + "kona/sp1/crates/client", + "kona/sp1/crates/elfs", + "kona/sp1/crates/ethereum/client", + "kona/sp1/crates/host", + "kona/sp1/crates/super-range-executor", + "kona/sp1/crates/proposer", + "kona/sp1/crates/spn-wallet", + "kona/sp1/crates/zkvm-canary", + + # Op-Alloy + "op-alloy/crates/*", + + # Op-Reth + "op-reth/bin/", + "op-reth/bin/proof-bench/", + "op-reth/crates/chainspec/", + "op-reth/crates/cli/", + "op-reth/crates/consensus/", + "op-reth/crates/evm/", + "op-reth/crates/flashblocks/", + "op-reth/crates/hardforks/", + "op-reth/crates/node/", + "op-reth/crates/payload/", + "op-reth/crates/post-exec-replay/", + "op-reth/crates/primitives/", + "op-reth/crates/reth/", + "op-reth/crates/rpc/", + "op-reth/crates/storage/", + "op-reth/crates/exex/", + "op-reth/crates/trie/", + "op-reth/crates/txpool/", + "op-reth/examples/*", + + # Alloy OP EVM + "alloy-op-evm/", + + # Alloy OP Hardforks + "alloy-op-hardforks/", + + # Op-Revm + "op-revm/", + + # Revm execution-environment integration tests + "revm-ee-tests/", + + # Ephemeral OP execution layer the op-e2e action tests run against + "op-reth-test-engine/", + + # Shared build/version metadata (op-reth + kona-node) + "op-version/", + + # Lokahi + "lokahi/", ] default-members = [ - "kona/bin/host", - "kona/bin/client", - "kona/bin/node", - "op-reth/bin/", + "kona/bin/host", + "kona/bin/client", + "kona/bin/node", + "op-reth/bin/", ] # ==================== WORKSPACE METADATA ==================== @@ -355,99 +355,99 @@ 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.7.0", default-features = false, features = [ - "alloy", +reth-codecs = { version = "0.8.1", default-features = false, features = [ + "alloy", ] } -reth-codecs-derive = "0.7.0" -reth-primitives-traits = { version = "0.7.1", default-features = false } -reth-rpc-traits = { version = "0.7.0", default-features = false } -reth-zstd-compressors = { version = "0.7.0", default-features = false } +reth-codecs-derive = "0.8.1" +reth-primitives-traits = { version = "0.8.1", default-features = false } +reth-rpc-traits = { version = "0.8.1", default-features = false } +reth-zstd-compressors = { version = "0.8.1", default-features = false } # ==================== RETH CRATES (git) ==================== -reth = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-basic-payload-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-chain-state = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-chainspec = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-cli = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-cli-commands = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-cli-runner = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-cli-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-consensus = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-consensus-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-db = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-db-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-db-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-downloaders = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-e2e-test-utils = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-engine-local = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-engine-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-engine-tree = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-eth-wire = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-eth-wire-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-ethereum-cli = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-ethereum-consensus = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-ethereum-forks = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-ethereum-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-evm = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-evm-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-exex = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-exex-test-utils = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-execution-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-execution-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-fs-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-ipc = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-metrics = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-network = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-network-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-network-peers = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-node-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-node-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-node-core = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-node-ethereum = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-node-events = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-node-metrics = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-payload-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-payload-builder-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-payload-primitives = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-payload-util = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-payload-validator = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-provider = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-prune = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-prune-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-revm = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-rpc = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-rpc-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-rpc-builder = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-rpc-engine-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-rpc-eth-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-rpc-eth-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-rpc-server-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-stages = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-stages-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-static-file = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-static-file-types = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-storage-api = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-storage-errors = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-storage-overlay = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-tasks = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-tracing = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-transaction-pool = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-trie = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } -reth-trie-common = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4", default-features = false } -reth-trie-db = { git = "https://github.com/ethereum-optimism/reth", tag = "op-v2.6.0-4" } +reth = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-basic-payload-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-chain-state = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-chainspec = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-cli = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-cli-commands = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-cli-runner = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-cli-util = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-consensus = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-consensus-common = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-db = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-db-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-db-common = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-downloaders = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-e2e-test-utils = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-engine-local = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-engine-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-engine-tree = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-eth-wire = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-eth-wire-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-ethereum-cli = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-ethereum-consensus = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-ethereum-forks = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-ethereum-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-evm = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-evm-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-exex = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-exex-test-utils = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-execution-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-execution-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-fs-util = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-ipc = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-metrics = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-network = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-network-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-network-peers = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-node-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-node-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-node-core = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-node-ethereum = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-node-events = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-node-metrics = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-payload-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-payload-builder-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-payload-primitives = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-payload-util = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-payload-validator = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-provider = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-prune = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-prune-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-revm = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-rpc = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-rpc-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-rpc-builder = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-rpc-engine-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-rpc-eth-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-rpc-eth-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-rpc-server-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-stages = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-stages-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-static-file = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-static-file-types = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-storage-api = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-storage-errors = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-storage-overlay = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-tasks = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-tracing = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-transaction-pool = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-trie = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } +reth-trie-common = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0", default-features = false } +reth-trie-db = { git = "https://github.com/ethereum-optimism/reth", rev = "0447cebe00d762a2be7508728fa123df2c673aa0" } # ==================== REVM (latest: op-reth versions) ==================== -revm = { version = "43.0.2", default-features = false } +revm = { version = "43.0.3", default-features = false } revm-bytecode = { version = "43.0.0", default-features = false } -revm-database = { version = "43.0.0", default-features = false } -revm-state = { version = "43.0.0", default-features = false } +revm-database = { version = "43.0.1", default-features = false } +revm-state = { version = "43.0.1", default-features = false } revm-primitives = { version = "43.0.0", default-features = false } -revm-interpreter = { version = "43.0.1", default-features = false } -revm-database-interface = { version = "43.0.0", default-features = false } +revm-interpreter = { version = "43.0.2", default-features = false } +revm-database-interface = { version = "43.0.1", default-features = false } op-revm = { version = "20.0.0", path = "op-revm/", default-features = false } -revm-inspectors = "0.43.0" +revm-inspectors = "0.44.0" # ==================== ALLOY ==================== alloy-chains = { version = "0.2.33", default-features = false } @@ -456,55 +456,55 @@ alloy-eip2124 = { version = "0.2.0", default-features = false } alloy-eip7928 = { version = "0.4.10", default-features = false } alloy-evm = { version = "0.39.0", default-features = false } alloy-primitives = { version = "1.6.1", default-features = false, features = [ - "map-foldhash", + "map-foldhash", ] } alloy-rlp = { version = "0.3.16", default-features = false, features = [ - "core-net", + "core-net", ] } 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.8", default-features = false } - -alloy-consensus = { version = "2.4.2", default-features = false } -alloy-contract = { version = "2.4.2", default-features = false } -alloy-eips = { version = "2.4.2", default-features = false } -alloy-genesis = { version = "2.4.2", default-features = false } -alloy-json-rpc = { version = "2.4.2", default-features = false } -alloy-network = { version = "2.4.2", default-features = false } -alloy-network-primitives = { version = "2.4.2", default-features = false } -alloy-node-bindings = { version = "2.4.2", default-features = false } -alloy-provider = { version = "2.4.2", features = [ - "reqwest", - "debug-api", +alloy-hardforks = { version = "0.4.9", default-features = false } + +alloy-consensus = { version = "2.5.0", default-features = false } +alloy-contract = { version = "2.5.0", default-features = false } +alloy-eips = { version = "2.5.0", default-features = false } +alloy-genesis = { version = "2.5.0", default-features = false } +alloy-json-rpc = { version = "2.5.0", default-features = false } +alloy-network = { version = "2.5.0", default-features = false } +alloy-network-primitives = { version = "2.5.0", default-features = false } +alloy-node-bindings = { version = "2.5.0", default-features = false } +alloy-provider = { version = "2.5.0", features = [ + "reqwest", + "debug-api", ], default-features = false } -alloy-pubsub = { version = "2.4.2", default-features = false } -alloy-rpc-client = { version = "2.4.2", default-features = false } -alloy-rpc-types = { version = "2.4.2", features = [ - "eth", +alloy-pubsub = { version = "2.5.0", default-features = false } +alloy-rpc-client = { version = "2.5.0", default-features = false } +alloy-rpc-types = { version = "2.5.0", features = [ + "eth", ], default-features = false } -alloy-rpc-types-admin = { version = "2.4.2", default-features = false } -alloy-rpc-types-anvil = { version = "2.4.2", default-features = false } -alloy-rpc-types-beacon = { version = "2.4.2", default-features = false } -alloy-rpc-types-debug = { version = "2.4.2", default-features = false } -alloy-rpc-types-engine = { version = "2.4.2", default-features = false } -alloy-rpc-types-eth = { version = "2.4.2", default-features = false } -alloy-rpc-types-mev = { version = "2.4.2", default-features = false } -alloy-rpc-types-trace = { version = "2.4.2", default-features = false } -alloy-rpc-types-txpool = { version = "2.4.2", default-features = false } -alloy-serde = { version = "2.4.2", default-features = false } -alloy-signer = { version = "2.4.2", default-features = false } +alloy-rpc-types-admin = { version = "2.5.0", default-features = false } +alloy-rpc-types-anvil = { version = "2.5.0", default-features = false } +alloy-rpc-types-beacon = { version = "2.5.0", default-features = false } +alloy-rpc-types-debug = { version = "2.5.0", default-features = false } +alloy-rpc-types-engine = { version = "2.5.0", default-features = false } +alloy-rpc-types-eth = { version = "2.5.0", default-features = false } +alloy-rpc-types-mev = { version = "2.5.0", default-features = false } +alloy-rpc-types-trace = { version = "2.5.0", default-features = false } +alloy-rpc-types-txpool = { version = "2.5.0", default-features = false } +alloy-serde = { version = "2.5.0", default-features = false } +alloy-signer = { version = "2.5.0", default-features = false } # sp1-sdk's dynamic_signer builder method uses alloy-signer 1.x, distinct from the workspace's 2.x. sp1-alloy-signer = { package = "alloy-signer", version = "1.0", default-features = false } -alloy-signer-local = { version = "2.4.2", default-features = false } -alloy-signer-gcp = { version = "2.4.2", default-features = false } -alloy-transport = { version = "2.4.2" } -alloy-transport-http = { version = "2.4.2", features = [ - "reqwest-rustls-tls", +alloy-signer-local = { version = "2.5.0", default-features = false } +alloy-signer-gcp = { version = "2.5.0", default-features = false } +alloy-transport = { version = "2.5.0" } +alloy-transport-http = { version = "2.5.0", features = [ + "reqwest-rustls-tls", ], default-features = false } -alloy-transport-ipc = { version = "2.4.2", default-features = false } -alloy-transport-ws = { version = "2.4.2", default-features = false } +alloy-transport-ipc = { version = "2.5.0", default-features = false } +alloy-transport-ws = { version = "2.5.0", default-features = false } # ==================== OP-ALLOY (from crates.io) ==================== op-alloy = { version = "2.0.0", path = "op-alloy/crates/op-alloy", default-features = false } @@ -513,9 +513,11 @@ op-alloy-flz = { version = "0.13.1", default-features = false } # ==================== SP1 ==================== sp1-core-executor = { version = "6.10.0", default-features = false } sp1-sdk = { version = "6.10.0", default-features = false, features = [ - "network", + "network", +] } +sp1-verifier = { version = "6.10.0", default-features = false, features = [ + "full", ] } -sp1-verifier = { version = "6.10.0", default-features = false, features = ["full"] } # spn-wallet talks to SPN through sp1-sdk's generated gRPC client, so these must stay on the # tonic/prost versions sp1-sdk compiles against. tonic = { version = "0.14.6", default-features = false } @@ -544,10 +546,10 @@ tokio-util = { version = "0.7.18", features = ["codec"] } # ==================== RPC ==================== jsonrpsee = { version = "0.26.0", features = [ - "jsonrpsee-core", - "client-core", - "server-core", - "macros", + "jsonrpsee-core", + "client-core", + "server-core", + "macros", ] } jsonrpsee-core = "0.26.0" jsonrpsee-server = "0.26.0" @@ -556,15 +558,18 @@ jsonrpsee-types = "0.26.0" # ==================== CRYPTO ==================== c-kzg = { version = "2.1.5", default-features = false } -enr = { version = "0.14", default-features = false, features = ["k256", "ed25519"] } +enr = { version = "0.14", default-features = false, features = [ + "k256", + "ed25519", +] } k256 = { version = "0.13", default-features = false, features = ["ecdsa"] } kzg-rs = { version = "0.2.9", features = ["rkyv", "serde"] } # Pinned to kzg-rs's exact version. `experimental` is needed for EIP-2537 MAP_FP_TO_G1 / MAP_FP2_TO_G2. sp1_bls12_381 = { version = "=0.8.0-sp1-6.10.0", default-features = false, features = [ - "groups", - "pairings", - "alloc", - "experimental", + "groups", + "pairings", + "alloc", + "experimental", ] } sha2 = { version = "0.10.9", default-features = false } secp256k1 = { version = "0.31.1", default-features = false } @@ -573,11 +578,11 @@ ark-ff = { version = "0.5.0", default-features = false } # 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", + "scalar_field", ] } # ark 0.6 (revm-precompile's EIP-2537 backend); used only to test kona-sp1's EIP-2537 precompiles. ark-bls12-381-0-6 = { package = "ark-bls12-381", version = "0.6.0", default-features = false, features = [ - "curve", + "curve", ] } ark-ec-0-6 = { package = "ark-ec", version = "0.6.0", default-features = false } ark-ff-0-6 = { package = "ark-ff", version = "0.6.0", default-features = false } @@ -592,15 +597,15 @@ ethereum_ssz_derive = "0.10" rkyv = "0.8.15" serde_repr = "0.1.20" serde_with = { version = "3.16", default-features = false, features = [ - "macros", + "macros", ] } toml = { version = "0.9.12", default-features = false } serde = { version = "1.0.228", default-features = false, features = [ - "derive", - "alloc", + "derive", + "alloc", ] } serde_json = { version = "1.0.149", default-features = false, features = [ - "alloc", + "alloc", ] } # ==================== METRICS ==================== @@ -621,7 +626,11 @@ tracing-subscriber = { version = "0.3.22", default-features = false } opentelemetry = { version = "0.32", features = ["logs", "trace"] } opentelemetry-appender-tracing = "0.32" opentelemetry-otlp = { version = "0.32", features = ["grpc-tonic", "logs"] } -opentelemetry_sdk = { version = "0.32.1", features = ["logs", "trace", "rt-tokio"] } +opentelemetry_sdk = { version = "0.32.1", features = [ + "logs", + "trace", + "rt-tokio", +] } # ==================== TESTING ==================== arbitrary = { version = "1.4.2", features = ["derive"] } @@ -672,8 +681,8 @@ arrayvec = { version = "0.7.6", default-features = false } auto_impl = "1.3.0" base64 = "0.22.1" backon = { version = "1.6.0", default-features = false, features = [ - "std-blocking-sleep", - "tokio-sleep", + "std-blocking-sleep", + "tokio-sleep", ] } bitflags = "2.10" boyer-moore-magiclen = "0.2.22" @@ -687,7 +696,7 @@ crossbeam-channel = "0.5.13" crossterm = "0.29.0" dashmap = "6.1" derive_more = { version = "2.1.1", default-features = false, features = [ - "full", + "full", ] } dirs = "6.0.0" dirs-next = "2.0.0" @@ -713,11 +722,11 @@ modular-bitfield = "0.13.1" moka = "0.12" multihash = "0.19.3" notify = { version = "8.2", default-features = false, features = [ - "macos_fsevent", + "macos_fsevent", ] } nybbles = { version = "0.4.8", default-features = false } once_cell = { version = "1.21", default-features = false, features = [ - "critical-section", + "critical-section", ] } parking_lot = "0.12.5" paste = "1.0" diff --git a/rust/UPDATING-RETH.md b/rust/UPDATING-RETH.md index 74453f28787..0c157a1a68a 100644 --- a/rust/UPDATING-RETH.md +++ b/rust/UPDATING-RETH.md @@ -41,16 +41,53 @@ main's CI actually validated. upstream base, and list its cherry-picks: ```bash - git fetch main - OLD_PIN= + git fetch main --tags + OLD_PIN= # the fork tag rust/Cargo.toml pins, e.g. op-v2.6.0-1 OLD_BASE=$(git merge-base "$OLD_PIN" /main) - git log --reverse --oneline "$OLD_BASE..$OLD_PIN" + git log --reverse --format='%h %s%n%b' "$OLD_BASE..$OLD_PIN" \ + | grep -E '^[0-9a-f]{9,} |^\(cherry picked from commit' ``` - For each commit, decide whether the selected target contains it or an - equivalent. Drop patches already present there; preserve every other patch. - If a rewritten or squashed equivalent makes that unclear, ask rather than - guess. + Patches are picked with `-x` ("The reth fork"), so each is followed by the + commit it came from. Some list more than one; check each that names an + upstream commit against the target, e.g. `v2.7.0`: + + ```bash + git merge-base --is-ancestor && echo contained || echo carry + ``` + + Drop contained patches and preserve every other one. Skip `ci:` commits: + the CI squash carries them whatever their sources say. Any other commit + without an upstream source is a fork-only patch, or was picked without + `-x`; decide it by hand. If a rewritten or squashed equivalent makes that + unclear, as upstream `paradigmxyz/reth#28015` did for + ethereum-optimism/reth#19, ask rather than guess. + + If any patch survives, build the fork branch now: follow + [The reth fork](#the-reth-fork) through tagging, then return to step 3 with + the tag. + + The audit stops at the pinned tag, and both the old branch and `develop` keep + moving during an update. For example, `op-v2.7.0` was built while `develop` + pinned `op-v2.6.0-1`. By step 3, `develop` pinned `op-v2.6.0-2`, and the + `op-v2.6.0` branch had `-3` and `-4` on top of that. Check again right before + step 3, and again before the update PR leaves draft: + + ```bash + # In the monorepo: has develop moved to a newer tag? + git fetch origin develop + git show origin/develop:rust/Cargo.toml | grep -m1 'ethereum-optimism/reth' + + # In the reth fork: what is past that tag, merged or still on the way? + git fetch --tags + OLD_PIN= # the tag develop pins now, e.g. op-v2.6.0-2 + OLD_BRANCH= # the branch that tag is on, e.g. op-v2.6.0 + git log --format='%h %s' "$OLD_PIN../$OLD_BRANCH" + gh pr list --repo ethereum-optimism/reth --base "$OLD_BRANCH" + ``` + + Audit anything new the same way. A patch `develop` already pins has to reach + the new branch before the update merges. Decide the rest with their authors. 3. Update the pin in `rust/Cargo.toml`. @@ -65,9 +102,7 @@ main's CI actually validated. grep -nE '||github.com//reth' Cargo.toml # no matches ``` - If patches must survive, build a new `op-*` branch in the - `ethereum-optimism/reth` fork as described in - [The reth fork](#the-reth-fork), tag its tip and pin it with + If patches survive, pin the fork tag from step 2 with `tag = "op--"` (or a temporary `rev`, see [Pinning a fork change](#pinning-a-fork-change)). Verify every reth workspace dependency uses the same repository and ref; the mirror checker @@ -205,8 +240,24 @@ main's CI actually validated. Only the `just` recipes use the repo-pinned nightly rustfmt — a bare `cargo fmt` on the stable toolchain reformats unrelated files and fails - CI's `rust-fmt` gate. Also run the test suites of any vendored-workspace - crate whose source you touched. + CI's `rust-fmt` gate. + + `just test` covers only the main workspace. The SP1 guest programs + (`kona/sp1/programs`) are a nested workspace with their own `Cargo.lock`, + which step 5 refreshes, so check them even when no guest source changed: + + ```bash + just check-sp1-guest-lock # the guest lockfile matches its manifests + just check-sp1-guest-precompile-patches # every crypto crate resolves to its SP1 fork + ``` + + An SP1 patch only covers the version it names, so a bump that pulls in a new + line of a crypto crate (`sha2`, `k256`, ...) fails the second check. Leave the + guest tests and lints to CI, which builds the guest ELFs in Docker first + (`kona-build-sp1-elfs`). Build them locally (`cd kona/sp1 && just build-elfs`) + only to debug a failure there. The bump changes code the guests run, so their + ELFs and verification keys change: say so in the PR description, as for a + kona prestate change. 9. Regenerate the CLI surface snapshot. Most reth bumps add, remove, or re-default upstream CLI flags, and op-reth inherits them silently. The @@ -260,14 +311,18 @@ git push git@github.com:ethereum-optimism/reth.git refs/tags/v first so every push runs the fork's CI, then carry over the previous branch's OP `.github/CODEOWNERS`, then the patches retained by the step 2 audit and any upstream fixes picked in the forward sweep (`docs/ai/reth-update-review.md`), -oldest first. The first push may already carry all of them: +oldest first. The first push may already carry all of them. Before it, check +formatting and the build locally: after it, the ruleset turns every fix into a +reviewed PR. ```bash git switch -c op-v v git cherry-pick git checkout -- .github/CODEOWNERS git commit -m "chore: replace upstream CODEOWNERS with OP owners" -git cherry-pick ... +git cherry-pick -x ... +cargo +nightly- fmt --all --check # the nightly lint.yml pins +cargo check --workspace --all-targets git push git@github.com:ethereum-optimism/reth.git op-v gh api 'repos/ethereum-optimism/reth/codeowners/errors?ref=op-v' --jq '.errors' ``` @@ -277,12 +332,71 @@ fork, so it requests no reviewers. Copy the file rather than cherry-picking it: upstream edits it often, so a cherry-pick would conflict. The errors check must print `[]`. -`` is the previous branch's CI commit squashed with every later CI -fix on that branch, so the chain of CI commits does not grow. It may need -adapting to the new base; its comments name what to re-check. Check the fork's -lockfile advisories separately: downstream lockfile fixes do not repair the -fork's CI. `` is the fork's prior `op-*` branch, fetched from -the fork. +Pick the patches with `-x`, which records each one's source commit for the +next bump's step 2 audit. + +`` is the fork's prior `op-*` branch, fetched from the fork. +`` is its CI commit squashed with every later CI fix on that +branch, so the chain of CI commits does not grow. List them from the branch +tip, not its last tag: CI-only fixes get no tag. + +```bash +git log --reverse --oneline v.. --grep='^ci' +``` + +Pick them oldest first, then squash them into one commit on top of the base: + +```bash +git cherry-pick ... +git log --reverse --format='=== %h%n%B' v..HEAD > ci-msg.txt +git reset --soft v +git commit -F ci-msg.txt # after merging the messages into one +``` + +The squash may need adapting to the new base. Before the first push, read +the code comments in the files it adds, starting with `.circleci/config.yml`: +some are instructions for this replay, naming what to compare against the new +base's workflows and which pins to move. Work each one. + +Upstream edits its workflows in most releases, so expect conflicts there. +Resolve each hunk to upstream's side (`HEAD`) and re-apply only our edits on +top: our side also carries the old base's lines, such as its action pins. +Resolve hunk by hunk rather than taking a whole file, which would discard the +hunks that merged cleanly. + +Upstream also adds steps and workflows in lines we don't edit, which merge +without conflict, so the replay never flags them. The fork's CI runs upstream's +workflows in CircleCI through [`act`](https://github.com/nektos/act), which +cannot run everything GitHub Actions can. Before the first push, look for what +`act` cannot run. A job that newly grants `id-token: write` asks GitHub for an +OIDC token, which `act` never receives. A new pull-request workflow belongs +either in `.circleci/config.yml`'s matrix or in its exclusion list. + +```bash +git diff v v -- .github/workflows/ | grep -cE '^\+ *id-token: write' +git diff v v -- .github/workflows/ .github/actions/ \ + | grep -E '^\+.*uses:' | sed -E 's/^\+ *(- )?uses: *//; s/@.*//' | sort | uniq -c | sort -rn +git diff --name-status v v -- .github/workflows/ +``` + +Stub what `act` cannot run in `.circleci/config.yml`; the comments there explain +the existing stubs. + +A `Cargo.lock` hunk conflicts whenever the base moved. Keep the new base's +lockfile (during a cherry-pick, `--ours` is the branch being built), then, +before the squash commit, update the crates that `cargo deny` reports to the +version on each advisory's `Solution: Upgrade to` line: + +```bash +git checkout --ours Cargo.lock && git add Cargo.lock && git cherry-pick --continue +cargo deny --all-features check --hide-inclusion-graph advisories 2>&1 \ + | grep -E '^(error|warning)\[|^ *[0-9]+ │ [a-z]|├ (ID|Solution):' +cargo update -p --precise # per reported crate +git add Cargo.lock +``` + +Check the fork's lockfile advisories separately: downstream lockfile fixes do +not repair the fork's CI. **Work** on the branch through pull requests into it afterwards. The `op-*` ruleset forbids force-pushes and deletion and requires a reviewed PR with @@ -300,6 +414,8 @@ git tag -a op-v- -m "..." git push git@github.com:ethereum-optimism/reth.git op-v- ``` +For an update, return to [Procedure](#procedure) step 3 and pin the tag. + Tags are immutable, so a tag pin is as reproducible as a rev pin. The org's tag ruleset also forbids deleting or re-annotating one, so a tag on the wrong commit stays forever with its misleading annotation (`op-v2.6.0-3` is one). @@ -328,19 +444,29 @@ historical record. Patches the current branch carries beyond upstream, and what to do with each on the next base: -- **RPC replay through the block executor** (ethereum-optimism/reth#37, a - backport of paradigmxyz/reth#28266). Op-reth's SDM refund settlement is only - visible to `debug_*`, `trace_*` and `ots_*` replays through it, and +- **RPC replay through the block executor** (ethereum-optimism/reth#37 on + `op-v2.6.0`, ethereum-optimism/reth#41 on `op-v2.7.0`: a backport of + `paradigmxyz/reth#28266`). Op-reth's SDM refund settlement is only visible to + `debug_*`, `trace_*` and `ots_*` replays through it, and `rust/op-reth/crates/node/tests/it/rpc_replay_settlement/` fails without it. On a base that still uses alloy-evm 0.39 (`v2.7.0` through `v2.8.1`), - cherry-pick the backport and resolve conflicts in `helpers/call.rs`, - `helpers/trace.rs` and `rpc/src/debug.rs`. On an evm2 base (`v2.9.0` and - later), drop the backport and cherry-pick #28266 itself until a release - contains it; there, upstream's `inspect_transaction_without_commit` installs - the tracer through the EVM's inspector slot, which op-reth's - `PostExecCompositeInspector` occupies, so `OpBlockExecutor` needs an override - or composition for it. Upstream's BAL branch skips per-transaction - settlement; op-reth rejects computed BALs, keep that invariant under test. + cherry-pick the backport from the current branch. Onto v2.7.0 it conflicted + in the imports of `helpers/call.rs` and in the replay callback of + `rpc/src/trace.rs`, which takes the backport's own `TracingCtx`; + `Call::block_executor` had to name the database `StateCacheDb` wraps + (`StateProviderDatabase>`), and its + e2e test moved to `test_setup_for(EthereumHardfork::Prague)`. On an evm2 + base (`v2.9.0` and later), drop the backport and cherry-pick + `paradigmxyz/reth#28266` itself until a release contains it; there, + upstream's `inspect_transaction_without_commit` installs the tracer through + the EVM's inspector slot, which op-reth's `PostExecCompositeInspector` + occupies, so `OpBlockExecutor` needs an override or composition for it. + Upstream's BAL branch skips per-transaction settlement; op-reth rejects + computed BALs, keep that invariant under test. +- **Trie iterator seek boundary** (`paradigmxyz/reth#28264`, carried as + ethereum-optimism/reth#32 on `op-v2.6.0` and ethereum-optimism/reth#40 on + `op-v2.7.0`, both picked from upstream with `-x`). No release up to v2.9.0 + contains it, so carry it until one does; the audit in step 2 drops it then. ### Pinning a fork change diff --git a/rust/alloy-op-evm/src/lib.rs b/rust/alloy-op-evm/src/lib.rs index 9ba63233286..035736f978c 100644 --- a/rust/alloy-op-evm/src/lib.rs +++ b/rust/alloy-op-evm/src/lib.rs @@ -85,7 +85,7 @@ pub struct OpEvm, } -/// UPSTREAM-MIRROR(copy): revm-context@43.0.2 `revm_context::Evm::with_inspector` +/// UPSTREAM-MIRROR(copy): revm-context@43.0.3 `revm_context::Evm::with_inspector` /// /// Rebuilds `evm` with its inspector replaced by `f(inspector)`. Upstream `with_inspector` takes /// the new inspector by value, so it cannot derive it from the old one. diff --git a/rust/alloy-op-evm/src/tx.rs b/rust/alloy-op-evm/src/tx.rs index 7caa6675ca0..d05d546dfa7 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@43.0.1 `revm_context_interface::Transaction` +/// UPSTREAM-MIRROR(delegate): revm-context-interface@43.0.2 `revm_context_interface::Transaction` /// /// Forwards the required getters and `effective_gas_price` to the inner `OpTransaction`, /// which overrides `tx_type` and `effective_gas_price` for deposits. The remaining defaulted diff --git a/rust/alloy-op-hardforks/src/lib.rs b/rust/alloy-op-hardforks/src/lib.rs index 7033a27e6b6..e14a6422a02 100644 --- a/rust/alloy-op-hardforks/src/lib.rs +++ b/rust/alloy-op-hardforks/src/lib.rs @@ -175,7 +175,7 @@ impl OpHardfork { *self as usize } - /// UPSTREAM-MIRROR(set): alloy-hardforks@0.4.8 `alloy_hardforks::EthereumHardfork` + /// UPSTREAM-MIRROR(set): alloy-hardforks@0.4.11 `alloy_hardforks::EthereumHardfork` /// /// A new upstream variant needs an explicit decision here. The `VARIANTS` loop below /// only smoke-tests lookup; semantic mappings remain explicit assertions. 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 e4d3bd734a4..90b348d05ba 100644 --- a/rust/kona/bin/client/src/fpvm_evm/precompiles/provider.rs +++ b/rust/kona/bin/client/src/fpvm_evm/precompiles/provider.rs @@ -98,7 +98,7 @@ where true } - /// UPSTREAM-MIRROR(copy): revm-handler@43.0.2 `revm_handler::EthPrecompiles::run` + /// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 `revm_handler::EthPrecompiles::run` /// /// FPVM acceleration replaces dispatch, while output conversion delegates to revm. Re-check /// input materialization, execution errors, and gas/reservoir propagation across both paths. diff --git a/rust/kona/sp1/crates/client/src/precompiles/custom.rs b/rust/kona/sp1/crates/client/src/precompiles/custom.rs index 41a10c8645d..765149bf921 100644 --- a/rust/kona/sp1/crates/client/src/precompiles/custom.rs +++ b/rust/kona/sp1/crates/client/src/precompiles/custom.rs @@ -106,7 +106,7 @@ impl Crypto for CustomCrypto { } } - /// UPSTREAM-MIRROR(override): revm-precompile@42.0.1 + /// UPSTREAM-MIRROR(override): revm-precompile@43.0.3 /// `revm_precompile::interface::Crypto::bls12_381_g1_add` /// /// Must equal the default's `bls12_381::arkworks::p1_add_affine_bytes` bit for bit, errors @@ -115,7 +115,7 @@ impl Crypto for CustomCrypto { bls12_381::g1_add(a, b) } - /// UPSTREAM-MIRROR(override): revm-precompile@42.0.1 + /// UPSTREAM-MIRROR(override): revm-precompile@43.0.3 /// `revm_precompile::interface::Crypto::bls12_381_g1_msm` /// /// Must equal the default's `bls12_381::arkworks::p1_msm_bytes` bit for bit, errors included. @@ -126,7 +126,7 @@ impl Crypto for CustomCrypto { bls12_381::g1_msm(pairs) } - /// UPSTREAM-MIRROR(override): revm-precompile@42.0.1 + /// UPSTREAM-MIRROR(override): revm-precompile@43.0.3 /// `revm_precompile::interface::Crypto::bls12_381_g2_add` /// /// Must equal the default's `bls12_381::arkworks::p2_add_affine_bytes` bit for bit, errors @@ -135,7 +135,7 @@ impl Crypto for CustomCrypto { bls12_381::g2_add(a, b) } - /// UPSTREAM-MIRROR(override): revm-precompile@42.0.1 + /// UPSTREAM-MIRROR(override): revm-precompile@43.0.3 /// `revm_precompile::interface::Crypto::bls12_381_g2_msm` /// /// Must equal the default's `bls12_381::arkworks::p2_msm_bytes` bit for bit, errors included. @@ -146,7 +146,7 @@ impl Crypto for CustomCrypto { bls12_381::g2_msm(pairs) } - /// UPSTREAM-MIRROR(override): revm-precompile@42.0.1 + /// UPSTREAM-MIRROR(override): revm-precompile@43.0.3 /// `revm_precompile::interface::Crypto::bls12_381_pairing_check` /// /// Must equal the default's `bls12_381::arkworks::pairing_check_bytes` (via @@ -158,7 +158,7 @@ impl Crypto for CustomCrypto { bls12_381::pairing_check(pairs) } - /// UPSTREAM-MIRROR(override): revm-precompile@42.0.1 + /// UPSTREAM-MIRROR(override): revm-precompile@43.0.3 /// `revm_precompile::interface::Crypto::bls12_381_fp_to_g1` /// /// Must equal the default's `bls12_381::arkworks::map_fp_to_g1_bytes` bit for bit, errors @@ -167,7 +167,7 @@ impl Crypto for CustomCrypto { bls12_381::map_fp_to_g1(fp) } - /// UPSTREAM-MIRROR(override): revm-precompile@42.0.1 + /// UPSTREAM-MIRROR(override): revm-precompile@43.0.3 /// `revm_precompile::interface::Crypto::bls12_381_fp2_to_g2` /// /// Must equal the default's `bls12_381::arkworks::map_fp2_to_g2_bytes` bit for bit, errors diff --git a/rust/kona/sp1/programs/Cargo.lock b/rust/kona/sp1/programs/Cargo.lock index b01f0fbba6e..6f8f2b9cfbb 100644 --- a/rust/kona/sp1/programs/Cargo.lock +++ b/rust/kona/sp1/programs/Cargo.lock @@ -57,9 +57,9 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b836b372d3b742b7c083d2617d6e68563cd5dadbd8752c461a935a756551e69" +checksum = "727016fed834c2392d014dd697ea473f3e47bcec31ba31ccffa9c1d18ed904e5" dependencies = [ "alloy-eips", "alloy-primitives", @@ -82,9 +82,9 @@ dependencies = [ [[package]] name = "alloy-consensus-any" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1befb37485ea71e8599e32ffd76c98af7c3720a34741d30abd87f41c3148407" +checksum = "6ea5ae60bbb3ce9dc52685a70a3755ad4432045fd38079b763cfe5127c706134" dependencies = [ "alloy-consensus", "alloy-eips", @@ -133,9 +133,9 @@ dependencies = [ [[package]] name = "alloy-eip7928" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cb19c9d53b507960f649e5689f7098e556696023fe1b57b67f2181ed54bc5b7" +checksum = "6a12e1dc70236cfb8e79b96dd8544aed47c39e2f45dc6b51c3703e969e052faa" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -144,16 +144,29 @@ dependencies = [ "thiserror", ] +[[package]] +name = "alloy-eip8141" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "36422c14bd57dcd638e276c8c9d7ac09eb16598e3a9dbd34e4b55267d4565b5e" +dependencies = [ + "alloy-primitives", + "alloy-rlp", + "serde", + "thiserror", +] + [[package]] name = "alloy-eips" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3e76d47e8de277cb55e7e77fa38adde835162fc01cddbe1b258b5e0a86035b" +checksum = "e01905444bd2fc330673f11d2466c0f54e8488f7ce3132b6a5e6497916fca765" dependencies = [ "alloy-eip2124", "alloy-eip2930", "alloy-eip7702", "alloy-eip7928", + "alloy-eip8141", "alloy-primitives", "alloy-rlp", "alloy-serde", @@ -186,9 +199,9 @@ dependencies = [ [[package]] name = "alloy-genesis" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0680a2f7d4bbc6f48c0cb43368fa544918a1fa291e772bdb47c834ade338f363" +checksum = "53cfa407c1d874cb306187996e30eb551bd98025e60e913e69e298ed2c8ea045" dependencies = [ "alloy-eips", "alloy-primitives", @@ -199,9 +212,9 @@ dependencies = [ [[package]] name = "alloy-hardforks" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865371fb677c005f7cb0ea9c2847a1ba4fdb042caf6428b1769fee20368bbfc7" +checksum = "7f03efb8382bf3b19f0bd0b3cdfaa59cb13e57a3a6650f75fae47645873723d5" dependencies = [ "alloy-chains", "alloy-eip2124", @@ -213,9 +226,9 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8795eecf50374a0dd942caff57922c59333c9991ead9eccbbc1709f55d73c7c2" +checksum = "3819bf6794d25f679d42c3f2b168e12cae08c56bb41d393cb6249b55e6d5933e" dependencies = [ "alloy-consensus", "alloy-eips", @@ -298,9 +311,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-engine" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a43d7b6b86be4885c7a76f1dfcde9651af2d419ff571e8ee7257de47101203b" +checksum = "77b967576e97165fed3fae1cf6adad964e192293e4ee61d9187afe3ecaa12323" dependencies = [ "alloy-consensus", "alloy-eips", @@ -315,9 +328,9 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756eb5803e70985be4066b636194ccb5f6629e5d141817c1f0c50cea8350bf5c" +checksum = "32c475e21fe8a8caa02166b326ed22207a1a0597fc9b0dcdfb46e2fe6f80dadf" dependencies = [ "alloy-consensus", "alloy-consensus-any", @@ -327,7 +340,8 @@ dependencies = [ "alloy-rlp", "alloy-serde", "alloy-sol-types", - "itertools 0.14.0", + "alloy-trie", + "itertools 0.13.0", "serde", "serde_json", "thiserror", @@ -335,9 +349,9 @@ dependencies = [ [[package]] name = "alloy-serde" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc142e40df0c3eb5983b1637a68ab33471d8d22b8f402c9ed8260411a4e89d86" +checksum = "4f44f297d3b9e3ca2c3039e3c0ed69acde9b35edda15381cf78f725b7263fbe2" dependencies = [ "alloy-primitives", "serde", @@ -404,9 +418,9 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.9.5" +version = "0.9.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f14b5d9b2c2173980202c6ff470d96e7c5e202c65a9f67884ad565226df7fbb" +checksum = "7895d0d2c946c0ae9253c227db77b9fc707383831058e6a5232fdfc774b28259" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -420,9 +434,9 @@ dependencies = [ [[package]] name = "alloy-tx-macros" -version = "2.4.2" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25484345e4d89c259235e200d4f895eba33e70f125f4e8bb37a7aa69a97bd656" +checksum = "60fa90c57738ace5b38106c9f743f3d6d47de09a82e82ecfc42702c1acf116ee" dependencies = [ "darling", "proc-macro2", @@ -2718,9 +2732,9 @@ dependencies = [ [[package]] name = "reth-codecs" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6bac09d9d84a412ae151149ec870d6eb7770335c5eb63f209453d81deff8d39" +checksum = "ef769807575055ccafe9db3a9d7eca3b97ca8213122942e71c47915776ec52b2" dependencies = [ "alloy-consensus", "alloy-eips", @@ -2736,9 +2750,9 @@ dependencies = [ [[package]] name = "reth-codecs-derive" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0101b1f474563c4c48c04fc2477199279a53d9c19b65301c6fd2131cf6e4a330" +checksum = "0652b5da6dcce54dc8bcfb69c5241b0ef09211963f76929d4d63e23767b43bf6" dependencies = [ "proc-macro2", "quote", @@ -2747,18 +2761,18 @@ dependencies = [ [[package]] name = "reth-zstd-compressors" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbdee2f0ad09dc32b43ab52641f8239766a66de4345834bad27d5cfa2f62864d" +checksum = "253f7d5772f3c8d0dcc3fdac398db6bca4f6f6e602d240c3bc47338dde0910dd" dependencies = [ "zstd", ] [[package]] name = "revm" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f2322f5ea197fac72c2cdc88cb501b2a7db0b0009911133fd3dda45bfceedd" +checksum = "62b2fbb3bdce72fef4f156e2164bdfde44dc3aeebc5b4f31a413fba0c09c524c" dependencies = [ "revm-bytecode", "revm-context", @@ -2785,9 +2799,9 @@ dependencies = [ [[package]] name = "revm-context" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c16835bc2ead203219a18fcc84c2c71879ad6b890e8a71150cf7f10e4e355dc4" +checksum = "9b06efea511a15ff8309acaa4c283239b444b461bbd2e9f0326c8586f45fb1da" dependencies = [ "bitvec", "cfg-if", @@ -2801,9 +2815,9 @@ dependencies = [ [[package]] name = "revm-context-interface" -version = "43.0.1" +version = "43.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b4109bdceaca5ee6e27bf41f6b156f2b15892dc5bb47d3530bc4d3b3060077" +checksum = "3068385c68f6a3bd2e781dd81cefd25c98dd0a574de6c8ec2a90acc33318b2da" dependencies = [ "alloy-eip2930", "alloy-eip7702", @@ -2816,9 +2830,9 @@ dependencies = [ [[package]] name = "revm-database" -version = "43.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d764afa9a1c9278c05d40461b07319d21ccb39c1bdf0e9dde7e5ea7d9be53d" +checksum = "8db6fb10912d7fba0161e91d4577ce71fa9726ec38a4d420e4242e504a47aa8f" dependencies = [ "derive_more", "either", @@ -2830,9 +2844,9 @@ dependencies = [ [[package]] name = "revm-database-interface" -version = "43.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2a27e4440c2ef4932afdaa28a1d1ac8601504c7030c1a387b5e307d07d864d1" +checksum = "5581ecadb3d0d1c18a91f1797d6b7c4c17720bea596e9e9ec90b95803db2bc77" dependencies = [ "auto_impl", "either", @@ -2843,9 +2857,9 @@ dependencies = [ [[package]] name = "revm-handler" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73a7409031d87ec281b74efff65d7a4dbea9d80727a55dbc7e4b3fd77b5e03fb" +checksum = "ba5102e9c02b9d27e7c98f449b495a2c2b2ec011209f4eeca16e054520ec5ac4" dependencies = [ "auto_impl", "derive-where", @@ -2861,9 +2875,9 @@ dependencies = [ [[package]] name = "revm-inspector" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a56f37224afd628f7244aa6965609ada04b440ed8ab7a19f55e4291df5a0112" +checksum = "825cf946c1bf3178f6a93aae4e8064a0ebd505bc764a7fe3d49411e7242e4091" dependencies = [ "auto_impl", "either", @@ -2877,9 +2891,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "43.0.1" +version = "43.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "932f7fe05a2cdeb08195dd7e88a09a4da7c3660cdc6e62720839c77ba77f65aa" +checksum = "aa32f5099a266329d1869d6f9bf4bb7894345d2b58c57d05396f67385d65f299" dependencies = [ "revm-bytecode", "revm-context-interface", @@ -2889,9 +2903,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "43.0.2" +version = "43.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac4dc0279f2a44770faa8c93d008df684440cf573c91b8e0e39d0d581abf7b3d" +checksum = "aa80b8cef09bead8c8b1afa7733b09fc1428f49158d8657c239268409d2a2bf7" dependencies = [ "ark-bls12-381 0.6.0", "ark-bn254", @@ -2922,9 +2936,9 @@ dependencies = [ [[package]] name = "revm-state" -version = "43.0.0" +version = "43.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cd02082cf1baca01e8bc17456c45136bdc66632395a98db1c1a2afe4c6ea87f" +checksum = "3b2d2ec0be925c4c87ff4afae33af4b9f693d9b011f74d6b4d52267a62df0c49" dependencies = [ "alloy-eip7928", "bitflags", diff --git a/rust/op-alloy/crates/consensus/src/receipts/envelope.rs b/rust/op-alloy/crates/consensus/src/receipts/envelope.rs index 80f9bd22f41..b60602b8b5a 100644 --- a/rust/op-alloy/crates/consensus/src/receipts/envelope.rs +++ b/rust/op-alloy/crates/consensus/src/receipts/envelope.rs @@ -10,7 +10,7 @@ use alloy_eips::{ use alloy_primitives::{Bloom, Log, logs_bloom}; use alloy_rlp::{BufMut, Decodable, Encodable, length_of_length}; -/// UPSTREAM-MIRROR(copy): alloy-consensus@2.4.2 `alloy_consensus::ReceiptEnvelope` +/// UPSTREAM-MIRROR(copy): alloy-consensus@2.5.0 `alloy_consensus::ReceiptEnvelope` /// /// Same per-transaction-type envelope over [`ReceiptWithBloom`], with the OP `PostExec` (0x7d) /// and `Deposit` (0x7e) variants added and EIP-4844 dropped. The shared Ethereum variants must diff --git a/rust/op-alloy/crates/consensus/src/receipts/receipt.rs b/rust/op-alloy/crates/consensus/src/receipts/receipt.rs index 72c29eb9018..e4101e835bd 100644 --- a/rust/op-alloy/crates/consensus/src/receipts/receipt.rs +++ b/rust/op-alloy/crates/consensus/src/receipts/receipt.rs @@ -13,7 +13,7 @@ use alloy_eips::eip2718::{Eip2718Error, Eip2718Result, IsTyped2718}; use alloy_primitives::{Bloom, Log}; use alloy_rlp::{Buf, BufMut, Decodable, Encodable, Header}; -/// UPSTREAM-MIRROR(copy): alloy-consensus@2.4.2 `alloy_consensus::ReceiptEnvelope` +/// UPSTREAM-MIRROR(copy): alloy-consensus@2.5.0 `alloy_consensus::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 diff --git a/rust/op-alloy/crates/rpc-types-engine/src/payload/mod.rs b/rust/op-alloy/crates/rpc-types-engine/src/payload/mod.rs index 325ffc34908..ab04f4295cd 100644 --- a/rust/op-alloy/crates/rpc-types-engine/src/payload/mod.rs +++ b/rust/op-alloy/crates/rpc-types-engine/src/payload/mod.rs @@ -14,7 +14,7 @@ use alloy_rpc_types_engine::{ ExecutionPayloadV3, }; -/// UPSTREAM-MIRROR(copy): alloy-rpc-types-engine@2.4.2 `alloy_rpc_types_engine::ExecutionPayload` +/// UPSTREAM-MIRROR(copy): alloy-rpc-types-engine@2.5.0 `alloy_rpc_types_engine::ExecutionPayload` /// /// Same versioned enum and the same field-sniffing `Deserialize`, but V4 is the OP Isthmus /// payload selected by `withdrawalsRoot` where upstream's V4 is Amsterdam, and this type also diff --git a/rust/op-reth-test-engine/src/chain.rs b/rust/op-reth-test-engine/src/chain.rs index a7e46c82673..7b3b0192c78 100644 --- a/rust/op-reth-test-engine/src/chain.rs +++ b/rust/op-reth-test-engine/src/chain.rs @@ -10,7 +10,7 @@ use alloy_eips::{BlockHashOrNumber, BlockNumHash}; use alloy_genesis::{Genesis, GenesisAccount}; use alloy_primitives::{Address, B256}; use op_revm::constants::L1_BLOCK_CONTRACT; -use reth_chain_state::{ExecutedBlock, MemoryOverlayStateProvider, NewCanonicalChain}; +use reth_chain_state::{ExecutedBlock, NewCanonicalChain}; use reth_db::{DatabaseEnv, test_utils::TempDatabase}; use reth_db_common::init::init_genesis; use reth_engine_tree::{engine::EngineApiKind, tree::state::TreeState}; @@ -136,7 +136,7 @@ impl EphemeralChain { &self, hash: B256, ) -> crate::Result> { - let Some((anchor, overlay)) = self.blocks.blocks_by_hash(hash) else { + let Some(block) = self.blocks.executed_block_by_hash(hash).cloned() else { let Some(header) = self.sealed_header(hash)? else { return Ok(None); }; @@ -145,11 +145,12 @@ impl EphemeralChain { .ok_or_else(|| Error::Execution(format!("no state for canonical block {hash}")))?; return Ok(Some((header, state))); }; - let header = overlay[0].recovered_block().clone_sealed_header(); - let Some(anchor_state) = self.state_at(anchor)? else { - return Ok(None); - }; - Ok(Some((header, MemoryOverlayStateProvider::new(anchor_state, overlay).boxed()))) + // Every recorded block is in the overlay manager the provider shares, and its recorded + // ancestors reach back to genesis, so the provider resolves the block's whole chain from + // its parent. A recorded ancestor it can't resolve is an inconsistency, so it errors. + let header = block.recovered_block().clone_sealed_header(); + let state = self.provider.state_with_block_appended(header.parent_hash(), block)?; + Ok(Some((header, state))) } /// Record a block that passed `new_payload` validation so a later forkchoice update can @@ -227,7 +228,7 @@ impl EphemeralChain { let evm_config: OpEvmConfig = OpEvmConfig::new(self.chain_spec(), OpRethReceiptBuilder::default()); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state)) + .with_database(StateProviderDatabase::new(state.into_evm_state_provider())) .with_bundle_update() .build(); // Assembling an OP block reads the DA-footprint scalar from the L1Block predeploy; a cold diff --git a/rust/op-reth-test-engine/src/exec.rs b/rust/op-reth-test-engine/src/exec.rs index f0a2f637c0f..a4fbcdfb624 100644 --- a/rust/op-reth-test-engine/src/exec.rs +++ b/rust/op-reth-test-engine/src/exec.rs @@ -26,7 +26,7 @@ use reth_optimism_primitives::{ }; use reth_primitives_traits::{SealedBlock, SealedHeader}; use reth_revm::database::StateProviderDatabase; -use reth_storage_api::{HashedPostStateProvider, StateRootProvider}; +use reth_storage_api::{HashedPostStateProvider, StateProvider as _, StateRootProvider}; use reth_trie::ComputedTrieData; use crate::{Error, chain::EphemeralChain}; @@ -100,7 +100,10 @@ pub(crate) fn import_payload( let evm_config: OpEvmConfig = OpEvmConfig::new(chain_spec.clone(), OpRethReceiptBuilder::default()); - let executor = BasicBlockExecutor::new(evm_config, StateProviderDatabase::new(&state)); + let executor = BasicBlockExecutor::new( + evm_config, + StateProviderDatabase::new((&state).into_evm_state_provider()), + ); let output: BlockExecutionOutput = match executor.execute(&recovered) { Ok(output) => output, Err(BlockExecutionError::Validation(err)) => { diff --git a/rust/op-reth/crates/cli/src/lib.rs b/rust/op-reth/crates/cli/src/lib.rs index c4c1f00eed1..65221e956ad 100644 --- a/rust/op-reth/crates/cli/src/lib.rs +++ b/rust/op-reth/crates/cli/src/lib.rs @@ -90,6 +90,7 @@ pub struct Cli< const DENIED_ARGS: &[(&str, &str, &str)] = &[ ("node", "minimal", MINIMAL_REMOVED_HELP), ("node", "max_bals", BAL_ARGS_UNSUPPORTED_HELP), + ("node", "max_bals_bytes", BAL_ARGS_UNSUPPORTED_HELP), ("node", "cache_computed_bals", BAL_ARGS_UNSUPPORTED_HELP), ("node", "prewarm_bals", BAL_ARGS_UNSUPPORTED_HELP), // Part of the database args, which most subcommands take. @@ -307,6 +308,7 @@ mod test { for args in [ &["op-reth", "node", "--engine.disable-bal-parallel-execution"][..], &["op-reth", "node", "--rpc-cache.max-bals", "10"], + &["op-reth", "node", "--rpc-cache.max-bals-bytes", "10"], &["op-reth", "node", "--db.balstore-cache-size", "10"], &["op-reth", "prune", "--db.balstore-cache-size", "10"], &["op-reth", "db", "--db.balstore-cache-size", "10", "stats"], diff --git a/rust/op-reth/crates/cli/tests/snapshots/cli.snap b/rust/op-reth/crates/cli/tests/snapshots/cli.snap index 4e1ba9b5c5c..c915b9c381b 100644 --- a/rust/op-reth/crates/cli/tests/snapshots/cli.snap +++ b/rust/op-reth/crates/cli/tests/snapshots/cli.snap @@ -132,7 +132,7 @@ arg: --rpc.max-blocking-io-requests [action: Set] [num-args: 1] [aliases arg: --rpc.max-trace-filter-blocks [action: Set] [num-args: 1] [aliases: rpc-max-trace-filter-blocks] [default: 100] help: Maximum number of blocks for `trace_filter` requests arg: --rpc.max-blocks-per-filter [action: Set] [num-args: 1] [aliases: rpc-max-blocks-per-filter] [default: 100000] help: Maximum number of blocks that could be scanned per filter request. (0 = entire chain) arg: --rpc.max-logs-per-response [action: Set] [num-args: 1] [aliases: rpc-max-logs-per-response] [default: 20000] help: Maximum number of logs that can be returned in a single response. (0 = no limit) -arg: --rpc.gascap [action: Set] [num-args: 1] [aliases: rpc-gascap] [default: 50000000] help: Maximum gas limit for `eth_call` and call tracing RPC methods +arg: --rpc.gascap [action: Set] [num-args: 1] [aliases: rpc-gascap] [default: 50000000] help: Maximum gas limit for `eth_call`, `eth_estimateGas`, and call tracing RPC methods arg: --rpc.evm-memory-limit [action: Set] [num-args: 1] [aliases: rpc-evm-memory-limit] [default: 4294967295] help: Maximum memory the EVM can allocate per RPC request arg: --rpc.txfeecap [action: Set] [num-args: 1] [aliases: rpc-txfeecap] [default: 1.0] help: Maximum eth transaction fee (in ether) that can be sent via the RPC APIs (0 = no cap) arg: --rpc.max-simulate-blocks [action: Set] [num-args: 1] [default: 256] help: Maximum number of blocks for `eth_simulateV1` call @@ -142,10 +142,14 @@ arg: --rpc.proof-permits [action: Set] [num-args: 1] [aliases: rpc-proof arg: --rpc.pending-block [action: Set] [num-args: 1] [default: full] help: Configures the pending block behavior for RPC responses arg: --rpc.forwarder [action: Set] [num-args: 1] [aliases: rpc-forwarder] help: Endpoint to forward transactions to arg: --builder.disallow [action: Set] [num-args: 1] help: Path to file containing disallowed addresses, json-encoded list of strings. Block validation API will reject blocks containing transactions from these addresses -arg: --rpc-cache.max-blocks [action: Set] [num-args: 1] [default: 5000] help: Max number of blocks in cache -arg: --rpc-cache.max-receipts [action: Set] [num-args: 1] [default: 2000] help: Max number receipts in cache +arg: --rpc-cache.max-blocks [action: Set] [num-args: 1] [default: 1000] help: Max number of blocks in cache +arg: --rpc-cache.max-receipts [action: Set] [num-args: 1] [default: 500] help: Max number receipts in cache arg: --rpc-cache.max-headers [action: Set] [num-args: 1] [aliases: rpc-cache.max-envs] [default: 1000] [hidden] help: Legacy no-op retained for CLI compatibility arg: --rpc-cache.max-bals [action: Set] [num-args: 1] [default: 1000] [hidden] help: Max number of block access lists in cache +arg: --rpc-cache.max-blocks-bytes [action: Set] [num-args: 1] [default: 2147483648] help: Maximum estimated block cache memory in bytes or with a unit (e.g. 1GB, 500MB). Units use powers of 1024. Zero disables caching. The entry count limit also applies +arg: --rpc-cache.max-receipts-bytes [action: Set] [num-args: 1] [default: 1073741824] help: Maximum estimated receipts cache memory in bytes or with a unit (e.g. 1GB, 500MB). Units use powers of 1024. Zero disables caching. The entry count limit also applies +arg: --rpc-cache.max-bals-bytes [action: Set] [num-args: 1] [default: 524288000] [hidden] help: Maximum estimated block access list cache memory in bytes or with a unit (e.g. 1GB, 500MB). Units use powers of 1024. Zero disables caching. The entry count limit also applies +arg: --rpc-cache.idle-timeout [action: Set] [num-args: 1] [default: 1h] help: Evict blocks, receipts, and block access lists after this duration without a cache hit (e.g. 5m, 30s). Zero disables expiration. Cleanup starts every 1 to 60 seconds and removes at most five entries per cache per poll arg: --rpc-cache.cache-computed-bals [action: SetTrue] [num-args: 0] [hidden] help: Cache block access lists computed by RPC requests for transaction tracing arg: --rpc-cache.prewarm-bals [action: Set] [num-args: 0..=1] [default-missing-values: ["0"]] [hidden] [require-equals] help: Replay new canonical blocks to cache block access lists until native BAL support arg: --rpc-cache.max-concurrent-db-requests [action: Set] [num-args: 1] [default: 512] help: Max number of concurrent database requests @@ -256,13 +260,14 @@ arg: --engine.persistence-threshold [action: Set] [num-a arg: --engine.persistence-backpressure-threshold [action: Set] [num-args: 1] help: Configure the maximum number of blocks beyond the in-memory buffer target that may await persistence before engine API processing stalls arg: --engine.num-state-masking-blocks [action: Set] [num-args: 1] [env: RETH_ENGINE_NUM_STATE_MASKING_BLOCKS] [default: 0] [hidden] help: Configure how many of the blocks being persisted should only mask state/trie writes instead of durably persisting their state/trie updates in the current cycle arg: --engine.memory-block-buffer-target [action: Set] [num-args: 1] help: Configure the target number of blocks to keep in memory +arg: --engine.backfill-threshold [action: Set] [num-args: 1] [env: RETH_ENGINE_BACKFILL_THRESHOLD] [default: 32] help: Configure the largest gap, in blocks, between the local head and the forkchoice head that is closed by downloading the missing blocks directly. Larger gaps trigger a full pipeline (backfill) run instead arg: --engine.invalid-header-cache-hit-eviction-threshold [action: Set] [num-args: 1] [default: 128] help: Configure how many cache hits an invalid header can accumulate before it is evicted and reprocessed arg: --engine.legacy-state-root [action: SetTrue] [num-args: 0] [default: false] [hidden] help: CAUTION: This CLI flag has no effect anymore, use --engine.state-root-fallback if you want to force synchronous state root computation arg: --engine.caching-and-prewarming [action: SetTrue] [num-args: 0] [default: true] [hidden] help: CAUTION: This CLI flag has no effect anymore, use --engine.disable-caching-and-prewarming if you want to disable caching and prewarming arg: --engine.disable-state-cache [action: SetTrue] [num-args: 0] [default: false] help: Disable state cache arg: --engine.disable-prewarming [action: SetTrue] [num-args: 0] [aliases: engine.disable-caching-and-prewarming] [default: false] help: Disable parallel prewarming arg: --engine.txpool-prewarming [action: SetTrue] [num-args: 0] [env: RETH_ENGINE_TXPOOL_PREWARMING] [default: false] help: Enable best-effort txpool transaction prewarming between payloads -arg: --engine.sender-recovery-cache [action: SetTrue] [num-args: 0] [env: RETH_ENGINE_SENDER_RECOVERY_CACHE] [default: false] help: Enable caching recovered transaction senders across transaction ingress and payload execution +arg: --engine.sender-recovery-cache [action: SetTrue] [num-args: 0..=1] [env: RETH_ENGINE_SENDER_RECOVERY_CACHE] [default: true] [default-missing-values: ["true"]] [possible: true, false] help: Cache recovered transaction senders across transaction ingress and payload execution arg: --engine.parallel-sparse-trie [action: SetTrue] [num-args: 0] [default: true] [hidden] help: CAUTION: This CLI flag has no effect anymore. The parallel sparse trie is always enabled arg: --engine.disable-parallel-sparse-trie [action: SetTrue] [num-args: 0] [default: false] [hidden] help: CAUTION: This CLI flag has no effect anymore. The parallel sparse trie is always enabled arg: --engine.state-provider-metrics [action: SetTrue] [num-args: 0] [default: false] help: Enable state provider latency metrics. This allows the engine to collect and report stats about how long state provider calls took during execution, but this does introduce slight overhead to state provider calls diff --git a/rust/op-reth/crates/consensus/src/validation/mod.rs b/rust/op-reth/crates/consensus/src/validation/mod.rs index 3e49ae52392..88ac26883e9 100644 --- a/rust/op-reth/crates/consensus/src/validation/mod.rs +++ b/rust/op-reth/crates/consensus/src/validation/mod.rs @@ -19,7 +19,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:8d359d0 +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_consensus_common::validation::validate_body_against_header` /// /// Copies the generic body/header checks and replaces withdrawals-root handling after Isthmus. @@ -86,7 +86,7 @@ where Ok(()) } -/// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_ethereum_consensus::validation::validate_block_post_execution` /// /// Copies upstream post-execution validation with OP receipt roots and Jovian DA accounting. @@ -164,7 +164,7 @@ pub fn validate_block_post_execution( Ok(()) } -/// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 `reth_ethereum_consensus::validation::verify_receipts` +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb `reth_ethereum_consensus::validation::verify_receipts` /// /// Copies the upstream helper, substituting OP receipt-root calculation. /// Verify the calculated receipts root against the expected receipts root. diff --git a/rust/op-reth/crates/evm/Cargo.toml b/rust/op-reth/crates/evm/Cargo.toml index 449b7193667..1a30792536e 100644 --- a/rust/op-reth/crates/evm/Cargo.toml +++ b/rust/op-reth/crates/evm/Cargo.toml @@ -52,6 +52,7 @@ tracing.workspace = true [dev-dependencies] reth-evm = { workspace = true, features = ["test-utils"] } reth-revm = { workspace = true, features = ["test-utils"] } +reth-storage-api.workspace = true alloy-genesis.workspace = true metrics-exporter-prometheus.workspace = true metrics-util.workspace = true diff --git a/rust/op-reth/crates/evm/src/build.rs b/rust/op-reth/crates/evm/src/build.rs index b9ee3aff77c..5d264b4fe13 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:8d359d0 + /// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `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 a3de8d5006e..5b412dce417 100644 --- a/rust/op-reth/crates/evm/src/config.rs +++ b/rust/op-reth/crates/evm/src/config.rs @@ -25,7 +25,7 @@ pub struct OpNextBlockEnvAttributes { impl reth_rpc_eth_api::helpers::pending_block::BuildPendingEnv for OpNextBlockEnvAttributes { - /// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 + /// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_rpc_eth_api::helpers::pending_block::NextBlockEnvAttributes::build_pending_env` /// /// Copies upstream pending-environment defaults for the OP attribute type, except that diff --git a/rust/op-reth/crates/evm/src/execute.rs b/rust/op-reth/crates/evm/src/execute.rs index f56ef5f9dd7..6ea8511a2e0 100644 --- a/rust/op-reth/crates/evm/src/execute.rs +++ b/rust/op-reth/crates/evm/src/execute.rs @@ -17,6 +17,7 @@ mod tests { use reth_optimism_primitives::{OpReceipt, OpTransactionSigned}; use reth_primitives_traits::{Account, RecoveredBlock}; use reth_revm::{database::StateProviderDatabase, test_utils::StateProviderTest}; + use reth_storage_api::StateProvider; use std::{collections::HashMap, str::FromStr}; fn create_op_state_provider() -> StateProviderTest { @@ -60,7 +61,10 @@ mod tests { senders: Vec
, ) -> BlockExecutionOutput { let provider = evm_config(chain_spec); - let mut executor = BasicBlockExecutor::new(provider, StateProviderDatabase::new(db)); + let mut executor = BasicBlockExecutor::new( + provider, + StateProviderDatabase::new(db.into_evm_state_provider()), + ); // make sure the L1 block contract state is preloaded. executor.with_state_mut(|state| { diff --git a/rust/op-reth/crates/evm/src/lib.rs b/rust/op-reth/crates/evm/src/lib.rs index 203d689b97c..1d1ab8fafa9 100644 --- a/rust/op-reth/crates/evm/src/lib.rs +++ b/rust/op-reth/crates/evm/src/lib.rs @@ -255,7 +255,7 @@ where } } -/// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 `reth_evm_ethereum::EthEvmConfig` +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb `reth_evm_ethereum::EthEvmConfig` /// /// Mirrors upstream `ConfigureEvm` plumbing with OP environments and execution context. impl ConfigureEvm for OpEvmConfig @@ -355,7 +355,7 @@ where } } -/// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 `reth_evm_ethereum::EthEvmConfig` +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb `reth_evm_ethereum::EthEvmConfig` /// /// Mirrors upstream payload-to-EVM configuration with OP payload and fork semantics. /// `tx_iterator_for_payload` recovers senders directly; upstream routes the same recovery through diff --git a/rust/op-reth/crates/flashblocks/src/worker.rs b/rust/op-reth/crates/flashblocks/src/worker.rs index 1284ed6f45b..3597a6906fc 100644 --- a/rust/op-reth/crates/flashblocks/src/worker.rs +++ b/rust/op-reth/crates/flashblocks/src/worker.rs @@ -32,8 +32,8 @@ use reth_revm::{ }; use reth_rpc_eth_types::{EthApiError, PendingBlock}; use reth_storage_api::{ - BlockReaderIdExt, HashedPostStateProvider, StateProviderFactory, StateRootProvider, - noop::NoopProvider, + BlockReaderIdExt, HashedPostStateProvider, StateProvider, StateProviderFactory, + StateRootProvider, noop::NoopProvider, }; use reth_trie_common::ComputedTrieData; use std::{ @@ -245,7 +245,8 @@ where args.pending_parent.as_ref().map(|p| p.cached_reads.clone()).unwrap_or_default() }); - let cached_db = request_cache.as_db_mut(StateProviderDatabase::new(&state_provider)); + let cached_db = request_cache + .as_db_mut(StateProviderDatabase::new((&state_provider).into_evm_state_provider())); // Check for resumable canonical execution state. let canonical_parent_hash = args.base.parent_hash; diff --git a/rust/op-reth/crates/hardforks/src/lib.rs b/rust/op-reth/crates/hardforks/src/lib.rs index 13ab39e3844..cbd635f8ae2 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:8d359d0 `reth_ethereum_forks::DEV_HARDFORKS` +/// UPSTREAM-MIRROR(set): reth@rev:0447ceb `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/src/node.rs b/rust/op-reth/crates/node/src/node.rs index 23f7f2bd057..f27d399fbf0 100644 --- a/rust/op-reth/crates/node/src/node.rs +++ b/rust/op-reth/crates/node/src/node.rs @@ -807,11 +807,11 @@ where /// RPC methods an OP node does not serve, on any transport. /// -/// UPSTREAM-MIRROR(set): reth@rev:8d359d0 `reth_rpc_eth_api::EthApi` +/// UPSTREAM-MIRROR(set): reth@rev:0447ceb `reth_rpc_eth_api::EthApi` /// -/// UPSTREAM-MIRROR(set): reth@rev:8d359d0 `reth_rpc_api::DebugApi` +/// UPSTREAM-MIRROR(set): reth@rev:0447ceb `reth_rpc_api::DebugApi` /// -/// UPSTREAM-MIRROR(set): reth@rev:8d359d0 `reth_rpc_api::EngineEthApi` +/// UPSTREAM-MIRROR(set): reth@rev:0447ceb `reth_rpc_api::EngineEthApi` /// /// Upstream installs these methods as part of the full `eth` and `debug` APIs, and the auth-port /// `eth` namespace. @@ -831,7 +831,7 @@ const UNSERVED_RPC_METHODS: &[&str] = &[ /// Rejects the RPC cache options that compute EIP-7928 block access lists by re-executing blocks. /// -/// UPSTREAM-MIRROR(set): reth@rev:8d359d0 `reth_node_core::args::RpcStateCacheArgs` +/// UPSTREAM-MIRROR(set): reth@rev:0447ceb `reth_node_core::args::RpcStateCacheArgs` /// /// Upstream replays every new canonical block to compute its BAL with `--rpc-cache.prewarm-bals` /// until a block carries a `block_access_list_hash`, which OP blocks never do, and transaction diff --git a/rust/op-reth/crates/node/src/rpc.rs b/rust/op-reth/crates/node/src/rpc.rs index 4826341105c..f476e1e4431 100644 --- a/rust/op-reth/crates/node/src/rpc.rs +++ b/rust/op-reth/crates/node/src/rpc.rs @@ -75,6 +75,7 @@ //! components: node.node_adapter(), //! config, //! cache, +//! sender_recovery_cache: node.sender_recovery_cache().cloned(), //! engine_handle: ConsensusEngineHandle::new(tx), //! }; //! let eth_api = OpEthApiBuilder::::default().build_eth_api(ctx).await.unwrap(); diff --git a/rust/op-reth/crates/node/src/utils.rs b/rust/op-reth/crates/node/src/utils.rs index bb504309731..daa45445a43 100644 --- a/rust/op-reth/crates/node/src/utils.rs +++ b/rust/op-reth/crates/node/src/utils.rs @@ -3,7 +3,7 @@ use alloy_genesis::Genesis; use alloy_primitives::{Address, B256}; use op_alloy_rpc_types_engine::OpPayloadAttributes; use reth_e2e_test_utils::{ - NodeHelperType, TmpDB, transaction::TransactionTestContext, wallet::Wallet, + E2ETestSetupBuilder, NodeHelperType, TmpDB, transaction::TransactionTestContext, wallet::Wallet, }; use reth_node_api::NodeTypesWithDBAdapter; use reth_optimism_chainspec::OpChainSpecBuilder; @@ -20,15 +20,14 @@ pub(crate) type OpNode = pub async fn setup(num_nodes: usize) -> eyre::Result<(Vec, Wallet)> { let genesis: Genesis = serde_json::from_str(include_str!("../tests/assets/genesis.json")).unwrap(); - reth_e2e_test_utils::setup_engine( + E2ETestSetupBuilder::new( num_nodes, Arc::new( OpChainSpecBuilder::optimism_sepolia().genesis(genesis).ecotone_activated().build(), ), - false, - Default::default(), - optimism_payload_attributes, ) + .with_attributes_generator(optimism_payload_attributes) + .build() .await } diff --git a/rust/op-reth/crates/node/tests/it/invalid_post_exec.rs b/rust/op-reth/crates/node/tests/it/invalid_post_exec.rs index 4e2c41149da..1d880f2bbd9 100644 --- a/rust/op-reth/crates/node/tests/it/invalid_post_exec.rs +++ b/rust/op-reth/crates/node/tests/it/invalid_post_exec.rs @@ -12,7 +12,7 @@ use eyre::WrapErr; use jsonrpsee::core::ClientError; use op_alloy_consensus::{PostExecPayloadValidationError, SDMGasEntry, build_post_exec_tx}; use op_alloy_rpc_types_engine::{OpExecutionData, OpExecutionPayload}; -use reth_e2e_test_utils::{NodeHelperType, setup_engine_with_connection, wallet::Wallet}; +use reth_e2e_test_utils::{E2ETestSetupBuilder, NodeHelperType, wallet::Wallet}; use reth_optimism_node::{ OpBuiltPayload, OpNode, payload::OpExecData, @@ -25,16 +25,12 @@ use tokio::sync::Mutex; /// Creates Lagoon-active nodes without changing the shared Ecotone fixture. async fn setup_lagoon(num_nodes: usize) -> eyre::Result<(Vec>, Wallet)> { - setup_engine_with_connection( - num_nodes, - crate::lagoon::chain_spec()?, - false, - Default::default(), - crate::lagoon::payload_attributes, + E2ETestSetupBuilder::new(num_nodes, crate::lagoon::chain_spec()?) + .with_attributes_generator(crate::lagoon::payload_attributes) // The buffered-child test must learn the parent only through its explicit newPayload. - false, - ) - .await + .with_connect_nodes(false) + .build() + .await } /// Adds a decodable `PostExec` with a wrong anchor, so rejection reaches executor validation diff --git a/rust/op-reth/crates/node/tests/it/rpc_replay_settlement/parity_replays.rs b/rust/op-reth/crates/node/tests/it/rpc_replay_settlement/parity_replays.rs index b76fdbc3fbd..bc21f98a0c1 100644 --- a/rust/op-reth/crates/node/tests/it/rpc_replay_settlement/parity_replays.rs +++ b/rust/op-reth/crates/node/tests/it/rpc_replay_settlement/parity_replays.rs @@ -23,9 +23,10 @@ async fn parity_replays_report_settled_state_diffs() -> eyre::Result<()> { fixture.transaction_hash(index), HashSet::from_iter([TraceType::StateDiff, TraceType::Trace]), ) - .await?; + .await? + .expect("transaction exists"); assert_eq!( - settled_balance(replay.state_diff.as_ref(), fixture.sender), + settled_balance(replay.full_trace.state_diff.as_ref(), fixture.sender), fixture.replayed_balance(index, fixture.sender).await?, "trace_replayTransaction state diff of transaction {index}", ); diff --git a/rust/op-reth/crates/payload/Cargo.toml b/rust/op-reth/crates/payload/Cargo.toml index c8d8ed80fcd..57421236a5d 100644 --- a/rust/op-reth/crates/payload/Cargo.toml +++ b/rust/op-reth/crates/payload/Cargo.toml @@ -24,6 +24,7 @@ reth-payload-builder-primitives.workspace = true reth-payload-util.workspace = true reth-payload-primitives.workspace = true reth-basic-payload-builder.workspace = true +reth-tasks.workspace = true reth-payload-validator.workspace = true reth-metrics.workspace = true diff --git a/rust/op-reth/crates/payload/src/builder.rs b/rust/op-reth/crates/payload/src/builder.rs index a8f01aee63b..f9c5e5b8849 100644 --- a/rust/op-reth/crates/payload/src/builder.rs +++ b/rust/op-reth/crates/payload/src/builder.rs @@ -45,13 +45,11 @@ use reth_payload_util::{BestPayloadTransactions, NoopPayloadTransactions, Payloa use reth_primitives_traits::{ HeaderTy, NodePrimitives, SealedHeader, SealedHeaderFor, SignedTransaction, TxTy, }; -use reth_revm::{ - cancelled::CancelOnDrop, database::StateProviderDatabase, db::State, - witness::ExecutionWitnessRecord, -}; +use reth_revm::{database::StateProviderDatabase, db::State, witness::ExecutionWitnessRecord}; use reth_storage_api::{ HeaderProvider, StateProvider, StateProviderFactory, errors::ProviderError, }; +use reth_tasks::CancelOnDrop; use reth_transaction_pool::{BestTransactionsAttributes, PoolTransaction, TransactionPool}; use revm::context::{Block, BlockEnv}; use std::{marker::PhantomData, sync::Arc}; @@ -268,7 +266,7 @@ where let builder = OpBuilder::new(best); let state_provider = self.client.state_by_block_hash(ctx.parent().hash())?; - let state = StateProviderDatabase::new(&state_provider); + let state = StateProviderDatabase::new((&state_provider).into_evm_state_provider()); if ctx.attributes().no_tx_pool() { builder.build(state, &state_provider, ctx) @@ -601,7 +599,7 @@ impl OpBuilder<'_, Txs> { Attrs: OpAttributes, { let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let executed = (|| { diff --git a/rust/op-reth/crates/payload/src/builder/admission_tests.rs b/rust/op-reth/crates/payload/src/builder/admission_tests.rs index 8b49aba88f5..c9679ee7370 100644 --- a/rust/op-reth/crates/payload/src/builder/admission_tests.rs +++ b/rust/op-reth/crates/payload/src/builder/admission_tests.rs @@ -46,6 +46,7 @@ use reth_payload_util::PayloadTransactionsFixed; use reth_primitives_traits::{Account, SealedHeader}; use reth_provider::test_utils::{ExtendedAccount, MockEthProvider}; use reth_revm::{database::StateProviderDatabase, db::State, test_utils::StateProviderTest}; +use reth_storage_api::StateProvider; use reth_transaction_pool::{ BlockInfo, CoinbaseTipOrdering, Pool, PoolConfig, PoolTransaction, TransactionOrigin, TransactionPool, TransactionPoolExt, blobstore::InMemoryBlobStore, @@ -540,7 +541,7 @@ fn run(case: &Case) -> Report { let ctx = env.payload_ctx(); let state_provider = env.state_provider(); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); db.load_cache_account(L1_BLOCK_CONTRACT).expect("L1Block loads"); diff --git a/rust/op-reth/crates/payload/src/builder/tests.rs b/rust/op-reth/crates/payload/src/builder/tests.rs index 7fcbdabd2aa..0b8d76070be 100644 --- a/rust/op-reth/crates/payload/src/builder/tests.rs +++ b/rust/op-reth/crates/payload/src/builder/tests.rs @@ -41,7 +41,7 @@ use reth_payload_builder_primitives::PayloadBuilderError; use reth_payload_util::PayloadTransactionsFixed; use reth_primitives_traits::{Account, InMemorySize, SealedHeader}; use reth_revm::{database::StateProviderDatabase, db::State, test_utils::StateProviderTest}; -use reth_storage_api::errors::ProviderError; +use reth_storage_api::{StateProvider, errors::ProviderError}; use reth_transaction_pool::PoolTransaction; use revm::context::result::{EVMError, InvalidTransaction}; use rstest::rstest; @@ -267,7 +267,7 @@ where let best_txs = PayloadTransactionsFixed::new(txs); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx.block_builder(&mut db).expect("block builder can be created"); @@ -345,7 +345,7 @@ fn rebuilds_derived_block_with_embedded_post_exec_tx_regardless_of_opt_in() { let state_provider = StateProviderTest::default(); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx.block_builder(&mut db).expect("block builder can be created"); @@ -373,7 +373,7 @@ fn block_builder_with_mode_honors_snapshot_over_live_opt_in() { let produce_ctx = interop_ctx(false, false, Some(Vec::new())); let provider = StateProviderTest::default(); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&provider)) + .with_database(StateProviderDatabase::new((&provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = produce_ctx @@ -387,7 +387,7 @@ fn block_builder_with_mode_honors_snapshot_over_live_opt_in() { let disabled_ctx = interop_ctx(false, true, Some(Vec::new())); let provider = StateProviderTest::default(); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&provider)) + .with_database(StateProviderDatabase::new((&provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = disabled_ctx @@ -532,7 +532,7 @@ fn execute_best_transactions_on_commit_hook_execution() { // Re-execute each tx that should be committed so we know the gas passed to on_commit. let expected_committed_gas: Vec = { let mut oracle_db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut oracle = ctx.block_builder(&mut oracle_db).expect("oracle block builder"); @@ -556,7 +556,7 @@ fn execute_best_transactions_on_commit_hook_execution() { }; let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx.block_builder(&mut db).expect("block builder can be created"); @@ -652,7 +652,7 @@ fn on_commit_reports_canonical_and_pre_refund_gas_separately_under_sdm_refund() }; let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx @@ -1220,7 +1220,7 @@ fn invalid_forced_transaction_fails_only_a_derived_rebuild() { ctx.config.attributes.transactions = vec![deposit_with_encoded(), invalid.clone()]; let state_provider = StateProviderTest::default(); let mut db = State::builder() - .with_database(StateProviderDatabase::new(&state_provider)) + .with_database(StateProviderDatabase::new((&state_provider).into_evm_state_provider())) .with_bundle_update() .build(); let mut builder = ctx.block_builder(&mut db).expect("block builder can be created"); diff --git a/rust/op-reth/crates/payload/src/lib.rs b/rust/op-reth/crates/payload/src/lib.rs index 5eaa2e48aea..f5abc1a9120 100644 --- a/rust/op-reth/crates/payload/src/lib.rs +++ b/rust/op-reth/crates/payload/src/lib.rs @@ -85,7 +85,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:8d359d0 + /// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `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 2c57ad964ec..88c3bfcdad5 100644 --- a/rust/op-reth/crates/payload/src/payload.rs +++ b/rust/op-reth/crates/payload/src/payload.rs @@ -449,7 +449,7 @@ impl BuiltPayload for OpBuiltPayload { } } -/// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_ethereum_engine_primitives::EthBuiltPayload::into_execution_data` /// /// Counterpart to `OpPayloadTypes::block_to_payload`; the two conversion paths are kept diff --git a/rust/op-reth/crates/payload/src/validator.rs b/rust/op-reth/crates/payload/src/validator.rs index f03fc8abbe7..15dfe28ac7e 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:8d359d0 +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `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 6b853be110b..a07fa13ff19 100644 --- a/rust/op-reth/crates/rpc/Cargo.toml +++ b/rust/op-reth/crates/rpc/Cargo.toml @@ -33,6 +33,7 @@ reth-chain-state.workspace = true reth-rpc-engine-api.workspace = true reth-payload-util.workspace = true reth-provider.workspace = true +reth-trie.workspace = true # op-reth reth-optimism-evm.workspace = true @@ -100,6 +101,10 @@ alloy-op-hardforks.workspace = true alloy-genesis.workspace = true reth-optimism-chainspec = { workspace = true, features = ["superchain-configs"] } reth-optimism-evm = { workspace = true, features = ["rpc"] } +reth-db-common.workspace = true +reth-ethereum-primitives.workspace = true +reth-execution-types.workspace = true +reth-provider = { workspace = true, features = ["test-utils"] } rstest.workspace = true [features] diff --git a/rust/op-reth/crates/rpc/src/debug.rs b/rust/op-reth/crates/rpc/src/debug.rs index 6e3ff58c827..a8607f5350d 100644 --- a/rust/op-reth/crates/rpc/src/debug.rs +++ b/rust/op-reth/crates/rpc/src/debug.rs @@ -29,7 +29,7 @@ use reth_payload_util::NoopPayloadTransactions; use reth_primitives_traits::{SealedHeader, TxTy}; use reth_provider::{ BlockReaderIdExt, ChainSpecProvider, HeaderProvider, NodePrimitivesProvider, ProviderError, - ProviderResult, StateProviderFactory, + ProviderResult, StateProvider, StateProviderFactory, }; use reth_revm::{State, database::StateProviderDatabase, witness::ExecutionWitnessRecord}; use reth_rpc_api::eth::helpers::FullEthApi; @@ -280,7 +280,7 @@ where .state_provider(BlockId::Hash(block.parent_hash().into())) .await .map_err(EthApiError::from)?; - let db = StateProviderDatabase::new(&state_provider); + let db = StateProviderDatabase::new((&state_provider).into_evm_state_provider()); let block_executor = this.eth_api.evm_config().executor(db); let mut witness = None; diff --git a/rust/op-reth/crates/rpc/src/engine.rs b/rust/op-reth/crates/rpc/src/engine.rs index 9608e86d554..5c06732739c 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:8d359d0 `reth_rpc_engine_api::capabilities::CAPABILITIES` +/// UPSTREAM-MIRROR(set): reth@rev:0447ceb `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:8d359d0 `reth_rpc_api::EngineApi` +/// UPSTREAM-MIRROR(set): reth@rev:0447ceb `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/memory_overlay.rs b/rust/op-reth/crates/rpc/src/eth/memory_overlay.rs new file mode 100644 index 00000000000..5c49dbb6e92 --- /dev/null +++ b/rust/op-reth/crates/rpc/src/eth/memory_overlay.rs @@ -0,0 +1,362 @@ +//! A state provider that layers executed blocks on a historical state provider. +//! +//! Vendored from reth v2.6.0's `crates/chain-state/src/memory_overlay.rs`, which +//! `paradigmxyz/reth#26923` removed in favour of the overlay manager. The pending state of a +//! speculative flashblock still needs it: see `pending_flashblock_state`. It is temporary: it can +//! go once the speculative chain reaches the RPC +//! () and reth lets us fold that chain +//! onto the anchor through its overlay manager +//! (). The trait impls are +//! unchanged, except that `canonical_hashes_range` no longer reserves capacity for the whole +//! requested range. The other changes fit it to this crate: import paths, crate-private visibility +//! and the lints that follow from it, and no default for the primitives type. +//! +//! UPSTREAM-MIRROR(port): reth@v2.6.0 `reth_chain_state::memory_overlay` + +use alloy_consensus::BlockHeader; +use alloy_primitives::{ + Address, B256, BlockNumber, Bytes, StorageKey, StorageValue, U256, keccak256, +}; +use reth_chain_state::ExecutedBlock; +use reth_errors::ProviderResult; +use reth_primitives_traits::{Account, Bytecode, NodePrimitives}; +use reth_storage_api::{ + AccountReader, BlockHashReader, BytecodeReader, HashedPostStateProvider, StateProofProvider, + StateProvider, StateProviderBox, StateRootProvider, StorageRootProvider, +}; +use reth_trie::{ + AccountProof, DecodedMultiProofV2, HashedPostState, HashedStorage, MultiProof, + MultiProofTargets, MultiProofTargetsV2, StorageMultiProof, TrieInput, updates::TrieUpdates, +}; +use revm::database::BundleState; +use std::{borrow::Cow, sync::OnceLock}; + +/// A state provider that stores references to in-memory blocks along with their state as well as a +/// reference of the historical state provider for fallback lookups. +pub(crate) struct MemoryOverlayStateProviderRef<'a, N: NodePrimitives> { + /// Historical state provider for state lookups that are not found in memory blocks. + pub(crate) historical: Box, + /// The collection of executed parent blocks. Expected order is newest to oldest. + pub(crate) in_memory: Cow<'a, [ExecutedBlock]>, + /// Lazy-loaded in-memory trie data. + pub(crate) trie_input: OnceLock, +} + +impl<'a, N: NodePrimitives> MemoryOverlayStateProviderRef<'a, N> { + /// Create new memory overlay state provider. + /// + /// ## Arguments + /// + /// - `in_memory` - the collection of executed ancestor blocks in reverse. + /// - `historical` - a historical state provider for the latest ancestor block stored in the + /// database. + #[cfg(test)] + pub(crate) fn new( + historical: Box, + in_memory: Vec>, + ) -> Self { + Self { historical, in_memory: Cow::Owned(in_memory), trie_input: OnceLock::new() } + } + + /// Return lazy-loaded trie state aggregated from in-memory blocks. + fn trie_input(&self) -> &TrieInput { + self.trie_input.get_or_init(|| { + let mut input = TrieInput::default(); + // Iterate from oldest to newest + for block in self.in_memory.iter().rev() { + let data = block.trie_data(); + input.nodes.extend_from_sorted(&data.sorted.trie_updates); + input.state.extend_from_sorted(&data.sorted.hashed_state); + } + input + }) + } + + fn merged_hashed_storage(&self, address: Address, storage: HashedStorage) -> HashedStorage { + let state = &self.trie_input().state; + let mut hashed = state.storages.get(&keccak256(address)).cloned().unwrap_or_default(); + hashed.extend(&storage); + hashed + } +} + +impl BlockHashReader for MemoryOverlayStateProviderRef<'_, N> { + fn block_hash(&self, number: BlockNumber) -> ProviderResult> { + for block in self.in_memory.iter() { + if block.recovered_block().number() == number { + return Ok(Some(block.recovered_block().hash())); + } + } + + self.historical.block_hash(number) + } + + fn canonical_hashes_range( + &self, + start: BlockNumber, + end: BlockNumber, + ) -> ProviderResult> { + let range = start..end; + let mut earliest_block_number = None; + // Upstream reserved `range.size_hint().0`, which overflows for a wide range although at + // most one hash per in-memory block is pushed. + let mut in_memory_hashes = Vec::with_capacity(self.in_memory.len()); + + // iterate in ascending order (oldest to newest = low to high) + for block in self.in_memory.iter() { + let block_num = block.recovered_block().number(); + if range.contains(&block_num) { + in_memory_hashes.push(block.recovered_block().hash()); + earliest_block_number = Some(block_num); + } + } + + // `self.in_memory` stores executed blocks in ascending order (oldest to newest). + // However, `in_memory_hashes` should be constructed in descending order (newest to oldest), + // so we reverse the vector after collecting the hashes. + in_memory_hashes.reverse(); + + let mut hashes = + self.historical.canonical_hashes_range(start, earliest_block_number.unwrap_or(end))?; + hashes.append(&mut in_memory_hashes); + Ok(hashes) + } +} + +impl AccountReader for MemoryOverlayStateProviderRef<'_, N> { + fn basic_account(&self, address: &Address) -> ProviderResult> { + for block in self.in_memory.iter() { + if let Some(account) = block.execution_output.account(address) { + return Ok(account); + } + } + + self.historical.basic_account(address) + } +} + +impl StateRootProvider for MemoryOverlayStateProviderRef<'_, N> { + fn state_root(&self, state: HashedPostState) -> ProviderResult { + self.state_root_from_nodes(TrieInput::from_state(state)) + } + + fn state_root_from_nodes(&self, mut input: TrieInput) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.historical.state_root_from_nodes(input) + } + + fn state_root_with_updates( + &self, + state: HashedPostState, + ) -> ProviderResult<(B256, TrieUpdates)> { + self.state_root_from_nodes_with_updates(TrieInput::from_state(state)) + } + + fn state_root_from_nodes_with_updates( + &self, + mut input: TrieInput, + ) -> ProviderResult<(B256, TrieUpdates)> { + input.prepend_self(self.trie_input().clone()); + self.historical.state_root_from_nodes_with_updates(input) + } +} + +impl StorageRootProvider for MemoryOverlayStateProviderRef<'_, N> { + // TODO: Currently this does not reuse available in-memory trie nodes. + fn storage_root(&self, address: Address, storage: HashedStorage) -> ProviderResult { + let merged = self.merged_hashed_storage(address, storage); + self.historical.storage_root(address, merged) + } + + // TODO: Currently this does not reuse available in-memory trie nodes. + fn storage_proof( + &self, + address: Address, + slot: B256, + storage: HashedStorage, + ) -> ProviderResult { + let merged = self.merged_hashed_storage(address, storage); + self.historical.storage_proof(address, slot, merged) + } + + // TODO: Currently this does not reuse available in-memory trie nodes. + fn storage_multiproof( + &self, + address: Address, + slots: &[B256], + storage: HashedStorage, + ) -> ProviderResult { + let merged = self.merged_hashed_storage(address, storage); + self.historical.storage_multiproof(address, slots, merged) + } +} + +impl StateProofProvider for MemoryOverlayStateProviderRef<'_, N> { + fn proof( + &self, + mut input: TrieInput, + address: Address, + slots: &[B256], + ) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.historical.proof(input, address, slots) + } + + fn multiproof( + &self, + mut input: TrieInput, + targets: MultiProofTargets, + ) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.historical.multiproof(input, targets) + } + + fn multiproof_v2( + &self, + mut input: TrieInput, + targets: MultiProofTargetsV2, + ) -> ProviderResult { + input.prepend_self(self.trie_input().clone()); + self.historical.multiproof_v2(input, targets) + } + + fn witness( + &self, + mut input: TrieInput, + target: HashedPostState, + mode: reth_trie::ExecutionWitnessMode, + ) -> ProviderResult> { + input.prepend_self(self.trie_input().clone()); + self.historical.witness(input, target, mode) + } +} + +impl HashedPostStateProvider for MemoryOverlayStateProviderRef<'_, N> { + fn hashed_post_state(&self, bundle_state: &BundleState) -> ProviderResult { + let mut hashed_state = self.historical.hashed_post_state(bundle_state)?; + + for (address, account) in bundle_state.state() { + // 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) + } +} + +impl StateProvider for MemoryOverlayStateProviderRef<'_, N> { + fn storage( + &self, + address: Address, + storage_key: StorageKey, + ) -> ProviderResult> { + for block in self.in_memory.iter() { + if let Some(value) = block.execution_output.storage(&address, storage_key.into()) { + return Ok(Some(value)); + } + } + + self.historical.storage(address, storage_key) + } +} + +impl BytecodeReader for MemoryOverlayStateProviderRef<'_, N> { + fn bytecode_by_hash(&self, code_hash: &B256) -> ProviderResult> { + for block in self.in_memory.iter() { + if let Some(contract) = block.execution_output.bytecode(code_hash) { + return Ok(Some(contract)); + } + } + + self.historical.bytecode_by_hash(code_hash) + } +} + +/// An owned state provider that stores references to in-memory blocks along with their state as +/// well as a reference of the historical state provider for fallback lookups. +pub(crate) struct MemoryOverlayStateProvider { + /// Historical state provider for state lookups that are not found in memory blocks. + pub(crate) historical: StateProviderBox, + /// The collection of executed parent blocks. Expected order is newest to oldest. + pub(crate) in_memory: Vec>, + /// Lazy-loaded in-memory trie data. + pub(crate) trie_input: OnceLock, +} + +impl MemoryOverlayStateProvider { + /// Create new memory overlay state provider. + /// + /// ## Arguments + /// + /// - `in_memory` - the collection of executed ancestor blocks in reverse. + /// - `historical` - a historical state provider for the latest ancestor block stored in the + /// database. + pub(crate) fn new(historical: StateProviderBox, in_memory: Vec>) -> Self { + Self { historical, in_memory, trie_input: OnceLock::new() } + } + + /// Returns a new provider that takes the `TX` as reference + #[inline(always)] + fn as_ref(&self) -> MemoryOverlayStateProviderRef<'_, N> { + MemoryOverlayStateProviderRef { + historical: Box::new(self.historical.as_ref()), + in_memory: Cow::Borrowed(&self.in_memory), + trie_input: self.trie_input.clone(), + } + } + + /// Wraps the [`Self`] in a `Box`. + pub(crate) fn boxed(self) -> StateProviderBox { + Box::new(self) + } +} + +// Delegates all provider impls to [`MemoryOverlayStateProviderRef`] +reth_storage_api::macros::delegate_provider_impls!(MemoryOverlayStateProvider where [N: NodePrimitives]); + +#[cfg(test)] +mod tests { + use super::*; + use reth_ethereum_primitives::EthPrimitives; + use reth_storage_api::noop::NoopProvider; + use revm::database::{AccountStatus, BundleAccount}; + + #[test] + fn created_and_destroyed_account_skips_in_memory_trie_aggregation() { + let address = Address::with_last_byte(1); + let provider = MemoryOverlayStateProviderRef::::new( + Box::new(NoopProvider::default()), + Vec::new(), + ); + let mut bundle_state = BundleState::default(); + bundle_state.state.insert( + address, + BundleAccount::new(None, None, Default::default(), AccountStatus::Destroyed), + ); + + provider.hashed_post_state(&bundle_state).unwrap(); + + assert!(provider.trie_input.get().is_none()); + } + + #[test] + fn canonical_hashes_range_does_not_allocate_for_the_whole_range() { + let provider = MemoryOverlayStateProviderRef::::new( + Box::new(NoopProvider::default()), + Vec::new(), + ); + + assert_eq!(provider.canonical_hashes_range(0, u64::MAX).unwrap(), Vec::::new()); + } +} diff --git a/rust/op-reth/crates/rpc/src/eth/mod.rs b/rust/op-reth/crates/rpc/src/eth/mod.rs index 5d404c2b8ea..1456c532420 100644 --- a/rust/op-reth/crates/rpc/src/eth/mod.rs +++ b/rust/op-reth/crates/rpc/src/eth/mod.rs @@ -8,6 +8,7 @@ pub mod transaction; mod block; mod call; +mod memory_overlay; mod pending_block; use crate::{ diff --git a/rust/op-reth/crates/rpc/src/eth/pending_block.rs b/rust/op-reth/crates/rpc/src/eth/pending_block.rs index 0c76edaca11..e2e6f0f3776 100644 --- a/rust/op-reth/crates/rpc/src/eth/pending_block.rs +++ b/rust/op-reth/crates/rpc/src/eth/pending_block.rs @@ -1,10 +1,10 @@ //! Loads OP pending block for a RPC response. -use crate::{OpEthApi, OpEthApiError}; +use crate::{OpEthApi, OpEthApiError, eth::memory_overlay::MemoryOverlayStateProvider}; use alloy_eips::BlockNumberOrTag; use alloy_primitives::B256; -use reth_chain_state::BlockState; use reth_optimism_flashblocks::PendingFlashBlock; +use reth_primitives_traits::NodePrimitives; use reth_rpc_eth_api::{ FromEvmError, RpcConvert, RpcNodeCore, RpcNodeCoreExt, helpers::{LoadPendingBlock, SpawnBlocking, pending_block::PendingEnvBuilder}, @@ -13,15 +13,56 @@ use reth_rpc_eth_types::{ EthApiError, PendingBlock, block::BlockAndReceipts, builder::config::PendingBlockKind, error::FromEthApiError, }; -use reth_storage_api::{BlockReaderIdExt, StateProviderBox, StateProviderFactory}; +use reth_storage_api::{ + BlockReaderIdExt, StateProviderBox, StateProviderFactory, errors::ProviderResult, +}; #[inline] -const fn pending_state_history_lookup_hash( +const fn pending_state_history_lookup_hash( pending_block: &PendingFlashBlock, ) -> B256 { pending_block.canonical_anchor_hash } +/// Returns the pending state: the tip's bundle on its canonical anchor's state. +/// +/// The sequencer streams flashblocks ahead of block import, so the flashblocks worker can build +/// past the canonical head. With canonical head N-1, it builds pending N on N-1, then speculative +/// N+1 on N, and so on, all anchored at N-1. A tip on the anchor, such as N, opens through reth's +/// `state_with_block_appended`. A speculative tip opens through the vendored +/// [`MemoryOverlayStateProvider`]: its bundle holds every write since the anchor, so account, +/// storage and code reads need only the tip. Block hash lookups are the exception: they see only +/// the tip, not the pending blocks before it. +/// +/// reth's `state_with_block_appended(parent_hash, block)` can't open a speculative tip such as N+1: +/// +/// - With N, it fails with `BlockHashNotFound`. N is in neither the database nor the overlay +/// manager, which holds only blocks the engine executed. +/// - With N-1, it panics on the `debug_assert` in `OverlayBuilder::with_appended_block` that the +/// hash is the header's parent. +/// +/// Appending the whole chain instead needs it at the RPC +/// () and reth access we lack: +/// `state_with_block_appended` takes one block, and `ProviderFactory::overlay_manager` is +/// crate-private. +fn pending_flashblock_state( + provider: &P, + pending_block: PendingFlashBlock, +) -> ProviderResult +where + N: NodePrimitives, + P: StateProviderFactory, +{ + let anchor = pending_state_history_lookup_hash(&pending_block); + let speculative = pending_block.pending.parent_hash() != anchor; + let tip = pending_block.pending.executed_block; + if !speculative { + return provider.state_with_block_appended(anchor, tip); + } + let anchor_historical = provider.history_by_block_hash(anchor)?; + Ok(MemoryOverlayStateProvider::new(anchor_historical, vec![tip]).boxed()) +} + impl LoadPendingBlock for OpEthApi where N: RpcNodeCore, @@ -43,6 +84,13 @@ where self.inner.eth_api.pending_block_kind() } + /// UPSTREAM-MIRROR(override): reth@rev:0447ceb + /// `reth_rpc_eth_api::helpers::pending_block::LoadPendingBlock::local_pending_state` + /// + /// Serves the flashblock pending state instead of the pool-built one. Keep upstream's blocking + /// discipline: callers await this on the async runtime, so the reads that open the state go + /// through `spawn_blocking_io`, as the default does. + /// /// Returns a [`StateProviderBox`] on a mem-pool built pending block overlaying latest. async fn local_pending_state(&self) -> Result, Self::Error> where @@ -51,15 +99,14 @@ where let Ok(Some(pending_block)) = self.pending_flashblock().await else { return Ok(None); }; - let canonical_anchor_hash = pending_state_history_lookup_hash(&pending_block); - let state = BlockState::from(pending_block.pending); - - let anchor_historical = self - .provider() - .history_by_block_hash(canonical_anchor_hash) - .map_err(Self::Error::from_eth_err)?; - - Ok(Some(Box::new(state.state_provider(anchor_historical)) as StateProviderBox)) + // Callers resolve pending state before taking a blocking thread, so the reads that open it + // take one here, as reth's default does. + self.spawn_blocking_io(move |this| { + pending_flashblock_state(this.provider(), pending_block) + .map(Some) + .map_err(Self::Error::from_eth_err) + }) + .await } /// Returns the locally built pending block @@ -81,20 +128,34 @@ where .get_block_and_receipts(latest.hash()) .await .map_err(Self::Error::from_eth_err)? - .map(|(block, receipts)| BlockAndReceipts { block, receipts }); + .map(|(block, receipts)| BlockAndReceipts::new(block, receipts)); Ok(latest) } } #[cfg(test)] mod tests { - use super::pending_state_history_lookup_hash; - use alloy_primitives::B256; + use super::{pending_flashblock_state, pending_state_history_lookup_hash}; + use alloy_consensus::Header; + use alloy_primitives::{Address, B256, U256}; use reth_chain_state::ExecutedBlock; + use reth_chainspec::MAINNET; + use reth_db_common::init::init_genesis; + use reth_ethereum_primitives::{Block, EthPrimitives}; + use reth_execution_types::BlockExecutionOutput; use reth_optimism_flashblocks::PendingFlashBlock; use reth_optimism_primitives::OpPrimitives; + use reth_primitives_traits::{RecoveredBlock, SealedBlock}; + use reth_provider::{providers::BlockchainProvider, test_utils::create_test_provider_factory}; use reth_rpc_eth_types::PendingBlock; - use std::time::Instant; + use reth_storage_api::{AccountReader, StateProvider, StateProviderFactory}; + use reth_trie::{ComputedTrieData, HashedPostState, KeccakKeyHasher}; + use revm::{ + database::{AccountStatus, BundleState}, + state::AccountInfo, + }; + use rstest::rstest; + use std::{sync::Arc, time::Instant}; #[test] fn pending_state_prefers_canonical_anchor_over_parent_hash() { @@ -116,4 +177,65 @@ mod tests { assert_eq!(pending_state_history_lookup_hash(&pending_flashblock), canonical_anchor_hash); } + + /// Builds `blocks` pending blocks on the canonical genesis and reads the tip's state the way + /// `local_pending_state` does: through reth's overlay for a tip on the anchor, through the + /// vendored one for a speculative tip. Block `n` sets the balance of account `n` to `n`, and + /// the first block also writes a storage slot and destroys a genesis account. As in the + /// flashblocks worker, a speculative tip's bundle holds every write since the anchor. + /// + /// These are spot checks that the speculative gap is bridged, not a parity suite against reth's + /// `OverlayStateProvider`: the vendored overlay is meant to go away (see its module doc). + #[rstest] + #[case::canonical(1)] + #[case::speculative(2)] + fn pending_flashblock_state_includes_every_pending_block(#[case] blocks: u64) { + let factory = create_test_provider_factory(); + let anchor = init_genesis(&factory).unwrap(); + let provider = BlockchainProvider::new(factory).unwrap(); + + let account = |number: u64| Address::with_last_byte(number as u8); + let destroyed = *MAINNET.genesis.alloc.keys().next().expect("mainnet genesis has accounts"); + assert!(provider.latest().unwrap().basic_account(&destroyed).unwrap().is_some()); + let (slot, value) = (U256::from(1), U256::from(42)); + + let mut bundle = BundleState::builder(1..=blocks) + .state_storage(account(1), std::iter::once((slot, (U256::ZERO, value))).collect()) + .state_original_account_info(destroyed, AccountInfo::default()); + let mut parent_hash = anchor; + let mut tip = None; + for number in 1..=blocks { + bundle = bundle.state_present_account_info( + account(number), + AccountInfo { balance: U256::from(number), ..Default::default() }, + ); + let header = Header { number, parent_hash, ..Default::default() }; + let block = SealedBlock::seal_slow(Block { header, body: Default::default() }); + parent_hash = block.hash(); + tip = Some(block); + } + let mut bundle = bundle.build(); + bundle.state.get_mut(&destroyed).expect("in the bundle").status = AccountStatus::Destroyed; + let hashed_state = HashedPostState::from_bundle_state::(bundle.state()); + let executed = ExecutedBlock::::new( + Arc::new(RecoveredBlock::new_sealed(tip.expect("at least one block"), Vec::new())), + Arc::new(BlockExecutionOutput { state: bundle, ..Default::default() }), + ComputedTrieData::new(Arc::new(hashed_state.into_sorted()), Arc::default()), + ); + let pending = PendingFlashBlock::new( + PendingBlock::with_executed_block(Instant::now(), executed), + anchor, + 0, + B256::ZERO, + false, + ); + + let state = pending_flashblock_state(&provider, pending).unwrap(); + for number in 1..=blocks { + let balance = state.basic_account(&account(number)).unwrap().map(|a| a.balance); + assert_eq!(balance, Some(U256::from(number)), "account {number}"); + } + assert_eq!(state.storage(account(1), B256::from(slot)).unwrap(), Some(value)); + assert_eq!(state.basic_account(&destroyed).unwrap(), None, "destroyed account"); + } } diff --git a/rust/op-reth/crates/rpc/src/eth/proofs.rs b/rust/op-reth/crates/rpc/src/eth/proofs.rs index 8f1cc5e93e9..02a1ff782b8 100644 --- a/rust/op-reth/crates/rpc/src/eth/proofs.rs +++ b/rust/op-reth/crates/rpc/src/eth/proofs.rs @@ -21,7 +21,7 @@ use reth_rpc_eth_types::EthApiError; /// The `eth_` proof methods served from the historical proofs storage. /// -/// UPSTREAM-MIRROR(set): reth@rev:8d359d0 `reth_rpc_eth_api::EthApi` +/// UPSTREAM-MIRROR(set): reth@rev:0447ceb `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 @@ -60,14 +60,18 @@ where Self { eth_api, preimage_store, metrics: EthApiExtMetrics::default() } } - /// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 + /// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_rpc_eth_api::helpers::state::EthState::get_proof` /// /// Uses the OP proofs-history state provider while preserving upstream permit and blocking-task /// behavior. Upstream's `ensure_within_proof_window` bounds the distance from the tip by /// `max_proof_window`; a proofs-history node instead serves its proofs storage window. Unlike /// upstream, which takes the permit first and then checks its window, this checks the window - /// before taking the permit, so out-of-window requests never wait for one. + /// before taking the permit, so out-of-window requests never wait for one. Upstream also + /// resolves the state before taking a blocking thread (`spawn_blocking_io_with_state`), as + /// opening the pending state takes one itself; this resolves it inside the task. That is safe + /// because `pending` never gets this far: reth sets no canonical pending block on an OP node, + /// so `ensure_within_proofs_window` rejects it with `HeaderNotFound` first. async fn get_proof_inner( &self, address: Address, diff --git a/rust/op-reth/crates/rpc/src/eth/transaction.rs b/rust/op-reth/crates/rpc/src/eth/transaction.rs index 56b7c183f6b..b5d1ff227e7 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:8d359d0 + /// UPSTREAM-MIRROR(override): reth@rev:0447ceb /// `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:8d359d0 + /// UPSTREAM-MIRROR(override): reth@rev:0447ceb /// `reth_rpc_eth_api::helpers::EthTransactions::transaction_receipt` /// /// Extends the upstream default with a flashblock receipt lookup. @@ -208,7 +208,7 @@ where OpEthApiError: FromEvmError, Rpc: RpcConvert, { - /// UPSTREAM-MIRROR(override): reth@rev:8d359d0 + /// UPSTREAM-MIRROR(override): reth@rev:0447ceb /// `reth_rpc_eth_api::helpers::LoadTransaction::transaction_by_hash` /// /// Inserts a flashblock lookup between upstream's disk and pool lookups, and does not diff --git a/rust/op-reth/crates/rpc/src/state.rs b/rust/op-reth/crates/rpc/src/state.rs index 577efa78508..1a57f194608 100644 --- a/rust/op-reth/crates/rpc/src/state.rs +++ b/rust/op-reth/crates/rpc/src/state.rs @@ -47,7 +47,7 @@ where /// Resolves `block_id` to a canonical block number inside the proofs storage window. /// -/// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_rpc_eth_api::helpers::state::EthState::ensure_within_proof_window` /// /// Stands in for upstream's check in the historical `eth_getProof` path. Both resolve the block diff --git a/rust/op-reth/crates/rpc/src/witness.rs b/rust/op-reth/crates/rpc/src/witness.rs index c99f9b4169a..42ce5e631e3 100644 --- a/rust/op-reth/crates/rpc/src/witness.rs +++ b/rust/op-reth/crates/rpc/src/witness.rs @@ -41,7 +41,8 @@ pub trait DebugExecutionWitnessApi { ) -> RpcResult; } use reth_storage_api::{ - BlockReaderIdExt, NodePrimitivesProvider, StateProviderFactory, TransactionVariant, + BlockReaderIdExt, NodePrimitivesProvider, StateProvider, StateProviderFactory, + TransactionVariant, errors::{ProviderError, ProviderResult}, }; use reth_tasks::Runtime; @@ -146,17 +147,17 @@ impl DebugExecutionWitnessApiServer where Pool: TransactionPool< - Transaction: OpPooledTx::SignedTx>, + Transaction: OpPooledTx::Primitives as NodePrimitives>::SignedTx>, > + 'static, - Provider: BlockReaderIdExt
::BlockHeader> + Provider: BlockReaderIdExt
::Primitives as NodePrimitives>::BlockHeader> + NodePrimitivesProvider + StateProviderFactory + ChainSpecProvider + Clone + 'static, - ::SignedTx: From>, + <::Primitives as NodePrimitives>::SignedTx: From>, EvmConfig: ConfigurePostExecEvm< - Primitives = Provider::Primitives, + Primitives = ::Primitives, NextBlockEnvCtx: BuildNextEnv, > + 'static, Attrs: OpAttributes, RpcPayloadAttributes: Send>, @@ -187,35 +188,35 @@ where impl OpDebugPostExecApiServer for OpDebugWitnessApi where - Provider::Primitives: OpPayloadPrimitives + ::Primitives: OpPayloadPrimitives + NodePrimitives< Block = AlloyBlock< - ::_TX, - ::_Header, + <::Primitives as OpPayloadPrimitives>::_TX, + <::Primitives as OpPayloadPrimitives>::_Header, >, BlockBody = alloy_consensus::BlockBody< - ::_TX, - ::_Header, + <::Primitives as OpPayloadPrimitives>::_TX, + <::Primitives as OpPayloadPrimitives>::_Header, >, - BlockHeader = ::_Header, - SignedTx = ::_TX, + BlockHeader = <::Primitives as OpPayloadPrimitives>::_Header, + SignedTx = <::Primitives as OpPayloadPrimitives>::_TX, >, Pool: TransactionPool< - Transaction: OpPooledTx::SignedTx>, + Transaction: OpPooledTx::Primitives as NodePrimitives>::SignedTx>, > + 'static, Provider: BlockReaderIdExt< Block = AlloyBlock< - ::_TX, - ::_Header, + <::Primitives as OpPayloadPrimitives>::_TX, + <::Primitives as OpPayloadPrimitives>::_Header, >, - Header = ::BlockHeader, + Header = <::Primitives as NodePrimitives>::BlockHeader, > + NodePrimitivesProvider + StateProviderFactory + ChainSpecProvider + Clone + 'static, EvmConfig: ConfigurePostExecEvm< - Primitives = Provider::Primitives, + Primitives = ::Primitives, NextBlockEnvCtx: BuildNextEnv, > + Clone + 'static, @@ -239,7 +240,7 @@ where .provider .state_by_block_hash(block.header().parent_hash()) .to_rpc_result()?; - let db = StateProviderDatabase::new(&state_provider); + let db = StateProviderDatabase::new((&state_provider).into_evm_state_provider()); replay_block(&this.inner.evm_config, db, &block, config) .map_err(|err| internal_rpc_err(err.to_string())) }; diff --git a/rust/op-reth/crates/trie/src/backfill/tests.rs b/rust/op-reth/crates/trie/src/backfill/tests.rs index c82438f4d48..b05616f3b3f 100644 --- a/rust/op-reth/crates/trie/src/backfill/tests.rs +++ b/rust/op-reth/crates/trie/src/backfill/tests.rs @@ -25,8 +25,9 @@ use reth_db_common::init::init_genesis; use reth_evm::{ConfigureEvm, execute::Executor}; use reth_evm_ethereum::EthEvmConfig; use reth_provider::{ - DatabaseProviderFactory, HashedPostStateProvider, LatestStateProviderRef, StateRootProvider, - StorageSettingsCache, test_utils::create_test_provider_factory_with_chain_spec, + DatabaseProviderFactory, HashedPostStateProvider, LatestStateProviderRef, StateProvider, + StateRootProvider, StorageSettingsCache, + test_utils::create_test_provider_factory_with_chain_spec, }; use reth_revm::database::StateProviderDatabase; use reth_trie::{HashedPostState, StateRoot}; @@ -208,7 +209,9 @@ fn backfill_then_forward_write_preserves_state_roots() { // updates + hashed post-state needed to build a `BlockStateDiff`. let (exec, hashed_state, trie_updates) = { let provider = provider_factory.provider().unwrap(); - let db = StateProviderDatabase::new(LatestStateProviderRef::new(&provider)); + let db = StateProviderDatabase::new( + LatestStateProviderRef::new(&provider).into_evm_state_provider(), + ); let evm_config = EthEvmConfig::ethereum(chain_spec.clone()); let block_executor = evm_config.batch_executor(db); let exec = block_executor.execute(&block).unwrap(); diff --git a/rust/op-reth/crates/trie/src/db/store/metrics.rs b/rust/op-reth/crates/trie/src/db/store/metrics.rs index d142fbc2d31..8a95cd08a89 100644 --- a/rust/op-reth/crates/trie/src/db/store/metrics.rs +++ b/rust/op-reth/crates/trie/src/db/store/metrics.rs @@ -9,7 +9,7 @@ use metrics::{Label, gauge}; use reth_db::Database; use tracing::error; -/// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_db::database_metrics::DatabaseMetrics` /// /// Mirrors the implementation for `DatabaseEnv`, which hard-codes reth's own table names. 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 ffe8fca2874..486de23b230 100644 --- a/rust/op-reth/crates/trie/src/engine/buffer/overlay.rs +++ b/rust/op-reth/crates/trie/src/engine/buffer/overlay.rs @@ -286,10 +286,13 @@ impl<'a, P> HashedPostStateProvider for MemoryOverlayOpProofsStateProviderRef<'a where P: OpProofsProviderRO + Clone, { - /// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 + /// UPSTREAM-MIRROR(port): reth@v2.6.0 /// `reth_chain_state::MemoryOverlayStateProviderRef::hashed_post_state` /// - /// Uses the OP proofs-buffer trie input instead of upstream's executed-block overlay. + /// Uses the OP proofs-buffer trie input instead of upstream's executed-block overlay. Upstream + /// removed the original in `paradigmxyz/reth#26923`; its successor, + /// `OverlayStateProvider::hashed_post_state`, zeroes destroyed storage through a database and + /// overlay cursor instead, so there is nothing left to re-diff. fn hashed_post_state(&self, bundle_state: &BundleState) -> ProviderResult { let mut hashed_state = self.inner.hashed_post_state(bundle_state)?; diff --git a/rust/op-reth/crates/trie/src/engine/tasks/execute_block.rs b/rust/op-reth/crates/trie/src/engine/tasks/execute_block.rs index c67f7bf3856..c1b7bb4efa7 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 @@ -10,7 +10,7 @@ use reth_evm::{ConfigureEvm, execute::Executor}; use reth_primitives_traits::{AlloyBlockHeader, BlockBody, NodePrimitives, RecoveredBlock}; use reth_provider::{ BlockHashReader, BlockReader, DatabaseProviderFactory, HashedPostStateProvider, - StageCheckpointReader, StateRootProvider, + StageCheckpointReader, StateProvider, StateRootProvider, }; use reth_revm::database::StateProviderDatabase; use reth_trie_common::EMPTY_ROOT_HASH; @@ -114,7 +114,7 @@ where ); let state_provider = state.memory.state_provider(block.parent_hash(), inner_provider); - let db = StateProviderDatabase::new(&state_provider); + let db = StateProviderDatabase::new((&state_provider).into_evm_state_provider()); let block_executor = state.evm_config.batch_executor(db); let execution_result = block_executor.execute(block)?; let execution_duration = start.elapsed(); diff --git a/rust/op-reth/crates/trie/src/initialize.rs b/rust/op-reth/crates/trie/src/initialize.rs index 6391d797ac2..25a605ebf9a 100644 --- a/rust/op-reth/crates/trie/src/initialize.rs +++ b/rust/op-reth/crates/trie/src/initialize.rs @@ -32,7 +32,7 @@ const INITIALIZE_LOG_THRESHOLD: usize = 100000; /// Metadata key under which reth records a partial state trie repair unwind in progress. /// -/// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 +/// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_node_builder::launch::common::PARTIAL_STATE_TRIE_UNWIND_METADATA_KEY` /// /// Private upstream; only its presence is read here, not the marker's contents. diff --git a/rust/op-reth/crates/trie/src/provider.rs b/rust/op-reth/crates/trie/src/provider.rs index 6dc7e525372..93d41d3f35a 100644 --- a/rust/op-reth/crates/trie/src/provider.rs +++ b/rust/op-reth/crates/trie/src/provider.rs @@ -229,7 +229,7 @@ impl<'a, P> HashedPostStateProvider for OpProofsStateProviderRef<'a, P> where P: OpProofsProviderRO + Clone, { - /// UPSTREAM-MIRROR(copy): reth@rev:8d359d0 + /// UPSTREAM-MIRROR(copy): reth@rev:0447ceb /// `reth_provider::LatestStateProviderRef::hashed_post_state` /// /// Mirrors the hashing/zeroing sequence, using historical OP proofs cursors instead of diff --git a/rust/op-reth/crates/trie/src/test_utils.rs b/rust/op-reth/crates/trie/src/test_utils.rs index a69f2816318..dfd97052746 100644 --- a/rust/op-reth/crates/trie/src/test_utils.rs +++ b/rust/op-reth/crates/trie/src/test_utils.rs @@ -22,8 +22,8 @@ use reth_node_api::{NodePrimitives, NodeTypesWithDB}; use reth_primitives_traits::{AlloyBlockHeader, Block as _, RecoveredBlock}; use reth_provider::{ BlockWriter as _, ExecutionOutcome, HashedPostStateProvider, LatestStateProviderRef, - ProviderFactory, StateRootProvider, StorageSettingsCache, providers::ProviderNodeTypes, - test_utils::create_test_provider_factory_with_chain_spec, + ProviderFactory, StateProvider, StateRootProvider, StorageSettingsCache, + providers::ProviderNodeTypes, test_utils::create_test_provider_factory_with_chain_spec, }; use reth_revm::database::StateProviderDatabase; use secp256k1::{Keypair, Secp256k1, SecretKey}; @@ -150,7 +150,9 @@ where > + NodeTypesWithDB, { let provider = provider_factory.provider().unwrap(); - let db = StateProviderDatabase::new(LatestStateProviderRef::new(&provider)); + let db = StateProviderDatabase::new( + LatestStateProviderRef::new(&provider).into_evm_state_provider(), + ); let evm_config = EthEvmConfig::ethereum(chain_spec.clone()); let block_executor = evm_config.batch_executor(db); let execution_result = block_executor.execute(block).unwrap(); diff --git a/rust/op-reth/crates/trie/tests/live.rs b/rust/op-reth/crates/trie/tests/live.rs index 26acd703190..ffae8ce520a 100644 --- a/rust/op-reth/crates/trie/tests/live.rs +++ b/rust/op-reth/crates/trie/tests/live.rs @@ -20,7 +20,7 @@ use reth_optimism_trie::{ use reth_primitives_traits::{Block as _, RecoveredBlock}; use reth_provider::{ BlockWriter as _, ExecutionOutcome, HashedPostStateProvider, LatestStateProviderRef, - ProviderFactory, StateRootProvider, StorageSettingsCache, + ProviderFactory, StateProvider, StateRootProvider, StorageSettingsCache, providers::{BlockchainProvider, ProviderNodeTypes}, test_utils::create_test_provider_factory_with_chain_spec, }; @@ -182,7 +182,9 @@ where > + NodeTypesWithDB, { let provider = provider_factory.provider()?; - let db = StateProviderDatabase::new(LatestStateProviderRef::new(&provider)); + let db = StateProviderDatabase::new( + LatestStateProviderRef::new(&provider).into_evm_state_provider(), + ); let evm_config = EthEvmConfig::ethereum(chain_spec.clone()); let block_executor = evm_config.batch_executor(db); diff --git a/rust/op-reth/crates/txpool/src/validator.rs b/rust/op-reth/crates/txpool/src/validator.rs index 4c5e30e5468..a290671bece 100644 --- a/rust/op-reth/crates/txpool/src/validator.rs +++ b/rust/op-reth/crates/txpool/src/validator.rs @@ -456,7 +456,7 @@ where } } -/// UPSTREAM-MIRROR(delegate): reth@rev:8d359d0 +/// UPSTREAM-MIRROR(delegate): reth@rev:0447ceb /// `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 66064ccb983..a3006fd109a 100644 --- a/rust/op-revm/src/api/exec.rs +++ b/rust/op-revm/src/api/exec.rs @@ -48,7 +48,7 @@ impl OpContextTr for T where /// Type alias for the error type of the `OpEvm`. pub type OpError = EVMError<<::Db as Database>::Error, OpTransactionError>; -/// UPSTREAM-MIRROR(copy): revm-handler@43.0.2 `revm_handler::api::ExecuteEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 `revm_handler::api::ExecuteEvm` /// /// Copies upstream's `ExecuteEvm` implementation with `OpHandler` substituted for /// `MainnetHandler`. Re-diff the bodies when the upstream implementation changes. @@ -95,7 +95,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-handler@43.0.2 `revm_handler::api::ExecuteCommitEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 `revm_handler::api::ExecuteCommitEvm` /// /// Copies the upstream commit implementation for the OP EVM. impl ExecuteCommitEvm @@ -109,7 +109,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.2 `revm_inspector::mainnet_inspect::InspectEvm` +/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.3 `revm_inspector::mainnet_inspect::InspectEvm` /// /// Copies the upstream inspector implementation with `OpHandler`. impl InspectEvm @@ -132,7 +132,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.2 `revm_inspector::mainnet_inspect::InspectCommitEvm` +/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.3 `revm_inspector::mainnet_inspect::InspectCommitEvm` /// /// Mirrors the upstream marker implementation for inspector commits. impl InspectCommitEvm @@ -144,7 +144,7 @@ where { } -/// UPSTREAM-MIRROR(copy): revm-handler@43.0.2 `revm_handler::system_call::SystemCallEvm` +/// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 `revm_handler::system_call::SystemCallEvm` /// /// Copies upstream system-call setup with `OpHandler`. impl SystemCallEvm @@ -169,7 +169,7 @@ where } } -/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.2 +/// UPSTREAM-MIRROR(copy): revm-inspector@43.0.3 /// `revm_inspector::mainnet_inspect::InspectSystemCallEvm` /// /// Copies upstream inspected system-call setup with `OpHandler`. diff --git a/rust/op-revm/src/evm.rs b/rust/op-revm/src/evm.rs index 9d6bf727473..ba0e45da967 100644 --- a/rust/op-revm/src/evm.rs +++ b/rust/op-revm/src/evm.rs @@ -63,7 +63,7 @@ impl OpEvm { } } -/// UPSTREAM-MIRROR(delegate): revm-inspector@43.0.2 `revm_inspector::InspectorEvmTr` +/// UPSTREAM-MIRROR(delegate): revm-inspector@43.0.3 `revm_inspector::InspectorEvmTr` /// /// Forwards inspector EVM access to the inner mainnet-shaped EVM. impl InspectorEvmTr for OpEvm @@ -102,7 +102,7 @@ where } } -/// UPSTREAM-MIRROR(delegate): revm-handler@43.0.2 `revm_handler::EvmTr` +/// UPSTREAM-MIRROR(delegate): revm-handler@43.0.3 `revm_handler::EvmTr` /// /// Forwards selected EVM operations to the inner EVM. Re-check newly defaulted methods and /// upstream overrides that this wrapper would otherwise miss. diff --git a/rust/op-revm/src/handler.rs b/rust/op-revm/src/handler.rs index 1a56dda37e6..c743dd26e3b 100644 --- a/rust/op-revm/src/handler.rs +++ b/rust/op-revm/src/handler.rs @@ -80,7 +80,7 @@ where type Error = ERROR; type HaltReason = OpHaltReason; - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 `revm_handler::Handler::validate_env` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::validate_env` /// /// Deposits return before `validation::validate_env`; non-deposits add the /// `enveloped_tx` requirement and then delegate. Re-check changes to the upstream @@ -110,10 +110,10 @@ where self.mainnet.validate_env(evm) } - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 /// `revm_handler::Handler::validate_against_state_and_deduct_caller` /// - /// UPSTREAM-MIRROR(copy): revm-handler@43.0.2 + /// UPSTREAM-MIRROR(copy): revm-handler@43.0.3 /// `revm_handler::pre_execution::validate_against_state_and_deduct_caller` /// /// The non-deposit arm copies the upstream helper with the L1-fee deduction inserted @@ -199,7 +199,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 `revm_handler::Handler::tx_gas` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::tx_gas` /// /// Deposits are force-included from L1 and are exempt from EIP-7825's per-transaction gas /// limit cap (), so @@ -221,7 +221,7 @@ where GasTracker::new(tx_gas_limit, remaining, reservoir) } - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 `revm_handler::Handler::last_frame_result` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::last_frame_result` /// /// Structure and comments are taken verbatim from the upstream default: the frame is /// settled into the transaction-level gas exactly as upstream does, and the @@ -299,7 +299,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 `revm_handler::Handler::reimburse_caller` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::reimburse_caller` /// /// Delegates to upstream `post_execution::reimburse_caller`, adding the operator-fee /// refund for non-deposits. Re-check that the upstream helper's signature and semantics @@ -321,7 +321,7 @@ where reimburse_caller(evm.ctx(), frame_result.gas(), additional_refund).map_err(From::from) } - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 `revm_handler::Handler::refund` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::refund` /// /// Same as upstream except that pre-Regolith deposits get no refund at all. fn refund( @@ -346,7 +346,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 `revm_handler::Handler::reward_beneficiary` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::reward_beneficiary` /// /// Returns early for deposits, otherwise calls the upstream implementation and then pays /// the three OP vaults. Re-check on any change to how upstream computes the beneficiary @@ -400,7 +400,7 @@ where Ok(()) } - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 `revm_handler::Handler::execution_result` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::execution_result` /// /// Reproduces the upstream teardown (`take_error`, `post_execution::output`, `commit_tx`, /// clearing local state and the frame stack) with the post-Regolith halted-deposit @@ -433,7 +433,7 @@ where Ok(exec_result) } - /// UPSTREAM-MIRROR(override): revm-handler@43.0.2 `revm_handler::Handler::catch_error` + /// UPSTREAM-MIRROR(override): revm-handler@43.0.3 `revm_handler::Handler::catch_error` /// /// Re-derive upstream error-path cleanup, currently `journal.discard_tx()`, /// when the default or journal semantics change. diff --git a/rust/op-revm/src/precompiles.rs b/rust/op-revm/src/precompiles.rs index 357f70ced8b..96a4322403e 100644 --- a/rust/op-revm/src/precompiles.rs +++ b/rust/op-revm/src/precompiles.rs @@ -49,7 +49,7 @@ impl OpPrecompiles { } } -/// UPSTREAM-MIRROR(set): revm-precompile@43.0.2 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Fjord extends the upstream Cancun set with P256 verification. Re-check the /// inherited address set and gas parameters on each bump. @@ -64,7 +64,7 @@ pub fn fjord() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@43.0.2 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Granite replaces the inherited pairing implementation. /// Returns precompiles for Granite spec. @@ -78,7 +78,7 @@ pub fn granite() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@43.0.2 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Isthmus extends the inherited set with Prague BLS precompiles and OP pricing. /// Returns precompiles for isthmus spec. @@ -98,7 +98,7 @@ pub fn isthmus() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@43.0.2 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Karst replaces the inherited Osaka-sensitive precompiles. /// Returns precompiles for karst spec. @@ -118,7 +118,7 @@ pub fn karst() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@43.0.2 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Lagoon replaces the BLS12-381 MSM and pairing precompiles with lower input limits. /// Returns precompiles for lagoon spec. @@ -135,7 +135,7 @@ pub fn lagoon() -> &'static Precompiles { }) } -/// UPSTREAM-MIRROR(set): revm-precompile@43.0.2 `revm_precompile::Precompiles` +/// UPSTREAM-MIRROR(set): revm-precompile@43.0.3 `revm_precompile::Precompiles` /// /// Jovian replaces variable-input precompiles in the inherited set. /// Returns precompiles for jovian spec. diff --git a/rust/op-revm/src/transaction/abstraction.rs b/rust/op-revm/src/transaction/abstraction.rs index af60e02ad58..3c332c68083 100644 --- a/rust/op-revm/src/transaction/abstraction.rs +++ b/rust/op-revm/src/transaction/abstraction.rs @@ -95,7 +95,7 @@ impl SystemCallTx for OpTransaction { } } -/// UPSTREAM-MIRROR(delegate): revm-context-interface@43.0.1 `revm_context_interface::Transaction` +/// UPSTREAM-MIRROR(delegate): revm-context-interface@43.0.2 `revm_context_interface::Transaction` /// /// Forwards the primitive getters to `self.base` and overrides `tx_type` and /// `effective_gas_price` for deposits. Everything not listed here inherits the upstream