diff --git a/Cargo.lock b/Cargo.lock
index 92003f5..1a1b5b5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3965,16 +3965,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "metrics"
-version = "0.23.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "884adb57038347dfbaf2d5065887b6cf4312330dc8e94bc30a1a839bd79d3261"
-dependencies = [
- "ahash",
- "portable-atomic",
-]
-
 [[package]]
 name = "metrics"
 version = "0.24.0"
@@ -3999,13 +3989,13 @@ dependencies = [
 
 [[package]]
 name = "metrics-exporter-prometheus"
-version = "0.15.3"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4f0c8427b39666bf970460908b213ec09b3b350f20c0c2eabcbba51704a08e6"
+checksum = "85b6f8152da6d7892ff1b7a1c0fa3f435e92b5918ad67035c3bb432111d9a29b"
 dependencies = [
  "base64 0.22.1",
  "indexmap 2.6.0",
- "metrics 0.23.0",
+ "metrics",
  "metrics-util",
  "quanta",
  "thiserror",
@@ -4020,7 +4010,7 @@ dependencies = [
  "libc",
  "libproc",
  "mach2",
- "metrics 0.24.0",
+ "metrics",
  "once_cell",
  "procfs 0.17.0",
  "rlimit",
@@ -4029,15 +4019,14 @@ dependencies = [
 
 [[package]]
 name = "metrics-util"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828"
+checksum = "15b482df36c13dd1869d73d14d28cd4855fbd6cfc32294bee109908a9f4a4ed7"
 dependencies = [
  "crossbeam-epoch",
  "crossbeam-utils",
- "hashbrown 0.14.5",
- "metrics 0.23.0",
- "num_cpus",
+ "hashbrown 0.15.0",
+ "metrics",
  "quanta",
  "sketches-ddsketch",
 ]
@@ -5188,7 +5177,7 @@ dependencies = [
 [[package]]
 name = "reth"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5260,7 +5249,7 @@ dependencies = [
 [[package]]
 name = "reth-auto-seal-consensus"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -5291,7 +5280,7 @@ dependencies = [
 [[package]]
 name = "reth-basic-payload-builder"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5299,7 +5288,7 @@ dependencies = [
  "alloy-rlp",
  "futures-core",
  "futures-util",
- "metrics 0.23.0",
+ "metrics",
  "reth-chainspec",
  "reth-evm",
  "reth-metrics",
@@ -5317,14 +5306,14 @@ dependencies = [
 [[package]]
 name = "reth-beacon-consensus"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "alloy-rpc-types-engine",
  "futures",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "reth-blockchain-tree-api",
  "reth-engine-primitives",
  "reth-errors",
@@ -5352,13 +5341,13 @@ dependencies = [
 [[package]]
 name = "reth-blockchain-tree"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "aquamarine",
  "linked_hash_set",
- "metrics 0.23.0",
+ "metrics",
  "parking_lot",
  "reth-blockchain-tree-api",
  "reth-consensus",
@@ -5385,7 +5374,7 @@ dependencies = [
 [[package]]
 name = "reth-blockchain-tree-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "reth-consensus",
@@ -5398,7 +5387,7 @@ dependencies = [
 [[package]]
 name = "reth-chain-state"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5407,7 +5396,7 @@ dependencies = [
  "alloy-signer-local",
  "auto_impl",
  "derive_more",
- "metrics 0.23.0",
+ "metrics",
  "parking_lot",
  "pin-project",
  "rand",
@@ -5427,7 +5416,7 @@ dependencies = [
 [[package]]
 name = "reth-chainspec"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -5447,7 +5436,7 @@ dependencies = [
 [[package]]
 name = "reth-cli"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-genesis",
  "clap",
@@ -5461,11 +5450,12 @@ dependencies = [
 [[package]]
 name = "reth-cli-commands"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "ahash",
  "alloy-eips",
  "alloy-primitives",
+ "alloy-rlp",
  "backon",
  "clap",
  "comfy-table",
@@ -5519,7 +5509,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-runner"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "reth-tasks",
  "tokio",
@@ -5529,7 +5519,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-util"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -5539,6 +5529,7 @@ dependencies = [
  "rand",
  "reth-fs-util",
  "secp256k1",
+ "serde",
  "thiserror",
  "tikv-jemallocator",
 ]
@@ -5546,7 +5537,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5565,7 +5556,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs-derive"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -5576,7 +5567,7 @@ dependencies = [
 [[package]]
 name = "reth-config"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "eyre",
  "humantime-serde",
@@ -5590,7 +5581,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -5602,7 +5593,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus-common"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5616,7 +5607,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus-debug-client"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5640,13 +5631,13 @@ dependencies = [
 [[package]]
 name = "reth-db"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "bytes",
  "derive_more",
  "eyre",
- "metrics 0.23.0",
+ "metrics",
  "page_size",
  "parking_lot",
  "paste",
@@ -5673,14 +5664,14 @@ dependencies = [
 [[package]]
 name = "reth-db-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
  "arbitrary",
  "bytes",
  "derive_more",
- "metrics 0.23.0",
+ "metrics",
  "modular-bitfield",
  "parity-scale-codec",
  "proptest",
@@ -5698,7 +5689,7 @@ dependencies = [
 [[package]]
 name = "reth-db-common"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
@@ -5726,7 +5717,7 @@ dependencies = [
 [[package]]
 name = "reth-db-models"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -5741,13 +5732,14 @@ dependencies = [
 [[package]]
 name = "reth-discv4"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "discv5",
  "enr",
  "generic-array",
+ "itertools 0.13.0",
  "parking_lot",
  "rand",
  "reth-ethereum-forks",
@@ -5766,7 +5758,7 @@ dependencies = [
 [[package]]
 name = "reth-discv5"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -5775,7 +5767,7 @@ dependencies = [
  "enr",
  "futures",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "rand",
  "reth-chainspec",
  "reth-ethereum-forks",
@@ -5790,7 +5782,7 @@ dependencies = [
 [[package]]
 name = "reth-dns-discovery"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "data-encoding",
@@ -5814,7 +5806,7 @@ dependencies = [
 [[package]]
 name = "reth-downloaders"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -5822,7 +5814,7 @@ dependencies = [
  "futures",
  "futures-util",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "pin-project",
  "rayon",
  "reth-config",
@@ -5843,7 +5835,7 @@ dependencies = [
 [[package]]
 name = "reth-ecies"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "aes",
  "alloy-primitives",
@@ -5874,7 +5866,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-local"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-engine",
@@ -5904,7 +5896,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-primitives"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "reth-execution-types",
@@ -5917,7 +5909,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-service"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "futures",
  "pin-project",
@@ -5940,13 +5932,13 @@ dependencies = [
 [[package]]
 name = "reth-engine-tree"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "alloy-rpc-types-engine",
  "futures",
- "metrics 0.23.0",
+ "metrics",
  "reth-beacon-consensus",
  "reth-blockchain-tree",
  "reth-blockchain-tree-api",
@@ -5977,7 +5969,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-util"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6010,7 +6002,7 @@ dependencies = [
 [[package]]
 name = "reth-errors"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "reth-blockchain-tree-api",
  "reth-consensus",
@@ -6023,7 +6015,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -6050,7 +6042,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-chains",
  "alloy-eips",
@@ -6068,7 +6060,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-cli"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "eyre",
  "reth-chainspec",
@@ -6078,7 +6070,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-consensus"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6093,7 +6085,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-engine-primitives"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6112,7 +6104,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-forks"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-chains",
  "alloy-primitives",
@@ -6132,7 +6124,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-payload-builder"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6159,7 +6151,7 @@ dependencies = [
 [[package]]
 name = "reth-etl"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "rayon",
  "reth-db-api",
@@ -6169,13 +6161,13 @@ dependencies = [
 [[package]]
 name = "reth-evm"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "auto_impl",
  "futures-util",
- "metrics 0.23.0",
+ "metrics",
  "parking_lot",
  "reth-chainspec",
  "reth-consensus",
@@ -6195,7 +6187,7 @@ dependencies = [
 [[package]]
 name = "reth-evm-ethereum"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6214,7 +6206,7 @@ dependencies = [
 [[package]]
 name = "reth-execution-errors"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6230,7 +6222,7 @@ dependencies = [
 [[package]]
 name = "reth-execution-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6245,14 +6237,14 @@ dependencies = [
 [[package]]
 name = "reth-exex"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "eyre",
  "futures",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "parking_lot",
  "reth-chain-state",
  "reth-chainspec",
@@ -6281,7 +6273,7 @@ dependencies = [
 [[package]]
 name = "reth-exex-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6294,7 +6286,7 @@ dependencies = [
 [[package]]
 name = "reth-fs-util"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "serde",
  "serde_json",
@@ -6304,7 +6296,7 @@ dependencies = [
 [[package]]
 name = "reth-invalid-block-hooks"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -6329,7 +6321,7 @@ dependencies = [
 [[package]]
 name = "reth-ipc"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "async-trait",
  "bytes",
@@ -6350,7 +6342,7 @@ dependencies = [
 [[package]]
 name = "reth-libmdbx"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "bitflags 2.6.0",
  "byteorder",
@@ -6367,7 +6359,7 @@ dependencies = [
 [[package]]
 name = "reth-mdbx-sys"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "bindgen",
  "cc",
@@ -6376,10 +6368,10 @@ dependencies = [
 [[package]]
 name = "reth-metrics"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "futures",
- "metrics 0.23.0",
+ "metrics",
  "metrics-derive",
  "tokio",
  "tokio-util",
@@ -6388,7 +6380,7 @@ dependencies = [
 [[package]]
 name = "reth-net-banlist"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
 ]
@@ -6396,7 +6388,7 @@ dependencies = [
 [[package]]
 name = "reth-net-nat"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "futures-util",
  "if-addrs",
@@ -6410,7 +6402,7 @@ dependencies = [
 [[package]]
 name = "reth-network"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6422,7 +6414,7 @@ dependencies = [
  "enr",
  "futures",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "parking_lot",
  "pin-project",
  "rand",
@@ -6461,7 +6453,7 @@ dependencies = [
 [[package]]
 name = "reth-network-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-admin",
@@ -6484,7 +6476,7 @@ dependencies = [
 [[package]]
 name = "reth-network-p2p"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6505,7 +6497,7 @@ dependencies = [
 [[package]]
 name = "reth-network-peers"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -6520,7 +6512,7 @@ dependencies = [
 [[package]]
 name = "reth-network-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "humantime-serde",
  "reth-ethereum-forks",
@@ -6534,7 +6526,7 @@ dependencies = [
 [[package]]
 name = "reth-nippy-jar"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "anyhow",
  "bincode",
@@ -6551,7 +6543,7 @@ dependencies = [
 [[package]]
 name = "reth-node-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-rpc-types-engine",
  "eyre",
@@ -6566,7 +6558,6 @@ dependencies = [
  "reth-payload-primitives",
  "reth-primitives",
  "reth-provider",
- "reth-rpc-eth-api",
  "reth-tasks",
  "reth-transaction-pool",
 ]
@@ -6574,7 +6565,7 @@ dependencies = [
 [[package]]
 name = "reth-node-builder"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types",
@@ -6638,7 +6629,7 @@ dependencies = [
 [[package]]
 name = "reth-node-core"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6665,8 +6656,6 @@ dependencies = [
  "reth-network-peers",
  "reth-primitives",
  "reth-prune-types",
- "reth-rpc-api",
- "reth-rpc-eth-api",
  "reth-rpc-eth-types",
  "reth-rpc-server-types",
  "reth-rpc-types-compat",
@@ -6688,7 +6677,7 @@ dependencies = [
 [[package]]
 name = "reth-node-ethereum"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "eyre",
  "reth-auto-seal-consensus",
@@ -6710,15 +6699,17 @@ dependencies = [
  "reth-rpc",
  "reth-tracing",
  "reth-transaction-pool",
+ "reth-trie-db",
  "revm",
 ]
 
 [[package]]
 name = "reth-node-events"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
+ "alloy-eips",
  "alloy-primitives",
  "alloy-rpc-types-engine",
  "futures",
@@ -6727,7 +6718,6 @@ dependencies = [
  "reth-beacon-consensus",
  "reth-network",
  "reth-network-api",
- "reth-primitives",
  "reth-primitives-traits",
  "reth-provider",
  "reth-prune",
@@ -6740,12 +6730,12 @@ dependencies = [
 [[package]]
 name = "reth-node-metrics"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "eyre",
  "http",
  "jsonrpsee",
- "metrics 0.23.0",
+ "metrics",
  "metrics-exporter-prometheus",
  "metrics-process",
  "metrics-util",
@@ -6764,25 +6754,26 @@ dependencies = [
 [[package]]
 name = "reth-node-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "reth-chainspec",
  "reth-db-api",
  "reth-engine-primitives",
  "reth-primitives",
  "reth-primitives-traits",
+ "reth-trie-db",
 ]
 
 [[package]]
 name = "reth-payload-builder"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types",
  "async-trait",
  "futures-util",
- "metrics 0.23.0",
+ "metrics",
  "reth-ethereum-engine-primitives",
  "reth-metrics",
  "reth-payload-primitives",
@@ -6796,8 +6787,9 @@ dependencies = [
 [[package]]
 name = "reth-payload-primitives"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
+ "alloy-eips",
  "alloy-primitives",
  "alloy-rpc-types",
  "async-trait",
@@ -6818,7 +6810,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-validator"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-rpc-types",
  "reth-chainspec",
@@ -6829,7 +6821,7 @@ dependencies = [
 [[package]]
 name = "reth-primitives"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6863,7 +6855,7 @@ dependencies = [
 [[package]]
 name = "reth-primitives-traits"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6887,7 +6879,7 @@ dependencies = [
 [[package]]
 name = "reth-provider"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6896,7 +6888,7 @@ dependencies = [
  "auto_impl",
  "dashmap 6.1.0",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "notify",
  "parking_lot",
  "rayon",
@@ -6931,11 +6923,11 @@ dependencies = [
 [[package]]
 name = "reth-prune"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "rayon",
  "reth-chainspec",
  "reth-config",
@@ -6957,7 +6949,7 @@ dependencies = [
 [[package]]
 name = "reth-prune-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -6972,7 +6964,7 @@ dependencies = [
 [[package]]
 name = "reth-revm"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -6988,7 +6980,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -6999,6 +6991,7 @@ dependencies = [
  "alloy-rlp",
  "alloy-rpc-types",
  "alloy-rpc-types-admin",
+ "alloy-rpc-types-beacon",
  "alloy-rpc-types-debug",
  "alloy-rpc-types-eth",
  "alloy-rpc-types-mev",
@@ -7019,13 +7012,15 @@ dependencies = [
  "pin-project",
  "rand",
  "reth-chainspec",
+ "reth-consensus",
  "reth-consensus-common",
  "reth-errors",
+ "reth-ethereum-consensus",
  "reth-evm",
  "reth-network-api",
  "reth-network-peers",
  "reth-network-types",
- "reth-node-api",
+ "reth-payload-validator",
  "reth-primitives",
  "reth-provider",
  "reth-revm",
@@ -7054,7 +7049,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-json-rpc",
@@ -7075,21 +7070,24 @@ dependencies = [
  "reth-network-peers",
  "reth-primitives",
  "reth-rpc-eth-api",
+ "serde",
+ "serde_with",
 ]
 
 [[package]]
 name = "reth-rpc-builder"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-network",
  "alloy-rpc-types",
  "alloy-serde",
  "http",
  "jsonrpsee",
- "metrics 0.23.0",
+ "metrics",
  "pin-project",
  "reth-chainspec",
+ "reth-consensus",
  "reth-engine-primitives",
  "reth-evm",
  "reth-ipc",
@@ -7108,6 +7106,8 @@ dependencies = [
  "reth-transaction-pool",
  "serde",
  "thiserror",
+ "tokio",
+ "tokio-util",
  "tower 0.4.13",
  "tower-http",
  "tracing",
@@ -7116,7 +7116,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-engine-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -7124,7 +7124,7 @@ dependencies = [
  "async-trait",
  "jsonrpsee-core",
  "jsonrpsee-types",
- "metrics 0.23.0",
+ "metrics",
  "reth-beacon-consensus",
  "reth-chainspec",
  "reth-engine-primitives",
@@ -7147,7 +7147,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-eth-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -7170,6 +7170,7 @@ dependencies = [
  "reth-evm",
  "reth-execution-types",
  "reth-network-api",
+ "reth-node-api",
  "reth-primitives",
  "reth-provider",
  "reth-revm",
@@ -7189,7 +7190,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-eth-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7203,7 +7204,7 @@ dependencies = [
  "itertools 0.13.0",
  "jsonrpsee-core",
  "jsonrpsee-types",
- "metrics 0.23.0",
+ "metrics",
  "rand",
  "reth-chain-state",
  "reth-chainspec",
@@ -7233,7 +7234,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-layer"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-rpc-types-engine",
  "http",
@@ -7246,7 +7247,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-server-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-engine",
@@ -7262,7 +7263,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-types-compat"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7280,7 +7281,7 @@ dependencies = [
 [[package]]
 name = "reth-stages"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "bincode",
@@ -7316,13 +7317,13 @@ dependencies = [
 [[package]]
 name = "reth-stages-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "aquamarine",
  "auto_impl",
  "futures-util",
- "metrics 0.23.0",
+ "metrics",
  "reth-consensus",
  "reth-errors",
  "reth-metrics",
@@ -7342,7 +7343,7 @@ dependencies = [
 [[package]]
 name = "reth-stages-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -7356,7 +7357,7 @@ dependencies = [
 [[package]]
 name = "reth-static-file"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "parking_lot",
@@ -7375,7 +7376,7 @@ dependencies = [
 [[package]]
 name = "reth-static-file-types"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "clap",
@@ -7387,7 +7388,7 @@ dependencies = [
 [[package]]
 name = "reth-storage-api"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7407,7 +7408,7 @@ dependencies = [
 [[package]]
 name = "reth-storage-errors"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -7420,12 +7421,12 @@ dependencies = [
 [[package]]
 name = "reth-tasks"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "auto_impl",
  "dyn-clone",
  "futures-util",
- "metrics 0.23.0",
+ "metrics",
  "pin-project",
  "rayon",
  "reth-metrics",
@@ -7438,7 +7439,7 @@ dependencies = [
 [[package]]
 name = "reth-tokio-util"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "tokio",
  "tokio-stream",
@@ -7448,7 +7449,7 @@ dependencies = [
 [[package]]
 name = "reth-tracing"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "clap",
  "eyre",
@@ -7463,7 +7464,7 @@ dependencies = [
 [[package]]
 name = "reth-transaction-pool"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7473,7 +7474,7 @@ dependencies = [
  "auto_impl",
  "bitflags 2.6.0",
  "futures-util",
- "metrics 0.23.0",
+ "metrics",
  "parking_lot",
  "rand",
  "reth-chain-state",
@@ -7499,14 +7500,14 @@ dependencies = [
 [[package]]
 name = "reth-trie"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
  "alloy-rlp",
  "auto_impl",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "rayon",
  "reth-execution-errors",
  "reth-metrics",
@@ -7524,7 +7525,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-common"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-consensus",
  "alloy-genesis",
@@ -7547,12 +7548,12 @@ dependencies = [
 [[package]]
 name = "reth-trie-db"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "derive_more",
- "metrics 0.23.0",
+ "metrics",
  "reth-db",
  "reth-db-api",
  "reth-execution-errors",
@@ -7570,13 +7571,13 @@ dependencies = [
 [[package]]
 name = "reth-trie-parallel"
 version = "1.1.0"
-source = "git+https://github.com/paradigmxyz/reth?rev=e93e373853ae2735fc6ca86ef0273bcacfd15c31#e93e373853ae2735fc6ca86ef0273bcacfd15c31"
+source = "git+https://github.com/paradigmxyz/reth?rev=bd8c4eceb20c39c6e501d06cf906469329340bb9#bd8c4eceb20c39c6e501d06cf906469329340bb9"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "derive_more",
  "itertools 0.13.0",
- "metrics 0.23.0",
+ "metrics",
  "rayon",
  "reth-db",
  "reth-execution-errors",
@@ -7628,10 +7629,12 @@ dependencies = [
  "reth-primitives",
  "reth-provider",
  "reth-prune-types",
+ "reth-rpc",
  "reth-stages",
  "reth-stages-api",
  "reth-stages-types",
  "reth-trie",
+ "reth-trie-db",
  "revm",
  "revm-inspectors",
  "revm-primitives",
@@ -8422,9 +8425,9 @@ checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
 
 [[package]]
 name = "sketches-ddsketch"
-version = "0.2.2"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85636c14b73d81f541e525f585c0a2109e6744e1565b5c1668e31c70c10ed65c"
+checksum = "c1e9a774a6c28142ac54bb25d25562e6bcf957493a184f15ad4eebccb23e410a"
 
 [[package]]
 name = "slab"
diff --git a/Cargo.toml b/Cargo.toml
index 4a87820..908b0e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,34 +12,34 @@ name = "reth"
 path = "src/main.rs"
 
 [dependencies]
-reth = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-auto-seal-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31", features = ["test-utils"] }
-reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-stages-api = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-stages-types = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
-reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "e93e373853ae2735fc6ca86ef0273bcacfd15c31" }
+reth = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-auto-seal-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-ethereum-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-ethereum-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9", features = ["test-utils"] }
+reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-stages-api = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-stages-types = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "bd8c4eceb20c39c6e501d06cf906469329340bb9" }
 eyre = "0.6.12"
 clap = { version = "4.5.6", features = ["derive"] }
-alloy-sol-macro = "0.8.5"
-alloy-sol-types = "0.8.5"
 
 # revm
 revm = { version = "17.0.0", features = [
@@ -52,7 +52,7 @@ revm-primitives = { version = "13.0.0", features = [
     "std",
 ], default-features = false }
 
-serde_json = "1.0.117"
+serde_json = "1.0.94"
 serde = { version = "1.0", default-features = false }
 serde_with = "3.3.0"
 hex = "0.4.3"
@@ -63,19 +63,22 @@ thiserror-no-std = { version = "2.0.2", default-features = false }
 # eth
 alloy-chains = "0.1.32"
 alloy-dyn-abi = "0.8.0"
-alloy-primitives = { version = "0.8.4", default-features = false }
-alloy-serde = { version = "0.5.4", default-features = false }
+alloy-primitives = { version = "0.8.9", default-features = false }
 alloy-rlp = "0.3.4"
-alloy-trie = { version = "0.7.2", default-features = false }
+alloy-sol-types = "0.8.0"
+alloy-trie = { version = "0.7", default-features = false }
+
 alloy-consensus = { version = "0.5.4", default-features = false }
 alloy-eips = { version = "0.5.4", default-features = false }
+alloy-sol-macro = "0.8.9"
+alloy-serde = { version = "0.5.4", default-features = false }
 rayon = "1.7"
 
 tracing = "0.1.0"
 
 [target.'cfg(unix)'.dependencies]
-tikv-jemallocator = { version = "0.6", optional = true }
 tikv-jemalloc-ctl = "0.6"
+tikv-jemallocator = { version = "0.6", optional = true }
 libc = "0.2"
 
 [features]
diff --git a/src/evm_config.rs b/src/evm_config.rs
index f866979..89962d2 100644
--- a/src/evm_config.rs
+++ b/src/evm_config.rs
@@ -1,21 +1,22 @@
-use reth::{
-    primitives::{transaction::FillTxEnv, Head, Header, TransactionSigned},
-    revm::{
-        inspector_handle_register,
-        interpreter::Gas,
-        primitives::{spec_to_generic, CfgEnvWithHandlerCfg, EVMError, Spec, SpecId, TxEnv},
-        Context, Database, Evm, EvmBuilder, GetInspector,
-    },
-};
+use alloy_primitives::{Address, U256};
+use reth::revm::{inspector_handle_register, Database, GetInspector};
+use reth::revm::{Evm, EvmBuilder};
 use reth_chainspec::ChainSpec;
 use reth_evm::{ConfigureEvm, ConfigureEvmEnv};
 use reth_evm_ethereum::{revm_spec, revm_spec_by_timestamp_after_merge};
-use revm::handler::mainnet::reward_beneficiary as reward_beneficiary_mainnet;
+use reth_primitives::{
+    revm_primitives::{AnalysisKind, CfgEnvWithHandlerCfg, TxEnv},
+    transaction::FillTxEnv,
+    Head, Header, TransactionSigned,
+};
+use revm::{
+    handler::mainnet::reward_beneficiary as reward_beneficiary_mainnet, interpreter::Gas, Context,
+};
 use revm_primitives::{
-    Address, AnalysisKind, BlobExcessGasAndPrice, BlockEnv, Bytes, CfgEnv, Env, HandlerCfg, TxKind,
-    U256,
+    spec_to_generic, BlobExcessGasAndPrice, BlockEnv, Bytes, CfgEnv, EVMError, Env, HandlerCfg,
+    Spec, SpecId, TxKind,
 };
-use std::sync::Arc;
+use std::{convert::Infallible, sync::Arc};
 
 /// Reward beneficiary with gas fee.
 #[inline]
@@ -122,6 +123,7 @@ impl ConfigureEvm for GnosisEvmConfig {
 
 impl ConfigureEvmEnv for GnosisEvmConfig {
     type Header = Header;
+    type Error = Infallible;
 
     fn fill_tx_env(&self, tx_env: &mut TxEnv, transaction: &TransactionSigned, sender: Address) {
         transaction.fill_tx_env(tx_env, sender);
@@ -191,7 +193,7 @@ impl ConfigureEvmEnv for GnosisEvmConfig {
         &self,
         parent: &Self::Header,
         attributes: reth_evm::NextBlockEnvAttributes,
-    ) -> (CfgEnvWithHandlerCfg, revm_primitives::BlockEnv) {
+    ) -> Result<(CfgEnvWithHandlerCfg, BlockEnv), Self::Error> {
         // configure evm env based on parent block
         let cfg = CfgEnv::default().with_chain_id(self.chain_spec.chain().id());
 
@@ -240,6 +242,6 @@ impl ConfigureEvmEnv for GnosisEvmConfig {
             };
         }
 
-        (cfg_with_handler_cfg, block_env)
+        Ok((cfg_with_handler_cfg, block_env))
     }
 }
diff --git a/src/execute.rs b/src/execute.rs
index cd60750..14b9305 100644
--- a/src/execute.rs
+++ b/src/execute.rs
@@ -1,14 +1,12 @@
 extern crate alloc;
 use crate::evm_config::GnosisEvmConfig;
 
-use crate::errors::GnosisBlockExecutionError;
-use crate::gnosis::{apply_block_rewards_contract_call, apply_withdrawals_contract_call};
+use crate::gnosis::apply_post_block_system_calls;
 use alloc::{boxed::Box, sync::Arc};
 use alloy_consensus::Transaction as _;
 use alloy_eips::eip7685::Requests;
 use alloy_primitives::Address;
 use core::fmt::Display;
-use eyre::eyre;
 use reth_chainspec::ChainSpec;
 use reth_chainspec::EthereumHardforks;
 use reth_evm::{
@@ -46,27 +44,14 @@ use revm_primitives::{
 pub struct GnosisExecutionStrategyFactory<EvmConfig = GnosisEvmConfig> {
     chain_spec: Arc<ChainSpec>,
     evm_config: EvmConfig,
-    /// AuRa BlockRewards contract address for its system call
-    block_rewards_contract: Address,
 }
 
 impl<EvmConfig> GnosisExecutionStrategyFactory<EvmConfig> {
     // Create a new executor strategy factory
     pub fn new(chain_spec: Arc<ChainSpec>, evm_config: EvmConfig) -> eyre::Result<Self> {
-        let block_rewards_contract = chain_spec
-            .genesis()
-            .config
-            .extra_fields
-            .get("blockRewardsContract")
-            .ok_or(eyre!("blockRewardsContract not defined"))?;
-        let block_rewards_contract: Address =
-            serde_json::from_value(block_rewards_contract.clone())
-                .map_err(|e| BlockExecutionError::other(Box::new(e)))?;
-
         Ok(Self {
             chain_spec,
             evm_config,
-            block_rewards_contract,
         })
     }
 }
@@ -88,12 +73,7 @@ where
             .with_bundle_update()
             .without_state_clear()
             .build();
-        GnosisExecutionStrategy::new(
-            state,
-            self.chain_spec.clone(),
-            self.evm_config.clone(),
-            self.block_rewards_contract.clone(),
-        )
+        GnosisExecutionStrategy::new(state, self.chain_spec.clone(), self.evm_config.clone())
     }
 }
 
@@ -119,13 +99,17 @@ impl<DB, EvmConfig> GnosisExecutionStrategy<DB, EvmConfig>
 where
     EvmConfig: Clone,
 {
-    pub fn new(
-        state: State<DB>,
-        chain_spec: Arc<ChainSpec>,
-        evm_config: EvmConfig,
-        block_rewards_contract: Address,
-    ) -> Self {
+    pub fn new(state: State<DB>, chain_spec: Arc<ChainSpec>, evm_config: EvmConfig) -> Self {
         let system_caller = SystemCaller::new(evm_config.clone(), (*chain_spec).clone());
+        let block_rewards_contract = chain_spec
+            .genesis()
+            .config
+            .extra_fields
+            .get("blockRewardsContract")
+            .expect("blockRewardsContract not defined")
+            .clone();
+        let block_rewards_contract: Address = serde_json::from_value(block_rewards_contract)
+            .expect("blockRewardsContract not an address");
         Self {
             state,
             chain_spec,
@@ -250,15 +234,20 @@ where
         total_difficulty: U256,
         receipts: &[Receipt],
     ) -> Result<Requests, Self::Error> {
-        let chain_spec = self.chain_spec.clone();
-        let mut cfg = CfgEnvWithHandlerCfg::new(Default::default(), Default::default());
-        let mut block_env = BlockEnv::default();
-        self.evm_config.fill_cfg_and_block_env(
-            &mut cfg,
-            &mut block_env,
-            &block.header,
-            total_difficulty,
-        );
+        let cfg = CfgEnvWithHandlerCfg::new(Default::default(), Default::default());
+        let block_env = BlockEnv::default();
+
+        apply_post_block_system_calls::<EvmConfig, DB>(
+            &self.chain_spec,
+            &self.evm_config,
+            &mut self.state,
+            &cfg,
+            &block_env,
+            self.block_rewards_contract,
+            block.timestamp,
+            block.body.withdrawals.as_ref(),
+            block.beneficiary,
+        )?;
 
         let env = self.evm_env_for_block(&block.header, total_difficulty);
         let mut evm = self.evm_config.evm_with_env(&mut self.state, env);
@@ -277,30 +266,6 @@ where
             Requests::default()
         };
 
-        if chain_spec.is_shanghai_active_at_timestamp(block.timestamp) {
-            let withdrawals = block.body.withdrawals.as_ref().ok_or(
-                GnosisBlockExecutionError::CustomErrorMessage {
-                    message: "block has no withdrawals field".to_owned(),
-                },
-            )?;
-            apply_withdrawals_contract_call(&self.evm_config, &chain_spec, withdrawals, &mut evm)?;
-        }
-
-        let balance_increments = apply_block_rewards_contract_call(
-            &self.evm_config,
-            self.block_rewards_contract,
-            block.timestamp,
-            block.beneficiary,
-            &mut evm,
-        )?;
-
-        drop(evm);
-
-        // increment balances
-        self.state
-            .increment_balances(balance_increments)
-            .map_err(|_| BlockValidationError::IncrementBalanceFailed)?;
-
         Ok(requests)
     }
 
diff --git a/src/lib.rs b/src/lib.rs
index 11cfaeb..c745148 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,27 +1,27 @@
-use crate::execute::GnosisExecutionStrategyFactory;
 use consensus::GnosisBeaconConsensus;
 use evm_config::GnosisEvmConfig;
+use execute::GnosisExecutionStrategyFactory;
 use eyre::eyre;
 use payload_builder::GnosisPayloadServiceBuilder;
 use reth::{
-    api::FullNodeComponents,
+    api::{AddOnsContext, FullNodeComponents},
     builder::{
         components::{ComponentsBuilder, ConsensusBuilder, ExecutorBuilder},
         node::{FullNodeTypes, NodeTypes, NodeTypesWithEngine},
         rpc::{EngineValidatorBuilder, RpcAddOns},
-        AddOnsContext, BuilderContext, Node, NodeAdapter, NodeComponentsBuilder,
+        BuilderContext, Node, NodeAdapter, NodeComponentsBuilder,
     },
     network::NetworkHandle,
-    rpc::eth::EthApi,
 };
 use reth_chainspec::ChainSpec;
 use reth_engine_primitives::EngineValidator;
 use reth_ethereum_engine_primitives::EthereumEngineValidator;
-use reth_evm::execute::BasicBlockExecutorProvider;
 use reth_node_ethereum::{
     node::{EthereumNetworkBuilder, EthereumPoolBuilder},
-    EthEngineTypes, EthereumNode,
+    BasicBlockExecutorProvider, EthEngineTypes, EthereumNode,
 };
+use reth_rpc::EthApi;
+use reth_trie_db::MerklePatriciaTrie;
 use std::sync::Arc;
 
 mod consensus;
@@ -82,6 +82,7 @@ impl GnosisNode {
 impl NodeTypes for GnosisNode {
     type Primitives = ();
     type ChainSpec = ChainSpec;
+    type StateCommitment = MerklePatriciaTrie;
 }
 
 impl NodeTypesWithEngine for GnosisNode {
diff --git a/src/payload_builder.rs b/src/payload_builder.rs
index 95afbeb..852785b 100644
--- a/src/payload_builder.rs
+++ b/src/payload_builder.rs
@@ -1,28 +1,27 @@
 use std::sync::Arc;
 
 use alloy_consensus::EMPTY_OMMER_ROOT_HASH;
-use alloy_eips::eip7685::Requests;
-use alloy_eips::merge::BEACON_NONCE;
+use alloy_eips::{eip4844::MAX_DATA_GAS_PER_BLOCK, eip7685::Requests, merge::BEACON_NONCE};
 use eyre::eyre;
-use reth::builder::PayloadBuilderError;
 use reth::{
     api::{FullNodeTypes, NodeTypesWithEngine},
     builder::{components::PayloadServiceBuilder, BuilderContext, PayloadBuilderConfig},
     payload::{
-        EthBuiltPayload, EthPayloadBuilderAttributes, PayloadBuilderHandle, PayloadBuilderService,
+        EthBuiltPayload, EthPayloadBuilderAttributes, PayloadBuilderError, PayloadBuilderHandle,
+        PayloadBuilderService,
     },
-    primitives::{constants::eip4844::MAX_DATA_GAS_PER_BLOCK, proofs, Block, Header, Receipt},
-    revm::database::StateProviderDatabase,
-    transaction_pool::{
-        noop::NoopTransactionPool, BestTransactions, BestTransactionsAttributes, TransactionPool,
+    primitives::{
+        proofs::{self},
+        Block, Header, Receipt,
     },
+    revm::database::StateProviderDatabase,
+    transaction_pool::{noop::NoopTransactionPool, BestTransactionsAttributes, TransactionPool},
 };
 use reth_basic_payload_builder::{
     commit_withdrawals, is_better_payload, BasicPayloadJobGenerator,
     BasicPayloadJobGeneratorConfig, BuildArguments, BuildOutcome, PayloadBuilder, PayloadConfig,
     WithdrawalsOutcome,
 };
-use reth_chain_state::CanonStateSubscriptions;
 use reth_chain_state::ExecutedBlock;
 use reth_chainspec::{ChainSpec, EthereumHardforks};
 use reth_errors::RethError;
@@ -30,7 +29,9 @@ use reth_evm::{system_calls::SystemCaller, ConfigureEvm, ConfigureEvmEnv, NextBl
 use reth_evm_ethereum::eip6110::parse_deposits_from_receipts;
 use reth_node_ethereum::EthEngineTypes;
 use reth_primitives::BlockBody;
-use reth_provider::{ChainSpecProvider, ExecutionOutcome, StateProviderFactory};
+use reth_provider::{
+    CanonStateSubscriptions, ChainSpecProvider, ExecutionOutcome, StateProviderFactory,
+};
 use reth_trie::HashedPostState;
 use revm::{db::states::bundle_state::BundleRetention, DatabaseCommit, State};
 use revm_primitives::{
@@ -146,7 +147,7 @@ where
         &self,
         config: &PayloadConfig<EthPayloadBuilderAttributes>,
         parent: &Header,
-    ) -> (CfgEnvWithHandlerCfg, BlockEnv) {
+    ) -> Result<(CfgEnvWithHandlerCfg, BlockEnv), EvmConfig::Error> {
         let next_attributes = NextBlockEnvAttributes {
             timestamp: config.attributes.timestamp,
             suggested_fee_recipient: config.attributes.suggested_fee_recipient,
@@ -171,7 +172,9 @@ where
         &self,
         args: BuildArguments<Pool, Client, EthPayloadBuilderAttributes, EthBuiltPayload>,
     ) -> Result<BuildOutcome<EthBuiltPayload>, PayloadBuilderError> {
-        let (cfg_env, block_env) = self.cfg_and_block_env(&args.config, &args.config.parent_block);
+        let (cfg_env, block_env) = self
+            .cfg_and_block_env(&args.config, &args.config.parent_header)
+            .map_err(PayloadBuilderError::other)?;
         default_ethereum_payload(
             self.evm_config.clone(),
             args,
@@ -194,7 +197,9 @@ where
             cancel: Default::default(),
             best_payload: None,
         };
-        let (cfg_env, block_env) = self.cfg_and_block_env(&args.config, &args.config.parent_block);
+        let (cfg_env, block_env) = self
+            .cfg_and_block_env(&args.config, &args.config.parent_header)
+            .map_err(PayloadBuilderError::other)?;
         default_ethereum_payload(
             self.evm_config.clone(),
             args,
@@ -237,19 +242,19 @@ where
         best_payload,
     } = args;
     let chain_spec = client.chain_spec();
-    let state_provider = client.state_by_block_hash(config.parent_block.hash())?;
+    let state_provider = client.state_by_block_hash(config.parent_header.hash())?;
     let state = StateProviderDatabase::new(state_provider);
     let mut db = State::builder()
         .with_database_ref(cached_reads.as_db(state))
         .with_bundle_update()
         .build();
     let PayloadConfig {
-        parent_block,
+        parent_header,
         extra_data,
         attributes,
     } = config;
 
-    debug!(target: "payload_builder", id=%attributes.id, parent_hash = ?parent_block.hash(), parent_number = parent_block.number, "building new payload");
+    debug!(target: "payload_builder", id=%attributes.id, parent_hash = ?parent_header.hash(), parent_number = parent_header.number, "building new payload");
     let mut cumulative_gas_used = 0;
     let mut sum_blob_gas_used = 0;
     let block_gas_limit: u64 = initialized_block_env.gas_limit.to::<u64>();
@@ -269,7 +274,7 @@ where
 
     let block_number = initialized_block_env.number.to::<u64>();
 
-    let mut system_caller = SystemCaller::new((&evm_config).clone(), chain_spec.clone());
+    let mut system_caller = SystemCaller::new(evm_config.clone(), chain_spec.clone());
 
     // apply eip-4788 pre block contract call
     system_caller
@@ -281,7 +286,7 @@ where
         )
         .map_err(|err| {
             warn!(target: "payload_builder",
-                parent_hash=%parent_block.hash(),
+                parent_hash=%parent_header.hash(),
                 %err,
                 "failed to apply beacon root contract call for payload"
             );
@@ -293,10 +298,10 @@ where
         &mut db,
         &initialized_cfg,
         &initialized_block_env,
-        parent_block.hash(),
+        parent_header.hash(),
     )
     .map_err(|err| {
-        warn!(target: "payload_builder", parent_hash=%parent_block.hash(), %err, "failed to update blockhashes for payload");
+        warn!(target: "payload_builder", parent_hash=%parent_header.hash(), %err, "failed to update blockhashes for payload");
         PayloadBuilderError::Internal(err.into())
     })?;
 
@@ -498,7 +503,7 @@ where
             .state_root_with_updates(hashed_state.clone())
             .inspect_err(|err| {
                 warn!(target: "payload_builder",
-                    parent_hash=%parent_block.hash(),
+                    parent_hash=%parent_header.hash(),
                     %err,
                     "failed to calculate state root for payload"
                 );
@@ -524,9 +529,9 @@ where
                 .collect(),
         )?;
 
-        excess_blob_gas = if chain_spec.is_cancun_active_at_timestamp(parent_block.timestamp) {
-            let parent_excess_blob_gas = parent_block.excess_blob_gas.unwrap_or_default();
-            let parent_blob_gas_used = parent_block.blob_gas_used.unwrap_or_default();
+        excess_blob_gas = if chain_spec.is_cancun_active_at_timestamp(parent_header.timestamp) {
+            let parent_excess_blob_gas = parent_header.excess_blob_gas.unwrap_or_default();
+            let parent_blob_gas_used = parent_header.blob_gas_used.unwrap_or_default();
             Some(calc_excess_blob_gas(
                 parent_excess_blob_gas,
                 parent_blob_gas_used,
@@ -541,7 +546,7 @@ where
     }
 
     let header = Header {
-        parent_hash: parent_block.hash(),
+        parent_hash: parent_header.hash(),
         ommers_hash: EMPTY_OMMER_ROOT_HASH,
         beneficiary: initialized_block_env.coinbase,
         state_root,
@@ -553,7 +558,7 @@ where
         mix_hash: attributes.prev_randao,
         nonce: BEACON_NONCE.into(),
         base_fee_per_gas: Some(base_fee),
-        number: parent_block.number + 1,
+        number: parent_header.number + 1,
         gas_limit: block_gas_limit,
         difficulty: U256::ZERO,
         gas_used: cumulative_gas_used,
@@ -585,10 +590,16 @@ where
         hashed_state: Arc::new(hashed_state),
         trie: Arc::new(trie_output),
     };
-    let mut payload = EthBuiltPayload::new(attributes.id, sealed_block, total_fees, Some(executed));
+    let mut payload = EthBuiltPayload::new(
+        attributes.id,
+        sealed_block,
+        total_fees,
+        Some(executed),
+        requests,
+    );
 
     // extend the payload with the blob sidecars from the executed txs
-    payload.extend_sidecars(blob_sidecars);
+    payload.extend_sidecars(blob_sidecars.into_iter().map(Arc::unwrap_or_clone));
 
     Ok(BuildOutcome::Better {
         payload,