diff --git a/Cargo.lock b/Cargo.lock index 61532327d9..1d7420fdfc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -342,9 +342,9 @@ dependencies = [ [[package]] name = "alloy-evm" -version = "0.29.2" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cb6ba2dafd6327f78f2b59ae539bd5c39c57a01dc76763e92942619d934a7bb" +checksum = "e13146597a586a4166ac31b192883e08c044272d6b8c43de231ee1f43dd9a115" dependencies = [ "alloy-consensus", "alloy-eips", @@ -355,8 +355,6 @@ dependencies = [ "alloy-sol-types", "auto_impl", "derive_more", - "op-alloy", - "op-revm", "revm", "thiserror 2.0.18", "tracing", @@ -6324,121 +6322,6 @@ version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" -[[package]] -name = "op-alloy" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a95dd0974d5e60ffe9342a70cc0033d299244fab01cb16a958eb7352ddba1fa7" -dependencies = [ - "op-alloy-consensus", - "op-alloy-network", - "op-alloy-provider", - "op-alloy-rpc-types", - "op-alloy-rpc-types-engine", -] - -[[package]] -name = "op-alloy-consensus" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fadcb964b0aa645d12e952d470c7585d23286d8bcf1ac41589410b6724216b68" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-eth", - "alloy-serde", - "derive_more", - "serde", - "serde_with", - "thiserror 2.0.18", -] - -[[package]] -name = "op-alloy-network" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ea44162d493219cc678aaca1253d46c3aa73aa361326dfa9d406f086dfa135" -dependencies = [ - "alloy-consensus", - "alloy-network", - "alloy-primitives", - "alloy-provider", - "alloy-rpc-types-eth", - "alloy-signer", - "op-alloy-consensus", - "op-alloy-rpc-types", -] - -[[package]] -name = "op-alloy-provider" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83aa8dc34bdf077c8e6d48ff75beff4ac14b428d982c9722483ccd7473c0e114" -dependencies = [ - "alloy-network", - "alloy-primitives", - "alloy-provider", - "alloy-rpc-types-engine", - "alloy-transport", - "async-trait", - "op-alloy-rpc-types-engine", -] - -[[package]] -name = "op-alloy-rpc-types" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be9d16ec9f7810e0623a37edc293d1c05fe9c58a5647f6973fdd93e0b4795015" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-network-primitives", - "alloy-primitives", - "alloy-rpc-types-eth", - "alloy-serde", - "derive_more", - "op-alloy-consensus", - "serde", - "serde_json", - "thiserror 2.0.18", -] - -[[package]] -name = "op-alloy-rpc-types-engine" -version = "0.24.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c0ac5c5ddcbffadcd097d278c717d34849bcc629f6e4f8514eb000ec862def8" -dependencies = [ - "alloy-consensus", - "alloy-eips", - "alloy-primitives", - "alloy-rlp", - "alloy-rpc-types-engine", - "alloy-serde", - "derive_more", - "ethereum_ssz 0.9.1", - "ethereum_ssz_derive 0.9.1", - "op-alloy-consensus", - "serde", - "sha2 0.10.9", - "snap", - "thiserror 2.0.18", -] - -[[package]] -name = "op-revm" -version = "17.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a98f3a512a7e02a1dcf1242b57302d83657b265a665d50ad98d0b158efaf2c" -dependencies = [ - "auto_impl", - "revm", - "serde", -] - [[package]] name = "opaque-debug" version = "0.3.1" @@ -7726,7 +7609,7 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" [[package]] name = "reth-basic-payload-builder" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7735,6 +7618,7 @@ dependencies = [ "futures-util", "metrics", "reth-chain-state", + "reth-execution-cache", "reth-metrics", "reth-payload-builder", "reth-payload-builder-primitives", @@ -7743,6 +7627,7 @@ dependencies = [ "reth-revm", "reth-storage-api", "reth-tasks", + "reth-trie-parallel", "serde", "tokio", "tracing", @@ -7751,7 +7636,7 @@ dependencies = [ [[package]] name = "reth-chain-state" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -7783,7 +7668,7 @@ dependencies = [ [[package]] name = "reth-chainspec" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-chains", "alloy-consensus", @@ -7803,7 +7688,7 @@ dependencies = [ [[package]] name = "reth-cli" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-genesis", "clap", @@ -7816,7 +7701,7 @@ dependencies = [ [[package]] name = "reth-cli-commands" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-chains", "alloy-consensus", @@ -7899,7 +7784,7 @@ dependencies = [ [[package]] name = "reth-cli-runner" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "reth-tasks", "tokio", @@ -7909,7 +7794,7 @@ dependencies = [ [[package]] name = "reth-cli-util" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-primitives", @@ -7962,7 +7847,7 @@ dependencies = [ [[package]] name = "reth-config" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "eyre", "humantime-serde", @@ -7978,7 +7863,7 @@ dependencies = [ [[package]] name = "reth-consensus" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -7991,7 +7876,7 @@ dependencies = [ [[package]] name = "reth-consensus-common" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8004,7 +7889,7 @@ dependencies = [ [[package]] name = "reth-consensus-debug-client" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8030,7 +7915,7 @@ dependencies = [ [[package]] name = "reth-db" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "derive_more", @@ -8058,7 +7943,7 @@ dependencies = [ [[package]] name = "reth-db-api" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8084,7 +7969,7 @@ dependencies = [ [[package]] name = "reth-db-common" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-genesis", @@ -8114,7 +7999,7 @@ dependencies = [ [[package]] name = "reth-db-models" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8129,7 +8014,7 @@ dependencies = [ [[package]] name = "reth-discv4" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8154,7 +8039,7 @@ dependencies = [ [[package]] name = "reth-discv5" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -8178,7 +8063,7 @@ dependencies = [ [[package]] name = "reth-dns-discovery" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "dashmap", @@ -8202,7 +8087,7 @@ dependencies = [ [[package]] name = "reth-downloaders" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8237,7 +8122,7 @@ dependencies = [ [[package]] name = "reth-e2e-test-utils" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8294,7 +8179,7 @@ dependencies = [ [[package]] name = "reth-ecies" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "aes", "alloy-primitives", @@ -8322,7 +8207,7 @@ dependencies = [ [[package]] name = "reth-engine-local" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8345,7 +8230,7 @@ dependencies = [ [[package]] name = "reth-engine-primitives" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8370,7 +8255,7 @@ dependencies = [ [[package]] name = "reth-engine-tree" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eip7928", @@ -8427,7 +8312,7 @@ dependencies = [ [[package]] name = "reth-engine-util" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -8455,7 +8340,7 @@ dependencies = [ [[package]] name = "reth-era" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8470,7 +8355,7 @@ dependencies = [ [[package]] name = "reth-era-downloader" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "bytes", @@ -8486,7 +8371,7 @@ dependencies = [ [[package]] name = "reth-era-utils" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8508,7 +8393,7 @@ dependencies = [ [[package]] name = "reth-errors" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "reth-consensus", "reth-execution-errors", @@ -8519,7 +8404,7 @@ dependencies = [ [[package]] name = "reth-eth-wire" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-chains", "alloy-primitives", @@ -8547,7 +8432,7 @@ dependencies = [ [[package]] name = "reth-eth-wire-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-chains", "alloy-consensus", @@ -8568,7 +8453,7 @@ dependencies = [ [[package]] name = "reth-ethereum" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-rpc-types-engine", "alloy-rpc-types-eth", @@ -8609,7 +8494,7 @@ dependencies = [ [[package]] name = "reth-ethereum-cli" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "clap", "eyre", @@ -8632,7 +8517,7 @@ dependencies = [ [[package]] name = "reth-ethereum-consensus" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8648,7 +8533,7 @@ dependencies = [ [[package]] name = "reth-ethereum-engine-primitives" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8664,7 +8549,7 @@ dependencies = [ [[package]] name = "reth-ethereum-forks" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eip2124", "alloy-hardforks", @@ -8677,7 +8562,7 @@ dependencies = [ [[package]] name = "reth-ethereum-payload-builder" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8691,6 +8576,7 @@ dependencies = [ "reth-ethereum-primitives", "reth-evm", "reth-evm-ethereum", + "reth-execution-cache", "reth-payload-builder", "reth-payload-builder-primitives", "reth-payload-primitives", @@ -8706,7 +8592,7 @@ dependencies = [ [[package]] name = "reth-ethereum-primitives" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8720,7 +8606,7 @@ dependencies = [ [[package]] name = "reth-etl" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "rayon", "reth-db-api", @@ -8730,7 +8616,7 @@ dependencies = [ [[package]] name = "reth-evm" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8754,7 +8640,7 @@ dependencies = [ [[package]] name = "reth-evm-ethereum" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8774,7 +8660,7 @@ dependencies = [ [[package]] name = "reth-execution-cache" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "fixed-cache", @@ -8792,7 +8678,7 @@ dependencies = [ [[package]] name = "reth-execution-errors" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-evm", "alloy-primitives", @@ -8805,7 +8691,7 @@ dependencies = [ [[package]] name = "reth-execution-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8824,7 +8710,7 @@ dependencies = [ [[package]] name = "reth-exex" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -8862,7 +8748,7 @@ dependencies = [ [[package]] name = "reth-exex-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-primitives", @@ -8876,7 +8762,7 @@ dependencies = [ [[package]] name = "reth-fs-util" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "serde", "serde_json", @@ -8886,7 +8772,7 @@ dependencies = [ [[package]] name = "reth-invalid-block-hooks" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -8914,7 +8800,7 @@ dependencies = [ [[package]] name = "reth-ipc" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "bytes", "futures", @@ -8934,7 +8820,7 @@ dependencies = [ [[package]] name = "reth-libmdbx" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "bitflags 2.11.0", "byteorder", @@ -8951,7 +8837,7 @@ dependencies = [ [[package]] name = "reth-mdbx-sys" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "bindgen", "cc", @@ -8960,7 +8846,7 @@ dependencies = [ [[package]] name = "reth-metrics" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "futures", "metrics", @@ -8972,7 +8858,7 @@ dependencies = [ [[package]] name = "reth-net-banlist" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "ipnet", @@ -8981,7 +8867,7 @@ dependencies = [ [[package]] name = "reth-net-nat" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "futures-util", "if-addrs", @@ -8995,7 +8881,7 @@ dependencies = [ [[package]] name = "reth-network" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9052,7 +8938,7 @@ dependencies = [ [[package]] name = "reth-network-api" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -9077,7 +8963,7 @@ dependencies = [ [[package]] name = "reth-network-p2p" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9100,7 +8986,7 @@ dependencies = [ [[package]] name = "reth-network-peers" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "alloy-rlp", @@ -9115,7 +9001,7 @@ dependencies = [ [[package]] name = "reth-network-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eip2124", "humantime-serde", @@ -9129,7 +9015,7 @@ dependencies = [ [[package]] name = "reth-nippy-jar" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "anyhow", "bincode", @@ -9146,7 +9032,7 @@ dependencies = [ [[package]] name = "reth-node-api" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-rpc-types-engine", "eyre", @@ -9170,7 +9056,7 @@ dependencies = [ [[package]] name = "reth-node-builder" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9238,7 +9124,7 @@ dependencies = [ [[package]] name = "reth-node-core" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9293,7 +9179,7 @@ dependencies = [ [[package]] name = "reth-node-ethereum" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-network", @@ -9331,7 +9217,7 @@ dependencies = [ [[package]] name = "reth-node-ethstats" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -9355,7 +9241,7 @@ dependencies = [ [[package]] name = "reth-node-events" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9379,7 +9265,7 @@ dependencies = [ [[package]] name = "reth-node-metrics" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "bytes", "eyre", @@ -9408,7 +9294,7 @@ dependencies = [ [[package]] name = "reth-node-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "reth-chainspec", "reth-db-api", @@ -9420,19 +9306,22 @@ dependencies = [ [[package]] name = "reth-payload-builder" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", "alloy-rpc-types", + "derive_more", "futures-util", "metrics", "reth-chain-state", "reth-ethereum-engine-primitives", + "reth-execution-cache", "reth-metrics", "reth-payload-builder-primitives", "reth-payload-primitives", "reth-primitives-traits", + "reth-trie-parallel", "tokio", "tokio-stream", "tracing", @@ -9441,7 +9330,7 @@ dependencies = [ [[package]] name = "reth-payload-builder-primitives" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "pin-project", "reth-payload-primitives", @@ -9453,7 +9342,7 @@ dependencies = [ [[package]] name = "reth-payload-primitives" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9462,7 +9351,6 @@ dependencies = [ "alloy-rpc-types-engine", "auto_impl", "either", - "op-alloy-rpc-types-engine", "reth-chain-state", "reth-chainspec", "reth-errors", @@ -9478,7 +9366,7 @@ dependencies = [ [[package]] name = "reth-payload-validator" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-rpc-types-engine", @@ -9521,7 +9409,7 @@ dependencies = [ [[package]] name = "reth-provider" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9567,7 +9455,7 @@ dependencies = [ [[package]] name = "reth-prune" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9596,7 +9484,7 @@ dependencies = [ [[package]] name = "reth-prune-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "arbitrary", @@ -9612,7 +9500,7 @@ dependencies = [ [[package]] name = "reth-revm" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "reth-primitives-traits", @@ -9625,7 +9513,7 @@ dependencies = [ [[package]] name = "reth-rpc" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -9703,7 +9591,7 @@ dependencies = [ [[package]] name = "reth-rpc-api" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eip7928", "alloy-eips", @@ -9734,7 +9622,7 @@ dependencies = [ [[package]] name = "reth-rpc-builder" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-network", "alloy-provider", @@ -9777,7 +9665,7 @@ dependencies = [ [[package]] name = "reth-rpc-convert" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-evm", @@ -9785,19 +9673,19 @@ dependencies = [ "alloy-network", "alloy-primitives", "alloy-rpc-types-eth", - "alloy-signer", "auto_impl", "dyn-clone", "jsonrpsee-types", "reth-evm", "reth-primitives-traits", + "reth-rpc-traits", "thiserror 2.0.18", ] [[package]] name = "reth-rpc-engine-api" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-primitives", @@ -9828,7 +9716,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-api" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-dyn-abi", @@ -9872,7 +9760,7 @@ dependencies = [ [[package]] name = "reth-rpc-eth-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -9920,7 +9808,7 @@ dependencies = [ [[package]] name = "reth-rpc-layer" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-rpc-types-engine", "http", @@ -9934,7 +9822,7 @@ dependencies = [ [[package]] name = "reth-rpc-server-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-primitives", @@ -9947,10 +9835,25 @@ dependencies = [ "strum", ] +[[package]] +name = "reth-rpc-traits" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9230acfd70f7f27bc52da3f397e1896432ce160f9bd460d9788f1a28d61588c" +dependencies = [ + "alloy-consensus", + "alloy-network", + "alloy-primitives", + "alloy-rpc-types-eth", + "alloy-signer", + "reth-primitives-traits", + "thiserror 2.0.18", +] + [[package]] name = "reth-stages" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10002,7 +9905,7 @@ dependencies = [ [[package]] name = "reth-stages-api" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-primitives", @@ -10030,7 +9933,7 @@ dependencies = [ [[package]] name = "reth-stages-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "arbitrary", @@ -10044,7 +9947,7 @@ dependencies = [ [[package]] name = "reth-static-file" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "parking_lot", @@ -10064,7 +9967,7 @@ dependencies = [ [[package]] name = "reth-static-file-types" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "clap", @@ -10079,7 +9982,7 @@ dependencies = [ [[package]] name = "reth-storage-api" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10103,7 +10006,7 @@ dependencies = [ [[package]] name = "reth-storage-errors" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-eips", "alloy-primitives", @@ -10121,7 +10024,7 @@ dependencies = [ [[package]] name = "reth-tasks" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "crossbeam-utils", "dashmap", @@ -10142,7 +10045,7 @@ dependencies = [ [[package]] name = "reth-testing-utils" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10158,7 +10061,7 @@ dependencies = [ [[package]] name = "reth-tokio-util" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "tokio", "tokio-stream", @@ -10168,7 +10071,7 @@ dependencies = [ [[package]] name = "reth-tracing" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "clap", "eyre", @@ -10187,7 +10090,7 @@ dependencies = [ [[package]] name = "reth-tracing-otlp" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "clap", "eyre", @@ -10205,7 +10108,7 @@ dependencies = [ [[package]] name = "reth-transaction-pool" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10249,7 +10152,7 @@ dependencies = [ [[package]] name = "reth-trie" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-eips", @@ -10275,7 +10178,7 @@ dependencies = [ [[package]] name = "reth-trie-common" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-consensus", "alloy-primitives", @@ -10302,7 +10205,7 @@ dependencies = [ [[package]] name = "reth-trie-db" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "metrics", @@ -10322,8 +10225,10 @@ dependencies = [ [[package]] name = "reth-trie-parallel" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ + "alloy-eip7928", + "alloy-evm", "alloy-primitives", "alloy-rlp", "crossbeam-channel", @@ -10340,6 +10245,7 @@ dependencies = [ "reth-tasks", "reth-trie", "reth-trie-sparse", + "revm-state", "thiserror 2.0.18", "tracing", ] @@ -10347,7 +10253,7 @@ dependencies = [ [[package]] name = "reth-trie-sparse" version = "1.11.3" -source = "git+https://github.com/paradigmxyz/reth?rev=7f4a9a0#7f4a9a05ef38b2f88f900209d0d7f8d67ca148c1" +source = "git+https://github.com/paradigmxyz/reth?rev=f8efc76#f8efc768805a6d45be992b826287cb68c80c5952" dependencies = [ "alloy-primitives", "alloy-rlp", diff --git a/Cargo.toml b/Cargo.toml index 2d029b71a0..67513d169d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -120,56 +120,56 @@ tempo-telemetry-util = { path = "crates/telemetry-util", default-features = fals tempo-transaction-pool = { path = "crates/transaction-pool", default-features = false } tempo-validator-config = { path = "crates/validator-config", default-features = false } -reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", default-features = false } -reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } +reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76", default-features = false } +reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } reth-codecs = { version = "0.1.0", default-features = false } -reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-etl = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", default-features = false } -reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", default-features = false } -reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } +reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-etl = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76", default-features = false } +reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76", default-features = false } +reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } reth-primitives-traits = { version = "0.1.0", default-features = false } -reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } -reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0" } +reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } +reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76" } -reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", features = [ +reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "f8efc76", features = [ "std", "optional-checks", ] } @@ -179,8 +179,8 @@ alloy = { version = "1.8.2", default-features = false } alloy-consensus = { version = "1.8.2", default-features = false } alloy-contract = { version = "1.8.2", default-features = false } alloy-eips = { version = "1.8.2", default-features = false } -alloy-evm = { version = "0.29.2", default-features = false } -revm-inspectors = "0.36.1" +alloy-evm = { version = "0.30.0", default-features = false } +revm-inspectors = "0.36.0" alloy-genesis = { version = "1.8.2", default-features = false } alloy-hardforks = "0.4.7" alloy-network = { version = "1.8.2", default-features = false } diff --git a/bin/tempo/src/defaults.rs b/bin/tempo/src/defaults.rs index 68edda5907..94ce4c7591 100644 --- a/bin/tempo/src/defaults.rs +++ b/bin/tempo/src/defaults.rs @@ -10,6 +10,7 @@ use tempo_chainspec::hardfork::TempoHardfork; use url::Url; pub(crate) const DEFAULT_DOWNLOAD_URL: &str = "https://snapshots.tempoxyz.dev/4217"; +const SNAPSHOT_API_URL: &str = "https://snapshots.tempoxyz.dev/api/snapshots"; /// Default OTLP logs filter level for telemetry. const DEFAULT_LOGS_OTLP_FILTER: &str = "debug"; @@ -155,6 +156,7 @@ fn init_download_urls() { ], default_base_url: Cow::Borrowed(DEFAULT_DOWNLOAD_URL), default_chain_aware_base_url: None, + snapshot_api_url: Cow::Borrowed(SNAPSHOT_API_URL), long_help: None, }; diff --git a/crates/alloy/src/rpc/reth_compat.rs b/crates/alloy/src/rpc/reth_compat.rs index ed288d8f83..09c0781eae 100644 --- a/crates/alloy/src/rpc/reth_compat.rs +++ b/crates/alloy/src/rpc/reth_compat.rs @@ -5,8 +5,7 @@ use alloy_primitives::{Address, B256, Bytes, Signature}; use reth_evm::EvmEnv; use reth_primitives_traits::SealedHeader; use reth_rpc_convert::{ - SignTxRequestError, SignableTxRequest, TryIntoSimTx, TryIntoTxEnv, - transaction::FromConsensusHeader, + FromConsensusHeader, SignTxRequestError, SignableTxRequest, TryIntoSimTx, TryIntoTxEnv, }; use reth_rpc_eth_types::EthApiError; use tempo_chainspec::hardfork::TempoHardfork; diff --git a/crates/commonware-node/src/feed/state.rs b/crates/commonware-node/src/feed/state.rs index 18f95e9e0f..ea971b0e87 100644 --- a/crates/commonware-node/src/feed/state.rs +++ b/crates/commonware-node/src/feed/state.rs @@ -11,7 +11,7 @@ use commonware_consensus::{ use commonware_cryptography::bls12381::primitives::variant::{MinSig, Variant}; use parking_lot::RwLock; use reth_provider::HeaderProvider as _; -use reth_rpc_convert::transaction::FromConsensusHeader; +use reth_rpc_convert::FromConsensusHeader; use std::sync::{Arc, OnceLock}; use tempo_alloy::rpc::TempoHeaderResponse; use tempo_dkg_onchain_artifacts::OnchainDkgOutcome; diff --git a/crates/evm/src/block.rs b/crates/evm/src/block.rs index 65b4170061..c1e9bf7ca7 100644 --- a/crates/evm/src/block.rs +++ b/crates/evm/src/block.rs @@ -103,6 +103,10 @@ impl TxResult for TempoTxResult { fn result(&self) -> &ResultAndState { self.inner.result() } + + fn into_result(self) -> ResultAndState { + self.inner.into_result() + } } /// Block executor for Tempo. diff --git a/crates/payload/builder/src/lib.rs b/crates/payload/builder/src/lib.rs index 30bfb46d55..cd63f9b3be 100644 --- a/crates/payload/builder/src/lib.rs +++ b/crates/payload/builder/src/lib.rs @@ -188,6 +188,8 @@ where self.build_payload( BuildArguments::new( Default::default(), + None, + None, config, Default::default(), Default::default(), @@ -227,6 +229,7 @@ where config, cancel, best_payload, + .. } = args; let PayloadConfig { parent_header, @@ -613,7 +616,7 @@ where block, hashed_state, trie_updates, - } = builder.finish(instrumented_provider)?; + } = builder.finish(instrumented_provider, None)?; drop(_finish_span); let builder_finish_elapsed = builder_finish_start.elapsed(); self.metrics diff --git a/crates/revm/src/exec.rs b/crates/revm/src/exec.rs index 7fc3568004..3bec5ea80b 100644 --- a/crates/revm/src/exec.rs +++ b/crates/revm/src/exec.rs @@ -4,8 +4,7 @@ use crate::{ evm::{TempoContext, TempoEvm}, handler::TempoEvmHandler, }; -use alloy_evm::Database; -use reth_evm::TransactionEnv; +use alloy_evm::{Database, TransactionEnvMut}; use revm::{ DatabaseCommit, ExecuteCommitEvm, ExecuteEvm, context::{ContextSetters, TxEnv, result::ExecResultAndState}, diff --git a/crates/revm/src/tx.rs b/crates/revm/src/tx.rs index 7b49612cbd..26d84a9ff6 100644 --- a/crates/revm/src/tx.rs +++ b/crates/revm/src/tx.rs @@ -1,8 +1,7 @@ use crate::TempoInvalidTransaction; use alloy_consensus::{EthereumTxEnvelope, TxEip4844, Typed2718, crypto::secp256k1}; -use alloy_evm::{FromRecoveredTx, FromTxWithEncoded, IntoTxEnv}; +use alloy_evm::{FromRecoveredTx, FromTxWithEncoded, IntoTxEnv, TransactionEnvMut}; use alloy_primitives::{Address, B256, Bytes, TxKind, U256}; -use reth_evm::TransactionEnv; use revm::context::{ Transaction, TxEnv, either::Either, @@ -237,15 +236,11 @@ impl Transaction for TempoTxEnv { } } -impl TransactionEnv for TempoTxEnv { +impl TransactionEnvMut for TempoTxEnv { fn set_gas_limit(&mut self, gas_limit: u64) { self.inner.set_gas_limit(gas_limit); } - fn nonce(&self) -> u64 { - Transaction::nonce(&self.inner) - } - fn set_nonce(&mut self, nonce: u64) { self.inner.set_nonce(nonce); } @@ -618,7 +613,7 @@ mod tests { #[test] fn test_transaction_env_set_gas_limit() { - use reth_evm::TransactionEnv; + use alloy_evm::TransactionEnvMut; let mut tx_env = super::TempoTxEnv::default(); @@ -631,21 +626,22 @@ mod tests { #[test] fn test_transaction_env_nonce() { - use reth_evm::TransactionEnv; + use alloy_evm::TransactionEnvMut; + use revm::context::Transaction; let mut tx_env = super::TempoTxEnv::default(); - assert_eq!(TransactionEnv::nonce(&tx_env), 0); + assert_eq!(Transaction::nonce(&tx_env), 0); tx_env.set_nonce(42); - assert_eq!(TransactionEnv::nonce(&tx_env), 42); + assert_eq!(Transaction::nonce(&tx_env), 42); tx_env.set_nonce(u64::MAX); - assert_eq!(TransactionEnv::nonce(&tx_env), u64::MAX); + assert_eq!(Transaction::nonce(&tx_env), u64::MAX); } #[test] fn test_transaction_env_set_access_list() { - use reth_evm::TransactionEnv; + use alloy_evm::TransactionEnvMut; use revm::context::transaction::{AccessList, AccessListItem}; let mut tx_env = super::TempoTxEnv::default(); @@ -677,7 +673,7 @@ mod tests { #[test] fn test_transaction_env_combined_operations() { - use reth_evm::TransactionEnv; + use alloy_evm::TransactionEnvMut; use revm::context::transaction::{AccessList, AccessListItem}; let mut tx_env = super::TempoTxEnv::default(); @@ -692,7 +688,7 @@ mod tests { // Verify all values are set correctly assert_eq!(tx_env.inner.gas_limit, 50_000); - assert_eq!(TransactionEnv::nonce(&tx_env), 100); + assert_eq!(revm::context::Transaction::nonce(&tx_env), 100); assert_eq!(tx_env.inner.access_list.0.len(), 1); assert_eq!( tx_env.inner.access_list.0[0].address, @@ -702,8 +698,7 @@ mod tests { #[test] fn test_transaction_env_from_tx_env() { - use reth_evm::TransactionEnv; - use revm::context::TxEnv; + use revm::context::{Transaction, TxEnv}; let inner = TxEnv { gas_limit: 75_000, @@ -714,7 +709,7 @@ mod tests { let tx_env: super::TempoTxEnv = inner.into(); assert_eq!(tx_env.inner.gas_limit, 75_000); - assert_eq!(TransactionEnv::nonce(&tx_env), 55); + assert_eq!(Transaction::nonce(&tx_env), 55); assert!(tx_env.fee_token.is_none()); assert!(!tx_env.is_system_tx); assert!(tx_env.fee_payer.is_none());