diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 5c8f903..423da78 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: "1.80" # MSRV
+          toolchain: "1.81" # MSRV
       - uses: Swatinem/rust-cache@v2
         with:
           cache-on-failure: true
diff --git a/Cargo.lock b/Cargo.lock
index 82d26b4..da446db 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -95,7 +95,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -133,9 +133,9 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "alloy"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2683873c2744f6cd72d0db51bb74fee9ed310e0476a140bdc19e82b407d8a0a"
+checksum = "8367891bf380210abb0d6aa30c5f85a9080cb4a066c4d5c5acadad630823751b"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -169,9 +169,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28ddd17ffb7e4d66ef3a84e7b179072a9320cdc4b26c7f6f44cbf1081631b36"
+checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -184,9 +184,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-contract"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a69257e2ffe1a9f15f20a89cd54d1ca758468c5b3e87979191b8b5fc24d39b37"
+checksum = "0eefe64fd344cffa9cf9e3435ec4e93e6e9c3481bc37269af988bf497faf4a6a"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
@@ -245,7 +245,7 @@ dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "arbitrary",
- "rand 0.8.5",
+ "rand",
  "serde",
 ]
 
@@ -259,15 +259,15 @@ dependencies = [
  "alloy-rlp",
  "arbitrary",
  "k256",
- "rand 0.8.5",
+ "rand",
  "serde",
 ]
 
 [[package]]
 name = "alloy-eips"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f6c5c0a383f14519531cf58d8440e74f10b938e289f803af870be6f79223110"
+checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f"
 dependencies = [
  "alloy-eip2930",
  "alloy-eip7702",
@@ -286,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7db0ddc76399bb1a4010f630767f027cafe65ab406cfee8e6040128cd65e8325"
+checksum = "3a7a18afb0b318616b6b2b0e2e7ac5529d32a966c673b48091c9919e284e6aca"
 dependencies = [
  "alloy-primitives",
  "alloy-serde",
@@ -309,9 +309,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7111af869909275cffc5c84d16b6c892d6d512773e40cbe83187d0b9c5235e91"
+checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -323,9 +323,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "342028392a2d5050b7b93dd32a0715d3b3b9ce30072ecb69a35dd4895c005495"
+checksum = "fb3705ce7d8602132bcf5ac7a1dd293a42adc2f183abf5907c30ac535ceca049"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -344,9 +344,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6e66d78c049dcadd065a926a9f2d9a9b2b10981a7889449e694fac7bccd2c6f"
+checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -367,14 +367,14 @@ dependencies = [
  "const-hex",
  "derive_arbitrary",
  "derive_more",
- "getrandom 0.2.15",
+ "getrandom",
  "hex-literal",
  "itoa",
  "k256",
  "keccak-asm",
  "proptest",
  "proptest-derive",
- "rand 0.8.5",
+ "rand",
  "ruint",
  "serde",
  "tiny-keccak",
@@ -382,9 +382,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79f14ccc2a3c575cb17b1b4af8c772cf9b5b93b7ce7047d6640e53954abb558d"
+checksum = "927f708dd457ed63420400ee5f06945df9632d5d101851952056840426a10dc5"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -420,9 +420,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b9f5e85120aab30b8da23354592f7bd2b208d33d3204ffa1d44ac2e3dd5691"
+checksum = "2d05f63677e210d758cd5d6d1ce10f20c980c3560ccfbe79ba1997791862a04f"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -461,9 +461,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc79aeca84abb122a2fffbc1c91fdf958dca5c95be3875977bc99672bde0027"
+checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -486,23 +486,22 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22045187a5ebf5b2af3f8b6831b66735b6556c5750ec5790aeeb45935260c1c2"
+checksum = "64333d639f2a0cf73491813c629a405744e16343a4bc5640931be707c345ecc5"
 dependencies = [
  "alloy-rpc-types-beacon",
  "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
- "alloy-rpc-types-trace",
  "alloy-serde",
  "serde",
 ]
 
 [[package]]
 name = "alloy-rpc-types-admin"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47ea9f282cd1ad5c30d5ed26c4c2ddf4e48403b7322941546d6ec86545312b07"
+checksum = "fefd12e99dd6b7de387ed13ad047ce2c90d8950ca62fc48b8a457ebb8f936c61"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
@@ -512,9 +511,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578d9ccad4e8510d32cc2810d05e01a232ccd79a4a6df60d257466897b43b013"
+checksum = "d25cb45ad7c0930dd62eecf164d2afe4c3d2dd2c82af85680ad1f118e1e5cb83"
 dependencies = [
  "alloy-primitives",
  "alloy-serde",
@@ -523,9 +522,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-beacon"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3005edeaea06e916f4d723e7e275bef44decfb1947438679edbb5b64dd8789"
+checksum = "2e7081d2206dca51ce23a06338d78d9b536931cc3f15134fc1c6535eb2b77f18"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -537,11 +536,21 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "alloy-rpc-types-debug"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f9f9033796bb3078d11cc9c839f00e277431ef997db2849a46045fcffee3835"
+dependencies = [
+ "alloy-primitives",
+ "serde",
+]
+
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c031a91e94a39f928244bc837c953817be5b8cc61759e1a9123b3abd17560dd"
+checksum = "1464c4dd646e1bdfde86ae65ce5ba168dbb29180b478011fe87117ae46b1629b"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -553,15 +562,15 @@ dependencies = [
  "ethereum_ssz_derive",
  "jsonrpsee-types",
  "jsonwebtoken",
- "rand 0.8.5",
+ "rand",
  "serde",
 ]
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "238f494727ff861a803bd73b1274ef788a615bf8f8c4bfada4e6df42afa275d2"
+checksum = "83aa984386deda02482660aa31cb8ca1e63d533f1c31a52d7d181ac5ec68e9b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -582,9 +591,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-mev"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fb6b5f521b1dc2a1517b46a85b43310bb7bacbf0a2cbea6a574d591c41db31c"
+checksum = "922d92389e5022650c4c60ffd2f9b2467c3f853764f0f74ff16a23106f9017d5"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -595,9 +604,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca08b0ccc0861055ceb83a1db009c4c8a7f52a259e7cda7ca6ca36ec2b5ce8"
+checksum = "98db35cd42c90b484377e6bc44d95377a7a38a5ebee996e67754ac0446d542ab"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -609,9 +618,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-txpool"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "192ad94fe34c12be8ac4413ea00b1170202faa6fdebaa756b6a33555bf86d902"
+checksum = "6bac37082c3b21283b3faf5cc0e08974272aee2f756ce1adeb26db56a5fce0d5"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -621,9 +630,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b95b6f024a558593dd3b8628af03f7df2ca50e4c56839293ad0a7546e471db0"
+checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -633,9 +642,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da64740ff0518606c514eb0e03dd0a1daa8ff94d6d491a626fd8e50efd6c4f18"
+checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -720,9 +729,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c7a669caa427abe8802184c8776f5103302f9337bb30a5b36bdebc332946c14"
+checksum = "33616b2edf7454302a1d48084db185e52c309f73f6c10be99b0fe39354b3f1e9"
 dependencies = [
  "alloy-json-rpc",
  "base64 0.22.1",
@@ -739,9 +748,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4433ffa97aab6ae643de81c7bde9a2f043496f27368a607405a5c78a610caf74"
+checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -754,9 +763,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9aa02db8751f9c0c37caf8c38ad3eb7aa1cfb09cfea3451a13aacaf06846c7a5"
+checksum = "09fd8491249f74d16ec979b1f5672377b12ebb818e6056478ffa386954dbd350"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -773,9 +782,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0a5c4a0929479bcb85a2df628c01173618a71c807b2f499939a236dbde5d008"
+checksum = "a9704761f6297fe482276bee7f77a93cb42bd541c2bd6c1c560b6f3a9ece672e"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
@@ -791,9 +800,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-trie"
-version = "0.5.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "398a977d774db13446b8cead8cfa9517aebf9e03fc8a1512892dc1e03e70bb04"
+checksum = "0a46c9c4fdccda7982e7928904bd85fe235a0404ee3d7e197fff13d61eac8b4f"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -871,9 +880,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.88"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "aquamarine"
@@ -1018,7 +1027,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -1028,7 +1037,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -1363,12 +1372,6 @@ dependencies = [
  "which",
 ]
 
-[[package]]
-name = "binout"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b60b1af88a588fca5fe424ae7d735bc52814f80ff57614f57043cc4e2024f2ea"
-
 [[package]]
 name = "bit-set"
 version = "0.5.3"
@@ -1399,15 +1402,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bitm"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06e8e5bec3490b9f6f3adbb78aa4f53e8396fd9994e8a62a346b44ea7c15f35"
-dependencies = [
- "dyn_size_of",
-]
-
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -1545,9 +1539,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 dependencies = [
  "serde",
 ]
@@ -1616,9 +1610,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.1.18"
+version = "1.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
 dependencies = [
  "jobserver",
  "libc",
@@ -2015,7 +2009,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
  "zeroize",
 ]
@@ -2027,7 +2021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
 dependencies = [
  "generic-array",
- "rand_core 0.6.4",
+ "rand_core",
  "typenum",
 ]
 
@@ -2068,20 +2062,6 @@ dependencies = [
  "cipher 0.4.4",
 ]
 
-[[package]]
-name = "cuckoofilter"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18"
-dependencies = [
- "byteorder",
- "fnv",
- "rand 0.7.3",
- "serde",
- "serde_bytes",
- "serde_derive",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "4.1.3"
@@ -2278,6 +2258,12 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "diff"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -2362,7 +2348,7 @@ dependencies = [
  "lru",
  "more-asserts",
  "parking_lot 0.11.2",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "socket2 0.4.10",
  "tokio",
@@ -2395,7 +2381,7 @@ dependencies = [
  "more-asserts",
  "multiaddr",
  "parking_lot 0.11.2",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "socket2 0.4.10",
  "tokio",
@@ -2439,12 +2425,6 @@ version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125"
 
-[[package]]
-name = "dyn_size_of"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33d4f78a40b1ec35bf8cafdaaf607ba2f773c366b0b3bda48937cacd7a8d5134"
-
 [[package]]
 name = "ecdsa"
 version = "0.16.9"
@@ -2477,7 +2457,7 @@ checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
  "curve25519-dalek",
  "ed25519",
- "rand_core 0.6.4",
+ "rand_core",
  "serde",
  "sha2 0.10.8",
  "subtle",
@@ -2503,7 +2483,7 @@ dependencies = [
  "generic-array",
  "group",
  "pkcs8",
- "rand_core 0.6.4",
+ "rand_core",
  "sec1",
  "subtle",
  "zeroize",
@@ -2543,7 +2523,7 @@ dependencies = [
  "hex",
  "k256",
  "log",
- "rand 0.8.5",
+ "rand",
  "secp256k1",
  "serde",
  "sha3",
@@ -2676,7 +2656,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -2686,6 +2666,18 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "filetime"
+version = "0.2.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "libredox",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -2693,7 +2685,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
  "static_assertions",
 ]
@@ -2744,6 +2736,15 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
 
+[[package]]
+name = "fsevent-sys"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "funty"
 version = "2.0.0"
@@ -2899,17 +2900,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "getrandom"
-version = "0.1.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
-dependencies = [
- "cfg-if",
- "libc",
- "wasi 0.9.0+wasi-snapshot-preview1",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.15"
@@ -2919,7 +2909,7 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
@@ -3008,7 +2998,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
- "rand_core 0.6.4",
+ "rand_core",
  "subtle",
 ]
 
@@ -3106,7 +3096,7 @@ dependencies = [
  "eyre",
  "op-net",
  "rollup",
- "superchain-registry",
+ "superchain",
  "tokio",
  "tracing",
 ]
@@ -3160,7 +3150,7 @@ dependencies = [
  "idna 0.4.0",
  "ipnet",
  "once_cell",
- "rand 0.8.5",
+ "rand",
  "socket2 0.5.7",
  "thiserror",
  "tinyvec",
@@ -3182,7 +3172,7 @@ dependencies = [
  "lru-cache",
  "once_cell",
  "parking_lot 0.12.3",
- "rand 0.8.5",
+ "rand",
  "resolv-conf",
  "smallvec",
  "thiserror",
@@ -3448,9 +3438,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3505,6 +3495,16 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "if-addrs"
+version = "0.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a78a89907582615b19f6f0da1af18abf6ff08be259395669b834b057a7ee92d8"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "if-watch"
 version = "3.2.0"
@@ -3515,7 +3515,7 @@ dependencies = [
  "core-foundation",
  "fnv",
  "futures",
- "if-addrs",
+ "if-addrs 0.10.2",
  "ipnet",
  "log",
  "rtnetlink",
@@ -3537,7 +3537,7 @@ dependencies = [
  "http 0.2.12",
  "hyper 0.14.30",
  "log",
- "rand 0.8.5",
+ "rand",
  "tokio",
  "url",
  "xmltree",
@@ -3610,6 +3610,26 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "inotify"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff"
+dependencies = [
+ "bitflags 1.3.2",
+ "inotify-sys",
+ "libc",
+]
+
+[[package]]
+name = "inotify-sys"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "inout"
 version = "0.1.3"
@@ -3808,7 +3828,7 @@ dependencies = [
  "jsonrpsee-types",
  "parking_lot 0.12.3",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "rustc-hash 2.0.0",
  "serde",
  "serde_json",
@@ -3971,7 +3991,7 @@ dependencies = [
 [[package]]
 name = "kona-derive"
 version = "0.0.3"
-source = "git+https://github.com/anton-rs/kona?rev=4ba2812#4ba28121ac0665f268876d6bbf15f1b4dfcbc011"
+source = "git+https://github.com/anton-rs/kona?branch=main#2a82bf7150daedd180e60e39e43a29aaa0e51ad2"
 dependencies = [
  "alloc-no-stdlib",
  "alloy-consensus",
@@ -3979,6 +3999,7 @@ dependencies = [
  "alloy-primitives",
  "alloy-provider",
  "alloy-rlp",
+ "alloy-rpc-types-engine",
  "alloy-transport",
  "anyhow",
  "async-trait",
@@ -3988,6 +4009,9 @@ dependencies = [
  "lru",
  "miniz_oxide",
  "op-alloy-consensus",
+ "op-alloy-genesis",
+ "op-alloy-protocol",
+ "op-alloy-rpc-types-engine",
  "reqwest",
  "serde",
  "tracing",
@@ -3997,7 +4021,7 @@ dependencies = [
 [[package]]
 name = "kona-primitives"
 version = "0.0.2"
-source = "git+https://github.com/anton-rs/kona?rev=4ba2812#4ba28121ac0665f268876d6bbf15f1b4dfcbc011"
+source = "git+https://github.com/anton-rs/kona?branch=main#2a82bf7150daedd180e60e39e43a29aaa0e51ad2"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -4006,11 +4030,11 @@ dependencies = [
  "anyhow",
  "c-kzg",
  "op-alloy-consensus",
+ "op-alloy-genesis",
  "op-alloy-protocol",
  "revm",
  "serde",
  "sha2 0.10.8",
- "superchain-primitives",
  "tracing",
 ]
 
@@ -4048,6 +4072,26 @@ version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
 
+[[package]]
+name = "kqueue"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+dependencies = [
+ "kqueue-sys",
+ "libc",
+]
+
+[[package]]
+name = "kqueue-sys"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+]
+
 [[package]]
 name = "lazy_static"
 version = "1.5.0"
@@ -4095,7 +4139,7 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "getrandom 0.2.15",
+ "getrandom",
  "libp2p-allow-block-list",
  "libp2p-connection-limits",
  "libp2p-core",
@@ -4159,7 +4203,7 @@ dependencies = [
  "parking_lot 0.12.3",
  "pin-project",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "rw-stream-sink",
  "smallvec",
  "thiserror",
@@ -4199,7 +4243,7 @@ dependencies = [
  "fnv",
  "futures",
  "futures-ticker",
- "getrandom 0.2.15",
+ "getrandom",
  "hex_fmt",
  "libp2p-core",
  "libp2p-identity",
@@ -4207,7 +4251,7 @@ dependencies = [
  "prometheus-client",
  "quick-protobuf",
  "quick-protobuf-codec",
- "rand 0.8.5",
+ "rand",
  "regex",
  "sha2 0.10.8",
  "smallvec",
@@ -4229,7 +4273,7 @@ dependencies = [
  "libsecp256k1",
  "multihash",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "thiserror",
  "tracing",
@@ -4249,7 +4293,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "socket2 0.5.7",
  "tokio",
@@ -4290,7 +4334,7 @@ dependencies = [
  "multihash",
  "once_cell",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "snow",
  "static_assertions",
@@ -4312,7 +4356,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "rand 0.8.5",
+ "rand",
  "tracing",
  "void",
  "web-time",
@@ -4333,7 +4377,7 @@ dependencies = [
  "libp2p-tls",
  "parking_lot 0.12.3",
  "quinn",
- "rand 0.8.5",
+ "rand",
  "ring 0.17.8",
  "rustls",
  "socket2 0.5.7",
@@ -4358,7 +4402,7 @@ dependencies = [
  "lru",
  "multistream-select",
  "once_cell",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "tokio",
  "tracing",
@@ -4464,6 +4508,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
+ "redox_syscall 0.5.4",
 ]
 
 [[package]]
@@ -4479,7 +4524,7 @@ dependencies = [
  "libsecp256k1-core",
  "libsecp256k1-gen-ecmult",
  "libsecp256k1-gen-genmult",
- "rand 0.8.5",
+ "rand",
  "serde",
  "sha2 0.9.9",
  "typenum",
@@ -4718,7 +4763,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.48.0",
 ]
 
@@ -4730,7 +4775,7 @@ checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
  "hermit-abi 0.3.9",
  "libc",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "windows-sys 0.52.0",
 ]
 
@@ -4940,6 +4985,24 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "notify"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
+dependencies = [
+ "bitflags 2.6.0",
+ "filetime",
+ "fsevent-sys",
+ "inotify",
+ "kqueue",
+ "libc",
+ "log",
+ "mio 0.8.11",
+ "walkdir",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "ntapi"
 version = "0.4.1"
@@ -5111,15 +5174,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "op-alloy-consensus"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ef361231f72bea90365e441bd97d9c8fd3875603f18bbcad0e04874c6158e53"
+checksum = "21aad1fbf80d2bcd7406880efc7ba109365f44bbb72896758ddcbfa46bf1592c"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -5132,41 +5195,49 @@ dependencies = [
 ]
 
 [[package]]
-name = "op-alloy-network"
-version = "0.2.11"
+name = "op-alloy-genesis"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "411e1fe4c2d6ea0001523d35cf37d3d4d79d9f86497c2c059fb2f7a0f6b5c015"
+checksum = "6e1b8a9b70da0e027242ec1762f0f3a386278b6291d00d12ff5a64929dc19f68"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
- "alloy-network",
  "alloy-primitives",
- "alloy-rpc-types-eth",
- "op-alloy-consensus",
- "op-alloy-rpc-types",
+ "alloy-sol-types",
+ "serde",
+ "serde_repr",
 ]
 
 [[package]]
 name = "op-alloy-protocol"
-version = "0.2.8"
-source = "git+https://github.com/alloy-rs/op-alloy?rev=cf27ad9#cf27ad92281235a073c2f77c9ffe3ce93a800b26"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf300a82ae2d30e2255bfea87a2259da49f63a25a44db561ae64cc9e3084139f"
 dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
  "alloy-primitives",
+ "alloy-rlp",
+ "alloy-serde",
  "hashbrown 0.14.5",
- "superchain-primitives",
+ "op-alloy-consensus",
+ "op-alloy-genesis",
+ "serde",
 ]
 
 [[package]]
 name = "op-alloy-rpc-types"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a65da5f7591acba3d2304b25145ca9942ea90481213269aed9cb28add8e3ff"
+checksum = "e281fbfc2198b7c0c16457d6524f83d192662bc9f3df70f24c3038d4521616df"
 dependencies = [
  "alloy-eips",
- "alloy-network",
+ "alloy-network-primitives",
  "alloy-primitives",
  "alloy-rpc-types-eth",
  "alloy-serde",
+ "cfg-if",
+ "hashbrown 0.14.5",
  "op-alloy-consensus",
  "serde",
  "serde_json",
@@ -5174,13 +5245,18 @@ dependencies = [
 
 [[package]]
 name = "op-alloy-rpc-types-engine"
-version = "0.2.10"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7105d398120c9ee788b86049506c513de7dfc4d48b3cefcffc88d7d4f4ec29a"
+checksum = "2947272a81ebf988f4804b6f0f6a7c0b2f6f89a908cb410e36f8f3828f81c778"
 dependencies = [
+ "alloy-eips",
  "alloy-primitives",
  "alloy-rpc-types-engine",
  "alloy-serde",
+ "derive_more",
+ "op-alloy-consensus",
+ "op-alloy-genesis",
+ "op-alloy-protocol",
  "serde",
 ]
 
@@ -5424,19 +5500,6 @@ dependencies = [
  "ucd-trie",
 ]
 
-[[package]]
-name = "ph"
-version = "0.8.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b7b74d575d7c11fb653fae69688be5206cafc1ead33c01ce61ac7f36eae45b"
-dependencies = [
- "binout",
- "bitm",
- "dyn_size_of",
- "rayon",
- "wyhash",
-]
-
 [[package]]
 name = "pharos"
 version = "0.5.3"
@@ -5566,6 +5629,16 @@ dependencies = [
  "zerocopy",
 ]
 
+[[package]]
+name = "pretty_assertions"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d"
+dependencies = [
+ "diff",
+ "yansi",
+]
+
 [[package]]
 name = "prettyplease"
 version = "0.2.22"
@@ -5711,8 +5784,8 @@ dependencies = [
  "bitflags 2.6.0",
  "lazy_static",
  "num-traits",
- "rand 0.8.5",
- "rand_chacha 0.3.1",
+ "rand",
+ "rand_chacha",
  "rand_xorshift",
  "regex-syntax 0.8.4",
  "rusty-fork",
@@ -5741,7 +5814,7 @@ dependencies = [
  "libc",
  "once_cell",
  "raw-cpuid",
- "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasi",
  "web-sys",
  "winapi",
 ]
@@ -5800,7 +5873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
 dependencies = [
  "bytes",
- "rand 0.8.5",
+ "rand",
  "ring 0.17.8",
  "rustc-hash 2.0.0",
  "rustls",
@@ -5848,19 +5921,6 @@ dependencies = [
  "nibble_vec",
 ]
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -5868,18 +5928,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
  "libc",
- "rand_chacha 0.3.1",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-dependencies = [
- "ppv-lite86",
- "rand_core 0.5.1",
+ "rand_chacha",
+ "rand_core",
 ]
 
 [[package]]
@@ -5889,16 +5939,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
 dependencies = [
  "ppv-lite86",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-dependencies = [
- "getrandom 0.1.16",
+ "rand_core",
 ]
 
 [[package]]
@@ -5907,16 +5948,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.15",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-dependencies = [
- "rand_core 0.5.1",
+ "getrandom",
 ]
 
 [[package]]
@@ -5925,7 +5957,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
 dependencies = [
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -6020,7 +6052,7 @@ version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
  "libredox",
  "thiserror",
 ]
@@ -6098,7 +6130,6 @@ dependencies = [
  "pin-project-lite",
  "quinn",
  "rustls",
- "rustls-native-certs 0.7.3",
  "rustls-pemfile",
  "rustls-pki-types",
  "serde",
@@ -6130,24 +6161,20 @@ dependencies = [
 
 [[package]]
 name = "reth"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-rlp",
  "aquamarine",
  "backon",
  "clap",
- "discv5 0.7.0",
  "eyre",
- "fdlimit",
  "futures",
- "itertools 0.13.0",
- "libc",
- "metrics-process",
  "reth-basic-payload-builder",
  "reth-beacon-consensus",
  "reth-blockchain-tree",
  "reth-chainspec",
+ "reth-cli",
  "reth-cli-commands",
  "reth-cli-runner",
  "reth-cli-util",
@@ -6156,7 +6183,6 @@ dependencies = [
  "reth-consensus-common",
  "reth-db",
  "reth-db-api",
- "reth-db-common",
  "reth-downloaders",
  "reth-engine-util",
  "reth-errors",
@@ -6174,8 +6200,6 @@ dependencies = [
  "reth-node-ethereum",
  "reth-node-events",
  "reth-node-metrics",
- "reth-optimism-primitives",
- "reth-optimism-rpc",
  "reth-payload-builder",
  "reth-payload-primitives",
  "reth-payload-validator",
@@ -6191,29 +6215,24 @@ dependencies = [
  "reth-rpc-types",
  "reth-rpc-types-compat",
  "reth-stages",
- "reth-stages-api",
  "reth-static-file",
- "reth-static-file-types",
  "reth-tasks",
  "reth-tracing",
  "reth-transaction-pool",
  "reth-trie",
  "reth-trie-db",
- "serde",
  "serde_json",
  "similar-asserts",
- "tempfile",
- "tikv-jemallocator",
  "tokio",
- "toml",
  "tracing",
 ]
 
 [[package]]
 name = "reth-auto-seal-consensus"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "futures-util",
  "reth-beacon-consensus",
  "reth-chainspec",
@@ -6239,8 +6258,8 @@ dependencies = [
 
 [[package]]
 name = "reth-basic-payload-builder"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-rlp",
  "futures-core",
@@ -6262,20 +6281,20 @@ dependencies = [
 
 [[package]]
 name = "reth-beacon-consensus"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "futures",
  "itertools 0.13.0",
  "metrics",
  "reth-blockchain-tree-api",
- "reth-chainspec",
- "reth-db-api",
  "reth-engine-primitives",
  "reth-errors",
  "reth-ethereum-consensus",
  "reth-metrics",
  "reth-network-p2p",
+ "reth-node-types",
  "reth-payload-builder",
  "reth-payload-primitives",
  "reth-payload-validator",
@@ -6296,9 +6315,10 @@ dependencies = [
 
 [[package]]
 name = "reth-blockchain-tree"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "aquamarine",
  "linked_hash_set",
  "metrics",
@@ -6312,9 +6332,9 @@ dependencies = [
  "reth-execution-types",
  "reth-metrics",
  "reth-network",
+ "reth-node-types",
  "reth-primitives",
  "reth-provider",
- "reth-prune-types",
  "reth-revm",
  "reth-stages-api",
  "reth-storage-errors",
@@ -6327,9 +6347,10 @@ dependencies = [
 
 [[package]]
 name = "reth-blockchain-tree-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "reth-consensus",
  "reth-execution-errors",
  "reth-primitives",
@@ -6339,9 +6360,10 @@ dependencies = [
 
 [[package]]
 name = "reth-chain-state"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "auto_impl",
  "derive_more",
  "metrics",
@@ -6361,8 +6383,8 @@ dependencies = [
 
 [[package]]
 name = "reth-chainspec"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-chains",
  "alloy-eips",
@@ -6379,12 +6401,24 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "reth-cli"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
+dependencies = [
+ "clap",
+ "eyre",
+ "reth-cli-runner",
+]
+
 [[package]]
 name = "reth-cli-commands"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "ahash",
+ "alloy-eips",
+ "alloy-primitives",
  "backon",
  "clap",
  "comfy-table",
@@ -6397,6 +6431,7 @@ dependencies = [
  "ratatui",
  "reth-beacon-consensus",
  "reth-chainspec",
+ "reth-cli",
  "reth-cli-runner",
  "reth-cli-util",
  "reth-config",
@@ -6435,8 +6470,8 @@ dependencies = [
 
 [[package]]
 name = "reth-cli-runner"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-tasks",
  "tokio",
@@ -6445,23 +6480,25 @@ dependencies = [
 
 [[package]]
 name = "reth-cli-util"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
+ "cfg-if",
  "eyre",
  "libc",
- "rand 0.8.5",
+ "rand",
  "reth-fs-util",
  "secp256k1",
  "thiserror",
+ "tikv-jemallocator",
 ]
 
 [[package]]
 name = "reth-codecs"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6476,8 +6513,8 @@ dependencies = [
 
 [[package]]
 name = "reth-codecs-derive"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "convert_case",
  "proc-macro2",
@@ -6487,8 +6524,8 @@ dependencies = [
 
 [[package]]
 name = "reth-config"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "eyre",
  "humantime-serde",
@@ -6501,9 +6538,10 @@ dependencies = [
 
 [[package]]
 name = "reth-consensus"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "auto_impl",
  "derive_more",
  "reth-primitives",
@@ -6511,9 +6549,10 @@ dependencies = [
 
 [[package]]
 name = "reth-consensus-common"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "reth-chainspec",
  "reth-consensus",
  "reth-primitives",
@@ -6521,8 +6560,8 @@ dependencies = [
 
 [[package]]
 name = "reth-consensus-debug-client"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -6544,9 +6583,10 @@ dependencies = [
 
 [[package]]
 name = "reth-db"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "bytes",
  "derive_more",
  "eyre",
@@ -6574,9 +6614,10 @@ dependencies = [
 
 [[package]]
 name = "reth-db-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "bytes",
  "derive_more",
  "metrics",
@@ -6595,10 +6636,11 @@ dependencies = [
 
 [[package]]
 name = "reth-db-common"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-genesis",
+ "alloy-primitives",
  "boyer-moore-magiclen",
  "eyre",
  "reth-chainspec",
@@ -6608,6 +6650,7 @@ dependencies = [
  "reth-db-api",
  "reth-etl",
  "reth-fs-util",
+ "reth-node-types",
  "reth-primitives",
  "reth-provider",
  "reth-stages-types",
@@ -6621,9 +6664,10 @@ dependencies = [
 
 [[package]]
 name = "reth-db-models"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "bytes",
  "modular-bitfield",
  "reth-codecs",
@@ -6633,8 +6677,8 @@ dependencies = [
 
 [[package]]
 name = "reth-discv4"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -6657,8 +6701,8 @@ dependencies = [
 
 [[package]]
 name = "reth-discv5"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -6668,7 +6712,7 @@ dependencies = [
  "futures",
  "itertools 0.13.0",
  "metrics",
- "rand 0.8.5",
+ "rand",
  "reth-chainspec",
  "reth-ethereum-forks",
  "reth-metrics",
@@ -6681,8 +6725,8 @@ dependencies = [
 
 [[package]]
 name = "reth-dns-discovery"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "data-encoding",
@@ -6703,8 +6747,8 @@ dependencies = [
 
 [[package]]
 name = "reth-downloaders"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-rlp",
  "futures",
@@ -6730,8 +6774,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ecies"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "aes 0.8.4",
  "alloy-primitives",
@@ -6746,7 +6790,7 @@ dependencies = [
  "generic-array",
  "hmac 0.12.1",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "reth-network-peers",
  "secp256k1",
  "sha2 0.10.8",
@@ -6761,29 +6805,30 @@ dependencies = [
 
 [[package]]
 name = "reth-engine-primitives"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-chainspec",
+ "reth-execution-types",
  "reth-payload-primitives",
+ "reth-primitives",
+ "reth-trie",
  "serde",
 ]
 
 [[package]]
 name = "reth-engine-service"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "futures",
  "pin-project",
  "reth-beacon-consensus",
- "reth-chainspec",
  "reth-consensus",
- "reth-db-api",
- "reth-engine-primitives",
  "reth-engine-tree",
  "reth-evm",
  "reth-network-p2p",
+ "reth-node-types",
  "reth-payload-builder",
  "reth-payload-validator",
  "reth-provider",
@@ -6795,8 +6840,8 @@ dependencies = [
 
 [[package]]
 name = "reth-engine-tree"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "futures",
  "metrics",
@@ -6805,13 +6850,12 @@ dependencies = [
  "reth-blockchain-tree-api",
  "reth-chain-state",
  "reth-consensus",
- "reth-db",
- "reth-db-api",
  "reth-engine-primitives",
  "reth-errors",
  "reth-evm",
  "reth-metrics",
  "reth-network-p2p",
+ "reth-node-types",
  "reth-payload-builder",
  "reth-payload-primitives",
  "reth-payload-validator",
@@ -6823,6 +6867,7 @@ dependencies = [
  "reth-stages-api",
  "reth-tasks",
  "reth-trie",
+ "reth-trie-parallel",
  "thiserror",
  "tokio",
  "tracing",
@@ -6830,8 +6875,8 @@ dependencies = [
 
 [[package]]
 name = "reth-engine-util"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "eyre",
  "futures",
@@ -6860,8 +6905,8 @@ dependencies = [
 
 [[package]]
 name = "reth-errors"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-blockchain-tree-api",
  "reth-consensus",
@@ -6873,8 +6918,8 @@ dependencies = [
 
 [[package]]
 name = "reth-eth-wire"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-rlp",
  "bytes",
@@ -6898,8 +6943,8 @@ dependencies = [
 
 [[package]]
 name = "reth-eth-wire-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-chains",
  "alloy-genesis",
@@ -6914,8 +6959,8 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-consensus"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-chainspec",
  "reth-consensus",
@@ -6926,26 +6971,25 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-engine-primitives"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-rlp",
+ "reth-chain-state",
  "reth-chainspec",
  "reth-engine-primitives",
- "reth-evm-ethereum",
  "reth-payload-primitives",
  "reth-primitives",
  "reth-rpc-types",
  "reth-rpc-types-compat",
- "revm-primitives",
  "serde",
  "sha2 0.10.8",
 ]
 
 [[package]]
 name = "reth-ethereum-forks"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-chains",
  "alloy-primitives",
@@ -6961,15 +7005,17 @@ dependencies = [
 
 [[package]]
 name = "reth-ethereum-payload-builder"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-basic-payload-builder",
+ "reth-chain-state",
  "reth-errors",
  "reth-evm",
  "reth-evm-ethereum",
  "reth-execution-types",
  "reth-payload-builder",
+ "reth-payload-primitives",
  "reth-primitives",
  "reth-provider",
  "reth-revm",
@@ -6981,8 +7027,8 @@ dependencies = [
 
 [[package]]
 name = "reth-etl"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "rayon",
  "reth-db-api",
@@ -6991,16 +7037,19 @@ dependencies = [
 
 [[package]]
 name = "reth-evm"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-eips",
  "auto_impl",
  "futures-util",
+ "metrics",
  "reth-chainspec",
  "reth-execution-errors",
  "reth-execution-types",
+ "reth-metrics",
  "reth-primitives",
+ "reth-primitives-traits",
  "reth-prune-types",
  "reth-storage-errors",
  "revm",
@@ -7009,8 +7058,8 @@ dependencies = [
 
 [[package]]
 name = "reth-evm-ethereum"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-eips",
  "alloy-sol-types",
@@ -7025,30 +7074,10 @@ dependencies = [
  "revm-primitives",
 ]
 
-[[package]]
-name = "reth-evm-optimism"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
-dependencies = [
- "reth-chainspec",
- "reth-ethereum-forks",
- "reth-evm",
- "reth-execution-errors",
- "reth-execution-types",
- "reth-optimism-consensus",
- "reth-primitives",
- "reth-prune-types",
- "reth-revm",
- "revm",
- "revm-primitives",
- "thiserror",
- "tracing",
-]
-
 [[package]]
 name = "reth-execution-errors"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -7063,8 +7092,8 @@ dependencies = [
 
 [[package]]
 name = "reth-execution-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-execution-errors",
  "reth-primitives",
@@ -7075,12 +7104,13 @@ dependencies = [
 
 [[package]]
 name = "reth-exex"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "eyre",
  "futures",
  "metrics",
+ "reth-chainspec",
  "reth-config",
  "reth-evm",
  "reth-exex-types",
@@ -7102,28 +7132,52 @@ dependencies = [
 
 [[package]]
 name = "reth-exex-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
+ "reth-primitives",
  "reth-provider",
  "serde",
 ]
 
 [[package]]
 name = "reth-fs-util"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "serde",
  "serde_json",
  "thiserror",
 ]
 
+[[package]]
+name = "reth-invalid-block-hooks"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
+dependencies = [
+ "alloy-rlp",
+ "alloy-rpc-types-debug",
+ "eyre",
+ "futures",
+ "jsonrpsee",
+ "pretty_assertions",
+ "reth-chainspec",
+ "reth-engine-primitives",
+ "reth-evm",
+ "reth-primitives",
+ "reth-provider",
+ "reth-revm",
+ "reth-rpc-api",
+ "reth-tracing",
+ "reth-trie",
+ "serde_json",
+]
+
 [[package]]
 name = "reth-ipc"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "async-trait",
  "bytes",
@@ -7143,8 +7197,8 @@ dependencies = [
 
 [[package]]
 name = "reth-libmdbx"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "bitflags 2.6.0",
  "byteorder",
@@ -7159,8 +7213,8 @@ dependencies = [
 
 [[package]]
 name = "reth-mdbx-sys"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "bindgen",
  "cc",
@@ -7168,8 +7222,8 @@ dependencies = [
 
 [[package]]
 name = "reth-metrics"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "futures",
  "metrics",
@@ -7180,8 +7234,8 @@ dependencies = [
 
 [[package]]
 name = "reth-metrics-derive"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7191,18 +7245,19 @@ dependencies = [
 
 [[package]]
 name = "reth-net-banlist"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
 ]
 
 [[package]]
 name = "reth-net-nat"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "futures-util",
+ "if-addrs 0.13.3",
  "reqwest",
  "serde_with",
  "thiserror",
@@ -7211,8 +7266,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-rlp",
  "aquamarine",
@@ -7225,7 +7280,7 @@ dependencies = [
  "metrics",
  "parking_lot 0.12.3",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "reth-chainspec",
  "reth-consensus",
  "reth-discv4",
@@ -7259,8 +7314,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-admin",
@@ -7282,8 +7337,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-p2p"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "auto_impl",
  "derive_more",
@@ -7300,8 +7355,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-peers"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -7315,8 +7370,8 @@ dependencies = [
 
 [[package]]
 name = "reth-network-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "humantime-serde",
  "reth-ethereum-forks",
@@ -7329,19 +7384,16 @@ dependencies = [
 
 [[package]]
 name = "reth-nippy-jar"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "anyhow",
  "bincode",
- "cuckoofilter",
  "derive_more",
  "lz4_flex",
  "memmap2",
- "ph",
  "reth-fs-util",
  "serde",
- "sucds",
  "thiserror",
  "tracing",
  "zstd",
@@ -7349,16 +7401,16 @@ dependencies = [
 
 [[package]]
 name = "reth-node-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
- "reth-chainspec",
- "reth-db-api",
  "reth-engine-primitives",
  "reth-evm",
  "reth-network-api",
+ "reth-node-types",
  "reth-payload-builder",
  "reth-payload-primitives",
+ "reth-primitives",
  "reth-provider",
  "reth-rpc-eth-api",
  "reth-tasks",
@@ -7367,14 +7419,16 @@ dependencies = [
 
 [[package]]
 name = "reth-node-builder"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-network",
+ "alloy-primitives",
  "aquamarine",
  "eyre",
  "fdlimit",
  "futures",
+ "jsonrpsee",
  "rayon",
  "reth-auto-seal-consensus",
  "reth-beacon-consensus",
@@ -7392,6 +7446,8 @@ dependencies = [
  "reth-engine-util",
  "reth-evm",
  "reth-exex",
+ "reth-fs-util",
+ "reth-invalid-block-hooks",
  "reth-network",
  "reth-network-api",
  "reth-network-p2p",
@@ -7405,6 +7461,7 @@ dependencies = [
  "reth-provider",
  "reth-prune",
  "reth-rpc",
+ "reth-rpc-api",
  "reth-rpc-builder",
  "reth-rpc-engine-api",
  "reth-rpc-eth-types",
@@ -7424,10 +7481,11 @@ dependencies = [
 
 [[package]]
 name = "reth-node-core"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-genesis",
+ "alloy-primitives",
  "alloy-rpc-types-engine",
  "clap",
  "const_format",
@@ -7436,13 +7494,13 @@ dependencies = [
  "eyre",
  "futures",
  "humantime",
- "rand 0.8.5",
+ "rand",
  "reth-chainspec",
+ "reth-cli",
  "reth-cli-util",
  "reth-config",
  "reth-consensus-common",
  "reth-db",
- "reth-db-api",
  "reth-discv4",
  "reth-discv5",
  "reth-fs-util",
@@ -7451,7 +7509,6 @@ dependencies = [
  "reth-network-p2p",
  "reth-network-peers",
  "reth-primitives",
- "reth-provider",
  "reth-prune-types",
  "reth-rpc-api",
  "reth-rpc-eth-api",
@@ -7460,6 +7517,7 @@ dependencies = [
  "reth-rpc-types",
  "reth-rpc-types-compat",
  "reth-stages-types",
+ "reth-storage-api",
  "reth-storage-errors",
  "reth-tracing",
  "reth-transaction-pool",
@@ -7467,6 +7525,8 @@ dependencies = [
  "serde",
  "serde_json",
  "shellexpand",
+ "strum",
+ "thiserror",
  "toml",
  "tracing",
  "vergen",
@@ -7474,8 +7534,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-ethereum"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "eyre",
  "reth-auto-seal-consensus",
@@ -7490,6 +7550,7 @@ dependencies = [
  "reth-node-api",
  "reth-node-builder",
  "reth-payload-builder",
+ "reth-primitives",
  "reth-provider",
  "reth-rpc",
  "reth-tracing",
@@ -7498,9 +7559,10 @@ dependencies = [
 
 [[package]]
 name = "reth-node-events"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "alloy-rpc-types-engine",
  "futures",
  "humantime",
@@ -7520,8 +7582,8 @@ dependencies = [
 
 [[package]]
 name = "reth-node-metrics"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "eyre",
  "http 1.1.0",
@@ -7543,58 +7605,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "reth-optimism-consensus"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
-dependencies = [
- "reth-chainspec",
- "reth-consensus",
- "reth-consensus-common",
- "reth-primitives",
- "tracing",
-]
-
-[[package]]
-name = "reth-optimism-primitives"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
-
-[[package]]
-name = "reth-optimism-rpc"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+name = "reth-node-types"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
- "alloy-primitives",
- "jsonrpsee-types",
- "op-alloy-network",
- "parking_lot 0.12.3",
- "reqwest",
  "reth-chainspec",
- "reth-evm",
- "reth-evm-optimism",
- "reth-network-api",
- "reth-node-api",
- "reth-node-builder",
- "reth-primitives",
- "reth-provider",
- "reth-rpc",
- "reth-rpc-eth-api",
- "reth-rpc-eth-types",
- "reth-rpc-server-types",
- "reth-rpc-types",
- "reth-tasks",
- "reth-transaction-pool",
- "revm",
- "serde_json",
- "thiserror",
- "tokio",
- "tracing",
+ "reth-db-api",
+ "reth-engine-primitives",
 ]
 
 [[package]]
 name = "reth-payload-builder"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "futures-util",
  "metrics",
@@ -7615,8 +7638,8 @@ dependencies = [
 
 [[package]]
 name = "reth-payload-primitives"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-chain-state",
  "reth-chainspec",
@@ -7631,8 +7654,8 @@ dependencies = [
 
 [[package]]
 name = "reth-payload-validator"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-chainspec",
  "reth-primitives",
@@ -7642,8 +7665,8 @@ dependencies = [
 
 [[package]]
 name = "reth-primitives"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7665,15 +7688,13 @@ dependencies = [
  "revm-primitives",
  "secp256k1",
  "serde",
- "tempfile",
- "thiserror",
  "zstd",
 ]
 
 [[package]]
 name = "reth-primitives-traits"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -7692,14 +7713,17 @@ dependencies = [
 
 [[package]]
 name = "reth-provider"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-eips",
+ "alloy-primitives",
  "alloy-rpc-types-engine",
  "auto_impl",
  "dashmap",
  "itertools 0.13.0",
  "metrics",
+ "notify",
  "parking_lot 0.12.3",
  "rayon",
  "reth-blockchain-tree-api",
@@ -7715,6 +7739,7 @@ dependencies = [
  "reth-metrics",
  "reth-network-p2p",
  "reth-nippy-jar",
+ "reth-node-types",
  "reth-primitives",
  "reth-prune-types",
  "reth-stages-types",
@@ -7730,8 +7755,8 @@ dependencies = [
 
 [[package]]
 name = "reth-prune"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "itertools 0.13.0",
@@ -7756,8 +7781,8 @@ dependencies = [
 
 [[package]]
 name = "reth-prune-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "bytes",
@@ -7770,8 +7795,8 @@ dependencies = [
 
 [[package]]
 name = "reth-revm"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "reth-chainspec",
  "reth-consensus-common",
@@ -7785,10 +7810,11 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-dyn-abi",
+ "alloy-eips",
  "alloy-genesis",
  "alloy-network",
  "alloy-primitives",
@@ -7803,7 +7829,7 @@ dependencies = [
  "jsonwebtoken",
  "parking_lot 0.12.3",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "reth-chainspec",
  "reth-consensus-common",
  "reth-errors",
@@ -7841,10 +7867,12 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-eips",
  "alloy-json-rpc",
+ "alloy-primitives",
  "jsonrpsee",
  "reth-engine-primitives",
  "reth-network-peers",
@@ -7855,9 +7883,10 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-builder"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-network",
  "http 1.1.0",
  "jsonrpsee",
  "metrics",
@@ -7869,6 +7898,7 @@ dependencies = [
  "reth-metrics",
  "reth-network-api",
  "reth-node-core",
+ "reth-primitives",
  "reth-provider",
  "reth-rpc",
  "reth-rpc-api",
@@ -7888,9 +7918,11 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-engine-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-eips",
+ "alloy-primitives",
  "async-trait",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -7908,6 +7940,7 @@ dependencies = [
  "reth-rpc-types-compat",
  "reth-storage-api",
  "reth-tasks",
+ "reth-transaction-pool",
  "serde",
  "thiserror",
  "tokio",
@@ -7916,12 +7949,13 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-eth-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-rpc",
  "alloy-network",
+ "alloy-primitives",
  "async-trait",
  "auto_impl",
  "dyn-clone",
@@ -7953,16 +7987,18 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-eth-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-consensus",
+ "alloy-primitives",
  "alloy-sol-types",
  "derive_more",
  "futures",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "metrics",
- "rand 0.8.5",
+ "rand",
  "reth-chain-state",
  "reth-chainspec",
  "reth-errors",
@@ -7991,8 +8027,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-layer"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-rpc-types-engine",
  "http 1.1.0",
@@ -8004,8 +8040,8 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-server-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "jsonrpsee-core",
@@ -8020,14 +8056,15 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types",
  "alloy-rpc-types-admin",
  "alloy-rpc-types-anvil",
  "alloy-rpc-types-beacon",
+ "alloy-rpc-types-debug",
  "alloy-rpc-types-engine",
  "alloy-rpc-types-mev",
  "alloy-rpc-types-trace",
@@ -8040,9 +8077,10 @@ dependencies = [
 
 [[package]]
 name = "reth-rpc-types-compat"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "alloy-rlp",
  "alloy-rpc-types",
  "reth-primitives",
@@ -8052,8 +8090,8 @@ dependencies = [
 
 [[package]]
 name = "reth-stages"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "futures-util",
  "itertools 0.13.0",
@@ -8086,8 +8124,8 @@ dependencies = [
 
 [[package]]
 name = "reth-stages-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "aquamarine",
@@ -8099,6 +8137,7 @@ dependencies = [
  "reth-errors",
  "reth-metrics",
  "reth-network-p2p",
+ "reth-node-types",
  "reth-primitives-traits",
  "reth-provider",
  "reth-prune",
@@ -8113,8 +8152,8 @@ dependencies = [
 
 [[package]]
 name = "reth-stages-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "bytes",
@@ -8126,15 +8165,17 @@ dependencies = [
 
 [[package]]
 name = "reth-static-file"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "parking_lot 0.12.3",
  "rayon",
+ "reth-chainspec",
  "reth-db",
  "reth-db-api",
  "reth-nippy-jar",
+ "reth-node-types",
  "reth-provider",
  "reth-prune-types",
  "reth-stages-types",
@@ -8146,8 +8187,8 @@ dependencies = [
 
 [[package]]
 name = "reth-static-file-types"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-primitives",
  "clap",
@@ -8158,11 +8199,14 @@ dependencies = [
 
 [[package]]
 name = "reth-storage-api"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-eips",
+ "alloy-primitives",
  "auto_impl",
  "reth-chainspec",
+ "reth-db-api",
  "reth-db-models",
  "reth-execution-types",
  "reth-primitives",
@@ -8174,9 +8218,11 @@ dependencies = [
 
 [[package]]
 name = "reth-storage-errors"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-eips",
+ "alloy-primitives",
  "alloy-rlp",
  "derive_more",
  "reth-fs-util",
@@ -8185,8 +8231,8 @@ dependencies = [
 
 [[package]]
 name = "reth-tasks"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "auto_impl",
  "dyn-clone",
@@ -8203,8 +8249,8 @@ dependencies = [
 
 [[package]]
 name = "reth-tokio-util"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "tokio",
  "tokio-stream",
@@ -8213,8 +8259,8 @@ dependencies = [
 
 [[package]]
 name = "reth-tracing"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "clap",
  "eyre",
@@ -8228,9 +8274,11 @@ dependencies = [
 
 [[package]]
 name = "reth-transaction-pool"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-eips",
+ "alloy-primitives",
  "alloy-rlp",
  "aquamarine",
  "auto_impl",
@@ -8260,9 +8308,10 @@ dependencies = [
 
 [[package]]
 name = "reth-trie"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "alloy-rlp",
  "auto_impl",
  "derive_more",
@@ -8282,8 +8331,8 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-common"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
  "alloy-consensus",
  "alloy-genesis",
@@ -8302,9 +8351,10 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-db"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "alloy-rlp",
  "auto_impl",
  "derive_more",
@@ -8326,9 +8376,10 @@ dependencies = [
 
 [[package]]
 name = "reth-trie-parallel"
-version = "1.0.6"
-source = "git+https://github.com/paradigmxyz/reth?tag=v1.0.6#c228fe15808c3acbf18dc3af1a03ef5cbdcda07a"
+version = "1.0.7"
+source = "git+https://github.com/paradigmxyz/reth?rev=000b412#000b41233d3bc1bed365e72bcfe0ebed6394e50f"
 dependencies = [
+ "alloy-primitives",
  "alloy-rlp",
  "derive_more",
  "itertools 0.13.0",
@@ -8350,9 +8401,9 @@ dependencies = [
 
 [[package]]
 name = "revm"
-version = "14.0.1"
+version = "14.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f719e28cc6fdd086f8bc481429e587740d20ad89729cec3f5f5dd7b655474df"
+checksum = "a9f3f55d0414c3d73902d876ba3d55a654f05fe937089fbf5f34b1ced26d78d5"
 dependencies = [
  "auto_impl",
  "cfg-if",
@@ -8365,12 +8416,13 @@ dependencies = [
 
 [[package]]
 name = "revm-inspectors"
-version = "0.6.0"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48184032103bb23788e42e42c7c85207f5b0b8a248b09ea8f5233077f35ab56e"
+checksum = "48294aab02ed5d1940ad9b06f2a3230c3f0d98db6eacd618878cf143e204f6b0"
 dependencies = [
  "alloy-primitives",
- "alloy-rpc-types",
+ "alloy-rpc-types-eth",
+ "alloy-rpc-types-trace",
  "alloy-sol-types",
  "anstyle",
  "colorchoice",
@@ -8381,9 +8433,9 @@ dependencies = [
 
 [[package]]
 name = "revm-interpreter"
-version = "10.0.1"
+version = "10.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "959ecbc36802de6126852479844737f20194cf8e6718e0c30697d306a2cca916"
+checksum = "713dbb271acd13afb06dcd460c1dc43da211e7ac9bc73cdf13528f615f55f96b"
 dependencies = [
  "revm-primitives",
  "serde",
@@ -8391,9 +8443,9 @@ dependencies = [
 
 [[package]]
 name = "revm-precompile"
-version = "11.0.1"
+version = "11.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e25f604cb9db593ca3013be8c00f310d6790ccb1b7d8fbbdd4660ec8888043a"
+checksum = "f73010c271d53fa7904e9845338e95f3955eb1200a0355e0abfdb89c41aaa9cd"
 dependencies = [
  "aurora-engine-modexp",
  "blst",
@@ -8410,9 +8462,9 @@ dependencies = [
 
 [[package]]
 name = "revm-primitives"
-version = "9.0.1"
+version = "9.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ccb981ede47ccf87c68cebf1ba30cdbb7ec935233ea305f3dfff4c1e10ae541"
+checksum = "e7a6bff9dbde3370a5ac9555104117f7e6039b3cc76e8d5d9d01899088beca2a"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -8461,7 +8513,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.15",
+ "getrandom",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
@@ -8532,16 +8584,18 @@ dependencies = [
  "futures",
  "hashbrown 0.14.5",
  "kona-derive",
- "kona-primitives",
  "kona-providers",
  "metrics-exporter-prometheus",
+ "op-alloy-genesis",
+ "op-alloy-protocol",
+ "op-alloy-rpc-types-engine",
  "reqwest",
  "reth",
  "reth-execution-types",
  "reth-exex",
  "reth-node-api",
  "serde_json",
- "superchain-registry",
+ "superchain",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -8586,7 +8640,7 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand 0.8.5",
+ "rand",
  "rlp",
  "ruint-macro",
  "serde",
@@ -8861,7 +8915,7 @@ version = "0.29.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113"
 dependencies = [
- "rand 0.8.5",
+ "rand",
  "secp256k1-sys",
  "serde",
 ]
@@ -8945,10 +8999,10 @@ dependencies = [
  "alloy-rlp",
  "eyre",
  "kona-derive",
- "kona-primitives",
+ "op-alloy-genesis",
  "op-alloy-protocol",
  "op-alloy-rpc-types",
- "rand 0.8.5",
+ "rand",
  "tracing",
 ]
 
@@ -8961,15 +9015,6 @@ dependencies = [
  "serde_derive",
 ]
 
-[[package]]
-name = "serde_bytes"
-version = "0.11.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_derive"
 version = "1.0.210"
@@ -9172,7 +9217,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
  "digest 0.10.7",
- "rand_core 0.6.4",
+ "rand_core",
 ]
 
 [[package]]
@@ -9247,7 +9292,7 @@ dependencies = [
  "blake2",
  "chacha20poly1305",
  "curve25519-dalek",
- "rand_core 0.6.4",
+ "rand_core",
  "ring 0.17.8",
  "rustc_version 0.4.1",
  "sha2 0.10.8",
@@ -9286,7 +9331,7 @@ dependencies = [
  "http 1.1.0",
  "httparse",
  "log",
- "rand 0.8.5",
+ "rand",
  "sha1",
 ]
 
@@ -9368,7 +9413,7 @@ dependencies = [
  "byteorder",
  "crunchy",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
 ]
 
@@ -9379,42 +9424,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
-name = "sucds"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53d46182afe6ed822a94c54a532dc0d59691a8f49226bdc4596529ca864cdd6"
-dependencies = [
- "anyhow",
- "num-traits",
-]
-
-[[package]]
-name = "superchain-primitives"
-version = "0.3.4"
+name = "superchain"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df394e39609f1f5d6b2d0d2fa9cd27aae0058339c992c9a4bf1f47f5f86fec6"
+checksum = "7d9113b97b12c98b213c77646077ef98f2b1f110e60a3f1b7813f46fb880e28d"
 dependencies = [
- "alloy-consensus",
- "alloy-eips",
- "alloy-genesis",
  "alloy-primitives",
- "alloy-sol-types",
- "anyhow",
- "serde",
- "serde_repr",
-]
-
-[[package]]
-name = "superchain-registry"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e0718465e68383a90ff54a2749ee1ec41609fec359840c1436d17414fdabae"
-dependencies = [
  "hashbrown 0.14.5",
  "lazy_static",
+ "op-alloy-genesis",
  "serde",
  "serde_json",
- "superchain-primitives",
 ]
 
 [[package]]
@@ -9613,9 +9633,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemalloc-ctl"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "619bfed27d807b54f7f776b9430d4f8060e66ee138a28632ca898584d462c31c"
+checksum = "f21f216790c8df74ce3ab25b534e0718da5a1916719771d3fec23315c99e468b"
 dependencies = [
  "libc",
  "paste",
@@ -9624,9 +9644,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemalloc-sys"
-version = "0.5.4+5.3.0-patched"
+version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1"
+checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d"
 dependencies = [
  "cc",
  "libc",
@@ -9634,9 +9654,9 @@ dependencies = [
 
 [[package]]
 name = "tikv-jemallocator"
-version = "0.5.4"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca"
+checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865"
 dependencies = [
  "libc",
  "tikv-jemalloc-sys",
@@ -9815,9 +9835,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.20"
+version = "0.22.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d"
+checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf"
 dependencies = [
  "indexmap 2.5.0",
  "serde",
@@ -9838,7 +9858,7 @@ dependencies = [
  "indexmap 1.9.3",
  "pin-project",
  "pin-project-lite",
- "rand 0.8.5",
+ "rand",
  "slab",
  "tokio",
  "tokio-util",
@@ -10040,7 +10060,7 @@ dependencies = [
  "idna 0.4.0",
  "ipnet",
  "once_cell",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "thiserror",
  "tinyvec",
@@ -10061,7 +10081,7 @@ dependencies = [
  "lru-cache",
  "once_cell",
  "parking_lot 0.12.3",
- "rand 0.8.5",
+ "rand",
  "resolv-conf",
  "smallvec",
  "thiserror",
@@ -10088,7 +10108,7 @@ dependencies = [
  "http 1.1.0",
  "httparse",
  "log",
- "rand 0.8.5",
+ "rand",
  "rustls",
  "rustls-pki-types",
  "sha1",
@@ -10149,9 +10169,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
  "tinyvec",
 ]
@@ -10258,7 +10278,7 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
- "getrandom 0.2.15",
+ "getrandom",
 ]
 
 [[package]]
@@ -10327,12 +10347,6 @@ dependencies = [
  "try-lock",
 ]
 
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-
 [[package]]
 name = "wasi"
 version = "0.11.0+wasi-snapshot-preview1"
@@ -10791,15 +10805,6 @@ dependencies = [
  "web-sys",
 ]
 
-[[package]]
-name = "wyhash"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf6e163c25e3fac820b4b453185ea2dea3b6a3e0a721d4d23d75bd33734c295"
-dependencies = [
- "rand_core 0.6.4",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -10816,7 +10821,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
  "curve25519-dalek",
- "rand_core 0.6.4",
+ "rand_core",
  "serde",
  "zeroize",
 ]
@@ -10864,7 +10869,7 @@ dependencies = [
  "nohash-hasher",
  "parking_lot 0.12.3",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "static_assertions",
 ]
 
@@ -10879,11 +10884,17 @@ dependencies = [
  "nohash-hasher",
  "parking_lot 0.12.3",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "static_assertions",
  "web-time",
 ]
 
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+
 [[package]]
 name = "yasna"
 version = "0.5.2"
diff --git a/Cargo.toml b/Cargo.toml
index fee0a6d..1ef0972 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [workspace.package]
 version = "0.0.0"
 edition = "2021"
-rust-version = "1.80"
+rust-version = "1.81"
 authors = []
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/paradigmxyz/op-rs"
@@ -23,10 +23,109 @@ default-members = ["bin/hera"]
 # https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
 resolver = "2"
 
+[profile.release]
+strip = "debuginfo"
+lto = "thin"
+panic = "unwind"
+codegen-units = 1
+incremental = false
+
+[workspace.dependencies]
+# Workspace
+op-net = { path = "crates/net" }
+kona-providers = { path = "crates/kona-providers" }
+rollup = { path = "crates/rollup" }
+ser = { path = "crates/ser" }
+
+# Optimism
+superchain = { version = "0.5", default-features = false }
+kona-primitives = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true }
+kona-derive = { git = "https://github.com/anton-rs/kona", branch = "main", default-features = true }
+
+# Alloy
+alloy = { version = "0.3.6", features = [
+    "contract",
+    "providers",
+    "provider-http",
+    "provider-ws",
+    "provider-ipc",
+    "signers",
+    "consensus",
+    "rpc-types",
+    "rpc-types-engine",
+    "network",
+    "ssz"
+] }
+alloy-primitives = { version = "0.8", features = ["serde"] }
+alloy-rlp = "0.3"
+op-alloy-protocol = { version = "0.2.12", default-features = false }
+op-alloy-rpc-types = { version = "0.2.12", default-features = false }
+op-alloy-rpc-types-engine = { version = "0.2.12", default-features = false }
+op-alloy-genesis = { version = "0.2.12", default-features = false }
+
+# Tokio
+tokio = { version = "1.21", default-features = false }
+
+# Serialization
+serde_json = "1"
+ethereum_ssz = "0.7.1"
+
+# Reth
+reth = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-discv5 = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", features = ["serde"], rev = "000b412" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "000b412" }
+
+# Networking
+snap = "1.1.1"
+discv5 = "0.6.0"
+openssl = { version = "0.10.66", features = ["vendored"] }
+libp2p-identity = { version = "0.2.9", features = [ "secp256k1" ] }
+libp2p = { version = "0.54.0", features = ["macros", "tokio", "tcp", "noise", "gossipsub", "ping", "yamux"] }
+
+# Testing
+arbtest = "0.3"
+arbitrary = { version = "1", features = ["derive"] }
+
+# Misc
+reqwest = "0.12.7"
+tracing = "0.1.0"
+tracing-subscriber = "0.3.18"
+eyre = "0.6.12"
+clap = { version = "4.5.4", features = ["derive", "env"] }
+lazy_static = "1.5.0"
+futures = "0.3.30"
+async-trait = "0.1.81"
+hashbrown = "0.14.5"
+parking_lot = "0.12.3"
+unsigned-varint = "0.8.0"
+rand = { version = "0.8.3", features = ["small_rng"], default-features = false }
+url = "2.5.2"
+
 [workspace.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
+[workspace.lints.rustdoc]
+all = "warn"
+
+[workspace.lints.rust]
+missing_debug_implementations = "warn"
+missing_docs = "warn"
+rust-2018-idioms = { level = "deny", priority = -1 }
+unreachable-pub = "warn"
+unused-must-use = "deny"
+
 [workspace.lints.clippy]
 # These are some of clippy's nursery (i.e., experimental) lints that we like.
 # By default, nursery lints are allowed. Some of the lints below have made good
@@ -97,102 +196,3 @@ non_send_fields_in_send_ty = "allow"
 redundant_pub_crate = "allow"
 significant_drop_in_scrutinee = "allow"
 significant_drop_tightening = "allow"
-
-[workspace.lints.rust]
-missing_debug_implementations = "warn"
-missing_docs = "warn"
-rust-2018-idioms = { level = "deny", priority = -1 }
-unreachable-pub = "warn"
-unused-must-use = "deny"
-
-[workspace.lints.rustdoc]
-all = "warn"
-
-[profile.release]
-strip = "debuginfo"
-lto = "thin"
-panic = "unwind"
-codegen-units = 1
-incremental = false
-
-# TODO(nico): remove this once we have a new release
-[patch.crates-io]
-op-alloy-protocol = { git = "https://github.com/alloy-rs/op-alloy", rev = "cf27ad9" }
-
-[workspace.dependencies]
-# Workspace
-op-net = { path = "crates/net" }
-kona-providers = { path = "crates/kona-providers" }
-rollup = { path = "crates/rollup" }
-ser = { path = "crates/ser" }
-
-# Optimism
-superchain-registry = { version = "0.3.4", default-features = false }
-kona-primitives = { git = "https://github.com/anton-rs/kona", rev = "4ba2812", default-features = true }
-kona-derive = { git = "https://github.com/anton-rs/kona", rev = "4ba2812", default-features = true }
-
-# Alloy
-alloy = { version = "0.3", features = [
-    "contract",
-    "providers",
-    "provider-http",
-    "provider-ws",
-    "provider-ipc",
-    "signers",
-    "consensus",
-    "rpc-types",
-    "rpc-types-engine",
-    "network",
-    "ssz"
-] }
-alloy-primitives = { version = "0.8", features = ["serde"] }
-alloy-rlp = "0.3.4"
-op-alloy-protocol = { version = "0.2", default-features = false }
-op-alloy-rpc-types = { version = "0.2", default-features = false }
-
-# Tokio
-tokio = { version = "1.21", default-features = false }
-
-# SSZ
-ethereum_ssz = "0.7.1"
-
-# Reth
-reth = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-discv5 = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-execution-types = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth", features = ["serde"], tag = "v1.0.6" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-primitives = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth", tag = "v1.0.6" }
-
-# Networking
-snap = "1.1.1"
-discv5 = "0.6.0"
-openssl = { version = "0.10.66", features = ["vendored"] }
-libp2p-identity = { version = "0.2.9", features = [ "secp256k1" ] }
-libp2p = { version = "0.54.0", features = ["macros", "tokio", "tcp", "noise", "gossipsub", "ping", "yamux"] }
-
-# Testing
-arbtest = "0.3"
-arbitrary = { version = "1", features = ["derive"] }
-
-# Misc
-tracing = "0.1.0"
-tracing-subscriber = "0.3.18"
-eyre = "0.6.12"
-clap = { version = "4.5.4", features = ["derive", "env"] }
-lazy_static = "1.5.0"
-futures = "0.3.30"
-async-trait = "0.1.81"
-hashbrown = "0.14.5"
-parking_lot = "0.12.3"
-unsigned-varint = "0.8.0"
-rand = { version = "0.8.3", features = ["small_rng"], default-features = false }
-url = "2.5.2"
diff --git a/bin/hera/Cargo.toml b/bin/hera/Cargo.toml
index 5abbfda..e9e67bf 100644
--- a/bin/hera/Cargo.toml
+++ b/bin/hera/Cargo.toml
@@ -15,7 +15,7 @@ categories.workspace = true
 rollup.workspace = true
 
 # Superchain
-superchain-registry.workspace = true
+superchain.workspace = true
 
 # Workspace
 eyre.workspace = true
diff --git a/bin/hera/src/network.rs b/bin/hera/src/network.rs
index f4801ac..b35528d 100644
--- a/bin/hera/src/network.rs
+++ b/bin/hera/src/network.rs
@@ -5,7 +5,7 @@ use clap::Args;
 use eyre::Result;
 use op_net::{discovery::builder::DiscoveryBuilder, driver::NetworkDriver};
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
-use superchain_registry::ROLLUP_CONFIGS;
+use superchain::ROLLUP_CONFIGS;
 
 /// The Hera network subcommand.
 #[derive(Debug, Clone, Args)]
diff --git a/bin/op-rs/src/main.rs b/bin/op-rs/src/main.rs
index 1c21113..c2ad6b9 100644
--- a/bin/op-rs/src/main.rs
+++ b/bin/op-rs/src/main.rs
@@ -7,7 +7,7 @@
 
 use clap::Parser;
 use eyre::{bail, Result};
-use reth::cli::Cli;
+use reth::{args::utils::DefaultChainSpecParser, cli::Cli};
 use reth_node_ethereum::EthereumNode;
 use tracing::{info, warn};
 
@@ -29,7 +29,7 @@ pub(crate) struct RethArgsExt {
 }
 
 fn main() -> Result<()> {
-    Cli::<RethArgsExt>::parse().run(|builder, args| async move {
+    Cli::<DefaultChainSpecParser, RethArgsExt>::parse().run(|builder, args| async move {
         if args.hera {
             info!("Running Reth with the Hera Execution Extension");
             let Some(hera_args) = args.hera_config else {
diff --git a/clippy.toml b/clippy.toml
index 8bfc90f..8c0bc00 100644
--- a/clippy.toml
+++ b/clippy.toml
@@ -1 +1 @@
-msrv = "1.80"
+msrv = "1.81"
diff --git a/crates/kona-providers/src/chain_provider.rs b/crates/kona-providers/src/chain_provider.rs
index e9067ec..cacf5f4 100644
--- a/crates/kona-providers/src/chain_provider.rs
+++ b/crates/kona-providers/src/chain_provider.rs
@@ -9,12 +9,13 @@ use alloy::{
         Header, Receipt, Signed, TxEip1559, TxEip2930, TxEip4844, TxEip4844Variant, TxEnvelope,
         TxLegacy,
     },
+    eips::BlockNumHash,
     primitives::B256,
     signers::Signature,
 };
 use async_trait::async_trait;
 use kona_derive::traits::ChainProvider;
-use kona_primitives::{BlockID, BlockInfo};
+use op_alloy_protocol::BlockInfo;
 use parking_lot::RwLock;
 use reth::{primitives::Transaction, providers::Chain};
 
@@ -37,8 +38,8 @@ impl InMemoryChainProvider {
         self.0.write().commit(chain);
     }
 
-    /// Inserts the L2 genesis [BlockID] into the provider.
-    pub fn insert_l2_genesis_block(&mut self, block: BlockID) {
+    /// Inserts the L2 genesis [BlockNumHash] into the provider.
+    pub fn insert_l2_genesis_block(&mut self, block: BlockNumHash) {
         self.0.write().insert_l2_genesis_block(block);
     }
 }
@@ -125,8 +126,8 @@ impl InMemoryChainProviderInner {
         }
     }
 
-    /// Inserts the L2 genesis [BlockID] into the provider.
-    fn insert_l2_genesis_block(&mut self, block: BlockID) {
+    /// Inserts the L2 genesis [BlockNumHash] into the provider.
+    fn insert_l2_genesis_block(&mut self, block: BlockNumHash) {
         self.hash_to_block_info.insert(
             block.hash,
             BlockInfo {
@@ -262,7 +263,7 @@ pub fn reth_to_alloy_tx(tx: &reth::primitives::TransactionSigned) -> Option<TxEn
                 chain_id: l.chain_id,
                 nonce: l.nonce,
                 gas_price: l.gas_price,
-                gas_limit: l.gas_limit as u128,
+                gas_limit: l.gas_limit,
                 to: l.to,
                 value: l.value,
                 input: l.input.clone(),
@@ -274,7 +275,7 @@ pub fn reth_to_alloy_tx(tx: &reth::primitives::TransactionSigned) -> Option<TxEn
                 chain_id: e.chain_id,
                 nonce: e.nonce,
                 gas_price: e.gas_price,
-                gas_limit: e.gas_limit as u128,
+                gas_limit: e.gas_limit,
                 to: e.to,
                 value: e.value,
                 input: e.input.clone(),
@@ -298,7 +299,7 @@ pub fn reth_to_alloy_tx(tx: &reth::primitives::TransactionSigned) -> Option<TxEn
                 nonce: e.nonce,
                 max_priority_fee_per_gas: e.max_priority_fee_per_gas,
                 max_fee_per_gas: e.max_fee_per_gas,
-                gas_limit: e.gas_limit as u128,
+                gas_limit: e.gas_limit,
                 to: e.to,
                 value: e.value,
                 input: e.input.clone(),
@@ -324,7 +325,7 @@ pub fn reth_to_alloy_tx(tx: &reth::primitives::TransactionSigned) -> Option<TxEn
                 max_priority_fee_per_gas: e.max_priority_fee_per_gas,
                 max_fee_per_blob_gas: e.max_fee_per_blob_gas,
                 blob_versioned_hashes: e.blob_versioned_hashes.clone(),
-                gas_limit: e.gas_limit as u128,
+                gas_limit: e.gas_limit,
                 to: e.to,
                 value: e.value,
                 input: e.input.clone(),
diff --git a/crates/net/src/builder.rs b/crates/net/src/builder.rs
index 553c96c..f36d9e2 100644
--- a/crates/net/src/builder.rs
+++ b/crates/net/src/builder.rs
@@ -151,8 +151,8 @@ impl NetworkDriverBuilder {
     /// ## Example
     ///
     /// ```rust
+    /// use alloy::primitives::{address, Address};
     /// use discv5::{ConfigBuilder, ListenConfig};
-    /// use kona_primitives::alloy_primitives::{address, Address};
     /// use op_net::builder::NetworkDriverBuilder;
     /// use std::net::{IpAddr, Ipv4Addr, SocketAddr};
     ///
diff --git a/crates/rollup/Cargo.toml b/crates/rollup/Cargo.toml
index b0af3ee..3e78d29 100644
--- a/crates/rollup/Cargo.toml
+++ b/crates/rollup/Cargo.toml
@@ -12,15 +12,12 @@ categories.workspace = true
 [dependencies]
 kona-providers.workspace = true
 
-# Workspace
-eyre.workspace = true
-tracing.workspace = true
-clap.workspace = true
-async-trait.workspace = true
-tokio.workspace = true
-futures.workspace = true
-alloy.workspace = true
-hashbrown.workspace = true
+# OP Stack Dependencies
+kona-derive.workspace = true
+op-alloy-genesis.workspace = true
+op-alloy-protocol.workspace = true
+op-alloy-rpc-types-engine.workspace = true
+superchain = { workspace = true, default-features = false }
 
 # Reth Dependencies
 reth.workspace = true
@@ -28,19 +25,22 @@ reth-exex.workspace = true
 reth-node-api.workspace = true
 reth-execution-types.workspace = true
 
-# OP Stack Dependencies
-kona-derive.workspace = true
-kona-primitives.workspace = true
-superchain-registry = { workspace = true, default-features = false }
-
 # Telemetry
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "fmt"] }   
 metrics-exporter-prometheus = { version = "0.15.3", features = ["http-listener"] }
 
-# Misc
-url = "2.5.2"
-serde_json = "1"
-reqwest = "0.12.7"
+# Misc 
+url.workspace = true
+reqwest.workspace = true
+serde_json.workspace = true
+eyre.workspace = true
+tracing.workspace = true
+clap.workspace = true
+async-trait.workspace = true
+tokio.workspace = true
+futures.workspace = true
+alloy.workspace = true
+hashbrown.workspace = true
 
 [features]
 default = ["online"]
diff --git a/crates/rollup/src/cli.rs b/crates/rollup/src/cli.rs
index 0b5f0a0..17d3df8 100644
--- a/crates/rollup/src/cli.rs
+++ b/crates/rollup/src/cli.rs
@@ -4,9 +4,9 @@ use std::{fs::File, path::PathBuf, sync::Arc};
 
 use clap::Args;
 use eyre::{bail, Context, Result};
-use kona_primitives::RollupConfig;
+use op_alloy_genesis::RollupConfig;
 use serde_json::from_reader;
-use superchain_registry::ROLLUP_CONFIGS;
+use superchain::ROLLUP_CONFIGS;
 use tracing::debug;
 use url::Url;
 
diff --git a/crates/rollup/src/driver/context/exex.rs b/crates/rollup/src/driver/context/exex.rs
index f0f5576..f82a16e 100644
--- a/crates/rollup/src/driver/context/exex.rs
+++ b/crates/rollup/src/driver/context/exex.rs
@@ -1,5 +1,6 @@
 use alloy::primitives::BlockNumber;
 use async_trait::async_trait;
+use futures::StreamExt;
 use kona_providers::InMemoryChainProvider;
 use reth_exex::{ExExContext, ExExEvent};
 use reth_node_api::FullNodeComponents;
@@ -29,7 +30,7 @@ impl<N: FullNodeComponents> ExExHeraContext<N> {
 #[async_trait]
 impl<N: FullNodeComponents> DriverContext for ExExHeraContext<N> {
     async fn recv_notification(&mut self) -> Option<ChainNotification> {
-        let exex_notification = self.ctx.notifications.recv().await?;
+        let exex_notification = self.ctx.notifications.next().await?;
 
         // Commit the new chain to the L1 cache to make it available to the pipeline
         if let Some(chain) = exex_notification.committed_chain() {
diff --git a/crates/rollup/src/driver/context/standalone.rs b/crates/rollup/src/driver/context/standalone.rs
index 3fb7ef3..269f537 100644
--- a/crates/rollup/src/driver/context/standalone.rs
+++ b/crates/rollup/src/driver/context/standalone.rs
@@ -2,6 +2,7 @@ use hashbrown::HashMap;
 use std::{collections::BTreeMap, time::Duration};
 
 use alloy::{
+    consensus::TxEnvelope,
     eips::BlockId,
     network::Ethereum,
     primitives::{BlockNumber, B256},
@@ -11,7 +12,6 @@ use alloy::{
 };
 use async_trait::async_trait;
 use futures::StreamExt;
-use kona_primitives::TxEnvelope;
 use reth::rpc::types::BlockTransactions;
 use tokio::{
     sync::mpsc::{self, error::SendError},
diff --git a/crates/rollup/src/driver/cursor.rs b/crates/rollup/src/driver/cursor.rs
index c33015a..f3f68b6 100644
--- a/crates/rollup/src/driver/cursor.rs
+++ b/crates/rollup/src/driver/cursor.rs
@@ -1,7 +1,7 @@
 use hashbrown::HashMap;
 use std::collections::{BTreeMap, VecDeque};
 
-use kona_primitives::{BlockInfo, L2BlockInfo};
+use op_alloy_protocol::{BlockInfo, L2BlockInfo};
 
 /// A cursor that keeps track of the L2 tip block for a given L1 origin block.
 ///
diff --git a/crates/rollup/src/driver/mod.rs b/crates/rollup/src/driver/mod.rs
index 783c0b9..1ffd4d7 100644
--- a/crates/rollup/src/driver/mod.rs
+++ b/crates/rollup/src/driver/mod.rs
@@ -8,15 +8,15 @@ use kona_derive::{
     online::{AlloyChainProvider, AlloyL2ChainProvider, OnlineBlobProviderBuilder},
     traits::{BlobProvider, ChainProvider, L2ChainProvider},
 };
-use kona_primitives::{BlockInfo, L2BlockInfo};
 use kona_providers::{
     blob_provider::DurableBlobProvider, InMemoryChainProvider, LayeredBlobProvider, Pipeline,
     StepResult,
 };
+use op_alloy_genesis::RollupConfig;
+use op_alloy_protocol::{BlockInfo, L2BlockInfo};
 use reth::rpc::types::engine::JwtSecret;
 use reth_exex::ExExContext;
 use reth_node_api::FullNodeComponents;
-use superchain_registry::RollupConfig;
 use tracing::{debug, error, info, trace, warn};
 
 use crate::{
diff --git a/crates/rollup/src/pipeline.rs b/crates/rollup/src/pipeline.rs
index 9e3c44e..0a517f9 100644
--- a/crates/rollup/src/pipeline.rs
+++ b/crates/rollup/src/pipeline.rs
@@ -10,7 +10,8 @@ use kona_derive::{
     },
     traits::{BlobProvider, ChainProvider},
 };
-use kona_primitives::{BlockInfo, RollupConfig};
+use op_alloy_genesis::RollupConfig;
+use op_alloy_protocol::BlockInfo;
 
 /// A [FrameQueue] stage implementation that takes the outputs of the [L1Retrieval] stage and
 /// parses it into frames, using the [L1Traversal] stage to fetch block info for each frame.
@@ -28,7 +29,8 @@ type L1AttributesQueue<CP, BP, L2CP> = AttributesQueue<
 /// - The L1 [BlobProvider] (BP)
 ///
 /// This pipeline is a derivation pipeline that takes the outputs of the [FrameQueue] stage
-/// and transforms them into [L2PayloadAttributes](kona_primitives::L2PayloadAttributes).
+/// and transforms them into
+/// [OptimismPayloadAttributes](op_alloy_rpc_types_engine::OptimismPayloadAttributes).
 pub type RollupPipeline<CP, BP> =
     DerivationPipeline<L1AttributesQueue<CP, BP, AlloyL2ChainProvider>, AlloyL2ChainProvider>;
 
diff --git a/crates/rollup/src/validator.rs b/crates/rollup/src/validator.rs
index dbcbbf8..69b656a 100644
--- a/crates/rollup/src/validator.rs
+++ b/crates/rollup/src/validator.rs
@@ -4,11 +4,13 @@ use std::fmt::Debug;
 
 use alloy::{
     eips::BlockNumberOrTag,
+    primitives::Bytes,
     providers::{network::primitives::BlockTransactionsKind, Provider, ReqwestProvider},
+    rpc::types::engine::PayloadAttributes,
 };
 use async_trait::async_trait;
 use eyre::{bail, eyre, Result};
-use kona_primitives::{L2AttributesWithParent, L2PayloadAttributes, RawTransaction};
+use op_alloy_rpc_types_engine::{OptimismAttributesWithParent, OptimismPayloadAttributes};
 use reqwest::{
     header::{AUTHORIZATION, CONTENT_TYPE},
     Client, StatusCode,
@@ -25,14 +27,14 @@ use url::Url;
 /// A trait that defines the interface for validating newly derived L2 attributes.
 #[async_trait]
 pub trait AttributesValidator: Debug + Send {
-    /// Validates the given [`L2AttributesWithParent`] and returns true
+    /// Validates the given [`OptimismAttributesWithParent`] and returns true
     /// if the attributes are valid, false otherwise.
-    async fn validate(&self, attributes: &L2AttributesWithParent) -> Result<bool>;
+    async fn validate(&self, attributes: &OptimismAttributesWithParent) -> Result<bool>;
 }
 
 /// TrustedValidator
 ///
-/// Validates the [`L2AttributesWithParent`] by fetching the associated L2 block from
+/// Validates the [`OptimismAttributesWithParent`] by fetching the associated L2 block from
 /// a trusted L2 RPC and constructing the L2 Attributes from the block.
 #[derive(Debug, Clone)]
 pub struct TrustedValidator {
@@ -59,7 +61,7 @@ impl TrustedValidator {
     ///
     /// This method needs to fetch the non-hydrated block and then
     /// fetch the raw transactions using the `debug_*` namespace.
-    pub async fn get_block(&self, tag: BlockNumberOrTag) -> Result<(Header, Vec<RawTransaction>)> {
+    pub async fn get_block(&self, tag: BlockNumberOrTag) -> Result<(Header, Vec<Bytes>)> {
         // Don't hydrate the block so we only get a list of transaction hashes.
         let block = self
             .provider
@@ -89,18 +91,20 @@ impl TrustedValidator {
     }
 
     /// Gets the payload for the specified [BlockNumberOrTag].
-    pub async fn get_payload(&self, tag: BlockNumberOrTag) -> Result<L2PayloadAttributes> {
+    pub async fn get_payload(&self, tag: BlockNumberOrTag) -> Result<OptimismPayloadAttributes> {
         let (header, transactions) = self.get_block(tag).await?;
 
-        Ok(L2PayloadAttributes {
-            timestamp: header.timestamp,
-            prev_randao: header.mix_hash.unwrap_or_default(),
-            fee_recipient: header.miner,
-            // Withdrawals on optimism are always empty, *after* canyon (Shanghai) activation
-            withdrawals: (header.timestamp >= self.canyon_activation).then_some(Vec::default()),
-            parent_beacon_block_root: header.parent_beacon_block_root,
-            transactions,
-            no_tx_pool: true,
+        Ok(OptimismPayloadAttributes {
+            payload_attributes: PayloadAttributes {
+                timestamp: header.timestamp,
+                suggested_fee_recipient: header.miner,
+                prev_randao: header.mix_hash.unwrap_or_default(),
+                // Withdrawals on optimism are always empty, *after* canyon (Shanghai) activation
+                withdrawals: (header.timestamp >= self.canyon_activation).then_some(Vec::default()),
+                parent_beacon_block_root: header.parent_beacon_block_root,
+            },
+            transactions: Some(transactions),
+            no_tx_pool: Some(true),
             gas_limit: Some(header.gas_limit as u64),
         })
     }
@@ -108,7 +112,7 @@ impl TrustedValidator {
 
 #[async_trait]
 impl AttributesValidator for TrustedValidator {
-    async fn validate(&self, attributes: &L2AttributesWithParent) -> Result<bool> {
+    async fn validate(&self, attributes: &OptimismAttributesWithParent) -> Result<bool> {
         let expected = attributes.parent.block_info.number + 1;
         let tag = BlockNumberOrTag::from(expected);
 
@@ -124,7 +128,7 @@ impl AttributesValidator for TrustedValidator {
 
 /// EngineApiValidator
 ///
-/// Validates the [`L2AttributesWithParent`] by sending the attributes to an L2 engine API.
+/// Validates the [`OptimismAttributesWithParent`] by sending the attributes to an L2 engine API.
 /// The engine API will return a `VALID` or `INVALID` response.
 #[derive(Debug, Clone)]
 pub struct EngineApiValidator {
@@ -146,7 +150,7 @@ impl EngineApiValidator {
 
 #[async_trait]
 impl AttributesValidator for EngineApiValidator {
-    async fn validate(&self, attributes: &L2AttributesWithParent) -> Result<bool> {
+    async fn validate(&self, attributes: &OptimismAttributesWithParent) -> Result<bool> {
         let request_body = serde_json::json!({
             "id": 1,
             "jsonrpc": "2.0",
diff --git a/crates/ser/Cargo.toml b/crates/ser/Cargo.toml
index 8c44a41..43cc43a 100644
--- a/crates/ser/Cargo.toml
+++ b/crates/ser/Cargo.toml
@@ -13,12 +13,12 @@ categories.workspace = true
 [dependencies]
 # Kona
 kona-derive.workspace = true
-kona-primitives.workspace = true
 
 # Alloy
 alloy-rlp = { workspace = true, features = ["derive"] }
 op-alloy-rpc-types.workspace = true
 op-alloy-protocol.workspace = true
+op-alloy-genesis.workspace = true
 
 # Misc
 rand.workspace = true
diff --git a/crates/ser/src/types/channel_out.rs b/crates/ser/src/types/channel_out.rs
index b65d171..98c1133 100644
--- a/crates/ser/src/types/channel_out.rs
+++ b/crates/ser/src/types/channel_out.rs
@@ -4,10 +4,10 @@ use alloc::{sync::Arc, vec, vec::Vec};
 use alloy_rlp::Encodable;
 use eyre::{bail, Result};
 use kona_derive::batch::SingleBatch;
-use kona_primitives::{
-    Frame, RollupConfig, FJORD_MAX_RLP_BYTES_PER_CHANNEL, MAX_RLP_BYTES_PER_CHANNEL,
+use op_alloy_genesis::RollupConfig;
+use op_alloy_protocol::{
+    ChannelId, Frame, FJORD_MAX_RLP_BYTES_PER_CHANNEL, MAX_RLP_BYTES_PER_CHANNEL,
 };
-use op_alloy_protocol::ChannelId;
 use rand::{rngs::SmallRng, Rng, SeedableRng};
 use tracing::{error, trace, warn};
 
@@ -28,7 +28,7 @@ pub struct ChannelOut<C: Compressor> {
     /// The current frame number.
     pub frame: u16,
     /// The uncompressed size of the channel.
-    /// This must be less than [kona_primitives::MAX_RLP_BYTES_PER_CHANNEL].
+    /// This must be less than [op_alloy_protocol::MAX_RLP_BYTES_PER_CHANNEL].
     pub rlp_length: u64,
     /// If the channel is closed.
     pub closed: bool,