diff --git a/Cargo.lock b/Cargo.lock
index 01517188ed..7f9899f62d 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eip7928",
@@ -8426,7 +8311,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-rpc-types-engine",
@@ -8454,7 +8339,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8469,7 +8354,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "bytes",
@@ -8485,7 +8370,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -8507,7 +8392,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "reth-consensus",
  "reth-execution-errors",
@@ -8518,7 +8403,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-chains",
  "alloy-primitives",
@@ -8546,7 +8431,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -8567,7 +8452,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
@@ -8608,7 +8493,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "clap",
  "eyre",
@@ -8631,7 +8516,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8647,7 +8532,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -8663,7 +8548,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eip2124",
  "alloy-hardforks",
@@ -8676,7 +8561,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8690,6 +8575,7 @@ dependencies = [
  "reth-ethereum-primitives",
  "reth-evm",
  "reth-evm-ethereum",
+ "reth-execution-cache",
  "reth-payload-builder",
  "reth-payload-builder-primitives",
  "reth-payload-primitives",
@@ -8705,7 +8591,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8719,7 +8605,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "rayon",
  "reth-db-api",
@@ -8729,7 +8615,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8753,7 +8639,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8773,7 +8659,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "fixed-cache",
@@ -8791,7 +8677,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-evm",
  "alloy-primitives",
@@ -8804,7 +8690,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8823,7 +8709,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8861,7 +8747,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -8875,7 +8761,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "serde",
  "serde_json",
@@ -8885,7 +8771,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -8913,7 +8799,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "bytes",
  "futures",
@@ -8933,7 +8819,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "bitflags 2.11.0",
  "byteorder",
@@ -8950,7 +8836,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "bindgen",
  "cc",
@@ -8959,7 +8845,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "futures",
  "metrics",
@@ -8971,7 +8857,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "ipnet",
@@ -8980,7 +8866,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "futures-util",
  "if-addrs",
@@ -8994,7 +8880,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9051,7 +8937,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -9076,7 +8962,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9099,7 +8985,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -9114,7 +9000,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eip2124",
  "humantime-serde",
@@ -9128,7 +9014,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "anyhow",
  "bincode",
@@ -9145,7 +9031,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-rpc-types-engine",
  "eyre",
@@ -9169,7 +9055,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9237,7 +9123,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9292,7 +9178,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eips",
  "alloy-network",
@@ -9330,7 +9216,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -9354,7 +9240,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9378,7 +9264,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "bytes",
  "eyre",
@@ -9407,7 +9293,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "reth-chainspec",
  "reth-db-api",
@@ -9419,19 +9305,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 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",
@@ -9440,7 +9329,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "pin-project",
  "reth-payload-primitives",
@@ -9452,7 +9341,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9461,7 +9350,6 @@ dependencies = [
  "alloy-rpc-types-engine",
  "auto_impl",
  "either",
- "op-alloy-rpc-types-engine",
  "reth-chain-state",
  "reth-chainspec",
  "reth-errors",
@@ -9477,7 +9365,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-rpc-types-engine",
@@ -9520,7 +9408,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9566,7 +9454,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9595,7 +9483,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -9611,7 +9499,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "reth-primitives-traits",
@@ -9624,7 +9512,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -9702,7 +9590,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eip7928",
  "alloy-eips",
@@ -9733,7 +9621,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-network",
  "alloy-provider",
@@ -9776,7 +9664,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-evm",
@@ -9796,7 +9684,7 @@ dependencies = [
 [[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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -9827,7 +9715,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -9871,7 +9759,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9919,7 +9807,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-rpc-types-engine",
  "http",
@@ -9933,7 +9821,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -9949,7 +9837,7 @@ dependencies = [
 [[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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10001,7 +9889,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -10029,7 +9917,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -10043,7 +9931,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "parking_lot",
@@ -10063,7 +9951,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "clap",
@@ -10078,7 +9966,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10102,7 +9990,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -10120,7 +10008,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "crossbeam-utils",
  "dashmap",
@@ -10141,7 +10029,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10157,7 +10045,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "tokio",
  "tokio-stream",
@@ -10167,7 +10055,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "clap",
  "eyre",
@@ -10186,7 +10074,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "clap",
  "eyre",
@@ -10204,7 +10092,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10248,7 +10136,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10274,7 +10162,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -10301,7 +10189,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "metrics",
@@ -10321,8 +10209,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
+ "alloy-eip7928",
+ "alloy-evm",
  "alloy-primitives",
  "alloy-rlp",
  "crossbeam-channel",
@@ -10338,6 +10228,7 @@ dependencies = [
  "reth-tasks",
  "reth-trie",
  "reth-trie-sparse",
+ "revm-state",
  "thiserror 2.0.18",
  "tracing",
 ]
@@ -10345,7 +10236,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=f0d07c3#f0d07c38be40c173abab5879b49a20dc4126c427"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
diff --git a/Cargo.toml b/Cargo.toml
index 2d029b71a0..f0e4e344f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -115,61 +115,61 @@ tempo-payload-types = { path = "crates/payload/types", default-features = false
 tempo-precompiles = { path = "crates/precompiles", default-features = false }
 tempo-precompiles-macros = { path = "crates/precompiles-macros" }
 tempo-primitives = { path = "crates/primitives", default-features = false }
-tempo-contracts = { path = "crates/contracts", default-features = false, features = ["serde"] }
+tempo-contracts = { path = "crates/contracts", default-features = false }
 tempo-telemetry-util = { path = "crates/telemetry-util", default-features = false }
 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 = "f0d07c3" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3", default-features = false }
+reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
 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 = "f0d07c3" }
+reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-engine-tree = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-eth-wire-types = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3", default-features = false }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3", default-features = false }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
 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 = "f0d07c3" }
+reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-rpc-convert = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-etl = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3" }
 
-reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "7f4a9a0", features = [
+reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "f0d07c3", features = [
   "std",
   "optional-checks",
 ] }
@@ -179,7 +179,7 @@ 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 }
+alloy-evm = { version = "0.30.0", default-features = false }
 revm-inspectors = "0.36.1"
 alloy-genesis = { version = "1.8.2", default-features = false }
 alloy-hardforks = "0.4.7"
diff --git a/crates/evm/src/block.rs b/crates/evm/src/block.rs
index 57056f5e64..c033b82e86 100644
--- a/crates/evm/src/block.rs
+++ b/crates/evm/src/block.rs
@@ -102,6 +102,10 @@ impl<H> TxResult for TempoTxResult<H> {
     fn result(&self) -> &ResultAndState<Self::HaltReason> {
         self.inner.result()
     }
+
+    fn into_result(self) -> ResultAndState<Self::HaltReason> {
+        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..475e222d46 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(),
@@ -224,6 +226,8 @@ where
     {
         let BuildArguments {
             mut cached_reads,
+            execution_cache: _,
+            trie_handle: _,
             config,
             cancel,
             best_payload,
@@ -613,7 +617,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..699e4b1266 100644
--- a/crates/revm/src/exec.rs
+++ b/crates/revm/src/exec.rs
@@ -5,7 +5,7 @@ use crate::{
     handler::TempoEvmHandler,
 };
 use alloy_evm::Database;
-use reth_evm::TransactionEnv;
+use reth_evm::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..248f0dc53f 100644
--- a/crates/revm/src/tx.rs
+++ b/crates/revm/src/tx.rs
@@ -2,7 +2,7 @@ use crate::TempoInvalidTransaction;
 use alloy_consensus::{EthereumTxEnvelope, TxEip4844, Typed2718, crypto::secp256k1};
 use alloy_evm::{FromRecoveredTx, FromTxWithEncoded, IntoTxEnv};
 use alloy_primitives::{Address, B256, Bytes, TxKind, U256};
-use reth_evm::TransactionEnv;
+use reth_evm::TransactionEnvMut;
 use revm::context::{
     Transaction, TxEnv,
     either::Either,
@@ -237,15 +237,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 +614,7 @@ mod tests {
 
     #[test]
     fn test_transaction_env_set_gas_limit() {
-        use reth_evm::TransactionEnv;
+        use reth_evm::TransactionEnvMut;
 
         let mut tx_env = super::TempoTxEnv::default();
 
@@ -631,21 +627,21 @@ mod tests {
 
     #[test]
     fn test_transaction_env_nonce() {
-        use reth_evm::TransactionEnv;
+        use reth_evm::TransactionEnvMut;
 
         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 reth_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 reth_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!(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,7 +698,6 @@ mod tests {
 
     #[test]
     fn test_transaction_env_from_tx_env() {
-        use reth_evm::TransactionEnv;
         use revm::context::TxEnv;
 
         let inner = TxEnv {
@@ -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());