diff --git a/Cargo.lock b/Cargo.lock
index fcde810e..36bedafa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -74,17 +74,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "ahash"
-version = "0.7.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd"
-dependencies = [
- "getrandom 0.2.10",
- "once_cell",
- "version_check",
-]
-
 [[package]]
 name = "ahash"
 version = "0.8.6"
@@ -612,6 +601,16 @@ dependencies = [
  "wildmatch",
 ]
 
+[[package]]
+name = "aurora-engine-modexp"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfacad86e9e138fca0670949eb8ed4ffdf73a55bded8887efe0863cd1a3a6f70"
+dependencies = [
+ "hex",
+ "num",
+]
+
 [[package]]
 name = "auto_impl"
 version = "1.1.0"
@@ -1186,21 +1185,6 @@ dependencies = [
  "pkg-config",
 ]
 
-[[package]]
-name = "c-kzg"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac926d808fb72fe09ebf471a091d6d72918876ccf0b4989766093d2d0d24a0ef"
-dependencies = [
- "bindgen 0.66.1",
- "blst",
- "cc",
- "glob",
- "hex",
- "libc",
- "serde",
-]
-
 [[package]]
 name = "c-kzg"
 version = "0.4.0"
@@ -1373,7 +1357,7 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15"
 [[package]]
 name = "codecs-derive"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "convert_case 0.6.0",
  "parity-scale-codec",
@@ -2055,7 +2039,7 @@ dependencies = [
 [[package]]
 name = "discv5"
 version = "0.3.1"
-source = "git+https://github.com/sigp/discv5?rev=d2e30e04ee62418b9e57278cee907c02b99d5bd1#d2e30e04ee62418b9e57278cee907c02b99d5bd1"
+source = "git+https://github.com/sigp/discv5?rev=f289bbd4c57d499bb1bdb393af3c249600a1c662#f289bbd4c57d499bb1bdb393af3c249600a1c662"
 dependencies = [
  "aes 0.7.5",
  "aes-gcm",
@@ -2068,7 +2052,7 @@ dependencies = [
  "hex",
  "hkdf",
  "lazy_static",
- "lru 0.7.8",
+ "lru 0.12.0",
  "more-asserts",
  "parking_lot 0.11.2",
  "rand 0.8.5",
@@ -2293,7 +2277,7 @@ dependencies = [
  "log",
  "rand 0.8.5",
  "rlp",
- "secp256k1",
+ "secp256k1 0.27.0",
  "serde",
  "sha3",
  "zeroize",
@@ -2446,7 +2430,7 @@ dependencies = [
  "async-stream",
  "blst",
  "bs58 0.4.0",
- "c-kzg 0.4.0",
+ "c-kzg",
  "enr 0.6.2",
  "hex",
  "integer-sqrt",
@@ -3167,23 +3151,11 @@ dependencies = [
  "byteorder",
 ]
 
-[[package]]
-name = "hashbrown"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
-dependencies = [
- "ahash 0.7.7",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.7",
-]
 
 [[package]]
 name = "hashbrown"
@@ -3191,7 +3163,7 @@ version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
 dependencies = [
- "ahash 0.8.6",
+ "ahash",
 ]
 
 [[package]]
@@ -3200,7 +3172,7 @@ version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
- "ahash 0.8.6",
+ "ahash",
  "allocator-api2",
  "serde",
 ]
@@ -3216,11 +3188,11 @@ dependencies = [
 
 [[package]]
 name = "hashlink"
-version = "0.7.0"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.11.2",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
@@ -4223,18 +4195,18 @@ checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
 
 [[package]]
 name = "lru"
-version = "0.7.8"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a"
+checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
 dependencies = [
- "hashbrown 0.12.3",
+ "hashbrown 0.14.2",
 ]
 
 [[package]]
 name = "lru"
-version = "0.11.1"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21"
+checksum = "1efa59af2ddfad1854ae27d75009d538d0998b4b2fd47083e743ac1a10e46c60"
 dependencies = [
  "hashbrown 0.14.2",
 ]
@@ -4330,7 +4302,7 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fde3af1a009ed76a778cb84fdef9e7dbbdf5775ae3e4cc1f434a6a307f6f76c5"
 dependencies = [
- "ahash 0.8.6",
+ "ahash",
  "metrics-macros",
  "portable-atomic",
 ]
@@ -4607,9 +4579,9 @@ dependencies = [
 
 [[package]]
 name = "more-asserts"
-version = "0.2.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
+checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e"
 
 [[package]]
 name = "multiaddr"
@@ -5801,7 +5773,7 @@ dependencies = [
 [[package]]
 name = "reth"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "aquamarine",
@@ -5863,7 +5835,7 @@ dependencies = [
  "reth-tracing",
  "reth-transaction-pool",
  "reth-trie",
- "secp256k1",
+ "secp256k1 0.27.0",
  "serde",
  "serde_json",
  "shellexpand",
@@ -5879,7 +5851,7 @@ dependencies = [
 [[package]]
 name = "reth-auto-seal-consensus"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "futures-util",
  "reth-beacon-consensus",
@@ -5897,7 +5869,7 @@ dependencies = [
 [[package]]
 name = "reth-basic-payload-builder"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "futures-core",
@@ -5919,8 +5891,9 @@ dependencies = [
 [[package]]
 name = "reth-beacon-consensus"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
+ "cfg-if",
  "futures",
  "metrics",
  "reth-consensus-common",
@@ -5936,6 +5909,7 @@ dependencies = [
  "reth-snapshot",
  "reth-stages",
  "reth-tasks",
+ "reth-tokio-util",
  "schnellru",
  "thiserror",
  "tokio",
@@ -5946,7 +5920,7 @@ dependencies = [
 [[package]]
 name = "reth-blockchain-tree"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "aquamarine",
  "linked_hash_set",
@@ -5966,7 +5940,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "arbitrary",
  "bytes",
@@ -5979,16 +5953,14 @@ dependencies = [
 [[package]]
 name = "reth-config"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
- "confy",
  "reth-discv4",
  "reth-downloaders",
  "reth-net-nat",
  "reth-network",
  "reth-primitives",
- "reth-stages",
- "secp256k1",
+ "secp256k1 0.27.0",
  "serde",
  "serde_json",
  "tempfile",
@@ -5997,8 +5969,9 @@ dependencies = [
 [[package]]
 name = "reth-consensus-common"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
+ "cfg-if",
  "reth-interfaces",
  "reth-primitives",
  "reth-provider",
@@ -6007,7 +5980,7 @@ dependencies = [
 [[package]]
 name = "reth-db"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "arbitrary",
  "bytes",
@@ -6015,6 +5988,7 @@ dependencies = [
  "eyre",
  "futures",
  "heapless",
+ "itertools 0.11.0",
  "metrics",
  "modular-bitfield",
  "page_size",
@@ -6025,6 +5999,7 @@ dependencies = [
  "proptest",
  "proptest-derive",
  "rand 0.8.5",
+ "rayon",
  "reth-codecs",
  "reth-interfaces",
  "reth-libmdbx",
@@ -6042,7 +6017,7 @@ dependencies = [
 [[package]]
 name = "reth-discv4"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "discv5",
@@ -6053,7 +6028,7 @@ dependencies = [
  "reth-net-nat",
  "reth-primitives",
  "rlp",
- "secp256k1",
+ "secp256k1 0.27.0",
  "serde",
  "thiserror",
  "tokio",
@@ -6064,7 +6039,7 @@ dependencies = [
 [[package]]
 name = "reth-dns-discovery"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "async-trait",
@@ -6075,7 +6050,7 @@ dependencies = [
  "reth-net-common",
  "reth-primitives",
  "schnellru",
- "secp256k1",
+ "secp256k1 0.27.0",
  "serde",
  "serde_with",
  "thiserror",
@@ -6088,7 +6063,7 @@ dependencies = [
 [[package]]
 name = "reth-downloaders"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "futures",
@@ -6113,7 +6088,7 @@ dependencies = [
 [[package]]
 name = "reth-ecies"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "aes 0.8.3",
  "alloy-rlp",
@@ -6130,7 +6105,7 @@ dependencies = [
  "rand 0.8.5",
  "reth-net-common",
  "reth-primitives",
- "secp256k1",
+ "secp256k1 0.27.0",
  "sha2 0.10.8",
  "sha3",
  "thiserror",
@@ -6144,7 +6119,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "async-trait",
@@ -6169,14 +6144,13 @@ dependencies = [
 [[package]]
 name = "reth-interfaces"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "async-trait",
  "auto_impl",
  "clap",
  "futures",
  "modular-bitfield",
- "parity-scale-codec",
  "parking_lot 0.12.1",
  "rand 0.8.5",
  "reth-codecs",
@@ -6186,7 +6160,7 @@ dependencies = [
  "reth-primitives",
  "reth-rpc-types",
  "revm-primitives",
- "secp256k1",
+ "secp256k1 0.27.0",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -6196,7 +6170,7 @@ dependencies = [
 [[package]]
 name = "reth-ipc"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "async-trait",
  "bytes",
@@ -6216,7 +6190,7 @@ dependencies = [
 [[package]]
 name = "reth-libmdbx"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "bitflags 2.4.1",
  "byteorder",
@@ -6231,7 +6205,7 @@ dependencies = [
 [[package]]
 name = "reth-mdbx-sys"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "bindgen 0.68.1",
  "cc",
@@ -6241,7 +6215,7 @@ dependencies = [
 [[package]]
 name = "reth-metrics"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "futures",
  "metrics",
@@ -6253,7 +6227,7 @@ dependencies = [
 [[package]]
 name = "reth-metrics-derive"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -6265,7 +6239,7 @@ dependencies = [
 [[package]]
 name = "reth-net-common"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "pin-project",
  "reth-primitives",
@@ -6275,7 +6249,7 @@ dependencies = [
 [[package]]
 name = "reth-net-nat"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "igd",
  "pin-project-lite",
@@ -6289,7 +6263,7 @@ dependencies = [
 [[package]]
 name = "reth-network"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "aquamarine",
@@ -6317,8 +6291,9 @@ dependencies = [
  "reth-provider",
  "reth-rpc-types",
  "reth-tasks",
+ "reth-tokio-util",
  "reth-transaction-pool",
- "secp256k1",
+ "secp256k1 0.27.0",
  "serde",
  "serde_json",
  "thiserror",
@@ -6331,7 +6306,7 @@ dependencies = [
 [[package]]
 name = "reth-network-api"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "async-trait",
  "reth-discv4",
@@ -6346,29 +6321,26 @@ dependencies = [
 [[package]]
 name = "reth-nippy-jar"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "anyhow",
  "bincode",
- "bytes",
  "cuckoofilter",
- "hex",
+ "derive_more",
  "lz4_flex",
  "memmap2",
  "ph",
  "serde",
  "sucds 0.8.1",
- "tempfile",
  "thiserror",
  "tracing",
- "tracing-appender",
  "zstd 0.12.4",
 ]
 
 [[package]]
 name = "reth-payload-builder"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "futures-util",
@@ -6376,7 +6348,6 @@ dependencies = [
  "reth-interfaces",
  "reth-metrics",
  "reth-primitives",
- "reth-revm-primitives",
  "reth-rpc-types",
  "reth-rpc-types-compat",
  "reth-transaction-pool",
@@ -6391,15 +6362,14 @@ dependencies = [
 [[package]]
 name = "reth-primitives"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
- "alloy-sol-types",
  "arbitrary",
  "byteorder",
  "bytes",
- "c-kzg 0.1.1",
+ "c-kzg",
  "clap",
  "crc",
  "derive_more",
@@ -6411,8 +6381,10 @@ dependencies = [
  "proptest-derive",
  "rayon",
  "reth-codecs",
+ "reth-rpc-types",
+ "revm",
  "revm-primitives",
- "secp256k1",
+ "secp256k1 0.27.0",
  "serde",
  "serde_json",
  "serde_with",
@@ -6421,8 +6393,6 @@ dependencies = [
  "sucds 0.6.0",
  "tempfile",
  "thiserror",
- "tokio",
- "tokio-stream",
  "tracing",
  "url",
  "zstd 0.12.4",
@@ -6431,19 +6401,21 @@ dependencies = [
 [[package]]
 name = "reth-provider"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "auto_impl",
+ "dashmap",
  "itertools 0.11.0",
+ "metrics",
  "parking_lot 0.12.1",
  "pin-project",
  "rayon",
  "reth-db",
  "reth-interfaces",
+ "reth-metrics",
  "reth-nippy-jar",
  "reth-primitives",
- "reth-revm-primitives",
  "reth-trie",
  "revm",
  "tokio",
@@ -6454,7 +6426,7 @@ dependencies = [
 [[package]]
 name = "reth-prune"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "itertools 0.11.0",
  "metrics",
@@ -6465,6 +6437,7 @@ dependencies = [
  "reth-primitives",
  "reth-provider",
  "reth-snapshot",
+ "reth-tokio-util",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -6474,14 +6447,13 @@ dependencies = [
 [[package]]
 name = "reth-revm"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "reth-consensus-common",
  "reth-interfaces",
  "reth-primitives",
  "reth-provider",
  "reth-revm-inspectors",
- "reth-revm-primitives",
  "revm",
  "tracing",
 ]
@@ -6489,7 +6461,7 @@ dependencies = [
 [[package]]
 name = "reth-revm-inspectors"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-sol-types",
  "boa_engine",
@@ -6503,19 +6475,10 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "reth-revm-primitives"
-version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
-dependencies = [
- "reth-primitives",
- "revm",
-]
-
 [[package]]
 name = "reth-rpc"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-primitives",
@@ -6551,7 +6514,7 @@ dependencies = [
  "revm",
  "revm-primitives",
  "schnellru",
- "secp256k1",
+ "secp256k1 0.27.0",
  "serde",
  "serde_json",
  "thiserror",
@@ -6566,7 +6529,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-api"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "jsonrpsee",
  "reth-primitives",
@@ -6577,7 +6540,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-builder"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "hyper",
  "jsonrpsee",
@@ -6606,7 +6569,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-engine-api"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "async-trait",
  "jsonrpsee-core",
@@ -6622,6 +6585,7 @@ dependencies = [
  "reth-rpc-types",
  "reth-rpc-types-compat",
  "reth-tasks",
+ "serde",
  "thiserror",
  "tokio",
  "tracing",
@@ -6630,22 +6594,29 @@ dependencies = [
 [[package]]
 name = "reth-rpc-types"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
+ "arbitrary",
+ "bytes",
+ "c-kzg",
  "itertools 0.11.0",
  "jsonrpsee-types",
- "reth-primitives",
+ "proptest",
+ "proptest-derive",
+ "secp256k1 0.27.0",
  "serde",
  "serde_json",
+ "serde_with",
  "thiserror",
+ "url",
 ]
 
 [[package]]
 name = "reth-rpc-types-compat"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "reth-primitives",
@@ -6655,7 +6626,7 @@ dependencies = [
 [[package]]
 name = "reth-snapshot"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "clap",
  "reth-db",
@@ -6671,7 +6642,7 @@ dependencies = [
 [[package]]
 name = "reth-stages"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "aquamarine",
  "async-trait",
@@ -6687,6 +6658,7 @@ dependencies = [
  "reth-metrics",
  "reth-primitives",
  "reth-provider",
+ "reth-tokio-util",
  "reth-trie",
  "revm",
  "serde",
@@ -6699,7 +6671,7 @@ dependencies = [
 [[package]]
 name = "reth-tasks"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "dyn-clone",
  "futures-util",
@@ -6711,10 +6683,19 @@ dependencies = [
  "tracing-futures",
 ]
 
+[[package]]
+name = "reth-tokio-util"
+version = "0.1.0-alpha.10"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
+dependencies = [
+ "tokio",
+ "tokio-stream",
+]
+
 [[package]]
 name = "reth-tracing"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "rolling-file",
  "tracing",
@@ -6726,7 +6707,7 @@ dependencies = [
 [[package]]
 name = "reth-transaction-pool"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "aquamarine",
@@ -6743,7 +6724,6 @@ dependencies = [
  "reth-metrics",
  "reth-primitives",
  "reth-provider",
- "reth-revm-primitives",
  "reth-tasks",
  "revm",
  "serde",
@@ -6756,7 +6736,7 @@ dependencies = [
 [[package]]
 name = "reth-trie"
 version = "0.1.0-alpha.10"
-source = "git+https://github.com/paradigmxyz/reth?rev=5dd5555c5c7d8e43420e273e7005b8af63a847a5#5dd5555c5c7d8e43420e273e7005b8af63a847a5"
+source = "git+https://github.com/paradigmxyz/reth?rev=0a3884ba81579a775a0305be3a6621cd6782176a#0a3884ba81579a775a0305be3a6621cd6782176a"
 dependencies = [
  "alloy-rlp",
  "auto_impl",
@@ -6772,8 +6752,7 @@ dependencies = [
 [[package]]
 name = "revm"
 version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68f4ca8ae0345104523b4af1a8a7ea97cfa1865cdb7a7c25d23c1a18d9b48598"
+source = "git+https://github.com/bluealloy/revm?rev=1609e07c68048909ad1682c98cf2b9baa76310b5#1609e07c68048909ad1682c98cf2b9baa76310b5"
 dependencies = [
  "auto_impl",
  "revm-interpreter",
@@ -6783,8 +6762,7 @@ dependencies = [
 [[package]]
 name = "revm-interpreter"
 version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f959cafdf64a7f89b014fa73dc2325001cf654b3d9400260b212d19a2ebe3da0"
+source = "git+https://github.com/bluealloy/revm?rev=1609e07c68048909ad1682c98cf2b9baa76310b5#1609e07c68048909ad1682c98cf2b9baa76310b5"
 dependencies = [
  "revm-primitives",
 ]
@@ -6792,16 +6770,15 @@ dependencies = [
 [[package]]
 name = "revm-precompile"
 version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d360a88223d85709d2e95d4609eb1e19c649c47e28954bfabae5e92bb37e83e"
+source = "git+https://github.com/bluealloy/revm?rev=1609e07c68048909ad1682c98cf2b9baa76310b5#1609e07c68048909ad1682c98cf2b9baa76310b5"
 dependencies = [
- "c-kzg 0.1.1",
+ "aurora-engine-modexp",
+ "c-kzg",
  "k256 0.13.1",
- "num",
  "once_cell",
  "revm-primitives",
  "ripemd",
- "secp256k1",
+ "secp256k1 0.28.0",
  "sha2 0.10.8",
  "substrate-bn",
 ]
@@ -6809,14 +6786,15 @@ dependencies = [
 [[package]]
 name = "revm-primitives"
 version = "1.3.0"
-source = "git+https://github.com/ralexstokes/revm?rev=929530a5b2575c97f3c055f4f8d8b9ba273cb3dd#929530a5b2575c97f3c055f4f8d8b9ba273cb3dd"
+source = "git+https://github.com/bluealloy/revm?rev=1609e07c68048909ad1682c98cf2b9baa76310b5#1609e07c68048909ad1682c98cf2b9baa76310b5"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "auto_impl",
  "bitflags 2.4.1",
  "bitvec",
- "c-kzg 0.1.1",
+ "c-kzg",
+ "derive_more",
  "enumn",
  "hashbrown 0.14.2",
  "hex",
@@ -7152,7 +7130,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d"
 dependencies = [
- "ahash 0.8.6",
+ "ahash",
  "cfg-if",
  "hashbrown 0.13.2",
 ]
@@ -7220,10 +7198,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
 dependencies = [
  "rand 0.8.5",
- "secp256k1-sys",
+ "secp256k1-sys 0.8.1",
  "serde",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.28.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2acea373acb8c21ecb5a23741452acd2593ed44ee3d343e72baaa143bc89d0d5"
+dependencies = [
+ "secp256k1-sys 0.9.0",
+]
+
 [[package]]
 name = "secp256k1-sys"
 version = "0.8.1"
@@ -7233,6 +7220,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09e67c467c38fd24bd5499dc9a18183b31575c12ee549197e3e20d57aa4fe3b7"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.9.2"
diff --git a/Cargo.toml b/Cargo.toml
index c8e83f72..7f686513 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -17,21 +17,14 @@ version = "0.3.0"
 ethereum-consensus = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "b9baee3f3b9fc76bd9b5bc22b78edc05446af815" }
 beacon-api-client = { git = "https://github.com/ralexstokes/ethereum-consensus", rev = "b9baee3f3b9fc76bd9b5bc22b78edc05446af815" }
 
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
-reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
-reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
-reth = { git = "https://github.com/paradigmxyz/reth", rev = "5dd5555c5c7d8e43420e273e7005b8af63a847a5" }
-revm = "3.5.0"
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "0a3884ba81579a775a0305be3a6621cd6782176a" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "0a3884ba81579a775a0305be3a6621cd6782176a" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "0a3884ba81579a775a0305be3a6621cd6782176a" }
+reth-rpc-types = { git = "https://github.com/paradigmxyz/reth", rev = "0a3884ba81579a775a0305be3a6621cd6782176a" }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "0a3884ba81579a775a0305be3a6621cd6782176a" }
+reth-interfaces = { git = "https://github.com/paradigmxyz/reth", rev = "0a3884ba81579a775a0305be3a6621cd6782176a" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "0a3884ba81579a775a0305be3a6621cd6782176a" }
+reth = { git = "https://github.com/paradigmxyz/reth", rev = "0a3884ba81579a775a0305be3a6621cd6782176a" }
+revm = { git = "https://github.com/bluealloy/revm", rev = "1609e07c68048909ad1682c98cf2b9baa76310b5" }
 
 eyre = "0.6.8"
-
-[patch.crates-io]
-# We patch `revm-primitives` so that all generated files go into the expected place ("OUT_DIR") which
-# works well with rust `nix` builders and does not work well otherwise.
-# TODO: It looks like later versions of this crate remove the problematic build script and so once `reth` updates
-# (which indirectly uses this dependency) then we can drop this patch.
-revm-primitives = { git = "https://github.com/ralexstokes/revm", rev = "929530a5b2575c97f3c055f4f8d8b9ba273cb3dd" }
diff --git a/mev-build-rs/src/reth_builder/payload_builder.rs b/mev-build-rs/src/reth_builder/payload_builder.rs
index be8bbbc9..27919aa1 100644
--- a/mev-build-rs/src/reth_builder/payload_builder.rs
+++ b/mev-build-rs/src/reth_builder/payload_builder.rs
@@ -14,14 +14,15 @@ use ethers::{
 };
 use reth_interfaces::RethError;
 use reth_primitives::{
-    constants::{BEACON_NONCE, EMPTY_OMMER_ROOT},
-    proofs, Address, Block, Bytes, ChainSpec, Header, IntoRecoveredTransaction, Receipt, Receipts,
+    constants::{BEACON_NONCE, EMPTY_OMMER_ROOT_HASH},
+    proofs,
+    revm::{compat::into_reth_log, env::tx_env_with_recovered},
+    Address, Block, Bytes, ChainSpec, Header, IntoRecoveredTransaction, Receipt, Receipts,
     TransactionSigned, TransactionSignedEcRecovered, Withdrawal, B256, U256,
 };
 use reth_provider::{BundleStateWithReceipts, StateProvider, StateProviderFactory};
 use reth_revm::{
-    database::StateProviderDatabase, env::tx_env_with_recovered, into_reth_log,
-    state_change::post_block_withdrawals_balance_increments,
+    database::StateProviderDatabase, state_change::post_block_withdrawals_balance_increments,
 };
 use revm::{
     db::{states::bundle_state::BundleRetention, WrapDatabaseRef},
@@ -123,7 +124,7 @@ fn assemble_payload_with_payments(
 
     let header = Header {
         parent_hash: context.build.parent_hash,
-        ommers_hash: EMPTY_OMMER_ROOT,
+        ommers_hash: EMPTY_OMMER_ROOT_HASH,
         beneficiary: context.build.block_env.coinbase,
         state_root,
         transactions_root,
@@ -277,7 +278,8 @@ impl<'a> ExecutionContext<'a> {
         self.receipts.push(Some(receipt));
 
         let base_fee = self.build.base_fee();
-        let fee = tx.effective_tip_per_gas(base_fee).expect("fee is valid; execution succeeded");
+        let fee =
+            tx.effective_tip_per_gas(Some(base_fee)).expect("fee is valid; execution succeeded");
         self.total_fees += U256::from(fee) * U256::from(gas_used);
 
         self.executed_txs.push(tx.into_signed());