From a99eaddcbc209f5a1cd53f2f646000632b9cf662 Mon Sep 17 00:00:00 2001
From: tac0turtle <marko@baricevic.me>
Date: Wed, 17 Dec 2025 05:09:26 -0800
Subject: [PATCH 1/2] downgrade to reth 1.8.4

---
 Cargo.lock                                 | 756 +++++++++++----------
 Cargo.toml                                 | 152 ++---
 bin/ev-reth/src/main.rs                    |  31 +-
 crates/ev-precompiles/src/mint.rs          |  25 +-
 crates/ev-revm/src/evm.rs                  |  49 +-
 crates/ev-revm/src/factory.rs              |  17 +-
 crates/node/src/builder.rs                 |   2 +-
 crates/tests/src/e2e_tests.rs              |  20 -
 crates/tests/src/test_evolve_engine_api.rs |   2 -
 9 files changed, 496 insertions(+), 558 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a4bf7f2..3d0e154 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -286,15 +286,15 @@ dependencies = [
  "ethereum_ssz_derive",
  "serde",
  "serde_with",
- "sha2",
+ "sha2 0.10.9",
  "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-evm"
-version = "0.23.3"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "527b47dc39850c6168002ddc1f7a2063e15d26137c1bb5330f6065a7524c1aa9"
+checksum = "2f1bfade4de9f464719b5aca30cf5bb02b9fda7036f0cf43addc3a0e66a0340c"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -328,9 +328,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-hardforks"
-version = "0.4.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e29d7eacf42f89c21d7f089916d0bdb4f36139a31698790e8837d2dbbd4b2c3"
+checksum = "889eb3949b58368a09d4f16931c660275ef5fb08e5fbd4a96573b19c7085c41f"
 dependencies = [
  "alloy-chains",
  "alloy-eip2124",
@@ -1615,6 +1615,15 @@ dependencies = [
  "wyz",
 ]
 
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array",
+]
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -1681,7 +1690,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4"
 dependencies = [
- "sha2",
+ "sha2 0.10.9",
  "tinyvec",
 ]
 
@@ -1926,7 +1935,7 @@ dependencies = [
  "hmac",
  "k256",
  "serde",
- "sha2",
+ "sha2 0.10.9",
  "thiserror 1.0.69",
 ]
 
@@ -1942,7 +1951,7 @@ dependencies = [
  "once_cell",
  "pbkdf2",
  "rand 0.8.5",
- "sha2",
+ "sha2 0.10.9",
  "thiserror 1.0.69",
 ]
 
@@ -1960,7 +1969,7 @@ dependencies = [
  "generic-array",
  "ripemd",
  "serde",
- "sha2",
+ "sha2 0.10.9",
  "sha3",
  "thiserror 1.0.69",
 ]
@@ -2529,7 +2538,7 @@ version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
- "block-buffer",
+ "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
  "subtle",
@@ -2579,9 +2588,9 @@ dependencies = [
 
 [[package]]
 name = "discv5"
-version = "0.10.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f170f4f6ed0e1df52bf43b403899f0081917ecf1500bfe312505cc3b515a8899"
+checksum = "c4b4e7798d2ff74e29cee344dc490af947ae657d6ab5273dde35d58ce06a4d71"
 dependencies = [
  "aes",
  "aes-gcm",
@@ -2674,7 +2683,7 @@ dependencies = [
  "ed25519",
  "rand_core 0.6.4",
  "serde",
- "sha2",
+ "sha2 0.10.9",
  "subtle",
  "zeroize",
 ]
@@ -2814,7 +2823,7 @@ checksum = "c853bd72c9e5787f8aafc3df2907c2ed03cff3150c3acd94e2e53a98ab70a8ab"
 dependencies = [
  "cpufeatures",
  "ring",
- "sha2",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -3373,6 +3382,7 @@ version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
+ "serde",
  "typenum",
  "version_check",
  "zeroize",
@@ -3868,19 +3878,6 @@ dependencies = [
  "webpki-roots 1.0.2",
 ]
 
-[[package]]
-name = "hyper-timeout"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
-dependencies = [
- "hyper 1.6.0",
- "hyper-util",
- "pin-project-lite",
- "tokio",
- "tower-service",
-]
-
 [[package]]
 name = "hyper-tls"
 version = "0.5.0"
@@ -4057,9 +4054,9 @@ dependencies = [
 
 [[package]]
 name = "if-addrs"
-version = "0.14.0"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf39cc0423ee66021dc5eccface85580e4a001e0c5288bae8bea7ecb69225e90"
+checksum = "69b2eeee38fef3aa9b4cc5f1beea8a2444fc00e7377cafae396de3f5c2065e24"
 dependencies = [
  "libc",
  "windows-sys 0.59.0",
@@ -4515,7 +4512,7 @@ dependencies = [
  "elliptic-curve",
  "once_cell",
  "serdect",
- "sha2",
+ "sha2 0.10.9",
  "signature",
 ]
 
@@ -4611,7 +4608,7 @@ dependencies = [
  "k256",
  "multihash",
  "quick-protobuf",
- "sha2",
+ "sha2 0.10.9",
  "thiserror 2.0.12",
  "tracing",
  "zeroize",
@@ -4639,6 +4636,52 @@ dependencies = [
  "redox_syscall",
 ]
 
+[[package]]
+name = "libsecp256k1"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e79019718125edc905a079a70cfa5f3820bc76139fc91d6f9abc27ea2a887139"
+dependencies = [
+ "arrayref",
+ "base64 0.22.1",
+ "digest 0.9.0",
+ "libsecp256k1-core",
+ "libsecp256k1-gen-ecmult",
+ "libsecp256k1-gen-genmult",
+ "rand 0.8.5",
+ "serde",
+ "sha2 0.9.9",
+]
+
+[[package]]
+name = "libsecp256k1-core"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
+dependencies = [
+ "crunchy",
+ "digest 0.9.0",
+ "subtle",
+]
+
+[[package]]
+name = "libsecp256k1-gen-ecmult"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809"
+dependencies = [
+ "libsecp256k1-core",
+]
+
+[[package]]
+name = "libsecp256k1-gen-genmult"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c"
+dependencies = [
+ "libsecp256k1-core",
+]
+
 [[package]]
 name = "libz-sys"
 version = "1.1.22"
@@ -5252,9 +5295,9 @@ checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
 [[package]]
 name = "op-alloy-consensus"
-version = "0.22.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0d7ec388eb83a3e6c71774131dbbb2ba9c199b6acac7dce172ed8de2f819e91"
+checksum = "3a501241474c3118833d6195312ae7eb7cc90bbb0d5f524cbb0b06619e49ff67"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5270,30 +5313,28 @@ dependencies = [
 
 [[package]]
 name = "op-alloy-rpc-types-engine"
-version = "0.22.1"
+version = "0.20.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1abe694cd6718b8932da3f824f46778be0f43289e4103c88abc505c63533a04"
+checksum = "14e50c94013a1d036a529df259151991dbbd6cf8dc215e3b68b784f95eec60e6"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
  "alloy-primitives",
  "alloy-rlp",
  "alloy-rpc-types-engine",
- "alloy-serde",
  "derive_more",
  "ethereum_ssz",
  "ethereum_ssz_derive",
  "op-alloy-consensus",
- "serde",
  "snap",
  "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "op-revm"
-version = "12.0.2"
+version = "10.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e31622d03b29c826e48800f4c8f389c8a9c440eb796a3e35203561a288f12985"
+checksum = "826f43a5b1613c224f561847c152bfbaefcb593a9ae2c612ff4dc4661c6e625f"
 dependencies = [
  "auto_impl",
  "revm",
@@ -5352,9 +5393,9 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.31.0"
+version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bcd6ae87133e903af7ef497404dda70c60d0ea14895fc8a5e6722754fc2a0"
+checksum = "9e87237e2775f74896f9ad219d26a2081751187eb7c9f5c58dde20a23b95d16c"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -5366,23 +5407,25 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry-http"
-version = "0.31.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a6d09a73194e6b66df7c8f1b680f156d916a1a942abf2de06823dd02b7855d"
+checksum = "46d7ab32b827b5b495bd90fa95a6cb65ccc293555dcc3199ae2937d2d237c8ed"
 dependencies = [
  "async-trait",
  "bytes",
  "http 1.3.1",
  "opentelemetry",
  "reqwest 0.12.22",
+ "tracing",
 ]
 
 [[package]]
 name = "opentelemetry-otlp"
-version = "0.31.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2366db2dca4d2ad033cad11e6ee42844fd727007af5ad04a1730f4cb8163bf"
+checksum = "d899720fe06916ccba71c01d04ecd77312734e2de3467fd30d9d580c8ce85656"
 dependencies = [
+ "futures-core",
  "http 1.3.1",
  "opentelemetry",
  "opentelemetry-http",
@@ -5391,43 +5434,43 @@ dependencies = [
  "prost",
  "reqwest 0.12.22",
  "thiserror 2.0.12",
- "tokio",
- "tonic",
  "tracing",
 ]
 
 [[package]]
 name = "opentelemetry-proto"
-version = "0.31.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7175df06de5eaee9909d4805a3d07e28bb752c34cab57fa9cff549da596b30f"
+checksum = "8c40da242381435e18570d5b9d50aca2a4f4f4d8e146231adb4e7768023309b3"
 dependencies = [
  "opentelemetry",
  "opentelemetry_sdk",
  "prost",
  "tonic",
- "tonic-prost",
 ]
 
 [[package]]
 name = "opentelemetry-semantic-conventions"
-version = "0.31.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e62e29dfe041afb8ed2a6c9737ab57db4907285d999ef8ad3a59092a36bdc846"
+checksum = "84b29a9f89f1a954936d5aa92f19b2feec3c8f3971d3e96206640db7f9706ae3"
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.31.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e14ae4f5991976fd48df6d843de219ca6d31b01daaab2dad5af2badeded372bd"
+checksum = "afdefb21d1d47394abc1ba6c57363ab141be19e27cc70d0e422b7f303e4d290b"
 dependencies = [
  "futures-channel",
  "futures-executor",
  "futures-util",
+ "glob",
  "opentelemetry",
  "percent-encoding",
  "rand 0.9.2",
+ "serde_json",
  "thiserror 2.0.12",
+ "tracing",
 ]
 
 [[package]]
@@ -5445,7 +5488,7 @@ dependencies = [
  "ecdsa",
  "elliptic-curve",
  "primeorder",
- "sha2",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -5566,9 +5609,9 @@ dependencies = [
 
 [[package]]
 name = "phf"
-version = "0.13.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
  "phf_macros",
  "phf_shared",
@@ -5577,19 +5620,19 @@ dependencies = [
 
 [[package]]
 name = "phf_generator"
-version = "0.13.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
- "fastrand",
  "phf_shared",
+ "rand 0.8.5",
 ]
 
 [[package]]
 name = "phf_macros"
-version = "0.13.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812f032b54b1e759ccd5f8b6677695d5268c588701effba24601f6932f8269ef"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
 dependencies = [
  "phf_generator",
  "phf_shared",
@@ -5600,9 +5643,9 @@ dependencies = [
 
 [[package]]
 name = "phf_shared"
-version = "0.13.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
  "siphasher",
 ]
@@ -5855,9 +5898,9 @@ dependencies = [
 
 [[package]]
 name = "prost"
-version = "0.14.1"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d"
+checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
 dependencies = [
  "bytes",
  "prost-derive",
@@ -5865,9 +5908,9 @@ dependencies = [
 
 [[package]]
 name = "prost-derive"
-version = "0.14.1"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
+checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
 dependencies = [
  "anyhow",
  "itertools 0.14.0",
@@ -6300,8 +6343,8 @@ checksum = "95325155c684b1c89f7765e30bc1c42e4a6da51ca513615660cb8a62ef9a88e3"
 
 [[package]]
 name = "reth-basic-payload-builder"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6324,8 +6367,8 @@ dependencies = [
 
 [[package]]
 name = "reth-chain-state"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6355,8 +6398,8 @@ dependencies = [
 
 [[package]]
 name = "reth-chainspec"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -6375,8 +6418,8 @@ dependencies = [
 
 [[package]]
 name = "reth-cli"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-genesis",
  "clap",
@@ -6389,8 +6432,8 @@ dependencies = [
 
 [[package]]
 name = "reth-cli-commands"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -6470,8 +6513,8 @@ dependencies = [
 
 [[package]]
 name = "reth-cli-runner"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "reth-tasks",
  "tokio",
@@ -6480,8 +6523,8 @@ dependencies = [
 
 [[package]]
 name = "reth-cli-util"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6499,8 +6542,8 @@ dependencies = [
 
 [[package]]
 name = "reth-codecs"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6519,9 +6562,10 @@ dependencies = [
 
 [[package]]
 name = "reth-codecs-derive"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
+ "convert_case",
  "proc-macro2",
  "quote",
  "syn 2.0.104",
@@ -6529,8 +6573,8 @@ dependencies = [
 
 [[package]]
 name = "reth-config"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "eyre",
  "humantime-serde",
@@ -6544,8 +6588,8 @@ dependencies = [
 
 [[package]]
 name = "reth-consensus"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -6557,8 +6601,8 @@ dependencies = [
 
 [[package]]
 name = "reth-consensus-common"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6569,8 +6613,8 @@ dependencies = [
 
 [[package]]
 name = "reth-consensus-debug-client"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6595,8 +6639,8 @@ dependencies = [
 
 [[package]]
 name = "reth-db"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "derive_more",
@@ -6621,8 +6665,8 @@ dependencies = [
 
 [[package]]
 name = "reth-db-api"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-genesis",
@@ -6649,8 +6693,8 @@ dependencies = [
 
 [[package]]
 name = "reth-db-common"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-genesis",
@@ -6679,8 +6723,8 @@ dependencies = [
 
 [[package]]
 name = "reth-db-models"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6694,13 +6738,14 @@ dependencies = [
 
 [[package]]
 name = "reth-discv4"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "discv5",
  "enr",
+ "generic-array",
  "itertools 0.14.0",
  "parking_lot",
  "rand 0.8.5",
@@ -6719,8 +6764,8 @@ dependencies = [
 
 [[package]]
 name = "reth-discv5"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -6743,8 +6788,8 @@ dependencies = [
 
 [[package]]
 name = "reth-dns-discovery"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "data-encoding",
@@ -6767,14 +6812,13 @@ dependencies = [
 
 [[package]]
 name = "reth-downloaders"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
  "alloy-primitives",
  "alloy-rlp",
- "async-compression",
  "futures",
  "futures-util",
  "itertools 0.14.0",
@@ -6783,12 +6827,13 @@ dependencies = [
  "rayon",
  "reth-config",
  "reth-consensus",
+ "reth-db",
+ "reth-db-api",
  "reth-ethereum-primitives",
  "reth-metrics",
  "reth-network-p2p",
  "reth-network-peers",
  "reth-primitives-traits",
- "reth-provider",
  "reth-storage-api",
  "reth-tasks",
  "reth-testing-utils",
@@ -6802,8 +6847,8 @@ dependencies = [
 
 [[package]]
 name = "reth-e2e-test-utils"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6826,7 +6871,6 @@ dependencies = [
  "reth-db",
  "reth-db-common",
  "reth-engine-local",
- "reth-engine-primitives",
  "reth-ethereum-primitives",
  "reth-network-api",
  "reth-network-p2p",
@@ -6860,8 +6904,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ecies"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "aes",
  "alloy-primitives",
@@ -6879,7 +6923,7 @@ dependencies = [
  "rand 0.8.5",
  "reth-network-peers",
  "secp256k1 0.30.0",
- "sha2",
+ "sha2 0.10.9",
  "sha3",
  "thiserror 2.0.12",
  "tokio",
@@ -6891,8 +6935,8 @@ dependencies = [
 
 [[package]]
 name = "reth-engine-local"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -6904,7 +6948,7 @@ dependencies = [
  "reth-ethereum-engine-primitives",
  "reth-payload-builder",
  "reth-payload-primitives",
- "reth-storage-api",
+ "reth-provider",
  "reth-transaction-pool",
  "tokio",
  "tokio-stream",
@@ -6913,8 +6957,8 @@ dependencies = [
 
 [[package]]
 name = "reth-engine-primitives"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6938,8 +6982,8 @@ dependencies = [
 
 [[package]]
 name = "reth-engine-service"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "futures",
  "pin-project",
@@ -6956,12 +7000,13 @@ dependencies = [
  "reth-prune",
  "reth-stages-api",
  "reth-tasks",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "reth-engine-tree"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6969,8 +7014,6 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "alloy-rpc-types-engine",
- "crossbeam-channel",
- "dashmap 6.1.0",
  "derive_more",
  "futures",
  "metrics",
@@ -7001,6 +7044,7 @@ dependencies = [
  "reth-tasks",
  "reth-tracing",
  "reth-trie",
+ "reth-trie-db",
  "reth-trie-parallel",
  "reth-trie-sparse",
  "reth-trie-sparse-parallel",
@@ -7015,8 +7059,8 @@ dependencies = [
 
 [[package]]
 name = "reth-engine-util"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-rpc-types-engine",
@@ -7043,8 +7087,8 @@ dependencies = [
 
 [[package]]
 name = "reth-era"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7059,8 +7103,8 @@ dependencies = [
 
 [[package]]
 name = "reth-era-downloader"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "bytes",
@@ -7068,14 +7112,14 @@ dependencies = [
  "futures-util",
  "reqwest 0.12.22",
  "reth-fs-util",
- "sha2",
+ "sha2 0.10.9",
  "tokio",
 ]
 
 [[package]]
 name = "reth-era-utils"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -7096,8 +7140,8 @@ dependencies = [
 
 [[package]]
 name = "reth-errors"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "reth-consensus",
  "reth-execution-errors",
@@ -7107,8 +7151,8 @@ dependencies = [
 
 [[package]]
 name = "reth-eth-wire"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-chains",
  "alloy-primitives",
@@ -7136,8 +7180,8 @@ dependencies = [
 
 [[package]]
 name = "reth-eth-wire-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -7160,8 +7204,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
@@ -7200,8 +7244,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-cli"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "clap",
  "eyre",
@@ -7217,15 +7261,13 @@ dependencies = [
  "reth-node-metrics",
  "reth-rpc-server-types",
  "reth-tracing",
- "reth-tracing-otlp",
  "tracing",
- "url",
 ]
 
 [[package]]
 name = "reth-ethereum-consensus"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7240,8 +7282,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-engine-primitives"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -7252,14 +7294,14 @@ dependencies = [
  "reth-payload-primitives",
  "reth-primitives-traits",
  "serde",
- "sha2",
+ "sha2 0.10.9",
  "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "reth-ethereum-forks"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eip2124",
  "alloy-hardforks",
@@ -7272,8 +7314,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-payload-builder"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7301,8 +7343,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-primitives"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7321,8 +7363,8 @@ dependencies = [
 
 [[package]]
 name = "reth-etl"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "rayon",
  "reth-db-api",
@@ -7331,8 +7373,8 @@ dependencies = [
 
 [[package]]
 name = "reth-evm"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7354,8 +7396,8 @@ dependencies = [
 
 [[package]]
 name = "reth-evm-ethereum"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7375,8 +7417,8 @@ dependencies = [
 
 [[package]]
 name = "reth-execution-errors"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-evm",
  "alloy-primitives",
@@ -7388,8 +7430,8 @@ dependencies = [
 
 [[package]]
 name = "reth-execution-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7406,8 +7448,8 @@ dependencies = [
 
 [[package]]
 name = "reth-exex"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7444,8 +7486,8 @@ dependencies = [
 
 [[package]]
 name = "reth-exex-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -7458,8 +7500,8 @@ dependencies = [
 
 [[package]]
 name = "reth-fs-util"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "serde",
  "serde_json",
@@ -7468,8 +7510,8 @@ dependencies = [
 
 [[package]]
 name = "reth-invalid-block-hooks"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -7487,7 +7529,6 @@ dependencies = [
  "reth-rpc-api",
  "reth-tracing",
  "reth-trie",
- "revm",
  "revm-bytecode",
  "revm-database",
  "serde",
@@ -7496,8 +7537,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ipc"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "bytes",
  "futures",
@@ -7516,8 +7557,8 @@ dependencies = [
 
 [[package]]
 name = "reth-libmdbx"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "bitflags 2.10.0",
  "byteorder",
@@ -7532,8 +7573,8 @@ dependencies = [
 
 [[package]]
 name = "reth-mdbx-sys"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "bindgen 0.71.1",
  "cc",
@@ -7541,8 +7582,8 @@ dependencies = [
 
 [[package]]
 name = "reth-metrics"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "futures",
  "metrics",
@@ -7553,16 +7594,16 @@ dependencies = [
 
 [[package]]
 name = "reth-net-banlist"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
 ]
 
 [[package]]
 name = "reth-net-nat"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "futures-util",
  "if-addrs",
@@ -7575,8 +7616,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7630,8 +7671,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-api"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -7655,8 +7696,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-p2p"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7678,8 +7719,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-peers"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -7693,8 +7734,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eip2124",
  "humantime-serde",
@@ -7707,8 +7748,8 @@ dependencies = [
 
 [[package]]
 name = "reth-nippy-jar"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "anyhow",
  "bincode",
@@ -7724,8 +7765,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-api"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-rpc-types-engine",
  "eyre",
@@ -7748,8 +7789,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-builder"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7816,8 +7857,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-core"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7853,7 +7894,6 @@ dependencies = [
  "reth-storage-api",
  "reth-storage-errors",
  "reth-tracing",
- "reth-tracing-otlp",
  "reth-transaction-pool",
  "secp256k1 0.30.0",
  "serde",
@@ -7869,8 +7909,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-ethereum"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-network",
@@ -7907,8 +7947,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-ethstats"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -7931,8 +7971,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-events"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7955,8 +7995,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-metrics"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "eyre",
  "http 1.3.1",
@@ -7966,7 +8006,6 @@ dependencies = [
  "metrics-process",
  "metrics-util",
  "procfs",
- "reqwest 0.12.22",
  "reth-metrics",
  "reth-tasks",
  "tikv-jemalloc-ctl",
@@ -7977,8 +8016,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "reth-chainspec",
  "reth-db-api",
@@ -7989,8 +8028,8 @@ dependencies = [
 
 [[package]]
 name = "reth-optimism-primitives"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7998,7 +8037,6 @@ dependencies = [
  "alloy-rlp",
  "arbitrary",
  "bytes",
- "modular-bitfield",
  "op-alloy-consensus",
  "reth-codecs",
  "reth-primitives-traits",
@@ -8009,8 +8047,8 @@ dependencies = [
 
 [[package]]
 name = "reth-payload-builder"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -8030,8 +8068,8 @@ dependencies = [
 
 [[package]]
 name = "reth-payload-builder-primitives"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "pin-project",
  "reth-payload-primitives",
@@ -8042,8 +8080,8 @@ dependencies = [
 
 [[package]]
 name = "reth-payload-primitives"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -8062,8 +8100,8 @@ dependencies = [
 
 [[package]]
 name = "reth-payload-validator"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-rpc-types-engine",
@@ -8072,8 +8110,8 @@ dependencies = [
 
 [[package]]
 name = "reth-primitives"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "c-kzg",
@@ -8086,8 +8124,8 @@ dependencies = [
 
 [[package]]
 name = "reth-primitives-traits"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8119,8 +8157,8 @@ dependencies = [
 
 [[package]]
 name = "reth-provider"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8141,6 +8179,7 @@ dependencies = [
  "reth-errors",
  "reth-ethereum-engine-primitives",
  "reth-ethereum-primitives",
+ "reth-evm",
  "reth-execution-types",
  "reth-fs-util",
  "reth-metrics",
@@ -8163,8 +8202,8 @@ dependencies = [
 
 [[package]]
 name = "reth-prune"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8172,6 +8211,7 @@ dependencies = [
  "itertools 0.14.0",
  "metrics",
  "rayon",
+ "reth-chainspec",
  "reth-config",
  "reth-db-api",
  "reth-errors",
@@ -8190,8 +8230,8 @@ dependencies = [
 
 [[package]]
 name = "reth-prune-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -8205,8 +8245,8 @@ dependencies = [
 
 [[package]]
 name = "reth-revm"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "reth-primitives-traits",
@@ -8218,8 +8258,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -8286,7 +8326,7 @@ dependencies = [
  "revm-primitives",
  "serde",
  "serde_json",
- "sha2",
+ "sha2 0.10.9",
  "thiserror 2.0.12",
  "tokio",
  "tokio-stream",
@@ -8297,8 +8337,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-api"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-genesis",
@@ -8325,8 +8365,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-builder"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-network",
  "alloy-provider",
@@ -8364,8 +8404,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-convert"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-json-rpc",
@@ -8385,8 +8425,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-engine-api"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -8415,8 +8455,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-eth-api"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -8459,8 +8499,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-eth-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8506,8 +8546,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-layer"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-rpc-types-engine",
  "http 1.3.1",
@@ -8520,8 +8560,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-server-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -8536,8 +8576,8 @@ dependencies = [
 
 [[package]]
 name = "reth-stages"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8584,8 +8624,8 @@ dependencies = [
 
 [[package]]
 name = "reth-stages-api"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -8611,8 +8651,8 @@ dependencies = [
 
 [[package]]
 name = "reth-stages-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -8625,8 +8665,8 @@ dependencies = [
 
 [[package]]
 name = "reth-static-file"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "parking_lot",
@@ -8645,8 +8685,8 @@ dependencies = [
 
 [[package]]
 name = "reth-static-file-types"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "clap",
@@ -8657,8 +8697,8 @@ dependencies = [
 
 [[package]]
 name = "reth-storage-api"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8680,8 +8720,8 @@ dependencies = [
 
 [[package]]
 name = "reth-storage-errors"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -8696,8 +8736,8 @@ dependencies = [
 
 [[package]]
 name = "reth-tasks"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "auto_impl",
  "dyn-clone",
@@ -8714,8 +8754,8 @@ dependencies = [
 
 [[package]]
 name = "reth-testing-utils"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8730,8 +8770,8 @@ dependencies = [
 
 [[package]]
 name = "reth-tokio-util"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "tokio",
  "tokio-stream",
@@ -8740,28 +8780,24 @@ dependencies = [
 
 [[package]]
 name = "reth-tracing"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "clap",
  "eyre",
- "reth-tracing-otlp",
  "rolling-file",
  "tracing",
  "tracing-appender",
  "tracing-journald",
  "tracing-logfmt",
  "tracing-subscriber 0.3.20",
- "url",
 ]
 
 [[package]]
 name = "reth-tracing-otlp"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
- "clap",
- "eyre",
  "opentelemetry",
  "opentelemetry-otlp",
  "opentelemetry-semantic-conventions",
@@ -8769,13 +8805,12 @@ dependencies = [
  "tracing",
  "tracing-opentelemetry",
  "tracing-subscriber 0.3.20",
- "url",
 ]
 
 [[package]]
 name = "reth-transaction-pool"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8817,8 +8852,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -8842,8 +8877,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-common"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -8852,7 +8887,6 @@ dependencies = [
  "alloy-serde",
  "alloy-trie",
  "arbitrary",
- "arrayvec",
  "bytes",
  "derive_more",
  "hash-db",
@@ -8869,8 +8903,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-db"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "reth-db-api",
@@ -8882,23 +8916,23 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-parallel"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
- "crossbeam-channel",
- "dashmap 6.1.0",
  "derive_more",
  "itertools 0.14.0",
  "metrics",
  "rayon",
+ "reth-db-api",
  "reth-execution-errors",
  "reth-metrics",
  "reth-provider",
  "reth-storage-errors",
  "reth-trie",
  "reth-trie-common",
+ "reth-trie-db",
  "reth-trie-sparse",
  "thiserror 2.0.12",
  "tokio",
@@ -8907,8 +8941,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-sparse"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -8926,8 +8960,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-sparse-parallel"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -8944,17 +8978,17 @@ dependencies = [
 
 [[package]]
 name = "reth-zstd-compressors"
-version = "1.9.2"
-source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.9.2#74351d98e906b8af5f118694529fb2b71d316946"
+version = "1.8.4"
+source = "git+https://github.com/paradigmxyz/reth.git?tag=v1.8.4#bde6574bcac266f9858c1a78f8d0da9fd1e5d262"
 dependencies = [
  "zstd",
 ]
 
 [[package]]
 name = "revm"
-version = "31.0.2"
+version = "29.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb67a5223602113cae59a305acde2d9936bc18f2478dda879a6124b267cebfb6"
+checksum = "718d90dce5f07e115d0e66450b1b8aa29694c1cf3f89ebddaddccc2ccbd2f13e"
 dependencies = [
  "revm-bytecode",
  "revm-context",
@@ -8971,9 +9005,9 @@ dependencies = [
 
 [[package]]
 name = "revm-bytecode"
-version = "7.1.1"
+version = "6.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2c6b5e6e8dd1e28a4a60e5f46615d4ef0809111c9e63208e55b5c7058200fb0"
+checksum = "66c52031b73cae95d84cd1b07725808b5fd1500da3e5e24574a3b2dc13d9f16d"
 dependencies = [
  "bitvec",
  "phf",
@@ -8983,9 +9017,9 @@ dependencies = [
 
 [[package]]
 name = "revm-context"
-version = "11.0.2"
+version = "9.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92850e150f4f99d46c05a20ad0cd09286a7ad4ee21866fffb87101de6e602231"
+checksum = "5a20c98e7008591a6f012550c2a00aa36cba8c14cc88eb88dec32eb9102554b4"
 dependencies = [
  "bitvec",
  "cfg-if",
@@ -9000,9 +9034,9 @@ dependencies = [
 
 [[package]]
 name = "revm-context-interface"
-version = "12.0.1"
+version = "10.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6d701e2c2347d65216b066489ab22a0a8e1f7b2568256110d73a7d5eff3385c"
+checksum = "b50d241ed1ce647b94caf174fcd0239b7651318b2c4c06b825b59b973dfb8495"
 dependencies = [
  "alloy-eip2930",
  "alloy-eip7702",
@@ -9016,9 +9050,9 @@ dependencies = [
 
 [[package]]
 name = "revm-database"
-version = "9.0.5"
+version = "7.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b6c15bb255481fcf29f5ef7c97f00ed4c28a6ab6c490d77b990d73603031569"
+checksum = "39a276ed142b4718dcf64bc9624f474373ed82ef20611025045c3fb23edbef9c"
 dependencies = [
  "alloy-eips",
  "revm-bytecode",
@@ -9030,9 +9064,9 @@ dependencies = [
 
 [[package]]
 name = "revm-database-interface"
-version = "8.0.5"
+version = "7.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cce03e3780287b07abe58faf4a7f5d8be7e81321f93ccf3343c8f7755602bae"
+checksum = "8c523c77e74eeedbac5d6f7c092e3851dbe9c7fec6f418b85992bd79229db361"
 dependencies = [
  "auto_impl",
  "either",
@@ -9043,9 +9077,9 @@ dependencies = [
 
 [[package]]
 name = "revm-handler"
-version = "12.0.2"
+version = "10.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b45418ed95cfdf0cb19effdbb7633cf2144cab7fb0e6ffd6b0eb9117a50adff6"
+checksum = "550331ea85c1d257686e672081576172fe3d5a10526248b663bbf54f1bef226a"
 dependencies = [
  "auto_impl",
  "derive-where",
@@ -9062,9 +9096,9 @@ dependencies = [
 
 [[package]]
 name = "revm-inspector"
-version = "12.0.2"
+version = "10.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c99801eac7da06cc112df2244bd5a64024f4ef21240e923b26e73c4b4a0e5da6"
+checksum = "7c0a6e9ccc2ae006f5bed8bd80cd6f8d3832cd55c5e861b9402fdd556098512f"
 dependencies = [
  "auto_impl",
  "either",
@@ -9080,9 +9114,9 @@ dependencies = [
 
 [[package]]
 name = "revm-inspectors"
-version = "0.32.0"
+version = "0.30.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21caa99f22184a6818946362778cccd3ff02f743c1e085bee87700671570ecb7"
+checksum = "de23199c4b6181a6539e4131cf7e31cde4df05e1192bcdce491c34a511241588"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -9098,22 +9132,21 @@ dependencies = [
 
 [[package]]
 name = "revm-interpreter"
-version = "29.0.1"
+version = "25.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22789ce92c5808c70185e3bc49732f987dc6fd907f77828c8d3470b2299c9c65"
+checksum = "06575dc51b1d8f5091daa12a435733a90b4a132dca7ccee0666c7db3851bc30c"
 dependencies = [
  "revm-bytecode",
  "revm-context-interface",
  "revm-primitives",
- "revm-state",
  "serde",
 ]
 
 [[package]]
 name = "revm-precompile"
-version = "29.0.1"
+version = "27.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "968b124028960201abf6d6bf8e223f15fadebb4307df6b7dc9244a0aab5d2d05"
+checksum = "25b57d4bd9e6b5fe469da5452a8a137bc2d030a3cd47c46908efc615bbc699da"
 dependencies = [
  "ark-bls12-381",
  "ark-bn254",
@@ -9126,19 +9159,20 @@ dependencies = [
  "c-kzg",
  "cfg-if",
  "k256",
+ "libsecp256k1",
  "p256",
  "revm-primitives",
  "ripemd",
  "rug",
  "secp256k1 0.31.1",
- "sha2",
+ "sha2 0.10.9",
 ]
 
 [[package]]
 name = "revm-primitives"
-version = "21.0.2"
+version = "20.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29e161db429d465c09ba9cbff0df49e31049fe6b549e28eb0b7bd642fcbd4412"
+checksum = "5aa29d9da06fe03b249b6419b33968ecdf92ad6428e2f012dc57bcd619b5d94e"
 dependencies = [
  "alloy-primitives",
  "num_enum",
@@ -9148,9 +9182,9 @@ dependencies = [
 
 [[package]]
 name = "revm-state"
-version = "8.1.1"
+version = "7.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d8be953b7e374dbdea0773cf360debed8df394ea8d82a8b240a6b5da37592fc"
+checksum = "1f64fbacb86008394aaebd3454f9643b7d5a782bd251135e17c5b33da592d84d"
 dependencies = [
  "bitflags 2.10.0",
  "revm-bytecode",
@@ -9802,6 +9836,19 @@ dependencies = [
  "digest 0.10.7",
 ]
 
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
 [[package]]
 name = "sha2"
 version = "0.10.9"
@@ -10495,9 +10542,9 @@ checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
 [[package]]
 name = "tonic"
-version = "0.14.2"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
 dependencies = [
  "async-trait",
  "base64 0.22.1",
@@ -10505,31 +10552,15 @@ dependencies = [
  "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
- "hyper 1.6.0",
- "hyper-timeout",
- "hyper-util",
  "percent-encoding",
  "pin-project",
- "sync_wrapper 1.0.2",
- "tokio",
+ "prost",
  "tokio-stream",
- "tower",
  "tower-layer",
  "tower-service",
  "tracing",
 ]
 
-[[package]]
-name = "tonic-prost"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67"
-dependencies = [
- "bytes",
- "prost",
- "tonic",
-]
-
 [[package]]
 name = "tower"
 version = "0.5.2"
@@ -10684,16 +10715,15 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.32.0"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e6e5658463dd88089aba75c7791e1d3120633b1bfde22478b28f625a9bb1b8e"
+checksum = "fd8e764bd6f5813fd8bebc3117875190c5b0415be8f7f8059bffb6ecd979c444"
 dependencies = [
  "js-sys",
+ "once_cell",
  "opentelemetry",
  "opentelemetry_sdk",
- "rustversion",
  "smallvec",
- "thiserror 2.0.12",
  "tracing",
  "tracing-core",
  "tracing-log",
diff --git a/Cargo.toml b/Cargo.toml
index d226fcf..d3babc7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -20,99 +20,99 @@ repository = "https://github.com/evstack/ev-reth"
 authors = ["Evolve Stack Contributors"]
 
 [workspace.dependencies]
-# Reth dependencies - Using the latest stable versions
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-cli = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-tracing-otlp = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-node-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-errors = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-optimism-node = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-trie-db = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-trie-common = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-storage-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-network = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-network-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-chain-state = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-ethereum = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-engine-local = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-execution-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-node-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-rpc-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
-reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2" }
+# Reth dependencies - Using v1.8.4 stable
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-cli = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-tracing-otlp = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-node-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-errors = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-optimism-node = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-optimism-cli = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-optimism-rpc = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-optimism-forks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-optimism-chainspec = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-optimism-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-optimism-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-trie-common = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-storage-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-tracing = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-network = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-network-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-chain-state = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-engine-local = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-node-core = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-node-types = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-rpc-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
+reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4" }
 
 ev-revm = { path = "crates/ev-revm" }
 
 
 # Consensus dependencies
-reth-consensus = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2", default-features = false }
-reth-consensus-common = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2", default-features = false }
-reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2", default-features = false }
+reth-consensus = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4", default-features = false }
+reth-consensus-common = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4", default-features = false }
+reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4", default-features = false }
 
 # Test dependencies
-reth-testing-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2", default-features = false }
-reth-db = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2", default-features = false }
-reth-tasks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.9.2", default-features = false }
+reth-testing-utils = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4", default-features = false }
+reth-db = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4", default-features = false }
+reth-tasks = { git = "https://github.com/paradigmxyz/reth.git", tag = "v1.8.4", default-features = false }
 
-revm = { version = "31.0.1", default-features = false }
-revm-context-interface = { version = "=12.0.1", default-features = false }
+revm = { version = "29.0.1", default-features = false }
+revm-context-interface = { version = "10.2.0", default-features = false }
 
 # Alloy dependencies
-alloy = { version = "1.0.41", features = [
+alloy = { version = "1.0.37", features = [
   "contract",
   "providers",
   "provider-http",
   "signers",
   "reqwest-rustls-tls",
 ], default-features = false }
-# Alloy family versions aligned to 1.0.41 compatibility
-alloy-evm = { version = "0.23.3", default-features = false }
-alloy-eips = { version = "1.0.41", default-features = false }
-alloy-network = { version = "1.0.41", default-features = false }
-alloy-provider = { version = "1.0.41", default-features = false }
-alloy-rpc-client = { version = "1.0.41", default-features = false }
-alloy-rpc-types = { version = "1.0.41", default-features = false }
-alloy-json-rpc = { version = "1.0.41", default-features = false }
-alloy-rpc-types-eth = { version = "1.0.41", default-features = false }
-alloy-rpc-types-engine = { version = "1.0.41", default-features = false }
-alloy-signer = { version = "1.0.41", default-features = false }
-alloy-signer-local = { version = "1.0.41", features = ["mnemonic"] }
-alloy-primitives = { version = "1.4.1", default-features = false }
-alloy-consensus = { version = "1.0.41", default-features = false }
-alloy-genesis = { version = "1.0.41", default-features = false }
-alloy-rpc-types-txpool = { version = "1.0.41", default-features = false }
-alloy-sol-types = { version = "1.4.1", default-features = false }
+# Alloy family versions aligned to 1.0.37 compatibility (reth v1.8.4)
+alloy-evm = { version = "0.21.3", default-features = false }
+alloy-eips = { version = "1.0.37", default-features = false }
+alloy-network = { version = "1.0.37", default-features = false }
+alloy-provider = { version = "1.0.37", default-features = false }
+alloy-rpc-client = { version = "1.0.37", default-features = false }
+alloy-rpc-types = { version = "1.0.37", default-features = false }
+alloy-json-rpc = { version = "1.0.37", default-features = false }
+alloy-rpc-types-eth = { version = "1.0.37", default-features = false }
+alloy-rpc-types-engine = { version = "1.0.37", default-features = false }
+alloy-signer = { version = "1.0.37", default-features = false }
+alloy-signer-local = { version = "1.0.37", features = ["mnemonic"] }
+alloy-primitives = { version = "1.3.1", default-features = false }
+alloy-consensus = { version = "1.0.37", default-features = false }
+alloy-genesis = { version = "1.0.37", default-features = false }
+alloy-rpc-types-txpool = { version = "1.0.37", default-features = false }
+alloy-sol-types = { version = "1.3.1", default-features = false }
 
-revm-inspector = { version = "12.0.1" }
+revm-inspector = { version = "10.0.1" }
 # Core dependencies
 eyre = "0.6"
 tracing = "0.1"
diff --git a/bin/ev-reth/src/main.rs b/bin/ev-reth/src/main.rs
index ea4ef98..cab2623 100644
--- a/bin/ev-reth/src/main.rs
+++ b/bin/ev-reth/src/main.rs
@@ -11,10 +11,9 @@ use evolve_ev_reth::{
     rpc::txpool::{EvolveTxpoolApiImpl, EvolveTxpoolApiServer},
 };
 use reth_ethereum_cli::{chainspec::EthereumChainSpecParser, Cli};
-use reth_tracing_otlp::{span_layer, OtlpProtocol};
+use reth_tracing_otlp::layer as otlp_layer;
 use tracing::info;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter};
-use url::Url;
 
 use ev_node::{log_startup, EvolveArgs, EvolveNode};
 
@@ -22,34 +21,15 @@ use ev_node::{log_startup, EvolveArgs, EvolveNode};
 static ALLOC: reth_cli_util::allocator::Allocator = reth_cli_util::allocator::new_allocator();
 
 /// Initialize reth OTLP tracing
-fn init_otlp_tracing() -> eyre::Result<()> {
-    const DEFAULT_ENDPOINT: &str = "http://127.0.0.1:4318/v1/traces";
-
-    let endpoint = std::env::var("OTEL_EXPORTER_OTLP_TRACES_ENDPOINT")
-        .or_else(|_| std::env::var("OTEL_EXPORTER_OTLP_ENDPOINT"))
-        .unwrap_or_else(|_| DEFAULT_ENDPOINT.to_owned());
-    let mut endpoint = Url::parse(&endpoint).or_else(|_| Url::parse(DEFAULT_ENDPOINT))?;
-
-    let protocol = std::env::var("OTEL_EXPORTER_OTLP_TRACES_PROTOCOL")
-        .or_else(|_| std::env::var("OTEL_EXPORTER_OTLP_PROTOCOL"))
-        .unwrap_or_else(|_| "http".to_string());
-    let protocol = match protocol.to_lowercase().as_str() {
-        "grpc" => OtlpProtocol::Grpc,
-        _ => OtlpProtocol::Http,
-    };
-
-    protocol.validate_endpoint(&mut endpoint)?;
-
-    let span_layer = span_layer("ev-reth", &endpoint, protocol)?;
+fn init_otlp_tracing() {
     // Set up tracing subscriber with reth OTLP layer
     tracing_subscriber::registry()
         .with(EnvFilter::try_from_default_env().unwrap_or_else(|_| "info".into()))
         .with(tracing_subscriber::fmt::layer().with_target(false))
-        .with(span_layer)
+        .with(otlp_layer("ev-reth"))
         .init();
 
     info!("Reth OTLP tracing initialized for service: ev-reth");
-    Ok(())
 }
 
 fn main() {
@@ -64,10 +44,7 @@ fn main() {
 
     // Initialize OTLP tracing
     if std::env::var("OTEL_SDK_DISABLED").as_deref() == Ok("false") {
-        if let Err(e) = init_otlp_tracing() {
-            eprintln!("Failed to initialize OTLP tracing: {:?}", e);
-            eprintln!("Continuing without OTLP tracing...");
-        }
+        init_otlp_tracing();
     }
 
     if let Err(err) = Cli::<EthereumChainSpecParser, EvolveArgs>::parse().run(
diff --git a/crates/ev-precompiles/src/mint.rs b/crates/ev-precompiles/src/mint.rs
index 6fe1764..b25b3a0 100644
--- a/crates/ev-precompiles/src/mint.rs
+++ b/crates/ev-precompiles/src/mint.rs
@@ -55,7 +55,7 @@ impl MintPrecompile {
         internals: &mut EvmInternals<'_>,
         addr: Address,
     ) -> Result<(), PrecompileError> {
-        let account = internals
+        let mut account = internals
             .load_account(addr)
             .map_err(Self::map_internals_error)?;
 
@@ -63,9 +63,10 @@ impl MintPrecompile {
             if addr == MINT_PRECOMPILE_ADDR {
                 // Ensure the mint precompile account is treated as non-empty so state pruning
                 // does not wipe out its storage between blocks.
-                internals.set_code(addr, Self::bytecode().clone());
-                internals.nonce_bump_journal_entry(addr);
+                account.info.set_code(Self::bytecode().clone());
+                account.info.set_nonce(1);
             }
+            account.mark_created();
             internals.touch_account(addr);
         }
 
@@ -77,17 +78,15 @@ impl MintPrecompile {
         addr: Address,
         amount: U256,
     ) -> Result<(), PrecompileError> {
-        let account = internals
+        let mut account = internals
             .load_account(addr)
             .map_err(Self::map_internals_error)?;
-        account
+        let new_balance = account
             .info
             .balance
             .checked_add(amount)
             .ok_or_else(|| PrecompileError::Other("balance overflow".to_string()))?;
-        internals
-            .balance_incr(addr, amount)
-            .map_err(Self::map_internals_error)?;
+        account.info.set_balance(new_balance);
         Ok(())
     }
 
@@ -96,7 +95,7 @@ impl MintPrecompile {
         addr: Address,
         amount: U256,
     ) -> Result<(), PrecompileError> {
-        let account = internals
+        let mut account = internals
             .load_account(addr)
             .map_err(Self::map_internals_error)?;
         let new_balance = account
@@ -104,9 +103,7 @@ impl MintPrecompile {
             .balance
             .checked_sub(amount)
             .ok_or_else(|| PrecompileError::Other("insufficient balance".to_string()))?;
-        internals
-            .set_balance(addr, new_balance)
-            .map_err(Self::map_internals_error)?;
+        account.info.set_balance(new_balance);
         Ok(())
     }
 
@@ -333,6 +330,10 @@ mod tests {
             account.is_touched(),
             "recipient account should be marked touched"
         );
+        assert!(
+            account.is_created(),
+            "recipient account should be marked created"
+        );
     }
 
     #[test]
diff --git a/crates/ev-revm/src/evm.rs b/crates/ev-revm/src/evm.rs
index b94808f..043b593 100644
--- a/crates/ev-revm/src/evm.rs
+++ b/crates/ev-revm/src/evm.rs
@@ -176,30 +176,6 @@ where
 {
     type Inspector = INSP;
 
-    fn all_inspector(
-        &self,
-    ) -> (
-        &Self::Context,
-        &Self::Instructions,
-        &Self::Precompiles,
-        &FrameStack<Self::Frame>,
-        &Self::Inspector,
-    ) {
-        self.inner.all_inspector()
-    }
-
-    fn all_mut_inspector(
-        &mut self,
-    ) -> (
-        &mut Self::Context,
-        &mut Self::Instructions,
-        &mut Self::Precompiles,
-        &mut FrameStack<Self::Frame>,
-        &mut Self::Inspector,
-    ) {
-        self.inner.all_mut_inspector()
-    }
-
     fn inspector(&mut self) -> &mut Self::Inspector {
         &mut self.inner.inspector
     }
@@ -246,28 +222,6 @@ where
     type Precompiles = PRECOMP;
     type Frame = EthFrame<EthInterpreter>;
 
-    fn all(
-        &self,
-    ) -> (
-        &Self::Context,
-        &Self::Instructions,
-        &Self::Precompiles,
-        &FrameStack<Self::Frame>,
-    ) {
-        self.inner.all()
-    }
-
-    fn all_mut(
-        &mut self,
-    ) -> (
-        &mut Self::Context,
-        &mut Self::Instructions,
-        &mut Self::Precompiles,
-        &mut FrameStack<Self::Frame>,
-    ) {
-        self.inner.all_mut()
-    }
-
     fn ctx(&mut self) -> &mut Self::Context {
         &mut self.inner.ctx
     }
@@ -333,7 +287,6 @@ where
     type Error = EVMError<DB::Error, InvalidTransaction>;
     type HaltReason = HaltReason;
     type Spec = SpecId;
-    type BlockEnv = BlockEnv;
     type Precompiles = PRECOMP;
     type Inspector = INSP;
 
@@ -371,7 +324,7 @@ where
         .map(|res| ResultAndState::new(res.result, res.state))
     }
 
-    fn finish(self) -> (Self::DB, EvmEnv<Self::Spec, Self::BlockEnv>) {
+    fn finish(self) -> (Self::DB, EvmEnv<Self::Spec>) {
         let Self { inner, .. } = self;
         let Context {
             block,
diff --git a/crates/ev-revm/src/factory.rs b/crates/ev-revm/src/factory.rs
index 8fc7f32..ae4d72e 100644
--- a/crates/ev-revm/src/factory.rs
+++ b/crates/ev-revm/src/factory.rs
@@ -14,7 +14,7 @@ use reth_revm::{
     revm::{
         context::{
             result::{EVMError, HaltReason},
-            BlockEnv, TxEnv,
+            TxEnv,
         },
         context_interface::result::InvalidTransaction,
         primitives::hardfork::SpecId,
@@ -173,13 +173,12 @@ impl EvmFactory for EvEvmFactory<EthEvmFactory> {
         EVMError<DBError, InvalidTransaction>;
     type HaltReason = HaltReason;
     type Spec = SpecId;
-    type BlockEnv = BlockEnv;
     type Precompiles = PrecompilesMap;
 
     fn create_evm<DB: Database>(
         &self,
         db: DB,
-        mut evm_env: EvmEnv<Self::Spec, Self::BlockEnv>,
+        mut evm_env: EvmEnv<Self::Spec>,
     ) -> Self::Evm<DB, NoOpInspector> {
         let block_number = evm_env.block_env.number;
         // Apply custom contract size limit if configured and active for this block
@@ -198,7 +197,7 @@ impl EvmFactory for EvEvmFactory<EthEvmFactory> {
     fn create_evm_with_inspector<DB: Database, I: Inspector<Self::Context<DB>>>(
         &self,
         db: DB,
-        mut input: EvmEnv<Self::Spec, Self::BlockEnv>,
+        mut input: EvmEnv<Self::Spec>,
         inspector: I,
     ) -> Self::Evm<DB, I> {
         let block_number = input.block_env.number;
@@ -303,7 +302,7 @@ mod tests {
             },
         );
 
-        let mut evm_env: alloy_evm::EvmEnv<SpecId, BlockEnv> = EvmEnv::default();
+        let mut evm_env: alloy_evm::EvmEnv<SpecId> = EvmEnv::default();
         evm_env.cfg_env.chain_id = 1;
         evm_env.cfg_env.spec = SpecId::CANCUN;
         evm_env.block_env.basefee = 100;
@@ -396,7 +395,7 @@ mod tests {
             },
         );
 
-        let mut evm_env: alloy_evm::EvmEnv<SpecId, BlockEnv> = EvmEnv::default();
+        let mut evm_env: alloy_evm::EvmEnv<SpecId> = EvmEnv::default();
         evm_env.cfg_env.chain_id = 1;
         evm_env.cfg_env.spec = SpecId::CANCUN;
         evm_env.block_env.gas_limit = 30_000_000;
@@ -451,7 +450,7 @@ mod tests {
             None,
         );
 
-        let mut before_env: alloy_evm::EvmEnv<SpecId, BlockEnv> = EvmEnv::default();
+        let mut before_env: alloy_evm::EvmEnv<SpecId> = EvmEnv::default();
         before_env.cfg_env.chain_id = 1;
         before_env.cfg_env.spec = SpecId::CANCUN;
         before_env.block_env.number = U256::from(4);
@@ -530,7 +529,7 @@ mod tests {
             ..Default::default()
         };
 
-        let mut before_env: alloy_evm::EvmEnv<SpecId, BlockEnv> = EvmEnv::default();
+        let mut before_env: alloy_evm::EvmEnv<SpecId> = EvmEnv::default();
         before_env.cfg_env.chain_id = 1;
         before_env.cfg_env.spec = SpecId::CANCUN;
         before_env.block_env.number = U256::from(2);
@@ -547,7 +546,7 @@ mod tests {
             "precompile must not mint before activation height"
         );
 
-        let mut after_env: alloy_evm::EvmEnv<SpecId, BlockEnv> = EvmEnv::default();
+        let mut after_env: alloy_evm::EvmEnv<SpecId> = EvmEnv::default();
         after_env.cfg_env.chain_id = 1;
         after_env.cfg_env.spec = SpecId::CANCUN;
         after_env.block_env.number = U256::from(3);
diff --git a/crates/node/src/builder.rs b/crates/node/src/builder.rs
index 23acc2c..c29c3d6 100644
--- a/crates/node/src/builder.rs
+++ b/crates/node/src/builder.rs
@@ -85,7 +85,7 @@ where
         // Get parent header using the client's HeaderProvider trait
         let parent_header = self
             .client
-            .header(attributes.parent_hash)
+            .header(&attributes.parent_hash)
             .map_err(PayloadBuilderError::other)?
             .ok_or_else(|| {
                 PayloadBuilderError::Internal(RethError::Other("Parent header not found".into()))
diff --git a/crates/tests/src/e2e_tests.rs b/crates/tests/src/e2e_tests.rs
index 402fd52..29a9401 100644
--- a/crates/tests/src/e2e_tests.rs
+++ b/crates/tests/src/e2e_tests.rs
@@ -22,7 +22,6 @@ use reth_e2e_test_utils::{
     transaction::TransactionTestContext,
     wallet::Wallet,
 };
-use reth_primitives::TransactionSigned;
 use reth_rpc_api::clients::{EngineApiClient, EthApiClient};
 
 use crate::common::{
@@ -276,7 +275,6 @@ async fn test_e2e_base_fee_sink_receives_base_fee() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc, fee_sink, Some(BlockId::latest())
     )
@@ -366,7 +364,6 @@ async fn test_e2e_base_fee_sink_receives_base_fee() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc, fee_sink, Some(BlockId::latest())
     )
@@ -450,7 +447,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         new_wallet_address,
@@ -514,7 +510,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::transaction_receipt(
         &env.node_clients[0].rpc, *allowlist_envelope.tx_hash()
     )
@@ -531,7 +526,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::storage_at(
         &env.node_clients[0].rpc,
         MINT_PRECOMPILE_ADDR,
@@ -584,7 +578,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::transaction_receipt(
         &env.node_clients[0].rpc, *mint_envelope.tx_hash()
     )
@@ -606,7 +599,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         new_wallet_address,
@@ -662,7 +654,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::transaction_receipt(
         &env.node_clients[0].rpc, *burn_envelope.tx_hash()
     )
@@ -680,7 +671,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
             Block,
             Receipt,
             Header,
-            TransactionSigned,
         >::call(
             &env.node_clients[0].rpc,
             burn_tx.clone(),
@@ -700,7 +690,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         new_wallet_address,
@@ -754,7 +743,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::transaction_receipt(
         &env.node_clients[0].rpc, *remove_envelope.tx_hash()
     )
@@ -808,7 +796,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::transaction_receipt(
         &env.node_clients[0].rpc, *unauthorized_envelope.tx_hash()
     )
@@ -826,7 +813,6 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         new_wallet_address,
@@ -906,7 +892,6 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         recipient_address,
@@ -1012,7 +997,6 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::transaction_receipt(&env.node_clients[0].rpc, mint_tx_hash)
     .await?
     .expect("mint transaction receipt available");
@@ -1032,7 +1016,6 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         recipient_address,
@@ -1045,7 +1028,6 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         recipient_address,
@@ -1058,7 +1040,6 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         contract_address,
@@ -1122,7 +1103,6 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
         Block,
         Receipt,
         Header,
-        TransactionSigned,
     >::balance(
         &env.node_clients[0].rpc,
         recipient_address,
diff --git a/crates/tests/src/test_evolve_engine_api.rs b/crates/tests/src/test_evolve_engine_api.rs
index 2d0608e..2884bd3 100644
--- a/crates/tests/src/test_evolve_engine_api.rs
+++ b/crates/tests/src/test_evolve_engine_api.rs
@@ -26,7 +26,6 @@ use reth_e2e_test_utils::{
     transaction::TransactionTestContext,
     wallet::Wallet,
 };
-use reth_primitives::TransactionSigned;
 use reth_rpc_api::clients::{EngineApiClient, EthApiClient};
 
 async fn make_transfer_batch(
@@ -206,7 +205,6 @@ async fn test_e2e_engine_api_fork_choice_with_transactions() -> Result<()> {
                     Block,
                     Receipt,
                     Header,
-                    TransactionSigned,
                 >::transaction_receipt(&env.node_clients[0].rpc, tx_hash)
                 .await?
                 .expect("transaction receipt should exist");

From ae311f23d3b17865f5412f10cb7f45ca008913a4 Mon Sep 17 00:00:00 2001
From: tac0turtle <marko@baricevic.me>
Date: Wed, 17 Dec 2025 08:34:01 -0800
Subject: [PATCH 2/2] lint

---
 crates/tests/src/e2e_tests.rs              | 249 ++++++++-------------
 crates/tests/src/test_evolve_engine_api.rs |  21 +-
 2 files changed, 105 insertions(+), 165 deletions(-)

diff --git a/crates/tests/src/e2e_tests.rs b/crates/tests/src/e2e_tests.rs
index 29a9401..21a8ef5 100644
--- a/crates/tests/src/e2e_tests.rs
+++ b/crates/tests/src/e2e_tests.rs
@@ -269,16 +269,13 @@ async fn test_e2e_base_fee_sink_receives_base_fee() -> Result<()> {
     let mut env = Environment::<EvolveEngineTypes>::default();
     setup.apply::<EvolveNode>(&mut env).await?;
 
-    let initial_balance = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc, fee_sink, Some(BlockId::latest())
-    )
-    .await?;
+    let initial_balance =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            fee_sink,
+            Some(BlockId::latest()),
+        )
+        .await?;
 
     let parent_block = env.node_clients[0]
         .get_block_by_number(BlockNumberOrTag::Latest)
@@ -358,16 +355,13 @@ async fn test_e2e_base_fee_sink_receives_base_fee() -> Result<()> {
     let expected_tip = tip_per_gas * U256::from(gas_used);
     let expected_total_credit = expected_base_fee + expected_tip;
 
-    let final_balance: U256 = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc, fee_sink, Some(BlockId::latest())
-    )
-    .await?;
+    let final_balance: U256 =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            fee_sink,
+            Some(BlockId::latest()),
+        )
+        .await?;
 
     let credited = final_balance.saturating_sub(initial_balance);
     assert_eq!(
@@ -441,18 +435,13 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
     setup.apply::<EvolveNode>(&mut env).await?;
 
     // Check initial balance of new wallet (should be zero since not in genesis).
-    let initial_balance = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        new_wallet_address,
-        Some(BlockId::latest()),
-    )
-    .await?;
+    let initial_balance =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            new_wallet_address,
+            Some(BlockId::latest()),
+        )
+        .await?;
     println!("New wallet initial balance: {}", initial_balance);
     assert_eq!(
         initial_balance,
@@ -520,19 +509,14 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         "allowlist transaction should succeed"
     );
     let allowlist_slot = operator_address.into_word();
-    let allowlist_storage = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::storage_at(
-        &env.node_clients[0].rpc,
-        MINT_PRECOMPILE_ADDR,
-        allowlist_slot.into(),
-        Some(BlockId::latest()),
-    )
-    .await?;
+    let allowlist_storage =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::storage_at(
+            &env.node_clients[0].rpc,
+            MINT_PRECOMPILE_ADDR,
+            allowlist_slot.into(),
+            Some(BlockId::latest()),
+        )
+        .await?;
     println!("Allowlist slot value after add: {allowlist_storage:?}");
 
     // Mint tokens to the new wallet directly via the precompile using the operator.
@@ -593,18 +577,13 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         "mint precompile transaction should succeed"
     );
 
-    let balance_after_mint = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        new_wallet_address,
-        Some(BlockId::latest()),
-    )
-    .await?;
+    let balance_after_mint =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            new_wallet_address,
+            Some(BlockId::latest()),
+        )
+        .await?;
     println!("New wallet balance after mint: {}", balance_after_mint);
     assert_eq!(
         balance_after_mint, mint_amount,
@@ -665,37 +644,27 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
         burn_receipt.logs
     );
     if !burn_receipt.status() {
-        let revert_preview = EthApiClient::<
-            TransactionRequest,
-            Transaction,
-            Block,
-            Receipt,
-            Header,
-        >::call(
-            &env.node_clients[0].rpc,
-            burn_tx.clone(),
-            Some(BlockId::latest()),
-            None,
-            None,
-        )
-        .await;
+        let revert_preview =
+            EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::call(
+                &env.node_clients[0].rpc,
+                burn_tx.clone(),
+                Some(BlockId::latest()),
+                None,
+                None,
+            )
+            .await;
         println!("Burn eth_call result: {revert_preview:?}");
         panic!("burn precompile transaction should succeed");
     }
 
     let expected_after_burn = mint_amount - burn_amount;
-    let balance_after_burn = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        new_wallet_address,
-        Some(BlockId::latest()),
-    )
-    .await?;
+    let balance_after_burn =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            new_wallet_address,
+            Some(BlockId::latest()),
+        )
+        .await?;
     println!("New wallet balance after burn: {}", balance_after_burn);
     assert_eq!(
         balance_after_burn, expected_after_burn,
@@ -807,18 +776,13 @@ async fn test_e2e_mint_and_burn_to_new_wallet() -> Result<()> {
     );
 
     // Ensure balance unchanged after failed mint.
-    let final_balance = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        new_wallet_address,
-        Some(BlockId::latest()),
-    )
-    .await?;
+    let final_balance =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            new_wallet_address,
+            Some(BlockId::latest()),
+        )
+        .await?;
     assert_eq!(
         final_balance, expected_after_burn,
         "failed mint must not change recipient balance"
@@ -886,18 +850,13 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
     let mut env = Environment::<EvolveEngineTypes>::default();
     setup.apply::<EvolveNode>(&mut env).await?;
 
-    let recipient_initial_balance = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        recipient_address,
-        Some(BlockId::latest()),
-    )
-    .await?;
+    let recipient_initial_balance =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            recipient_address,
+            Some(BlockId::latest()),
+        )
+        .await?;
 
     let parent_block = env.node_clients[0]
         .get_block_by_number(BlockNumberOrTag::Latest)
@@ -1010,42 +969,27 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
         "mint proxy transaction reverted on execution"
     );
 
-    let balance_after_mint: U256 = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        recipient_address,
-        Some(BlockId::latest()),
-    )
-    .await?;
-    let balance_at_block = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        recipient_address,
-        Some(BlockId::Number(BlockNumberOrTag::Number(parent_number))),
-    )
-    .await?;
-    let contract_balance_after_mint = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        contract_address,
-        Some(BlockId::latest()),
-    )
-    .await?;
+    let balance_after_mint: U256 =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            recipient_address,
+            Some(BlockId::latest()),
+        )
+        .await?;
+    let balance_at_block =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            recipient_address,
+            Some(BlockId::Number(BlockNumberOrTag::Number(parent_number))),
+        )
+        .await?;
+    let contract_balance_after_mint =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            contract_address,
+            Some(BlockId::latest()),
+        )
+        .await?;
     println!(
         "mintee balance diff: {} -> {} (latest) | {} (@block {}), contract balance now: {}",
         recipient_initial_balance,
@@ -1097,18 +1041,13 @@ async fn test_e2e_mint_precompile_via_contract() -> Result<()> {
     )
     .await?;
 
-    let final_balance = EthApiClient::<
-        TransactionRequest,
-        Transaction,
-        Block,
-        Receipt,
-        Header,
-    >::balance(
-        &env.node_clients[0].rpc,
-        recipient_address,
-        Some(BlockId::latest()),
-    )
-    .await?;
+    let final_balance =
+        EthApiClient::<TransactionRequest, Transaction, Block, Receipt, Header>::balance(
+            &env.node_clients[0].rpc,
+            recipient_address,
+            Some(BlockId::latest()),
+        )
+        .await?;
     assert_eq!(
         final_balance,
         recipient_initial_balance + mint_amount - burn_amount,
diff --git a/crates/tests/src/test_evolve_engine_api.rs b/crates/tests/src/test_evolve_engine_api.rs
index 2884bd3..ea5f572 100644
--- a/crates/tests/src/test_evolve_engine_api.rs
+++ b/crates/tests/src/test_evolve_engine_api.rs
@@ -198,16 +198,17 @@ async fn test_e2e_engine_api_fork_choice_with_transactions() -> Result<()> {
                 TxEnvelope::decode_2718(&mut raw_slice).expect("transaction should decode");
             let tx_hash = *tx_envelope.tx_hash();
 
-            let receipt: Receipt =
-                EthApiClient::<
-                    TransactionRequest,
-                    Transaction,
-                    Block,
-                    Receipt,
-                    Header,
-                >::transaction_receipt(&env.node_clients[0].rpc, tx_hash)
-                .await?
-                .expect("transaction receipt should exist");
+            let receipt: Receipt = EthApiClient::<
+                TransactionRequest,
+                Transaction,
+                Block,
+                Receipt,
+                Header,
+            >::transaction_receipt(
+                &env.node_clients[0].rpc, tx_hash
+            )
+            .await?
+            .expect("transaction receipt should exist");
             assert!(receipt.status(), "{label} transaction should succeed");
         }
     }