diff --git a/.circleci/continue/rust-ci.yml b/.circleci/continue/rust-ci.yml
index bdd3b57ec5613..852056d981d62 100644
--- a/.circleci/continue/rust-ci.yml
+++ b/.circleci/continue/rust-ci.yml
@@ -714,7 +714,7 @@ jobs:
             if [ "$CIRCLE_NODE_TOTAL" -gt 1 ]; then
               PARTITION_FLAG="$((CIRCLE_NODE_INDEX + 1))/$CIRCLE_NODE_TOTAL"
             fi
-            just hack $PARTITION_FLAG
+            just hack "$PARTITION_FLAG" "true" "$CIRCLE_WORKFLOW_ID"
       - rust-save-build-cache: *hack-cache-args
 
   # --------------------------------------------------------------------------
@@ -906,25 +906,6 @@ jobs:
           command: |
             just build-<<parameters.target>>
 
-  # Kona Build Benchmarks
-  kona-cargo-build-benches:
-    docker:
-      - image: <<pipeline.parameters.c-default_docker_image>>
-    resource_class: 2xlarge
-    steps:
-      - utils/checkout-with-mise:
-          checkout-method: blobless
-      - rust-prepare-and-restore-cache: &kona-benches-cache
-          directory: rust
-          prefix: kona-benches
-      - run:
-          name: Build benchmarks
-          working_directory: rust/kona
-          no_output_timeout: 40m
-          command: |
-            just benches
-      - rust-save-build-cache: *kona-benches-cache
-
   # Kona Coverage
   kona-coverage:
     docker:
@@ -1260,9 +1241,6 @@ workflows:
               target: ["cannon-client", "asterisc-client"]
           context: *rust-ci-context
 
-      - kona-cargo-build-benches:
-          context: *rust-ci-context
-
       - kona-coverage:
           context: *rust-ci-context
           requires:
diff --git a/.semgrepignore b/.semgrepignore
index db09993ebfea6..5a5c4eea4ea16 100644
--- a/.semgrepignore
+++ b/.semgrepignore
@@ -19,3 +19,6 @@ op-chain-ops/script/testdata/scripts/
 
 # Op-alloy book theme (third-party mdbook assets)
 rust/op-alloy/book/
+
+# Op-reth test contracts (not production Solidity code)
+rust/op-reth/crates/tests/
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 2e8a90552b541..5646536d30543 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -116,14 +116,14 @@ dependencies = [
  "num_enum",
  "proptest",
  "serde",
- "strum 0.27.2",
+ "strum",
 ]
 
 [[package]]
 name = "alloy-consensus"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed1958f0294ecc05ebe7b3c9a8662a3e221c2523b7f2bcd94c7a651efbd510bf"
+checksum = "4e4ff99651d46cef43767b5e8262ea228cd05287409ccb0c947cc25e70a952f9"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -149,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f752e99497ddc39e22d547d7dfe516af10c979405a034ed90e69b914b7dddeae"
+checksum = "1a0701b0eda8051a2398591113e7862f807ccdd3315d0b441f06c2a0865a379b"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -240,9 +240,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "813a67f87e56b38554d18b182616ee5006e8e2bf9df96a0df8bf29dff1d52e3f"
+checksum = "def1626eea28d48c6cc0a6f16f34d4af0001906e4f889df6c660b39c86fd044d"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -257,8 +257,8 @@ dependencies = [
  "c-kzg",
  "derive_more",
  "either",
- "ethereum_ssz",
- "ethereum_ssz_derive",
+ "ethereum_ssz 0.9.1",
+ "ethereum_ssz_derive 0.9.1",
  "serde",
  "serde_with",
  "sha2",
@@ -267,9 +267,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-evm"
-version = "0.27.0"
+version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1582933a9fc27c0953220eb4f18f6492ff577822e9a8d848890ff59f6b4f5beb"
+checksum = "d2ccfe6d724ceabd5518350cfb34f17dd3a6c3cc33579eee94d98101d3a511ff"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -289,9 +289,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-genesis"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05864eef929c4d28895ae4b4d8ac9c6753c4df66e873b9c8fafc8089b59c1502"
+checksum = "55d9d1aba3f914f0e8db9e4616ae37f3d811426d95bdccf44e47d0605ab202f6"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -330,9 +330,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2dd146b3de349a6ffaa4e4e319ab3a90371fb159fb0bddeb1c7bbe8b1792eff"
+checksum = "e57586581f2008933241d16c3e3f633168b3a5d2738c5c42ea5246ec5e0ef17a"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -345,9 +345,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c12278ffbb8872dfba3b2f17d8ea5e8503c2df5155d9bc5ee342794bde505c3"
+checksum = "3b36c2a0ed74e48851f78415ca5b465211bd678891ba11e88fee09eac534bab1"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -371,9 +371,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "833037c04917bc2031541a60e8249e4ab5500e24c637c1c62e95e963a655d66f"
+checksum = "636c8051da58802e757b76c3b65af610b95799f72423dc955737dec73de234fd"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -444,9 +444,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eafa840b0afe01c889a3012bb2fde770a544f74eab2e2870303eb0a5fb869c48"
+checksum = "b3dd56e2eafe8b1803e325867ac2c8a4c73c9fb5f341ffd8347f9344458c5922"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -489,9 +489,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b3a3b3e4efc9f4d30e3326b6bd6811231d16ef94837e18a802b44ca55119e6"
+checksum = "6eebf54983d4fccea08053c218ee5c288adf2e660095a243d0532a8070b43955"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -533,9 +533,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12768ae6303ec764905a8a7cd472aea9072f9f9c980d18151e26913da8ae0123"
+checksum = "91577235d341a1bdbee30a463655d08504408a4d51e9f72edbfc5a622829f402"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -559,9 +559,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0622d8bcac2f16727590aa33f4c3f05ea98130e7e4b4924bce8be85da5ad0dae"
+checksum = "79cff039bf01a17d76c0aace3a3a773d5f895eb4c68baaae729ec9da9e86c99c"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-debug",
@@ -573,9 +573,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-admin"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c38c5ac70457ecc74e87fe1a5a19f936419224ded0eb0636241452412ca92733"
+checksum = "564afceae126df73b95f78c81eb46e2ef689a45ace0fcdaf5c9a178693a5ccca"
 dependencies = [
  "alloy-genesis",
  "alloy-primitives",
@@ -585,9 +585,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8eb0e5d6c48941b61ab76fabab4af66f7d88309a98aa14ad3dec7911c1eba3"
+checksum = "d22250cf438b6a3926de67683c08163bfa1fd1efa47ee9512cbcd631b6b0243c"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -597,9 +597,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1cf5a093e437dfd62df48e480f24e1a3807632358aad6816d7a52875f1c04aa"
+checksum = "73234a141ecce14e2989748c04fcac23deee67a445e2c4c167cfb42d4dacd1b6"
 dependencies = [
  "alloy-consensus-any",
  "alloy-rpc-types-eth",
@@ -608,16 +608,16 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-beacon"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e07949e912479ef3b848e1cf8db54b534bdd7bc58e6c23f28ea9488960990c8c"
+checksum = "625af0c3ebd3c31322edb1fb6b8e3e518acc39e164ed07e422eaff05310ff2fa"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
  "alloy-rpc-types-engine",
  "derive_more",
- "ethereum_ssz",
- "ethereum_ssz_derive",
+ "ethereum_ssz 0.9.1",
+ "ethereum_ssz_derive 0.9.1",
  "serde",
  "serde_json",
  "serde_with",
@@ -628,9 +628,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-debug"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925ff0f48c2169c050f0ae7a82769bdf3f45723d6742ebb6a5efb4ed2f491b26"
+checksum = "779f70ab16a77e305571881b07a9bc6b0068ae6f962497baf5762825c5b839fb"
 dependencies = [
  "alloy-primitives",
  "derive_more",
@@ -640,9 +640,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "336ef381c7409f23c69f6e79bddc1917b6e832cff23e7a5cf84b9381d53582e6"
+checksum = "10620d600cc46538f613c561ac9a923843c6c74c61f054828dcdb8dd18c72ec4"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -651,19 +651,19 @@ dependencies = [
  "alloy-serde",
  "arbitrary",
  "derive_more",
- "ethereum_ssz",
- "ethereum_ssz_derive",
+ "ethereum_ssz 0.9.1",
+ "ethereum_ssz_derive 0.9.1",
  "jsonwebtoken",
  "rand 0.8.5",
  "serde",
- "strum 0.27.2",
+ "strum",
 ]
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28e97603095020543a019ab133e0e3dc38cd0819f19f19bdd70c642404a54751"
+checksum = "010e101dbebe0c678248907a2545b574a87d078d82c2f6f5d0e8e7c9a6149a10"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -683,9 +683,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-mev"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2805153975e25d38e37ee100880e642d5b24e421ed3014a7d2dae1d9be77562e"
+checksum = "375e4bf001135fe4f344db6197fafed8c2b61e99fa14d3597f44cd413f79e45b"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -698,9 +698,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1aec4e1c66505d067933ea1a949a4fb60a19c4cfc2f109aa65873ea99e62ea8"
+checksum = "be096f74d85e1f927580b398bf7bc5b4aa62326f149680ec0867e3c040c9aced"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -712,9 +712,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-txpool"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25b73c1d6e4f1737a20d246dad5a0abd6c1b76ec4c3d153684ef8c6f1b6bb4f4"
+checksum = "14ab75189fbc29c5dd6f0bc1529bccef7b00773b458763f4d9d81a77ae4a1a2d"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -724,9 +724,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "946a0d413dbb5cd9adba0de5f8a1a34d5b77deda9b69c1d7feed8fc875a1aa26"
+checksum = "9e6d631f8b975229361d8af7b2c749af31c73b3cf1352f90e144ddb06227105e"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -736,9 +736,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f7481dc8316768f042495eaf305d450c32defbc9bce09d8bf28afcd956895bb"
+checksum = "97f40010b5e8f79b70bf163b38cd15f529b18ca88c4427c0e43441ee54e4ed82"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -751,9 +751,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer-local"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1259dac1f534a4c66c1d65237c89915d0010a2a91d6c3b0bada24dc5ee0fb917"
+checksum = "9c4ec1cc27473819399a3f0da83bc1cef0ceaac8c1c93997696e46dc74377a58"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -840,9 +840,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f169b85eb9334871db986e7eaf59c58a03d86a30cc68b846573d47ed0656bb"
+checksum = "a03bb3f02b9a7ab23dacd1822fa7f69aa5c8eefcdcf57fad085e0b8d76fb4334"
 dependencies = [
  "alloy-json-rpc",
  "auto_impl",
@@ -863,9 +863,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "019821102e70603e2c141954418255bec539ef64ac4117f8e84fb493769acf73"
+checksum = "5ce599598ef8ebe067f3627509358d9faaa1ef94f77f834a7783cd44209ef55c"
 dependencies = [
  "alloy-json-rpc",
  "alloy-rpc-types-engine",
@@ -874,6 +874,7 @@ dependencies = [
  "hyper",
  "hyper-tls",
  "hyper-util",
+ "itertools 0.14.0",
  "jsonwebtoken",
  "reqwest 0.12.28",
  "serde_json",
@@ -884,9 +885,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e574ca2f490fb5961d2cdd78188897392c46615cd88b35c202d34bbc31571a81"
+checksum = "49963a2561ebd439549915ea61efb70a7b13b97500ec16ca507721c9d9957d07"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -904,9 +905,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b92dea6996269769f74ae56475570e3586910661e037b7b52d50c9641f76c68f"
+checksum = "5ed38ea573c6658e0c2745af9d1f1773b1ed83aa59fbd9c286358ad469c3233a"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
@@ -921,9 +922,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-trie"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "428aa0f0e0658ff091f8f667c406e034b431cb10abd39de4f507520968acc499"
+checksum = "4d7fd448ab0a017de542de1dcca7a58e7019fe0e7a34ed3f9543ebddf6aceffa"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -933,17 +934,18 @@ dependencies = [
  "derive_more",
  "nybbles",
  "proptest",
- "proptest-derive 0.5.1",
+ "proptest-derive 0.7.0",
  "serde",
  "smallvec",
+ "thiserror 2.0.18",
  "tracing",
 ]
 
 [[package]]
 name = "alloy-tx-macros"
-version = "1.5.2"
+version = "1.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45ceac797eb8a56bdf5ab1fab353072c17d472eab87645ca847afe720db3246d"
+checksum = "397406cf04b11ca2a48e6f81804c70af3f40a36abf648e11dc7416043eb0834d"
 dependencies = [
  "darling 0.21.3",
  "proc-macro2",
@@ -1030,9 +1032,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.100"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea"
 
 [[package]]
 name = "aquamarine"
@@ -1463,7 +1465,7 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 1.1.3",
+ "rustix",
  "slab",
  "windows-sys 0.61.2",
 ]
@@ -1777,24 +1779,6 @@ dependencies = [
  "virtue",
 ]
 
-[[package]]
-name = "bindgen"
-version = "0.71.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
-dependencies = [
- "bitflags 2.10.0",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.114",
-]
-
 [[package]]
 name = "bindgen"
 version = "0.72.1"
@@ -2285,12 +2269,6 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
-[[package]]
-name = "cassowary"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
-
 [[package]]
 name = "cast"
 version = "0.3.0"
@@ -2434,9 +2412,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.56"
+version = "4.5.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a75ca66430e33a14957acc24c5077b503e7d374151b2b4b3a10c83b4ceb4be0e"
+checksum = "63be97961acde393029492ce0be7a1af7e323e6bae9511ebfac33751be5e6806"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2444,9 +2422,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.56"
+version = "4.5.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793207c7fa6300a0608d1080b858e5fdbe713cdc1c8db9fb17777d8a13e63df0"
+checksum = "7f13174bda5dfd69d7e947827e5af4b0f2f94a4a3ee92912fba07a66150f21e2"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2468,9 +2446,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.7"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
+checksum = "3a822ea5bc7590f9d40f1ba12c0dc3c2760f3482c6984db1573ad11031420831"
 
 [[package]]
 name = "cmake"
@@ -2596,7 +2574,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2615,16 +2593,16 @@ version = "7.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47"
 dependencies = [
- "crossterm 0.29.0",
+ "crossterm",
  "unicode-segmentation",
- "unicode-width 0.2.0",
+ "unicode-width",
 ]
 
 [[package]]
 name = "compact_str"
-version = "0.8.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b79c4069c6cad78e2e0cdfcbd26275770669fb39fd308a752dc110e83b9af32"
+checksum = "3fdb1325a1cece981e8a296ab8f0f9b63ae357bd0784a9faaf548cc7b480707a"
 dependencies = [
  "castaway",
  "cfg-if",
@@ -2867,22 +2845,6 @@ version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
-[[package]]
-name = "crossterm"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
-dependencies = [
- "bitflags 2.10.0",
- "crossterm_winapi",
- "mio",
- "parking_lot",
- "rustix 0.38.44",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
-]
-
 [[package]]
 name = "crossterm"
 version = "0.29.0"
@@ -2891,9 +2853,13 @@ checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
 dependencies = [
  "bitflags 2.10.0",
  "crossterm_winapi",
+ "derive_more",
  "document-features",
+ "mio",
  "parking_lot",
- "rustix 1.1.3",
+ "rustix",
+ "signal-hook",
+ "signal-hook-mio",
  "winapi",
 ]
 
@@ -3082,12 +3048,14 @@ version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
 dependencies = [
+ "arbitrary",
  "cfg-if",
  "crossbeam-utils",
  "hashbrown 0.14.5",
  "lock_api",
  "once_cell",
  "parking_lot_core",
+ "serde",
 ]
 
 [[package]]
@@ -3113,7 +3081,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7ab67060fc6b8ef687992d439ca0fa36e7ed17e9a0b16b25b601e8757df720de"
 dependencies = [
  "data-encoding",
- "syn 1.0.109",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -3653,6 +3621,21 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "ethereum_ssz"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2128a84f7a3850d54ee343334e3392cca61f9f6aa9441eec481b9394b43c238b"
+dependencies = [
+ "alloy-primitives",
+ "ethereum_serde_utils",
+ "itertools 0.14.0",
+ "serde",
+ "serde_derive",
+ "smallvec",
+ "typenum",
+]
+
 [[package]]
 name = "ethereum_ssz_derive"
 version = "0.9.1"
@@ -3665,6 +3648,18 @@ dependencies = [
  "syn 2.0.114",
 ]
 
+[[package]]
+name = "ethereum_ssz_derive"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd596f91cff004fc8d02be44c21c0f9b93140a04b66027ae052f5f8e05b48eba"
+dependencies = [
+ "darling 0.23.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "event-listener"
 version = "5.4.1"
@@ -3946,9 +3941,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 
 [[package]]
 name = "flate2"
-version = "1.1.8"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369"
+checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c"
 dependencies = [
  "crc32fast",
  "miniz_oxide 0.8.9",
@@ -4239,6 +4234,19 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasip3",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.1"
@@ -4628,9 +4636,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "httpmock"
-version = "0.8.2"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "511f510e9b1888d67f10bab4397f8b019d2a9b249a2c10acbce2d705b1b32e26"
+checksum = "bf4888a4d02d8e1f92ffb6b4965cf5ff56dda36ef41975f41c6fa0f6bde78c4e"
 dependencies = [
  "assert-json-diff",
  "async-object-pool",
@@ -4721,7 +4729,7 @@ dependencies = [
  "tokio",
  "tokio-rustls",
  "tower-service",
- "webpki-roots 1.0.5",
+ "webpki-roots 1.0.6",
 ]
 
 [[package]]
@@ -4770,7 +4778,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.2",
+ "socket2 0.5.10",
  "system-configuration 0.7.0",
  "tokio",
  "tower-layer",
@@ -4892,6 +4900,12 @@ dependencies = [
  "zerovec",
 ]
 
+[[package]]
+name = "id-arena"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25a2bc672d1148e28034f176e01fffebb08b35768468cc954630da77a1449005"
+
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -5116,9 +5130,9 @@ dependencies = [
 
 [[package]]
 name = "interprocess"
-version = "2.2.3"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d"
+checksum = "7b00d05442c2106c75b7410f820b152f61ec0edc7befcb9b381b673a20314753"
 dependencies = [
  "doctest-file",
  "futures-core",
@@ -5480,6 +5494,17 @@ dependencies = [
  "signature",
 ]
 
+[[package]]
+name = "kasuari"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fe90c1150662e858c7d5f945089b7517b0a80d8bf7ba4b1b5ffc984e7230a5b"
+dependencies = [
+ "hashbrown 0.16.1",
+ "portable-atomic",
+ "thiserror 2.0.18",
+]
+
 [[package]]
 name = "keccak"
 version = "0.1.5"
@@ -5733,7 +5758,7 @@ dependencies = [
  "serde_repr",
  "tabled",
  "thiserror 2.0.18",
- "toml 0.9.11+spec-1.1.0",
+ "toml",
 ]
 
 [[package]]
@@ -5878,7 +5903,7 @@ dependencies = [
  "op-alloy-rpc-types-engine",
  "proptest",
  "rand 0.9.2",
- "reqwest 0.13.1",
+ "reqwest 0.13.2",
  "serde",
  "thiserror 2.0.18",
  "tokio",
@@ -5924,11 +5949,11 @@ dependencies = [
  "op-alloy-network",
  "op-alloy-provider",
  "op-alloy-rpc-types-engine",
- "reqwest 0.13.1",
+ "reqwest 0.13.2",
  "rollup-boost",
  "rstest",
  "serde_json",
- "strum 0.27.2",
+ "strum",
  "tabled",
  "tempfile",
  "thiserror 2.0.18",
@@ -5991,7 +6016,7 @@ dependencies = [
  "rand 0.9.2",
  "rollup-boost",
  "rstest",
- "strum 0.27.2",
+ "strum",
  "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
@@ -6221,7 +6246,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tabled",
- "toml 0.9.11+spec-1.1.0",
+ "toml",
 ]
 
 [[package]]
@@ -6264,7 +6289,7 @@ dependencies = [
  "alloy-primitives",
  "serde",
  "serde_json",
- "toml 0.9.11+spec-1.1.0",
+ "toml",
 ]
 
 [[package]]
@@ -6506,11 +6531,17 @@ dependencies = [
  "spin 0.9.8",
 ]
 
+[[package]]
+name = "leb128fmt"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2"
+
 [[package]]
 name = "libc"
-version = "0.2.180"
+version = "0.2.181"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc"
+checksum = "459427e2af2b9c839b132acb702a1c654d95e10f8c326bfc2ad11310e458b1c5"
 
 [[package]]
 name = "libgit2-sys"
@@ -6923,7 +6954,7 @@ version = "0.14.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a54ad7278b8bc5301d5ffd2a94251c004feb971feba96c971ea4063645990757"
 dependencies = [
- "bindgen 0.72.1",
+ "bindgen",
  "errno",
  "libc",
 ]
@@ -6945,7 +6976,7 @@ version = "0.17.3+10.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cef2a00ee60fe526157c9023edab23943fae1ce2ab6f4abb2a807c1746835de9"
 dependencies = [
- "bindgen 0.72.1",
+ "bindgen",
  "bzip2-sys",
  "cc",
  "libc",
@@ -6967,6 +6998,15 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "line-clipping"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f4de44e98ddbf09375cbf4d17714d18f39195f4f4894e8524501726fd9a8a4a"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -6983,12 +7023,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.11.0"
@@ -7081,9 +7115,9 @@ dependencies = [
 
 [[package]]
 name = "lz4_flex"
-version = "0.11.5"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a"
+checksum = "ab6473172471198271ff72e9379150e9dfd70d8e533e0752a27e515b48dd375e"
 
 [[package]]
 name = "mach2"
@@ -7094,6 +7128,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "mach2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dae608c151f68243f2b000364e1f7b186d9c29845f7d2d85bd31b9ad77ad552b"
+
 [[package]]
 name = "macro-string"
 version = "0.1.4"
@@ -7146,9 +7186,9 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79"
 
 [[package]]
 name = "memmap2"
@@ -7232,16 +7272,16 @@ dependencies = [
 
 [[package]]
 name = "metrics-process"
-version = "2.4.2"
+version = "2.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f615e08e049bd14a44c4425415782efb9bcd479fc1e19ddeb971509074c060d0"
+checksum = "4268d87f64a752f5a651314fc683f04da10be65701ea3e721ba4d74f79163cac"
 dependencies = [
  "libc",
  "libproc",
- "mach2",
+ "mach2 0.6.0",
  "metrics",
  "once_cell",
- "procfs 0.18.0",
+ "procfs",
  "rlimit",
  "windows 0.62.2",
 ]
@@ -7364,9 +7404,9 @@ dependencies = [
 
 [[package]]
 name = "modular-bitfield"
-version = "0.11.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a53d79ba8304ac1c4f9eb3b9d281f21f7be9d4626f72ce7df4ad8fbde4f38a74"
+checksum = "2956e537fc68236d2aa048f55704f231cc93f1c4de42fe1ecb5bd7938061fc4a"
 dependencies = [
  "modular-bitfield-impl",
  "static_assertions",
@@ -7374,13 +7414,13 @@ dependencies = [
 
 [[package]]
 name = "modular-bitfield-impl"
-version = "0.11.2"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a7d5f7076603ebc68de2dc6a650ec331a062a13abaa346975be747bbfa4b789"
+checksum = "59b43b4fd69e3437618106f7754f34021b831a514f9e1a98ae863cabcd8d8dad"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.114",
 ]
 
 [[package]]
@@ -7770,9 +7810,9 @@ dependencies = [
 
 [[package]]
 name = "nybbles"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5676b5c379cf5b03da1df2b3061c4a4e2aa691086a56ac923e08c143f53f59"
+checksum = "0d49ff0c0d00d4a502b39df9af3a525e1efeb14b9dabb5bb83335284c1309210"
 dependencies = [
  "alloy-rlp",
  "arbitrary",
@@ -7783,6 +7823,25 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "objc2-core-foundation"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
+[[package]]
+name = "objc2-io-kit"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a"
+dependencies = [
+ "libc",
+ "objc2-core-foundation",
+]
+
 [[package]]
 name = "object"
 version = "0.37.3"
@@ -7932,8 +7991,8 @@ dependencies = [
  "arbitrary",
  "arbtest",
  "derive_more",
- "ethereum_ssz",
- "ethereum_ssz_derive",
+ "ethereum_ssz 0.9.1",
+ "ethereum_ssz_derive 0.9.1",
  "op-alloy-consensus",
  "serde",
  "serde_json",
@@ -8260,7 +8319,7 @@ checksum = "6978128c8b51d8f4080631ceb2302ab51e32cc6e8615f735ee2f83fd269ae3f1"
 dependencies = [
  "bytecount",
  "fnv",
- "unicode-width 0.2.0",
+ "unicode-width",
 ]
 
 [[package]]
@@ -8365,9 +8424,9 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "pest"
-version = "2.8.5"
+version = "2.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9eb05c21a464ea704b53158d358a31e6425db2f63a1a7312268b05fe2b75f7"
+checksum = "e0848c601009d37dfa3430c4666e147e49cdcf1b92ecd3e63657d8a5f19da662"
 dependencies = [
  "memchr",
  "ucd-trie",
@@ -8521,7 +8580,7 @@ dependencies = [
  "concurrent-queue",
  "hermit-abi",
  "pin-project-lite",
- "rustix 1.1.3",
+ "rustix",
  "windows-sys 0.61.2",
 ]
 
@@ -8628,6 +8687,16 @@ dependencies = [
  "yansi",
 ]
 
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "primeorder"
 version = "0.13.6"
@@ -8654,7 +8723,7 @@ version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
 dependencies = [
- "toml_edit 0.23.10+spec-1.0.0",
+ "toml_edit",
 ]
 
 [[package]]
@@ -8688,40 +8757,17 @@ dependencies = [
  "unicode-ident",
 ]
 
-[[package]]
-name = "procfs"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc5b72d8145275d844d4b5f6d4e1eef00c8cd889edb6035c21675d1bb1f45c9f"
-dependencies = [
- "bitflags 2.10.0",
- "chrono",
- "flate2",
- "hex",
- "procfs-core 0.17.0",
- "rustix 0.38.44",
-]
-
 [[package]]
 name = "procfs"
 version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25485360a54d6861439d60facef26de713b1e126bf015ec8f98239467a2b82f7"
-dependencies = [
- "bitflags 2.10.0",
- "procfs-core 0.18.0",
- "rustix 1.1.3",
-]
-
-[[package]]
-name = "procfs-core"
-version = "0.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239df02d8349b06fc07398a3a1697b06418223b1c7725085e801e7c0fc6a12ec"
 dependencies = [
  "bitflags 2.10.0",
  "chrono",
- "hex",
+ "flate2",
+ "procfs-core",
+ "rustix",
 ]
 
 [[package]]
@@ -8731,6 +8777,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6401bf7b6af22f78b563665d15a22e9aef27775b79b149a66ca022468a4e405"
 dependencies = [
  "bitflags 2.10.0",
+ "chrono",
  "hex",
 ]
 
@@ -8759,9 +8806,9 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40"
+checksum = "37566cb3fdacef14c0737f9546df7cfeadbfbc9fef10991038bf5015d0c80532"
 dependencies = [
  "bit-set",
  "bit-vec",
@@ -8788,9 +8835,9 @@ dependencies = [
 
 [[package]]
 name = "proptest-derive"
-version = "0.5.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ee1c9ac207483d5e7db4940700de86a9aae46ef90c48b57f99fe7edb8345e49"
+checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8799,9 +8846,9 @@ dependencies = [
 
 [[package]]
 name = "proptest-derive"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30"
+checksum = "fb6dc647500e84a25a85b100e76c85b8ace114c209432dc174f20aac11d4ed6c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8931,7 +8978,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "socket2 0.6.2",
+ "socket2 0.5.10",
  "thiserror 2.0.18",
  "tokio",
  "tracing",
@@ -8968,7 +9015,7 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.6.2",
+ "socket2 0.5.10",
  "tracing",
  "windows-sys 0.60.2",
 ]
@@ -9095,9 +9142,9 @@ dependencies = [
 
 [[package]]
 name = "rapidhash"
-version = "4.2.1"
+version = "4.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8b5b858a440a0bc02625b62dd95131b9201aa9f69f411195dd4a7cfb1de3d7"
+checksum = "71ec30b38a417407efe7676bad0ca6b78f995f810185ece9af3bd5dc561185a9"
 dependencies = [
  "rand 0.9.2",
  "rustversion",
@@ -9105,23 +9152,65 @@ dependencies = [
 
 [[package]]
 name = "ratatui"
-version = "0.29.0"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1ce67fb8ba4446454d1c8dbaeda0557ff5e94d39d5e5ed7f10a65eb4c8266bc"
+dependencies = [
+ "instability",
+ "ratatui-core",
+ "ratatui-crossterm",
+ "ratatui-widgets",
+]
+
+[[package]]
+name = "ratatui-core"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabd94c2f37801c20583fc49dd5cd6b0ba68c716787c2dd6ed18571e1e63117b"
+checksum = "5ef8dea09a92caaf73bff7adb70b76162e5937524058a7e5bff37869cbbec293"
 dependencies = [
  "bitflags 2.10.0",
- "cassowary",
  "compact_str",
- "crossterm 0.28.1",
+ "hashbrown 0.16.1",
  "indoc",
- "instability",
- "itertools 0.13.0",
- "lru 0.12.5",
- "paste",
- "strum 0.26.3",
+ "itertools 0.14.0",
+ "kasuari",
+ "lru 0.16.3",
+ "strum",
+ "thiserror 2.0.18",
  "unicode-segmentation",
  "unicode-truncate",
- "unicode-width 0.2.0",
+ "unicode-width",
+]
+
+[[package]]
+name = "ratatui-crossterm"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "577c9b9f652b4c121fb25c6a391dd06406d3b092ba68827e6d2f09550edc54b3"
+dependencies = [
+ "cfg-if",
+ "crossterm",
+ "instability",
+ "ratatui-core",
+]
+
+[[package]]
+name = "ratatui-widgets"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7dbfa023cd4e604c2553483820c5fe8aa9d71a42eea5aa77c6e7f35756612db"
+dependencies = [
+ "bitflags 2.10.0",
+ "hashbrown 0.16.1",
+ "indoc",
+ "instability",
+ "itertools 0.14.0",
+ "line-clipping",
+ "ratatui-core",
+ "strum",
+ "time",
+ "unicode-segmentation",
+ "unicode-width",
 ]
 
 [[package]]
@@ -9234,9 +9323,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.2"
+version = "1.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -9246,9 +9335,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -9257,9 +9346,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.8"
+version = "0.8.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+checksum = "a96887878f22d7bad8a3b6dc5b7440e0ada9a245242924394987b21cf2210a4c"
 
 [[package]]
 name = "regress"
@@ -9326,14 +9415,14 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "webpki-roots 1.0.5",
+ "webpki-roots 1.0.6",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04e9018c9d814e5f30cc16a0f03271aeab3571e609612d9fe78c1aa8d11c2f62"
+checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801"
 dependencies = [
  "base64 0.22.1",
  "bytes",
@@ -9367,7 +9456,7 @@ checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7"
 [[package]]
 name = "reth-basic-payload-builder"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9391,7 +9480,7 @@ dependencies = [
 [[package]]
 name = "reth-chain-state"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9423,7 +9512,7 @@ dependencies = [
 [[package]]
 name = "reth-chainspec"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -9443,7 +9532,7 @@ dependencies = [
 [[package]]
 name = "reth-cli"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-genesis",
  "clap",
@@ -9457,7 +9546,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-commands"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -9468,7 +9557,7 @@ dependencies = [
  "backon",
  "clap",
  "comfy-table",
- "crossterm 0.28.1",
+ "crossterm",
  "eyre",
  "fdlimit",
  "futures",
@@ -9477,6 +9566,7 @@ dependencies = [
  "itertools 0.14.0",
  "lz4",
  "metrics",
+ "parking_lot",
  "proptest",
  "proptest-arbitrary-interop",
  "ratatui",
@@ -9533,7 +9623,7 @@ dependencies = [
  "tar",
  "tokio",
  "tokio-stream",
- "toml 0.8.23",
+ "toml",
  "tracing",
  "url",
  "zstd",
@@ -9542,7 +9632,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-runner"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "reth-tasks",
  "tokio",
@@ -9552,7 +9642,7 @@ dependencies = [
 [[package]]
 name = "reth-cli-util"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -9572,7 +9662,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9592,7 +9682,7 @@ dependencies = [
 [[package]]
 name = "reth-codecs-derive"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9602,7 +9692,7 @@ dependencies = [
 [[package]]
 name = "reth-config"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "eyre",
  "humantime-serde",
@@ -9611,14 +9701,14 @@ dependencies = [
  "reth-stages-types",
  "reth-static-file-types",
  "serde",
- "toml 0.8.23",
+ "toml",
  "url",
 ]
 
 [[package]]
 name = "reth-consensus"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -9631,7 +9721,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus-common"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9643,7 +9733,7 @@ dependencies = [
 [[package]]
 name = "reth-consensus-debug-client"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9660,7 +9750,7 @@ dependencies = [
  "reth-node-api",
  "reth-primitives-traits",
  "reth-tracing",
- "ringbuffer 0.15.0",
+ "ringbuffer",
  "serde",
  "serde_json",
  "tokio",
@@ -9669,7 +9759,7 @@ dependencies = [
 [[package]]
 name = "reth-db"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "derive_more",
@@ -9686,16 +9776,17 @@ dependencies = [
  "reth-storage-errors",
  "reth-tracing",
  "rustc-hash",
- "strum 0.27.2",
+ "strum",
  "sysinfo",
  "tempfile",
  "thiserror 2.0.18",
+ "tracing",
 ]
 
 [[package]]
 name = "reth-db-api"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-genesis",
@@ -9724,7 +9815,7 @@ dependencies = [
 [[package]]
 name = "reth-db-common"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-genesis",
@@ -9754,7 +9845,7 @@ dependencies = [
 [[package]]
 name = "reth-db-models"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -9769,7 +9860,7 @@ dependencies = [
 [[package]]
 name = "reth-discv4"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -9794,7 +9885,7 @@ dependencies = [
 [[package]]
 name = "reth-discv5"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -9818,14 +9909,14 @@ dependencies = [
 [[package]]
 name = "reth-dns-discovery"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
+ "dashmap",
  "data-encoding",
  "enr",
  "hickory-resolver",
  "linked_hash_set",
- "parking_lot",
  "reth-ethereum-forks",
  "reth-network-peers",
  "reth-tokio-util",
@@ -9842,7 +9933,7 @@ dependencies = [
 [[package]]
 name = "reth-downloaders"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9877,7 +9968,7 @@ dependencies = [
 [[package]]
 name = "reth-e2e-test-utils"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -9935,7 +10026,7 @@ dependencies = [
 [[package]]
 name = "reth-ecies"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "aes",
  "alloy-primitives",
@@ -9963,7 +10054,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-local"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -9987,7 +10078,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-primitives"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10012,7 +10103,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-service"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "futures",
  "pin-project",
@@ -10020,7 +10111,6 @@ dependencies = [
  "reth-consensus",
  "reth-engine-primitives",
  "reth-engine-tree",
- "reth-ethereum-primitives",
  "reth-evm",
  "reth-network-p2p",
  "reth-node-types",
@@ -10035,7 +10125,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-tree"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eip7928",
@@ -10045,7 +10135,6 @@ dependencies = [
  "alloy-rlp",
  "alloy-rpc-types-engine",
  "crossbeam-channel",
- "dashmap",
  "derive_more",
  "fixed-cache",
  "futures",
@@ -10081,7 +10170,6 @@ dependencies = [
  "reth-trie-db",
  "reth-trie-parallel",
  "reth-trie-sparse",
- "reth-trie-sparse-parallel",
  "revm",
  "revm-primitives",
  "schnellru",
@@ -10094,7 +10182,7 @@ dependencies = [
 [[package]]
 name = "reth-engine-util"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-rpc-types-engine",
@@ -10122,14 +10210,14 @@ dependencies = [
 [[package]]
 name = "reth-era"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
  "alloy-primitives",
  "alloy-rlp",
- "ethereum_ssz",
- "ethereum_ssz_derive",
+ "ethereum_ssz 0.10.1",
+ "ethereum_ssz_derive 0.10.1",
  "snap",
  "thiserror 2.0.18",
 ]
@@ -10137,7 +10225,7 @@ dependencies = [
 [[package]]
 name = "reth-era-downloader"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "bytes",
@@ -10153,7 +10241,7 @@ dependencies = [
 [[package]]
 name = "reth-era-utils"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -10175,7 +10263,7 @@ dependencies = [
 [[package]]
 name = "reth-errors"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "reth-consensus",
  "reth-execution-errors",
@@ -10186,7 +10274,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-chains",
  "alloy-primitives",
@@ -10215,7 +10303,7 @@ dependencies = [
 [[package]]
 name = "reth-eth-wire-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -10239,7 +10327,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
@@ -10280,7 +10368,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-cli"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "clap",
  "eyre",
@@ -10302,7 +10390,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-consensus"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10318,7 +10406,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-engine-primitives"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -10336,7 +10424,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-forks"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eip2124",
  "alloy-hardforks",
@@ -10350,7 +10438,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-payload-builder"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10379,7 +10467,7 @@ dependencies = [
 [[package]]
 name = "reth-ethereum-primitives"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10399,7 +10487,7 @@ dependencies = [
 [[package]]
 name = "reth-etl"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "rayon",
  "reth-db-api",
@@ -10409,7 +10497,7 @@ dependencies = [
 [[package]]
 name = "reth-evm"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10433,7 +10521,7 @@ dependencies = [
 [[package]]
 name = "reth-evm-ethereum"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10455,7 +10543,7 @@ dependencies = [
 [[package]]
 name = "reth-execution-errors"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-evm",
  "alloy-primitives",
@@ -10468,7 +10556,7 @@ dependencies = [
 [[package]]
 name = "reth-execution-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10486,7 +10574,7 @@ dependencies = [
 [[package]]
 name = "reth-exex"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10522,23 +10610,55 @@ dependencies = [
 ]
 
 [[package]]
-name = "reth-exex-types"
+name = "reth-exex-test-utils"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
- "alloy-primitives",
- "reth-chain-state",
+ "eyre",
+ "futures-util",
+ "reth-chainspec",
+ "reth-config",
+ "reth-consensus",
+ "reth-db",
+ "reth-db-common",
+ "reth-ethereum-primitives",
+ "reth-evm-ethereum",
  "reth-execution-types",
- "reth-primitives-traits",
- "serde",
- "serde_with",
-]
-
-[[package]]
+ "reth-exex",
+ "reth-network",
+ "reth-node-api",
+ "reth-node-builder",
+ "reth-node-core",
+ "reth-node-ethereum",
+ "reth-payload-builder",
+ "reth-primitives-traits",
+ "reth-provider",
+ "reth-tasks",
+ "reth-transaction-pool",
+ "tempfile",
+ "thiserror 2.0.18",
+ "tokio",
+]
+
+[[package]]
+name = "reth-exex-types"
+version = "1.10.2"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
+dependencies = [
+ "alloy-eips",
+ "alloy-primitives",
+ "reth-chain-state",
+ "reth-execution-types",
+ "reth-primitives-traits",
+ "serde",
+ "serde_with",
+]
+
+[[package]]
 name = "reth-fs-util"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "serde",
  "serde_json",
@@ -10548,7 +10668,7 @@ dependencies = [
 [[package]]
 name = "reth-invalid-block-hooks"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -10576,7 +10696,7 @@ dependencies = [
 [[package]]
 name = "reth-ipc"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "bytes",
  "futures",
@@ -10596,7 +10716,7 @@ dependencies = [
 [[package]]
 name = "reth-libmdbx"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "bitflags 2.10.0",
  "byteorder",
@@ -10612,16 +10732,16 @@ dependencies = [
 [[package]]
 name = "reth-mdbx-sys"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
- "bindgen 0.71.1",
+ "bindgen",
  "cc",
 ]
 
 [[package]]
 name = "reth-metrics"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "futures",
  "metrics",
@@ -10633,7 +10753,7 @@ dependencies = [
 [[package]]
 name = "reth-net-banlist"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "ipnet",
@@ -10642,7 +10762,7 @@ dependencies = [
 [[package]]
 name = "reth-net-nat"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "futures-util",
  "if-addrs 0.14.0",
@@ -10656,7 +10776,7 @@ dependencies = [
 [[package]]
 name = "reth-network"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10713,7 +10833,7 @@ dependencies = [
 [[package]]
 name = "reth-network-api"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -10738,7 +10858,7 @@ dependencies = [
 [[package]]
 name = "reth-network-p2p"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10761,7 +10881,7 @@ dependencies = [
 [[package]]
 name = "reth-network-peers"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -10776,7 +10896,7 @@ dependencies = [
 [[package]]
 name = "reth-network-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eip2124",
  "humantime-serde",
@@ -10790,7 +10910,7 @@ dependencies = [
 [[package]]
 name = "reth-nippy-jar"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "anyhow",
  "bincode 1.3.3",
@@ -10807,7 +10927,7 @@ dependencies = [
 [[package]]
 name = "reth-node-api"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-rpc-types-engine",
  "eyre",
@@ -10831,7 +10951,7 @@ dependencies = [
 [[package]]
 name = "reth-node-builder"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10900,7 +11020,7 @@ dependencies = [
 [[package]]
 name = "reth-node-core"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -10943,9 +11063,9 @@ dependencies = [
  "secp256k1 0.30.0",
  "serde",
  "shellexpand",
- "strum 0.27.2",
+ "strum",
  "thiserror 2.0.18",
- "toml 0.8.23",
+ "toml",
  "tracing",
  "url",
  "vergen",
@@ -10955,7 +11075,7 @@ dependencies = [
 [[package]]
 name = "reth-node-ethereum"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
  "alloy-network",
@@ -10993,7 +11113,7 @@ dependencies = [
 [[package]]
 name = "reth-node-ethstats"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -11009,7 +11129,7 @@ dependencies = [
  "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
- "tokio-tungstenite 0.26.2",
+ "tokio-tungstenite 0.28.0",
  "tracing",
  "url",
 ]
@@ -11017,7 +11137,7 @@ dependencies = [
 [[package]]
 name = "reth-node-events"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -11041,7 +11161,7 @@ dependencies = [
 [[package]]
 name = "reth-node-metrics"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "bytes",
  "eyre",
@@ -11055,7 +11175,7 @@ dependencies = [
  "metrics-process",
  "metrics-util 0.20.1",
  "pprof_util",
- "procfs 0.17.0",
+ "procfs",
  "reqwest 0.12.28",
  "reth-fs-util",
  "reth-metrics",
@@ -11070,7 +11190,7 @@ dependencies = [
 [[package]]
 name = "reth-node-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "reth-chainspec",
  "reth-db-api",
@@ -11182,6 +11302,7 @@ dependencies = [
  "reth-optimism-evm",
  "reth-optimism-node",
  "reth-optimism-primitives",
+ "reth-optimism-trie",
  "reth-primitives-traits",
  "reth-provider",
  "reth-prune",
@@ -11257,6 +11378,33 @@ dependencies = [
  "thiserror 2.0.18",
 ]
 
+[[package]]
+name = "reth-optimism-exex"
+version = "1.10.2"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "eyre",
+ "futures",
+ "futures-util",
+ "reth-db",
+ "reth-ethereum-primitives",
+ "reth-execution-types",
+ "reth-exex",
+ "reth-exex-test-utils",
+ "reth-node-api",
+ "reth-node-builder",
+ "reth-optimism-chainspec",
+ "reth-optimism-node",
+ "reth-optimism-trie",
+ "reth-primitives-traits",
+ "reth-provider",
+ "reth-trie",
+ "tempfile",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "reth-optimism-flashblocks"
 version = "1.10.2"
@@ -11286,7 +11434,7 @@ dependencies = [
  "reth-rpc-eth-types",
  "reth-storage-api",
  "reth-tasks",
- "ringbuffer 0.16.0",
+ "ringbuffer",
  "serde_json",
  "test-case",
  "tokio",
@@ -11319,6 +11467,8 @@ dependencies = [
  "clap",
  "eyre",
  "futures",
+ "futures-util",
+ "humantime",
  "op-alloy-consensus",
  "op-alloy-network",
  "op-alloy-rpc-types-engine",
@@ -11337,12 +11487,14 @@ dependencies = [
  "reth-optimism-chainspec",
  "reth-optimism-consensus",
  "reth-optimism-evm",
+ "reth-optimism-exex",
  "reth-optimism-forks",
  "reth-optimism-node",
  "reth-optimism-payload-builder",
  "reth-optimism-primitives",
  "reth-optimism-rpc",
  "reth-optimism-storage",
+ "reth-optimism-trie",
  "reth-optimism-txpool",
  "reth-payload-builder",
  "reth-payload-util",
@@ -11364,6 +11516,7 @@ dependencies = [
  "serde",
  "serde_json",
  "tokio",
+ "tracing",
  "url",
 ]
 
@@ -11442,10 +11595,12 @@ dependencies = [
  "alloy-json-rpc",
  "alloy-op-hardforks",
  "alloy-primitives",
+ "alloy-rlp",
  "alloy-rpc-client",
  "alloy-rpc-types-debug",
  "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
+ "alloy-serde",
  "alloy-transport",
  "alloy-transport-http",
  "async-trait",
@@ -11462,6 +11617,8 @@ dependencies = [
  "op-alloy-rpc-types",
  "op-alloy-rpc-types-engine",
  "op-revm",
+ "reqwest 0.13.2",
+ "reth-basic-payload-builder",
  "reth-chain-state",
  "reth-chainspec",
  "reth-evm",
@@ -11474,8 +11631,12 @@ dependencies = [
  "reth-optimism-forks",
  "reth-optimism-payload-builder",
  "reth-optimism-primitives",
+ "reth-optimism-trie",
  "reth-optimism-txpool",
+ "reth-payload-util",
  "reth-primitives-traits",
+ "reth-provider",
+ "reth-revm",
  "reth-rpc",
  "reth-rpc-api",
  "reth-rpc-engine-api",
@@ -11486,7 +11647,9 @@ dependencies = [
  "reth-tasks",
  "reth-transaction-pool",
  "revm",
+ "serde",
  "serde_json",
+ "strum",
  "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
@@ -11506,6 +11669,51 @@ dependencies = [
  "reth-storage-api",
 ]
 
+[[package]]
+name = "reth-optimism-trie"
+version = "1.10.2"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-genesis",
+ "alloy-primitives",
+ "auto_impl",
+ "bincode 2.0.1",
+ "bytes",
+ "derive_more",
+ "eyre",
+ "metrics",
+ "mockall",
+ "parking_lot",
+ "reth-chainspec",
+ "reth-codecs",
+ "reth-db",
+ "reth-db-api",
+ "reth-db-common",
+ "reth-ethereum-primitives",
+ "reth-evm",
+ "reth-evm-ethereum",
+ "reth-execution-errors",
+ "reth-metrics",
+ "reth-node-api",
+ "reth-primitives-traits",
+ "reth-provider",
+ "reth-revm",
+ "reth-storage-errors",
+ "reth-tasks",
+ "reth-trie",
+ "reth-trie-common",
+ "secp256k1 0.31.1",
+ "serde",
+ "serial_test",
+ "strum",
+ "tempfile",
+ "test-case",
+ "thiserror 2.0.18",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "reth-optimism-txpool"
 version = "1.10.2"
@@ -11547,7 +11755,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-builder"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -11568,7 +11776,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-builder-primitives"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "pin-project",
  "reth-payload-primitives",
@@ -11580,7 +11788,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-primitives"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -11603,7 +11811,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-util"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -11613,7 +11821,7 @@ dependencies = [
 [[package]]
 name = "reth-payload-validator"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-rpc-types-engine",
@@ -11623,7 +11831,7 @@ dependencies = [
 [[package]]
 name = "reth-primitives"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "once_cell",
@@ -11636,7 +11844,7 @@ dependencies = [
 [[package]]
 name = "reth-primitives-traits"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -11649,6 +11857,7 @@ dependencies = [
  "auto_impl",
  "byteorder",
  "bytes",
+ "dashmap",
  "derive_more",
  "modular-bitfield",
  "once_cell",
@@ -11669,13 +11878,12 @@ dependencies = [
 [[package]]
 name = "reth-provider"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
  "alloy-primitives",
  "alloy-rpc-types-engine",
- "dashmap",
  "eyre",
  "itertools 0.14.0",
  "metrics",
@@ -11691,6 +11899,7 @@ dependencies = [
  "reth-ethereum-engine-primitives",
  "reth-ethereum-primitives",
  "reth-execution-types",
+ "reth-fs-util",
  "reth-metrics",
  "reth-nippy-jar",
  "reth-node-types",
@@ -11700,12 +11909,13 @@ dependencies = [
  "reth-static-file-types",
  "reth-storage-api",
  "reth-storage-errors",
+ "reth-tasks",
  "reth-trie",
  "reth-trie-db",
  "revm-database",
  "revm-state",
  "rocksdb",
- "strum 0.27.2",
+ "strum",
  "tokio",
  "tracing",
 ]
@@ -11713,7 +11923,7 @@ dependencies = [
 [[package]]
 name = "reth-prune"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -11742,7 +11952,7 @@ dependencies = [
 [[package]]
 name = "reth-prune-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -11750,7 +11960,7 @@ dependencies = [
  "modular-bitfield",
  "reth-codecs",
  "serde",
- "strum 0.27.2",
+ "strum",
  "thiserror 2.0.18",
  "tracing",
 ]
@@ -11758,7 +11968,7 @@ dependencies = [
 [[package]]
 name = "reth-revm"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "reth-primitives-traits",
@@ -11771,7 +11981,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -11799,13 +12009,9 @@ dependencies = [
  "derive_more",
  "dyn-clone",
  "futures",
- "http",
- "http-body",
- "hyper",
  "itertools 0.14.0",
  "jsonrpsee",
  "jsonrpsee-types",
- "jsonwebtoken",
  "parking_lot",
  "pin-project",
  "reth-chain-state",
@@ -11845,7 +12051,6 @@ dependencies = [
  "thiserror 2.0.18",
  "tokio",
  "tokio-stream",
- "tower 0.5.3",
  "tracing",
  "tracing-futures",
 ]
@@ -11853,7 +12058,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-api"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eip7928",
  "alloy-eips",
@@ -11883,7 +12088,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-builder"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-network",
  "alloy-provider",
@@ -11924,7 +12129,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-convert"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-evm",
@@ -11948,7 +12153,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-engine-api"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -11978,7 +12183,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-eth-api"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -12022,7 +12227,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-eth-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -12070,7 +12275,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-layer"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-rpc-types-engine",
  "http",
@@ -12084,7 +12289,7 @@ dependencies = [
 [[package]]
 name = "reth-rpc-server-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -12094,13 +12299,13 @@ dependencies = [
  "reth-errors",
  "reth-network-api",
  "serde",
- "strum 0.27.2",
+ "strum",
 ]
 
 [[package]]
 name = "reth-stages"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -12137,6 +12342,7 @@ dependencies = [
  "reth-static-file-types",
  "reth-storage-api",
  "reth-storage-errors",
+ "reth-tasks",
  "reth-testing-utils",
  "reth-trie",
  "reth-trie-db",
@@ -12149,7 +12355,7 @@ dependencies = [
 [[package]]
 name = "reth-stages-api"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -12176,7 +12382,7 @@ dependencies = [
 [[package]]
 name = "reth-stages-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "arbitrary",
@@ -12190,7 +12396,7 @@ dependencies = [
 [[package]]
 name = "reth-static-file"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "parking_lot",
@@ -12210,20 +12416,22 @@ dependencies = [
 [[package]]
 name = "reth-static-file-types"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "clap",
  "derive_more",
  "fixed-map",
+ "reth-stages-types",
  "serde",
- "strum 0.27.2",
+ "strum",
+ "tracing",
 ]
 
 [[package]]
 name = "reth-storage-api"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -12247,7 +12455,7 @@ dependencies = [
 [[package]]
 name = "reth-storage-errors"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -12264,7 +12472,7 @@ dependencies = [
 [[package]]
 name = "reth-tasks"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "auto_impl",
  "dyn-clone",
@@ -12282,7 +12490,7 @@ dependencies = [
 [[package]]
 name = "reth-testing-utils"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -12298,7 +12506,7 @@ dependencies = [
 [[package]]
 name = "reth-tokio-util"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "tokio",
  "tokio-stream",
@@ -12308,7 +12516,7 @@ dependencies = [
 [[package]]
 name = "reth-tracing"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "clap",
  "eyre",
@@ -12327,7 +12535,7 @@ dependencies = [
 [[package]]
 name = "reth-tracing-otlp"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "clap",
  "eyre",
@@ -12345,7 +12553,7 @@ dependencies = [
 [[package]]
 name = "reth-transaction-pool"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -12391,7 +12599,7 @@ dependencies = [
 [[package]]
 name = "reth-trie"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -12417,7 +12625,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-common"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-consensus",
  "alloy-primitives",
@@ -12444,7 +12652,7 @@ dependencies = [
 [[package]]
 name = "reth-trie-db"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "metrics",
@@ -12464,12 +12672,11 @@ dependencies = [
 [[package]]
 name = "reth-trie-parallel"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
  "crossbeam-channel",
- "dashmap",
  "derive_more",
  "itertools 0.14.0",
  "metrics",
@@ -12479,18 +12686,18 @@ dependencies = [
  "reth-primitives-traits",
  "reth-provider",
  "reth-storage-errors",
+ "reth-tasks",
  "reth-trie",
  "reth-trie-common",
  "reth-trie-sparse",
  "thiserror 2.0.18",
- "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "reth-trie-sparse"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -12506,28 +12713,10 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "reth-trie-sparse-parallel"
-version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
-dependencies = [
- "alloy-primitives",
- "alloy-rlp",
- "alloy-trie",
- "metrics",
- "rayon",
- "reth-execution-errors",
- "reth-metrics",
- "reth-trie-common",
- "reth-trie-sparse",
- "smallvec",
- "tracing",
-]
-
 [[package]]
 name = "reth-zstd-compressors"
 version = "1.10.2"
-source = "git+https://github.com/paradigmxyz/reth?rev=b3d532ce#b3d532ce9d09b925ebbce7bdf213d04c402e124c"
+source = "git+https://github.com/paradigmxyz/reth?rev=2c5d00f#2c5d00ffb5b7f3ed8f89382c4bbea79c173da621"
 dependencies = [
  "zstd",
 ]
@@ -12768,12 +12957,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "ringbuffer"
-version = "0.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3df6368f71f205ff9c33c076d170dd56ebf68e8161c733c0caa07a7a5509ed53"
-
 [[package]]
 name = "ringbuffer"
 version = "0.16.0"
@@ -12791,9 +12974,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360b333c61ae24e5af3ae7c8660bd6b21ccd8200dbbc5d33c2454421e85b9c69"
+checksum = "1a30e631b7f4a03dee9056b8ef6982e8ba371dd5bedb74d3ec86df4499132c70"
 dependencies = [
  "bytecheck",
  "bytes",
@@ -12810,9 +12993,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv_derive"
-version = "0.8.14"
+version = "0.8.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02f8cdd12b307ab69fe0acf4cd2249c7460eb89dce64a0febadf934ebb6a9e"
+checksum = "8100bb34c0a1d0f907143db3149e6b4eea3c33b9ee8b189720168e818303986f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -12821,9 +13004,9 @@ dependencies = [
 
 [[package]]
 name = "rlimit"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7043b63bd0cd1aaa628e476b80e6d4023a3b50eb32789f2728908107bd0c793a"
+checksum = "f35ee2729c56bb610f6dba436bf78135f728b7373bdffae2ec815b2d3eb98cc3"
 dependencies = [
  "libc",
 ]
@@ -12859,9 +13042,9 @@ dependencies = [
 
 [[package]]
 name = "roaring"
-version = "0.10.12"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e8d2cfa184d94d0726d650a9f4a1be7f9b76ac9fdb954219878dc00c1c1e7b"
+checksum = "8ba9ce64a8f45d7fc86358410bb1a82e8c987504c0d4900e9141d69a9f26c885"
 dependencies = [
  "bytemuck",
  "byteorder",
@@ -13112,19 +13295,6 @@ dependencies = [
  "nom",
 ]
 
-[[package]]
-name = "rustix"
-version = "0.38.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
-dependencies = [
- "bitflags 2.10.0",
- "errno",
- "libc",
- "linux-raw-sys 0.4.15",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "rustix"
 version = "1.1.3"
@@ -13134,7 +13304,7 @@ dependencies = [
  "bitflags 2.10.0",
  "errno",
  "libc",
- "linux-raw-sys 0.11.0",
+ "linux-raw-sys",
  "windows-sys 0.61.2",
 ]
 
@@ -13265,6 +13435,15 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "scc"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"
+dependencies = [
+ "sdd",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.28"
@@ -13321,6 +13500,12 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "sdd"
+version = "3.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
+
 [[package]]
 name = "sec1"
 version = "0.7.3"
@@ -13357,7 +13542,6 @@ dependencies = [
  "bitcoin_hashes",
  "rand 0.9.2",
  "secp256k1-sys 0.11.0",
- "serde",
 ]
 
 [[package]]
@@ -13534,15 +13718,6 @@ dependencies = [
  "syn 2.0.114",
 ]
 
-[[package]]
-name = "serde_spanned"
-version = "0.6.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "serde_spanned"
 version = "1.0.4"
@@ -13605,6 +13780,32 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serial_test"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d0b343e184fc3b7bb44dff0705fffcf4b3756ba6aff420dddd8b24ca145e555"
+dependencies = [
+ "futures-executor",
+ "futures-util",
+ "log",
+ "once_cell",
+ "parking_lot",
+ "scc",
+ "serial_test_derive",
+]
+
+[[package]]
+name = "serial_test_derive"
+version = "3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f50427f258fb77356e4cd4aa0e87e2bd2c66dbcee41dc405282cae2bfc26c83"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -13902,35 +14103,13 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "strum"
-version = "0.26.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
-dependencies = [
- "strum_macros 0.26.4",
-]
-
 [[package]]
 name = "strum"
 version = "0.27.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af23d6f6c1a224baef9d3f61e287d2761385a5b88fdab4eb4c6f11aeb54c4bcf"
 dependencies = [
- "strum_macros 0.27.2",
-]
-
-[[package]]
-name = "strum_macros"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 2.0.114",
+ "strum_macros",
 ]
 
 [[package]]
@@ -14007,15 +14186,16 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.33.1"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01"
+checksum = "5792d209c2eac902426c0c4a166c9f72147db453af548cf9bf3242644c4d4fe3"
 dependencies = [
- "core-foundation-sys",
  "libc",
  "memchr",
  "ntapi",
- "windows 0.57.0",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows 0.62.2",
 ]
 
 [[package]]
@@ -14080,7 +14260,7 @@ version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fce91f2f0ec87dff7e6bcbbeb267439aa1188703003c6055193c821487400432"
 dependencies = [
- "unicode-width 0.2.0",
+ "unicode-width",
 ]
 
 [[package]]
@@ -14125,14 +14305,14 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.24.0"
+version = "3.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c"
+checksum = "0136791f7c95b1f6dd99f9cc786b91bb81c3800b639b3478e561ddb7be95e5f1"
 dependencies = [
  "fastrand",
- "getrandom 0.3.4",
+ "getrandom 0.4.1",
  "once_cell",
- "rustix 1.1.3",
+ "rustix",
  "windows-sys 0.61.2",
 ]
 
@@ -14181,7 +14361,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0f8daae29995a24f65619e19d8d31dea5b389f3d853d8bf297bbf607cd0014cc"
 dependencies = [
- "unicode-width 0.2.0",
+ "unicode-width",
 ]
 
 [[package]]
@@ -14419,7 +14599,6 @@ dependencies = [
  "log",
  "native-tls",
  "rustls",
- "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
  "tokio-native-tls",
@@ -14436,11 +14615,7 @@ checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
 dependencies = [
  "futures-util",
  "log",
- "rustls",
- "rustls-native-certs",
- "rustls-pki-types",
  "tokio",
- "tokio-rustls",
  "tungstenite 0.28.0",
 ]
 
@@ -14461,40 +14636,19 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
-dependencies = [
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_edit 0.22.27",
-]
-
-[[package]]
-name = "toml"
-version = "0.9.11+spec-1.1.0"
+version = "0.9.12+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3afc9a848309fe1aaffaed6e1546a7a14de1f935dc9d89d32afd9a44bab7c46"
+checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863"
 dependencies = [
  "indexmap 2.13.0",
  "serde_core",
- "serde_spanned 1.0.4",
- "toml_datetime 0.7.5+spec-1.1.0",
+ "serde_spanned",
+ "toml_datetime",
  "toml_parser",
  "toml_writer",
  "winnow",
 ]
 
-[[package]]
-name = "toml_datetime"
-version = "0.6.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "toml_datetime"
 version = "0.7.5+spec-1.1.0"
@@ -14504,20 +14658,6 @@ dependencies = [
  "serde_core",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.22.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
-dependencies = [
- "indexmap 2.13.0",
- "serde",
- "serde_spanned 0.6.9",
- "toml_datetime 0.6.11",
- "toml_write",
- "winnow",
-]
-
 [[package]]
 name = "toml_edit"
 version = "0.23.10+spec-1.0.0"
@@ -14525,26 +14665,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269"
 dependencies = [
  "indexmap 2.13.0",
- "toml_datetime 0.7.5+spec-1.1.0",
+ "toml_datetime",
  "toml_parser",
  "winnow",
 ]
 
 [[package]]
 name = "toml_parser"
-version = "1.0.6+spec-1.1.0"
+version = "1.0.7+spec-1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3198b4b0a8e11f09dd03e133c0280504d0801269e9afa46362ffde1cbeebf44"
+checksum = "247eaa3197818b831697600aadf81514e577e0cba5eab10f7e064e78ae154df1"
 dependencies = [
  "winnow",
 ]
 
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
 [[package]]
 name = "toml_writer"
 version = "1.0.6+spec-1.1.0"
@@ -14833,7 +14967,7 @@ dependencies = [
  "cfg-if",
  "itoa",
  "libc",
- "mach2",
+ "mach2 0.5.0",
  "memmap2",
  "smallvec",
  "tracing-core",
@@ -14910,7 +15044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c5f7c95348f20c1c913d72157b3c6dee6ea3e30b3d19502c5a7f6d3f160dacbf"
 dependencies = [
  "cc",
- "windows-targets 0.52.6",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -14921,7 +15055,7 @@ checksum = "ee44f4cef85f88b4dea21c0b1f58320bdf35715cf56d840969487cff00613321"
 dependencies = [
  "alloy-primitives",
  "ethereum_hashing",
- "ethereum_ssz",
+ "ethereum_ssz 0.9.1",
  "smallvec",
  "typenum",
 ]
@@ -14986,8 +15120,6 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.9.2",
- "rustls",
- "rustls-pki-types",
  "sha1",
  "thiserror 2.0.18",
  "utf-8",
@@ -15049,9 +15181,9 @@ checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "537dd038a89878be9b64dd4bd1b260315c1bb94f4d784956b81e27a088d9a09e"
 
 [[package]]
 name = "unicode-segmentation"
@@ -15061,26 +15193,20 @@ checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
 
 [[package]]
 name = "unicode-truncate"
-version = "1.1.0"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3644627a5af5fa321c95b9b235a72fd24cd29c648c2c379431e6628655627bf"
+checksum = "16b380a1238663e5f8a691f9039c73e1cdae598a30e9855f541d29b08b53e9a5"
 dependencies = [
- "itertools 0.13.0",
+ "itertools 0.14.0",
  "unicode-segmentation",
- "unicode-width 0.1.14",
+ "unicode-width",
 ]
 
 [[package]]
 name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unicode-width"
-version = "0.2.0"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode-xid"
@@ -15289,6 +15415,15 @@ dependencies = [
  "wit-bindgen",
 ]
 
+[[package]]
+name = "wasip3"
+version = "0.4.0+wasi-0.3.0-rc-2026-01-06"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5"
+dependencies = [
+ "wit-bindgen",
+]
+
 [[package]]
 name = "wasm-bindgen"
 version = "0.2.108"
@@ -15348,6 +15483,28 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "wasm-encoder"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319"
+dependencies = [
+ "leb128fmt",
+ "wasmparser",
+]
+
+[[package]]
+name = "wasm-metadata"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909"
+dependencies = [
+ "anyhow",
+ "indexmap 2.13.0",
+ "wasm-encoder",
+ "wasmparser",
+]
+
 [[package]]
 name = "wasm-streams"
 version = "0.4.2"
@@ -15361,6 +15518,18 @@ dependencies = [
  "web-sys",
 ]
 
+[[package]]
+name = "wasmparser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe"
+dependencies = [
+ "bitflags 2.10.0",
+ "hashbrown 0.15.5",
+ "indexmap 2.13.0",
+ "semver 1.0.27",
+]
+
 [[package]]
 name = "wasmtimer"
 version = "0.4.3"
@@ -15419,14 +15588,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "webpki-roots 1.0.5",
+ "webpki-roots 1.0.6",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.5"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c"
+checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed"
 dependencies = [
  "rustls-pki-types",
 ]
@@ -15459,7 +15628,7 @@ version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -15478,16 +15647,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
-dependencies = [
- "windows-core 0.57.0",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows"
 version = "0.62.2"
@@ -15519,26 +15678,14 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-core"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
-dependencies = [
- "windows-implement 0.57.0",
- "windows-interface 0.57.0",
- "windows-result 0.1.2",
- "windows-targets 0.52.6",
-]
-
 [[package]]
 name = "windows-core"
 version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
- "windows-implement 0.60.2",
- "windows-interface 0.59.3",
+ "windows-implement",
+ "windows-interface",
  "windows-link",
  "windows-result 0.4.1",
  "windows-strings",
@@ -15555,17 +15702,6 @@ dependencies = [
  "windows-threading",
 ]
 
-[[package]]
-name = "windows-implement"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
 [[package]]
 name = "windows-implement"
 version = "0.60.2"
@@ -15577,17 +15713,6 @@ dependencies = [
  "syn 2.0.114",
 ]
 
-[[package]]
-name = "windows-interface"
-version = "0.57.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.114",
-]
-
 [[package]]
 name = "windows-interface"
 version = "0.59.3"
@@ -15983,6 +16108,88 @@ name = "wit-bindgen"
 version = "0.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
+dependencies = [
+ "wit-bindgen-rust-macro",
+]
+
+[[package]]
+name = "wit-bindgen-core"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc"
+dependencies = [
+ "anyhow",
+ "heck",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-bindgen-rust"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21"
+dependencies = [
+ "anyhow",
+ "heck",
+ "indexmap 2.13.0",
+ "prettyplease",
+ "syn 2.0.114",
+ "wasm-metadata",
+ "wit-bindgen-core",
+ "wit-component",
+]
+
+[[package]]
+name = "wit-bindgen-rust-macro"
+version = "0.51.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a"
+dependencies = [
+ "anyhow",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.114",
+ "wit-bindgen-core",
+ "wit-bindgen-rust",
+]
+
+[[package]]
+name = "wit-component"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2"
+dependencies = [
+ "anyhow",
+ "bitflags 2.10.0",
+ "indexmap 2.13.0",
+ "log",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "wasm-encoder",
+ "wasm-metadata",
+ "wasmparser",
+ "wit-parser",
+]
+
+[[package]]
+name = "wit-parser"
+version = "0.244.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736"
+dependencies = [
+ "anyhow",
+ "id-arena",
+ "indexmap 2.13.0",
+ "log",
+ "semver 1.0.27",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "unicode-xid",
+ "wasmparser",
+]
 
 [[package]]
 name = "write16"
@@ -16060,7 +16267,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156"
 dependencies = [
  "libc",
- "rustix 1.1.3",
+ "rustix",
 ]
 
 [[package]]
@@ -16155,18 +16362,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.37"
+version = "0.8.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7456cf00f0685ad319c5b1693f291a650eaf345e941d082fc4e03df8a03996ac"
+checksum = "db6d35d663eadb6c932438e763b262fe1a70987f9ae936e60158176d710cae4a"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.37"
+version = "0.8.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1328722bbf2115db7e19d69ebcc15e795719e2d66b60827c6a69a117365e37a0"
+checksum = "4122cd3169e94605190e77839c9a40d40ed048d305bfdc146e7df40ab0f3e517"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -16250,9 +16457,9 @@ dependencies = [
 
 [[package]]
 name = "zmij"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff05f8caa9038894637571ae6b9e29466c1f4f829d26c9b28f869a29cbe3445"
+checksum = "4de98dfa5d5b7fef4ee834d0073d560c9ca7b6c46a71d058c48db7960f8cfaf7"
 
 [[package]]
 name = "zstd"
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
index 798261865bdf9..ef5b20677543e 100644
--- a/rust/Cargo.toml
+++ b/rust/Cargo.toml
@@ -39,6 +39,8 @@ members = [
   "op-reth/crates/reth/",
   "op-reth/crates/rpc/",
   "op-reth/crates/storage/",
+  "op-reth/crates/exex/",
+  "op-reth/crates/trie/",
   "op-reth/crates/txpool/",
   "op-reth/examples/*",
 
@@ -288,6 +290,8 @@ reth-optimism-primitives = { path = "op-reth/crates/primitives/", default-featur
 reth-op = { path = "op-reth/crates/reth/", default-features = false }
 reth-optimism-rpc = { path = "op-reth/crates/rpc/" }
 reth-optimism-storage = { path = "op-reth/crates/storage/" }
+reth-optimism-exex = { path = "op-reth/crates/exex/" }
+reth-optimism-trie = { path = "op-reth/crates/trie/" }
 reth-optimism-txpool = { path = "op-reth/crates/txpool/" }
 
 # ==================== OP-ALLOY INTERNAL CRATES ====================
@@ -302,78 +306,79 @@ op-alloy-rpc-jsonrpsee = { version = "0.23.1", path = "op-alloy/crates/rpc-jsonr
 alloy-op-evm = { version = "0.26.3", path = "alloy-op-evm/", default-features = false }
 alloy-op-hardforks = { version = "0.4.7", path = "alloy-op-hardforks/", default-features = false }
 
-# ==================== RETH CRATES (from git rev b3d532ce / main) ====================
-reth = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-codecs = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-db-common = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-downloaders = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-fs-util = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-network = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-network-api = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-node-events = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-payload-util = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-payload-validator = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-prune = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-stages-types = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-static-file = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-static-file-types = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-storage-errors = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-tasks = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
-reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce" }
-reth-zstd-compressors = { git = "https://github.com/paradigmxyz/reth", rev = "b3d532ce", default-features = false }
+# ==================== RETH CRATES (from git rev 2c5d00f / main) ====================
+reth = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-basic-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-chain-state = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-chainspec = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-cli = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-cli-commands = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-cli-runner = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-cli-util = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-codecs = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-consensus-common = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-db = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-db-api = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-db-common = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-downloaders = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-e2e-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-engine-local = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-engine-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-errors = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-eth-wire = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-ethereum-cli = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-ethereum-consensus = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-ethereum-forks = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-ethereum-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-evm = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-evm-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-exex = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-exex-test-utils = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-execution-errors = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-execution-types = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-fs-util = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-network = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-network-api = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-network-peers = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-node-api = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-node-builder = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-node-core = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-node-ethereum = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-node-events = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-node-metrics = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-payload-builder = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-payload-builder-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-payload-primitives = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-payload-util = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-payload-validator = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-primitives-traits = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-provider = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-prune = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-prune-types = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-revm = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-rpc = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-rpc-api = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-rpc-builder = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-rpc-engine-api = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-rpc-eth-api = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-rpc-eth-types = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-rpc-server-types = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-stages = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-stages-types = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-static-file = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-static-file-types = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-storage-api = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-storage-errors = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-tasks = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-tracing = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-transaction-pool = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-trie = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-trie-common = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
+reth-trie-db = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f" }
+reth-zstd-compressors = { git = "https://github.com/paradigmxyz/reth", rev = "2c5d00f", default-features = false }
 
 # ==================== REVM (latest: op-reth versions) ====================
 revm = { version = "34.0.0", default-features = false }
@@ -384,61 +389,61 @@ revm-primitives = { version = "22.0.0", default-features = false }
 revm-interpreter = { version = "32.0.0", default-features = false }
 revm-database-interface = { version = "9.0.0", default-features = false }
 op-revm = { version = "15.0.0", default-features = false }
-revm-inspectors = "0.34.1"
+revm-inspectors = "0.34.2"
 
 # ==================== ALLOY ====================
 alloy-chains = { version = "0.2.30", default-features = false }
 alloy-dyn-abi = "1.5.4"
 alloy-eip2124 = { version = "0.2.0", default-features = false }
 alloy-eip7928 = { version = "0.3.2", default-features = false }
-alloy-evm = { version = "0.27.0", default-features = false }
+alloy-evm = { version = "0.27.2", default-features = false }
 alloy-primitives = { version = "1.5.4", default-features = false, features = [
   "map-foldhash",
 ] }
-alloy-rlp = { version = "0.3.12", default-features = false, features = [
+alloy-rlp = { version = "0.3.13", default-features = false, features = [
   "core-net",
 ] }
 alloy-sol-macro = "1.5.4"
 alloy-sol-types = { version = "1.5.4", default-features = false }
-alloy-trie = { version = "0.9.3", default-features = false }
+alloy-trie = { version = "0.9.4", default-features = false }
 
 alloy-hardforks = { version = "0.4.7", default-features = false }
 
-alloy-consensus = { version = "1.5.2", default-features = false }
-alloy-contract = { version = "1.5.2", default-features = false }
-alloy-eips = { version = "1.5.2", default-features = false }
-alloy-genesis = { version = "1.5.2", default-features = false }
-alloy-json-rpc = { version = "1.5.2", default-features = false }
-alloy-network = { version = "1.5.2", default-features = false }
-alloy-network-primitives = { version = "1.5.2", default-features = false }
-alloy-node-bindings = { version = "1.5.2", default-features = false }
-alloy-provider = { version = "1.5.2", features = [
+alloy-consensus = { version = "1.6.3", default-features = false }
+alloy-contract = { version = "1.6.3", default-features = false }
+alloy-eips = { version = "1.6.3", default-features = false }
+alloy-genesis = { version = "1.6.3", default-features = false }
+alloy-json-rpc = { version = "1.6.3", default-features = false }
+alloy-network = { version = "1.6.3", default-features = false }
+alloy-network-primitives = { version = "1.6.3", default-features = false }
+alloy-node-bindings = { version = "1.6.3", default-features = false }
+alloy-provider = { version = "1.6.3", features = [
   "reqwest",
   "debug-api",
 ], default-features = false }
-alloy-pubsub = { version = "1.5.2", default-features = false }
-alloy-rpc-client = { version = "1.5.2", default-features = false }
-alloy-rpc-types = { version = "1.5.2", features = [
+alloy-pubsub = { version = "1.6.3", default-features = false }
+alloy-rpc-client = { version = "1.6.3", default-features = false }
+alloy-rpc-types = { version = "1.6.3", features = [
   "eth",
 ], default-features = false }
-alloy-rpc-types-admin = { version = "1.5.2", default-features = false }
-alloy-rpc-types-anvil = { version = "1.5.2", default-features = false }
-alloy-rpc-types-beacon = { version = "1.5.2", default-features = false }
-alloy-rpc-types-debug = { version = "1.5.2", default-features = false }
-alloy-rpc-types-engine = { version = "1.5.2", default-features = false }
-alloy-rpc-types-eth = { version = "1.5.2", default-features = false }
-alloy-rpc-types-mev = { version = "1.5.2", default-features = false }
-alloy-rpc-types-trace = { version = "1.5.2", default-features = false }
-alloy-rpc-types-txpool = { version = "1.5.2", default-features = false }
-alloy-serde = { version = "1.5.2", default-features = false }
-alloy-signer = { version = "1.5.2", default-features = false }
-alloy-signer-local = { version = "1.5.2", default-features = false }
-alloy-transport = { version = "1.5.2" }
-alloy-transport-http = { version = "1.5.2", features = [
+alloy-rpc-types-admin = { version = "1.6.3", default-features = false }
+alloy-rpc-types-anvil = { version = "1.6.3", default-features = false }
+alloy-rpc-types-beacon = { version = "1.6.3", default-features = false }
+alloy-rpc-types-debug = { version = "1.6.3", default-features = false }
+alloy-rpc-types-engine = { version = "1.6.3", default-features = false }
+alloy-rpc-types-eth = { version = "1.6.3", default-features = false }
+alloy-rpc-types-mev = { version = "1.6.3", default-features = false }
+alloy-rpc-types-trace = { version = "1.6.3", default-features = false }
+alloy-rpc-types-txpool = { version = "1.6.3", default-features = false }
+alloy-serde = { version = "1.6.3", default-features = false }
+alloy-signer = { version = "1.6.3", default-features = false }
+alloy-signer-local = { version = "1.6.3", default-features = false }
+alloy-transport = { version = "1.6.3" }
+alloy-transport-http = { version = "1.6.3", features = [
   "reqwest-rustls-tls",
 ], default-features = false }
-alloy-transport-ipc = { version = "1.5.2", default-features = false }
-alloy-transport-ws = { version = "1.5.2", default-features = false }
+alloy-transport-ipc = { version = "1.6.3", default-features = false }
+alloy-transport-ws = { version = "1.6.3", default-features = false }
 
 # ==================== OP-ALLOY (from crates.io) ====================
 op-alloy = { version = "0.23.1", path = "op-alloy/crates/op-alloy", default-features = false }
@@ -453,7 +458,7 @@ futures = "0.3.31"
 futures-core = "0.3"
 futures-util = { version = "0.3.31", default-features = false }
 hyper = "1.8"
-hyper-util = "0.1.19"
+hyper-util = "0.1.20"
 pin-project = "1.1.10"
 tracing-futures = "0.2"
 tower = "0.5.3"
@@ -490,12 +495,12 @@ ark-bls12-381 = { version = "0.5.0", default-features = false }
 bincode = { version = "2.0.1", features = ["serde"] }
 ethereum_ssz = "0.9.1"
 ethereum_ssz_derive = "0.9.1"
-rkyv = "0.8.14"
+rkyv = "0.8.15"
 serde_repr = "0.1.20"
 serde_with = { version = "3.16", default-features = false, features = [
   "macros",
 ] }
-toml = { version = "0.9.11", default-features = false }
+toml = { version = "0.9.12", default-features = false }
 serde = { version = "1.0.228", default-features = false, features = [
   "derive",
   "alloc",
@@ -508,7 +513,7 @@ serde_json = { version = "1.0.149", default-features = false, features = [
 metrics = { version = "0.24.3", default-features = false }
 metrics-derive = "0.1"
 metrics-exporter-prometheus = { version = "0.18.1", default-features = false }
-metrics-process = "2.4.2"
+metrics-process = "2.4.3"
 metrics-util = { default-features = false, version = "0.20.1" }
 prometheus = { version = "0.14.0", default-features = false }
 
@@ -523,16 +528,17 @@ arbitrary = { version = "1.4.2", features = ["derive"] }
 arbtest = "0.3.2"
 assert_matches = "1.5.0"
 criterion = { package = "codspeed-criterion-compat", version = "2.10" }
-httpmock = "0.8.2"
+httpmock = "0.8.3"
 insta = "1.46"
 mockall = "0.14.0"
 pprof = "0.15.0"
-proptest = "1.9.0"
+proptest = "1.10.0"
 proptest-derive = "0.7"
 proptest-arbitrary-interop = "0.1.0"
 rstest = "0.26.1"
 similar-asserts = { version = "1.7.0", features = ["serde"] }
 tempfile = "3.24.0"
+serial_test = "3"
 test-case = "3"
 test-fuzz = "7.2.5"
 
@@ -557,7 +563,7 @@ openssl = "0.10.75"
 
 # ==================== MISC ====================
 ambassador = "0.5.0"
-anyhow = { version = "1.0.100", default-features = false }
+anyhow = { version = "1.0.101", default-features = false }
 aquamarine = "0.6"
 arrayvec = { version = "0.7.6", default-features = false }
 auto_impl = "1.3.0"
@@ -568,10 +574,10 @@ backon = { version = "1.6.0", default-features = false, features = [
 bitflags = "2.10"
 boyer-moore-magiclen = "0.2.22"
 buddy_system_allocator = "0.12.0"
-bytes = { version = "1.11.0", default-features = false }
+bytes = { version = "1.11.1", default-features = false }
 cfg-if = "1.0.4"
 chrono = "0.4.43"
-clap = "4.5.56"
+clap = "4.5.58"
 color-eyre = "0.6.5"
 crossterm = "0.29.0"
 dashmap = "6.1"
@@ -598,13 +604,13 @@ libc = "0.2"
 linked_hash_set = "0.1"
 lru = "0.16.3"
 mini-moka = "0.10"
-modular-bitfield = "0.11.2"
+modular-bitfield = "0.13.1"
 moka = "0.12"
 multihash = "0.19.3"
 notify = { version = "8.2", default-features = false, features = [
   "macos_fsevent",
 ] }
-nybbles = { version = "0.4.7", default-features = false }
+nybbles = { version = "0.4.8", default-features = false }
 once_cell = { version = "1.21", default-features = false, features = [
   "critical-section",
 ] }
@@ -616,7 +622,7 @@ rand = { version = "0.9.2", default-features = false }
 rand_08 = { package = "rand", version = "0.8" }
 ratatui = "0.30.0"
 rayon = "1.11.0"
-reqwest = { version = "0.13.1", default-features = false }
+reqwest = { version = "0.13.2", default-features = false }
 ringbuffer = "0.16.0"
 rollup-boost = "0.7.13"
 rollup-boost-types = "0.1.0"
diff --git a/rust/deny.toml b/rust/deny.toml
index 461d1eda1932b..b8bd5086ad1dd 100644
--- a/rust/deny.toml
+++ b/rust/deny.toml
@@ -17,6 +17,8 @@ ignore = [
   "RUSTSEC-2025-0012",
   # bincode is unmaintained but still functional; transitive dep from reth-nippy-jar and test-fuzz.
   "RUSTSEC-2025-0141",
+  # https://rustsec.org/advisories/RUSTSEC-2026-0002 lru unused directly: https://github.com/alloy-rs/alloy/pull/3460
+  "RUSTSEC-2026-0002",
 ]
 
 # This section is considered when running `cargo deny check bans`.
diff --git a/rust/justfile b/rust/justfile
index 76ca9da383578..4b109a8643f59 100644
--- a/rust/justfile
+++ b/rust/justfile
@@ -130,10 +130,27 @@ check-udeps:
   cargo +nightly udeps --release --workspace --all-features --all-targets
 
 # Run cargo hack for feature powerset checking
-hack partition="":
+# shuffle: "true" to shuffle package order before partitioning (spreads heavy/light crates more evenly)
+# seed: deterministic seed for shuffle (all partition nodes must use the same seed)
+hack partition="" shuffle="false" seed="default":
   #!/usr/bin/env bash
   set -euo pipefail
-  cargo hack check --feature-powerset --depth 2 --no-dev-deps {{ if partition != "" { "--partition " + partition } else { "" } }}
+  if [ "{{partition}}" != "" ]; then
+    echo "Running cargo hack with partition {{partition}}"
+  else
+    echo "Running cargo hack without partition"
+  fi
+
+  PKG_FLAGS=""
+  if [ "{{shuffle}}" = "true" ]; then
+    PKGS=$(cargo metadata --no-deps --format-version 1 \
+      | jq -r '.packages[].name' \
+      | shuf --random-source=<(openssl enc -aes-256-ctr -pass "pass:{{seed}}" -nosalt </dev/zero 2>/dev/null))
+    PKG_FLAGS=$(echo "$PKGS" | sed 's/^/-p /' | tr '\n' ' ')
+    echo "Shuffled package order (seed={{seed}}): $PKGS"
+  fi
+
+  cargo hack check --each-feature --no-dev-deps $PKG_FLAGS {{ if partition != "" { "--partition " + partition } else { "" } }}
 
 ######################### Documentation ################################
 
diff --git a/rust/op-reth/bin/Cargo.toml b/rust/op-reth/bin/Cargo.toml
index 0af1181b4918a..ee43fa0c0328f 100644
--- a/rust/op-reth/bin/Cargo.toml
+++ b/rust/op-reth/bin/Cargo.toml
@@ -4,9 +4,9 @@ version = "1.10.2"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true
-homepage = "https://paradigmxyz.github.io/reth"
-repository = "https://github.com/paradigmxyz/reth"
-exclude = [".github/"]
+homepage.workspace = true
+repository.workspace = true
+exclude.workspace = true
 
 [dependencies]
 reth-cli-util.workspace = true
diff --git a/rust/op-reth/crates/cli/Cargo.toml b/rust/op-reth/crates/cli/Cargo.toml
index 7cd9474a9db27..2523a6c1e19e8 100644
--- a/rust/op-reth/crates/cli/Cargo.toml
+++ b/rust/op-reth/crates/cli/Cargo.toml
@@ -37,6 +37,7 @@ reth-node-metrics.workspace = true
 reth-optimism-primitives.workspace = true
 reth-optimism-chainspec = { workspace = true, features = ["superchain-configs"] }
 reth-optimism-consensus.workspace = true
+reth-optimism-trie.workspace = true
 
 reth-chainspec.workspace = true
 reth-node-events.workspace = true
@@ -108,10 +109,7 @@ jemalloc-symbols = [
 
 tracy = ["reth-tracing/tracy", "reth-node-core/tracy"]
 
-dev = [
-    "dep:proptest",
-    "reth-cli-commands/arbitrary",
-]
+dev = ["dep:proptest", "reth-cli-commands/arbitrary"]
 
 serde = [
     "alloy-consensus/serde",
diff --git a/rust/op-reth/crates/cli/src/app.rs b/rust/op-reth/crates/cli/src/app.rs
index 22df73b0d90d8..730bda4c2747c 100644
--- a/rust/op-reth/crates/cli/src/app.rs
+++ b/rust/op-reth/crates/cli/src/app.rs
@@ -114,6 +114,9 @@ where
             Commands::ReExecute(command) => {
                 runner.run_until_ctrl_c(command.execute::<OpNode>(components))
             }
+            Commands::OpProofs(command) => {
+                runner.run_blocking_until_ctrl_c(command.execute::<OpNode>())
+            }
         }
     }
 
diff --git a/rust/op-reth/crates/cli/src/commands/mod.rs b/rust/op-reth/crates/cli/src/commands/mod.rs
index 3c08400d5dc6f..9c13243791e81 100644
--- a/rust/op-reth/crates/cli/src/commands/mod.rs
+++ b/rust/op-reth/crates/cli/src/commands/mod.rs
@@ -14,6 +14,7 @@ use std::{fmt, sync::Arc};
 pub mod import;
 pub mod import_receipts;
 pub mod init_state;
+pub mod op_proofs;
 
 #[cfg(feature = "dev")]
 pub mod test_vectors;
@@ -61,6 +62,9 @@ pub enum Commands<Spec: ChainSpecParser = OpChainSpecParser, Ext: clap::Args + f
     /// Re-execute blocks in parallel to verify historical sync correctness.
     #[command(name = "re-execute")]
     ReExecute(re_execute::Command<Spec>),
+    /// Manage storage of historical proofs in expanded trie db in fault proof window.
+    #[command(name = "proofs")]
+    OpProofs(op_proofs::Command<Spec>),
 }
 
 impl<
@@ -85,6 +89,7 @@ impl<
             #[cfg(feature = "dev")]
             Self::TestVectors(_) => None,
             Self::ReExecute(cmd) => cmd.chain_spec(),
+            Self::OpProofs(cmd) => cmd.chain_spec(),
         }
     }
 }
diff --git a/rust/op-reth/crates/cli/src/commands/op_proofs/init.rs b/rust/op-reth/crates/cli/src/commands/op_proofs/init.rs
new file mode 100644
index 0000000000000..d38745e6fc6f7
--- /dev/null
+++ b/rust/op-reth/crates/cli/src/commands/op_proofs/init.rs
@@ -0,0 +1,102 @@
+//! Command that initializes the OP proofs storage with the current state of the chain.
+
+use clap::Parser;
+use reth_chainspec::ChainInfo;
+use reth_cli::chainspec::ChainSpecParser;
+use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
+use reth_node_core::version::version_metadata;
+use reth_optimism_chainspec::OpChainSpec;
+use reth_optimism_primitives::OpPrimitives;
+use reth_optimism_trie::{
+    InitializationJob, OpProofsStorage, OpProofsStore, db::MdbxProofsStorage,
+};
+use reth_provider::{BlockNumReader, DBProvider, DatabaseProviderFactory};
+use std::{path::PathBuf, sync::Arc};
+use tracing::info;
+
+/// Initializes the proofs storage with the current state of the chain.
+///
+/// This command must be run before starting the node with proofs history enabled.
+/// It backfills the proofs storage with trie nodes from the current chain state.
+#[derive(Debug, Parser)]
+pub struct InitCommand<C: ChainSpecParser> {
+    #[command(flatten)]
+    env: EnvironmentArgs<C>,
+
+    /// The path to the storage DB for proofs history.
+    ///
+    /// This should match the path used when starting the node with
+    /// `--proofs-history.storage-path`.
+    #[arg(
+        long = "proofs-history.storage-path",
+        value_name = "PROOFS_HISTORY_STORAGE_PATH",
+        required = true
+    )]
+    pub storage_path: PathBuf,
+}
+
+impl<C: ChainSpecParser<ChainSpec = OpChainSpec>> InitCommand<C> {
+    /// Execute `initialize-op-proofs` command
+    pub async fn execute<N: CliNodeTypes<ChainSpec = C::ChainSpec, Primitives = OpPrimitives>>(
+        self,
+    ) -> eyre::Result<()> {
+        info!(target: "reth::cli", "reth {} starting", version_metadata().short_version);
+        info!(target: "reth::cli", "Initializing OP proofs storage at: {:?}", self.storage_path);
+
+        // Initialize the environment with read-only access
+        let Environment { provider_factory, .. } = self.env.init::<N>(AccessRights::RO)?;
+
+        // Create the proofs storage
+        let storage: OpProofsStorage<Arc<MdbxProofsStorage>> = Arc::new(
+            MdbxProofsStorage::new(&self.storage_path)
+                .map_err(|e| eyre::eyre!("Failed to create MdbxProofsStorage: {e}"))?,
+        )
+        .into();
+
+        // Check if already initialized
+        if let Some((block_number, block_hash)) = storage.get_earliest_block_number()? {
+            info!(
+                target: "reth::cli",
+                block_number = block_number,
+                block_hash = ?block_hash,
+                "Proofs storage already initialized"
+            );
+            return Ok(());
+        }
+
+        // Get the current chain state
+        let ChainInfo { best_number, best_hash, .. } = provider_factory.chain_info()?;
+
+        info!(
+            target: "reth::cli",
+            best_number = best_number,
+            best_hash = ?best_hash,
+            "Starting backfill job for current chain state"
+        );
+
+        // Run the backfill job
+        {
+            let db_provider =
+                provider_factory.database_provider_ro()?.disable_long_read_transaction_safety();
+            let db_tx = db_provider.into_tx();
+
+            InitializationJob::new(storage, db_tx).run(best_number, best_hash)?;
+        }
+
+        info!(
+            target: "reth::cli",
+            best_number = best_number,
+            best_hash = ?best_hash,
+            "Proofs storage initialized successfully"
+        );
+
+        Ok(())
+    }
+}
+
+impl<C: ChainSpecParser> InitCommand<C> {
+    /// Returns the underlying chain being used to run this command
+    pub const fn chain_spec(&self) -> Option<&Arc<C::ChainSpec>> {
+        Some(&self.env.chain)
+    }
+}
diff --git a/rust/op-reth/crates/cli/src/commands/op_proofs/mod.rs b/rust/op-reth/crates/cli/src/commands/op_proofs/mod.rs
new file mode 100644
index 0000000000000..9f49a288ccb3d
--- /dev/null
+++ b/rust/op-reth/crates/cli/src/commands/op_proofs/mod.rs
@@ -0,0 +1,57 @@
+//! OP Proofs management commands
+
+use clap::{Parser, Subcommand};
+use reth_cli::chainspec::ChainSpecParser;
+use reth_cli_commands::common::CliNodeTypes;
+use reth_optimism_chainspec::OpChainSpec;
+use reth_optimism_primitives::OpPrimitives;
+use std::sync::Arc;
+
+pub mod init;
+pub mod prune;
+pub mod unwind;
+
+/// `op-reth op-proofs` command
+#[derive(Debug, Parser)]
+pub struct Command<C: ChainSpecParser> {
+    #[command(subcommand)]
+    command: Subcommands<C>,
+}
+
+impl<C: ChainSpecParser<ChainSpec = OpChainSpec>> Command<C> {
+    /// Execute `op-proofs` command
+    pub async fn execute<N: CliNodeTypes<ChainSpec = C::ChainSpec, Primitives = OpPrimitives>>(
+        self,
+    ) -> eyre::Result<()> {
+        match self.command {
+            Subcommands::Init(cmd) => cmd.execute::<N>().await,
+            Subcommands::Prune(cmd) => cmd.execute::<N>().await,
+            Subcommands::Unwind(cmd) => cmd.execute::<N>().await,
+        }
+    }
+}
+
+impl<C: ChainSpecParser> Command<C> {
+    /// Returns the underlying chain being used to run this command
+    pub const fn chain_spec(&self) -> Option<&Arc<C::ChainSpec>> {
+        match &self.command {
+            Subcommands::Init(cmd) => cmd.chain_spec(),
+            Subcommands::Prune(cmd) => cmd.chain_spec(),
+            Subcommands::Unwind(cmd) => cmd.chain_spec(),
+        }
+    }
+}
+
+/// `op-reth op-proofs` subcommands
+#[derive(Debug, Subcommand)]
+pub enum Subcommands<C: ChainSpecParser> {
+    /// Initialize the proofs storage with the current state of the chain
+    #[command(name = "init")]
+    Init(init::InitCommand<C>),
+    /// Prune old proof history to reclaim space
+    #[command(name = "prune")]
+    Prune(prune::PruneCommand<C>),
+    /// Unwind the proofs storage to a specific block
+    #[command(name = "unwind")]
+    Unwind(unwind::UnwindCommand<C>),
+}
diff --git a/rust/op-reth/crates/cli/src/commands/op_proofs/prune.rs b/rust/op-reth/crates/cli/src/commands/op_proofs/prune.rs
new file mode 100644
index 0000000000000..fd7a6e8d053e6
--- /dev/null
+++ b/rust/op-reth/crates/cli/src/commands/op_proofs/prune.rs
@@ -0,0 +1,90 @@
+//! Command that prunes the OP proofs storage.
+
+use clap::Parser;
+use reth_cli::chainspec::ChainSpecParser;
+use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
+use reth_node_core::version::version_metadata;
+use reth_optimism_chainspec::OpChainSpec;
+use reth_optimism_primitives::OpPrimitives;
+use reth_optimism_trie::{
+    OpProofStoragePruner, OpProofsStorage, OpProofsStore, db::MdbxProofsStorage,
+};
+use std::{path::PathBuf, sync::Arc};
+use tracing::info;
+
+/// Prunes the proofs storage by removing old proof history and state updates.
+#[derive(Debug, Parser)]
+pub struct PruneCommand<C: ChainSpecParser> {
+    #[command(flatten)]
+    env: EnvironmentArgs<C>,
+
+    /// The path to the storage DB for proofs history.
+    #[arg(
+        long = "proofs-history.storage-path",
+        value_name = "PROOFS_HISTORY_STORAGE_PATH",
+        required = true
+    )]
+    pub storage_path: PathBuf,
+
+    /// The window to span blocks for proofs history. Value is the number of blocks.
+    /// Default is 1 month of blocks based on 2 seconds block time.
+    /// 30 * 24 * 60 * 60 / 2 = `1_296_000`
+    #[arg(
+        long = "proofs-history.window",
+        default_value_t = 1_296_000,
+        value_name = "PROOFS_HISTORY_WINDOW"
+    )]
+    pub proofs_history_window: u64,
+
+    /// The batch size for pruning operations.
+    #[arg(
+        long = "proofs-history.prune-batch-size",
+        default_value_t = 1000,
+        value_name = "PROOFS_HISTORY_PRUNE_BATCH_SIZE"
+    )]
+    pub proofs_history_prune_batch_size: u64,
+}
+
+impl<C: ChainSpecParser<ChainSpec = OpChainSpec>> PruneCommand<C> {
+    /// Execute [`PruneCommand`].
+    pub async fn execute<N: CliNodeTypes<ChainSpec = C::ChainSpec, Primitives = OpPrimitives>>(
+        self,
+    ) -> eyre::Result<()> {
+        info!(target: "reth::cli", "reth {} starting", version_metadata().short_version);
+        info!(target: "reth::cli", "Pruning OP proofs storage at: {:?}", self.storage_path);
+
+        // Initialize the environment with read-only access
+        let Environment { provider_factory, .. } = self.env.init::<N>(AccessRights::RO)?;
+
+        let storage: OpProofsStorage<Arc<MdbxProofsStorage>> = Arc::new(
+            MdbxProofsStorage::new(&self.storage_path)
+                .map_err(|e| eyre::eyre!("Failed to create MdbxProofsStorage: {e}"))?,
+        )
+        .into();
+
+        let earliest_block = storage.get_earliest_block_number()?;
+        let latest_block = storage.get_latest_block_number()?;
+        info!(
+            target: "reth::cli",
+            ?earliest_block,
+            ?latest_block,
+            "Current proofs storage block range"
+        );
+
+        let pruner = OpProofStoragePruner::new(
+            storage,
+            provider_factory,
+            self.proofs_history_window,
+            self.proofs_history_prune_batch_size,
+        );
+        pruner.run();
+        Ok(())
+    }
+}
+
+impl<C: ChainSpecParser> PruneCommand<C> {
+    /// Returns the underlying chain being used to run this command
+    pub const fn chain_spec(&self) -> Option<&Arc<C::ChainSpec>> {
+        Some(&self.env.chain)
+    }
+}
diff --git a/rust/op-reth/crates/cli/src/commands/op_proofs/unwind.rs b/rust/op-reth/crates/cli/src/commands/op_proofs/unwind.rs
new file mode 100644
index 0000000000000..f95ffcf4737b2
--- /dev/null
+++ b/rust/op-reth/crates/cli/src/commands/op_proofs/unwind.rs
@@ -0,0 +1,106 @@
+//! Command that unwinds the OP proofs storage to a specific block number.
+
+use clap::Parser;
+use reth_cli::chainspec::ChainSpecParser;
+use reth_cli_commands::common::{AccessRights, CliNodeTypes, Environment, EnvironmentArgs};
+use reth_node_core::version::version_metadata;
+use reth_optimism_chainspec::OpChainSpec;
+use reth_optimism_primitives::OpPrimitives;
+use reth_optimism_trie::{OpProofsStorage, OpProofsStore, db::MdbxProofsStorage};
+use reth_provider::{BlockReader, TransactionVariant};
+use std::{path::PathBuf, sync::Arc};
+use tracing::{info, warn};
+
+/// Unwinds the proofs storage to a specific block number.
+///
+/// This command removes all proof history and state updates after the target block number.
+#[derive(Debug, Parser)]
+pub struct UnwindCommand<C: ChainSpecParser> {
+    #[command(flatten)]
+    env: EnvironmentArgs<C>,
+
+    /// The path to the storage DB for proofs history.
+    #[arg(
+        long = "proofs-history.storage-path",
+        value_name = "PROOFS_HISTORY_STORAGE_PATH",
+        required = true
+    )]
+    pub storage_path: PathBuf,
+
+    /// The target block number to unwind to.
+    ///
+    /// All history *after* this block will be removed.
+    #[arg(long, value_name = "TARGET_BLOCK")]
+    pub target: u64,
+}
+
+impl<C: ChainSpecParser> UnwindCommand<C> {
+    /// Validates that the target block number is within a valid range for unwinding.
+    fn validate_unwind_range<Store: OpProofsStore>(
+        &self,
+        storage: &OpProofsStorage<Store>,
+    ) -> eyre::Result<bool> {
+        let (Some((earliest, _)), Some((latest, _))) =
+            (storage.get_earliest_block_number()?, storage.get_latest_block_number()?)
+        else {
+            warn!(target: "reth::cli", "No blocks found in proofs storage. Nothing to unwind.");
+            return Ok(false);
+        };
+
+        if self.target <= earliest {
+            warn!(target: "reth::cli", unwind_target = ?self.target, ?earliest, "Target block is less than the earliest block in proofs storage. Nothing to unwind.");
+            return Ok(false);
+        }
+
+        if self.target > latest {
+            warn!(target: "reth::cli", unwind_target = ?self.target, ?latest, "Target block is not less than the latest block in proofs storage. Nothing to unwind.");
+            return Ok(false);
+        }
+
+        Ok(true)
+    }
+}
+
+impl<C: ChainSpecParser<ChainSpec = OpChainSpec>> UnwindCommand<C> {
+    /// Execute [`UnwindCommand`].
+    pub async fn execute<N: CliNodeTypes<ChainSpec = C::ChainSpec, Primitives = OpPrimitives>>(
+        self,
+    ) -> eyre::Result<()> {
+        info!(target: "reth::cli", "reth {} starting", version_metadata().short_version);
+        info!(target: "reth::cli", "Unwinding OP proofs storage at: {:?}", self.storage_path);
+
+        // Initialize the environment with read-only access
+        let Environment { provider_factory, .. } = self.env.init::<N>(AccessRights::RO)?;
+
+        // Create the proofs storage
+        let storage: OpProofsStorage<Arc<MdbxProofsStorage>> = Arc::new(
+            MdbxProofsStorage::new(&self.storage_path)
+                .map_err(|e| eyre::eyre!("Failed to create MdbxProofsStorage: {e}"))?,
+        )
+        .into();
+
+        // Validate that the target block is within a valid range for unwinding
+        if !self.validate_unwind_range(&storage)? {
+            return Ok(());
+        }
+
+        // Get the target block from the main database
+        let block = provider_factory
+            .recovered_block(self.target.into(), TransactionVariant::NoHash)?
+            .ok_or_else(|| {
+                eyre::eyre!("Target block {} not found in the main database", self.target)
+            })?;
+
+        info!(target: "reth::cli", block_number = block.number, block_hash = %block.hash(), "Unwinding to target block");
+        storage.unwind_history(block.block_with_parent())?;
+
+        Ok(())
+    }
+}
+
+impl<C: ChainSpecParser> UnwindCommand<C> {
+    /// Returns the underlying chain being used to run this command
+    pub const fn chain_spec(&self) -> Option<&Arc<C::ChainSpec>> {
+        Some(&self.env.chain)
+    }
+}
diff --git a/rust/op-reth/crates/cli/src/lib.rs b/rust/op-reth/crates/cli/src/lib.rs
index a5951f1e5fa6d..6d1ef26749bdc 100644
--- a/rust/op-reth/crates/cli/src/lib.rs
+++ b/rust/op-reth/crates/cli/src/lib.rs
@@ -37,7 +37,7 @@ pub use commands::{import::ImportOpCommand, import_receipts::ImportReceiptsOpCom
 use reth_optimism_chainspec::OpChainSpec;
 use reth_rpc_server_types::{DefaultRpcModuleValidator, RpcModuleValidator};
 
-use std::{ffi::OsString, fmt, marker::PhantomData, sync::Arc};
+use std::{ffi::OsString, fmt, marker::PhantomData};
 
 use chainspec::OpChainSpecParser;
 use clap::Parser;
@@ -121,7 +121,7 @@ where
     /// [`NodeCommand`](reth_cli_commands::node::NodeCommand).
     pub fn run<L, Fut>(self, launcher: L) -> eyre::Result<()>
     where
-        L: FnOnce(WithLaunchContext<NodeBuilder<Arc<DatabaseEnv>, C::ChainSpec>>, Ext) -> Fut,
+        L: FnOnce(WithLaunchContext<NodeBuilder<DatabaseEnv, C::ChainSpec>>, Ext) -> Fut,
         Fut: Future<Output = eyre::Result<()>>,
     {
         self.with_runner(CliRunner::try_default_runtime()?, launcher)
@@ -130,7 +130,7 @@ where
     /// Execute the configured cli command with the provided [`CliRunner`].
     pub fn with_runner<L, Fut>(self, runner: CliRunner, launcher: L) -> eyre::Result<()>
     where
-        L: FnOnce(WithLaunchContext<NodeBuilder<Arc<DatabaseEnv>, C::ChainSpec>>, Ext) -> Fut,
+        L: FnOnce(WithLaunchContext<NodeBuilder<DatabaseEnv, C::ChainSpec>>, Ext) -> Fut,
         Fut: Future<Output = eyre::Result<()>>,
     {
         let mut this = self.configure();
diff --git a/rust/op-reth/crates/evm/src/lib.rs b/rust/op-reth/crates/evm/src/lib.rs
index 54ea9ae7b8479..5ac1adaa35d38 100644
--- a/rust/op-reth/crates/evm/src/lib.rs
+++ b/rust/op-reth/crates/evm/src/lib.rs
@@ -293,7 +293,10 @@ mod tests {
     use alloy_consensus::{Header, Receipt};
     use alloy_eips::eip7685::Requests;
     use alloy_genesis::Genesis;
-    use alloy_primitives::{Address, B256, LogData, bytes, map::HashMap};
+    use alloy_primitives::{
+        Address, B256, LogData, bytes,
+        map::{AddressMap, B256Map, HashMap},
+    };
     use op_revm::OpSpecId;
     use reth_chainspec::ChainSpec;
     use reth_evm::execute::ProviderError;
@@ -588,12 +591,12 @@ mod tests {
         );
 
         // Create a BundleStateInit object and insert initial data
-        let mut state_init: BundleStateInit = HashMap::default();
+        let mut state_init: BundleStateInit = AddressMap::default();
         state_init
-            .insert(Address::new([2; 20]), (None, Some(Account::default()), HashMap::default()));
+            .insert(Address::new([2; 20]), (None, Some(Account::default()), B256Map::default()));
 
-        // Create a HashMap for account reverts and insert initial data
-        let mut revert_inner: HashMap<Address, AccountRevertInit> = HashMap::default();
+        // Create an AddressMap for account reverts and insert initial data
+        let mut revert_inner: AddressMap<AccountRevertInit> = AddressMap::default();
         revert_inner.insert(Address::new([2; 20]), (None, vec![]));
 
         // Create a RevertsInit object and insert the revert_inner data
diff --git a/rust/op-reth/crates/exex/Cargo.toml b/rust/op-reth/crates/exex/Cargo.toml
new file mode 100644
index 0000000000000..ccfdb0b202c34
--- /dev/null
+++ b/rust/op-reth/crates/exex/Cargo.toml
@@ -0,0 +1,68 @@
+[package]
+name = "reth-optimism-exex"
+version = "1.10.2"
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+homepage = "https://paradigmxyz.github.io/reth"
+repository = "https://github.com/paradigmxyz/reth"
+description = "Execution extensions for OP-Reth"
+
+[lints]
+workspace = true
+
+[dependencies]
+# reth
+reth-exex.workspace = true
+reth-execution-types.workspace = true
+reth-node-api.workspace = true
+reth-trie.workspace = true
+reth-provider.workspace = true
+
+# op-reth
+# proofs exex handles `TrieUpdates` in notifications
+reth-optimism-trie = { workspace = true, features = ["serde-bincode-compat"] }
+
+# alloy
+alloy-consensus.workspace = true
+alloy-eips.workspace = true
+
+# misc
+eyre.workspace = true
+futures-util.workspace = true
+tracing.workspace = true
+tokio.workspace = true
+
+[dev-dependencies]
+futures.workspace = true
+reth-db = { workspace = true, features = ["op", "test-utils"] }
+reth-node-builder.workspace = true
+reth-optimism-node.workspace = true
+reth-optimism-chainspec.workspace = true
+reth-primitives-traits.workspace = true
+reth-ethereum-primitives.workspace = true
+reth-exex-test-utils.workspace = true
+tempfile.workspace = true
+
+[features]
+test-utils = [
+    "reth-db/test-utils",
+    "reth-trie/test-utils",
+    "reth-node-builder/test-utils",
+    "reth-optimism-node/test-utils",
+    "reth-provider/test-utils",
+    "reth-ethereum-primitives/test-utils",
+    "reth-primitives-traits/test-utils",
+]
+metrics = [
+	"reth-optimism-trie/metrics",
+	"reth-trie/metrics"
+]
+
+[package.metadata.cargo-udeps.ignore]
+development = [
+    "reth-node-builder",
+    "reth-optimism-node",
+    "reth-optimism-chainspec",
+    "tempfile.workspace",
+]
diff --git a/rust/op-reth/crates/exex/src/lib.rs b/rust/op-reth/crates/exex/src/lib.rs
new file mode 100644
index 0000000000000..0e12a14e2d82b
--- /dev/null
+++ b/rust/op-reth/crates/exex/src/lib.rs
@@ -0,0 +1,1124 @@
+//! ExEx unique for OP-Reth. See also [`reth_exex`] for more op-reth execution extensions.
+
+#![doc(
+    html_logo_url = "https://raw.githubusercontent.com/paradigmxyz/reth/main/assets/reth-docs.png",
+    html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
+    issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
+)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
+
+use alloy_consensus::BlockHeader;
+use alloy_eips::eip1898::BlockWithParent;
+use futures_util::TryStreamExt;
+use reth_execution_types::Chain;
+use reth_exex::{ExExContext, ExExEvent, ExExNotification};
+use reth_node_api::{FullNodeComponents, NodePrimitives, NodeTypes};
+use reth_optimism_trie::{
+    OpProofStoragePrunerTask, OpProofsStorage, OpProofsStore, live::LiveTrieCollector,
+};
+use reth_provider::{BlockNumReader, BlockReader, TransactionVariant};
+use reth_trie::{HashedPostStateSorted, SortedTrieData, updates::TrieUpdatesSorted};
+use std::{sync::Arc, time::Duration};
+use tokio::{sync::watch, task, time};
+use tracing::{debug, error, info};
+
+// Safety threshold for maximum blocks to prune automatically on startup.
+// If the required prune exceeds this, the node will error out and require manual pruning. Default
+// is 1000 blocks.
+const MAX_PRUNE_BLOCKS_STARTUP: u64 = 1000;
+
+/// How many blocks to process in a single batch before yielding. Default is 50 blocks.
+const SYNC_BLOCKS_BATCH_SIZE: usize = 50;
+
+/// How close to tip before we process blocks in real-time vs batch. Default is 1024 blocks.
+const REAL_TIME_BLOCKS_THRESHOLD: u64 = 1024;
+
+/// How long to sleep when sync task is caught up. Default is 5 seconds.
+const SYNC_IDLE_SLEEP_SECS: u64 = 5;
+
+/// Default proofs history window: 1 month of blocks at 2s block time
+const DEFAULT_PROOFS_HISTORY_WINDOW: u64 = 1_296_000;
+
+/// Default interval between proof-storage prune runs. Default is 15 seconds.
+const DEFAULT_PRUNE_INTERVAL: Duration = Duration::from_secs(15);
+
+/// Default verification interval: disabled
+const DEFAULT_VERIFICATION_INTERVAL: u64 = 0; // disabled
+
+/// Builder for [`OpProofsExEx`].
+#[derive(Debug)]
+pub struct OpProofsExExBuilder<Node, Storage>
+where
+    Node: FullNodeComponents,
+{
+    ctx: ExExContext<Node>,
+    storage: OpProofsStorage<Storage>,
+    proofs_history_window: u64,
+    proofs_history_prune_interval: Duration,
+    verification_interval: u64,
+}
+
+impl<Node, Storage> OpProofsExExBuilder<Node, Storage>
+where
+    Node: FullNodeComponents,
+{
+    /// Create a new builder with required parameters and defaults.
+    pub const fn new(ctx: ExExContext<Node>, storage: OpProofsStorage<Storage>) -> Self {
+        Self {
+            ctx,
+            storage,
+            proofs_history_window: DEFAULT_PROOFS_HISTORY_WINDOW,
+            proofs_history_prune_interval: DEFAULT_PRUNE_INTERVAL,
+            verification_interval: DEFAULT_VERIFICATION_INTERVAL,
+        }
+    }
+
+    /// Sets the window to span blocks for proofs history.
+    pub const fn with_proofs_history_window(mut self, window: u64) -> Self {
+        self.proofs_history_window = window;
+        self
+    }
+
+    /// Sets the interval between proof-storage prune runs.
+    pub const fn with_proofs_history_prune_interval(mut self, interval: Duration) -> Self {
+        self.proofs_history_prune_interval = interval;
+        self
+    }
+
+    /// Sets the verification interval.
+    pub const fn with_verification_interval(mut self, interval: u64) -> Self {
+        self.verification_interval = interval;
+        self
+    }
+
+    /// Builds the [`OpProofsExEx`].
+    pub fn build(self) -> OpProofsExEx<Node, Storage> {
+        OpProofsExEx {
+            ctx: self.ctx,
+            storage: self.storage,
+            proofs_history_window: self.proofs_history_window,
+            proofs_history_prune_interval: self.proofs_history_prune_interval,
+            verification_interval: self.verification_interval,
+        }
+    }
+}
+
+/// OP Proofs ExEx - processes blocks and tracks state changes within fault proof window.
+///
+/// Saves and serves trie nodes to make proofs faster. This handles the process of
+/// saving the current state, new blocks as they're added, and serving proof RPCs
+/// based on the saved data.
+///
+/// # Examples
+///
+/// The following example shows how to install the ExEx with either in-memory or persistent storage.
+/// This can be used when launching an OP-Reth node via a binary.
+/// We are currently using it in optimism/bin/src/main.rs.
+///
+/// ```
+/// use futures_util::FutureExt;
+/// use reth_db::test_utils::create_test_rw_db;
+/// use reth_node_api::NodeTypesWithDBAdapter;
+/// use reth_node_builder::{NodeBuilder, NodeConfig};
+/// use reth_optimism_chainspec::BASE_MAINNET;
+/// use reth_optimism_exex::OpProofsExEx;
+/// use reth_optimism_node::{OpNode, args::RollupArgs};
+/// use reth_optimism_trie::{InMemoryProofsStorage, OpProofsStorage, db::MdbxProofsStorage};
+/// use reth_provider::providers::BlockchainProvider;
+/// use std::{sync::Arc, time::Duration};
+///
+/// let config = NodeConfig::new(BASE_MAINNET.clone());
+/// let db = create_test_rw_db();
+/// let args = RollupArgs::default();
+/// let op_node = OpNode::new(args);
+///
+/// // Create in-memory or persistent storage
+/// let storage: OpProofsStorage<Arc<InMemoryProofsStorage>> =
+///     Arc::new(InMemoryProofsStorage::new()).into();
+///
+/// // Example for creating persistent storage
+/// # let temp_dir = tempfile::tempdir().expect("Failed to create temp dir");
+/// # let storage_path = temp_dir.path().join("proofs_storage");
+///
+/// # let storage: OpProofsStorage<Arc<MdbxProofsStorage>> = Arc::new(
+/// #    MdbxProofsStorage::new(&storage_path).expect("Failed to create MdbxProofsStorage"),
+/// # ).into();
+///
+/// let storage_exec = storage.clone();
+/// let proofs_history_window = 1_296_000u64;
+/// let proofs_history_prune_interval = Duration::from_secs(3600);
+///
+/// // Verification interval: perform full execution every N blocks
+/// let verification_interval = 0; // 0 = disabled, 100 = verify every 100 blocks
+///
+/// // Can also use install_exex_if along with a boolean flag
+/// // Set this based on your configuration or CLI args
+/// let _builder = NodeBuilder::new(config)
+///     .with_database(db)
+///     .with_types_and_provider::<OpNode, BlockchainProvider<NodeTypesWithDBAdapter<OpNode, _>>>()
+///     .with_components(op_node.components())
+///     .install_exex("proofs-history", move |exex_context| async move {
+///         Ok(OpProofsExEx::builder(exex_context, storage_exec)
+///             .with_proofs_history_window(proofs_history_window)
+///             .with_proofs_history_prune_interval(proofs_history_prune_interval)
+///             .with_verification_interval(verification_interval)
+///             .build()
+///             .run()
+///             .boxed())
+///     })
+///     .on_node_started(|_full_node| Ok(()))
+///     .check_launch();
+/// ```
+#[derive(Debug)]
+pub struct OpProofsExEx<Node, Storage>
+where
+    Node: FullNodeComponents,
+{
+    /// The ExEx context containing the node related utilities e.g. provider, notifications,
+    /// events.
+    ctx: ExExContext<Node>,
+    /// The type of storage DB.
+    storage: OpProofsStorage<Storage>,
+    /// The window to span blocks for proofs history. Value is the number of blocks, received as
+    /// cli arg.
+    proofs_history_window: u64,
+    /// Interval between proof-storage prune runs
+    proofs_history_prune_interval: Duration,
+    /// Verification interval: perform full block execution every N blocks for data integrity.
+    /// If 0, verification is disabled (always use fast path when available).
+    /// If 1, verification is always enabled (always execute blocks).
+    verification_interval: u64,
+}
+
+impl<Node, Storage> OpProofsExEx<Node, Storage>
+where
+    Node: FullNodeComponents,
+{
+    /// Create a new `OpProofsExEx` instance.
+    pub fn new(ctx: ExExContext<Node>, storage: OpProofsStorage<Storage>) -> Self {
+        OpProofsExExBuilder::new(ctx, storage).build()
+    }
+
+    /// Create a new builder for `OpProofsExEx`.
+    pub const fn builder(
+        ctx: ExExContext<Node>,
+        storage: OpProofsStorage<Storage>,
+    ) -> OpProofsExExBuilder<Node, Storage> {
+        OpProofsExExBuilder::new(ctx, storage)
+    }
+}
+
+impl<Node, Storage, Primitives> OpProofsExEx<Node, Storage>
+where
+    Node: FullNodeComponents<Types: NodeTypes<Primitives = Primitives>>,
+    Primitives: NodePrimitives,
+    Storage: OpProofsStore + Clone + 'static,
+{
+    /// Main execution loop for the ExEx
+    pub async fn run(mut self) -> eyre::Result<()> {
+        self.ensure_initialized()?;
+        let sync_target_tx = self.spawn_sync_task();
+
+        let prune_task = OpProofStoragePrunerTask::new(
+            self.storage.clone(),
+            self.ctx.provider().clone(),
+            self.proofs_history_window,
+            self.proofs_history_prune_interval,
+        );
+        self.ctx
+            .task_executor()
+            .spawn_with_graceful_shutdown_signal(|signal| Box::pin(prune_task.run(signal)));
+
+        let collector = LiveTrieCollector::new(
+            self.ctx.evm_config().clone(),
+            self.ctx.provider().clone(),
+            &self.storage,
+        );
+
+        while let Some(notification) = self.ctx.notifications.try_next().await? {
+            self.handle_notification(notification, &collector, &sync_target_tx)?;
+        }
+
+        Ok(())
+    }
+
+    /// Ensure proofs storage is initialized
+    fn ensure_initialized(&self) -> eyre::Result<()> {
+        // Check if proofs storage is initialized
+        let earliest_block_number = match self.storage.get_earliest_block_number()? {
+            Some((n, _)) => n,
+            None => {
+                return Err(eyre::eyre!(
+                    "Proofs storage not initialized. Please run 'op-reth initialize-op-proofs --proofs-history.storage-path <PATH>' first."
+                ));
+            }
+        };
+
+        let latest_block_number = match self.storage.get_latest_block_number()? {
+            Some((n, _)) => n,
+            None => {
+                return Err(eyre::eyre!(
+                    "Proofs storage not initialized. Please run 'op-reth initialize-op-proofs --proofs-history.storage-path <PATH>' first."
+                ));
+            }
+        };
+
+        // Check if we have accumulated too much history for the configured window.
+        // If the gap between what we have and what we want to keep is too large, the auto-pruner
+        // will stall the node.
+        let target_earliest = latest_block_number.saturating_sub(self.proofs_history_window);
+        if target_earliest > earliest_block_number {
+            let blocks_to_prune = target_earliest - earliest_block_number;
+            if blocks_to_prune > MAX_PRUNE_BLOCKS_STARTUP {
+                return Err(eyre::eyre!(
+                    "Configuration requires pruning {} blocks, which exceeds the safety threshold of {}. \
+                     Huge prune operations can stall the node. \
+                     Please run 'op-reth proofs prune' manually before starting the node.",
+                    blocks_to_prune,
+                    MAX_PRUNE_BLOCKS_STARTUP
+                ));
+            }
+        }
+
+        // Need to update the earliest block metric on startup as this is not called frequently and
+        // can show outdated info. When metrics are disabled, this is a no-op.
+        #[cfg(feature = "metrics")]
+        {
+            self.storage
+                .metrics()
+                .block_metrics()
+                .earliest_number
+                .set(earliest_block_number as f64);
+        }
+
+        Ok(())
+    }
+
+    /// Spawn the background sync task and return the target sender
+    fn spawn_sync_task(&self) -> watch::Sender<u64> {
+        let (sync_target_tx, sync_target_rx) = watch::channel(0u64);
+
+        let task_storage = self.storage.clone();
+        let task_provider = self.ctx.provider().clone();
+        let task_evm_config = self.ctx.evm_config().clone();
+
+        self.ctx.task_executor().spawn_critical_task(
+            "optimism::exex::proofs_storage_sync_loop",
+            async move {
+                let storage = task_storage.clone();
+                let task_collector =
+                    LiveTrieCollector::new(task_evm_config, task_provider.clone(), &storage);
+                Self::sync_loop(sync_target_rx, task_storage, task_provider, &task_collector).await;
+            },
+        );
+
+        sync_target_tx
+    }
+
+    /// Background sync loop that processes blocks up to the target
+    async fn sync_loop(
+        mut sync_target_rx: watch::Receiver<u64>,
+        storage: OpProofsStorage<Storage>,
+        provider: Node::Provider,
+        collector: &LiveTrieCollector<'_, Node::Evm, Node::Provider, Storage>,
+    ) {
+        debug!(target: "optimism::exex", "Starting proofs storage sync loop");
+
+        loop {
+            let target = *sync_target_rx.borrow_and_update();
+            let latest = match storage.get_latest_block_number() {
+                Ok(Some((n, _))) => n,
+                Ok(None) => {
+                    error!(target: "optimism::exex", "No blocks stored in proofs storage during sync loop");
+                    continue;
+                }
+                Err(e) => {
+                    error!(target: "optimism::exex", error = ?e, "Failed to get latest block");
+                    continue;
+                }
+            };
+
+            if latest >= target {
+                time::sleep(Duration::from_secs(SYNC_IDLE_SLEEP_SECS)).await;
+                continue;
+            }
+
+            // Process one batch
+            if let Err(e) =
+                Self::process_batch(latest, target, &provider, collector, SYNC_BLOCKS_BATCH_SIZE)
+            {
+                error!(target: "optimism::exex", error = ?e, "Batch processing failed");
+            }
+
+            // Yield to allow other tasks to run
+            debug!(target: "optimism::exex", latest_stored = latest, target, "Batch processed, yielding");
+            task::yield_now().await;
+        }
+    }
+
+    /// Process a batch of blocks from start to target (up to `batch_size`)
+    fn process_batch(
+        start: u64,
+        target: u64,
+        provider: &Node::Provider,
+        collector: &LiveTrieCollector<'_, Node::Evm, Node::Provider, Storage>,
+        batch_size: usize,
+    ) -> eyre::Result<()> {
+        let end = (start + batch_size as u64).min(target);
+        debug!(
+            target: "optimism::exex",
+            start,
+            end,
+            "Processing proofs storage sync batch"
+        );
+
+        for block_num in (start + 1)..=end {
+            let block = provider
+                .recovered_block(block_num.into(), TransactionVariant::NoHash)?
+                .ok_or_else(|| eyre::eyre!("Missing block {}", block_num))?;
+
+            collector.execute_and_store_block_updates(&block)?;
+        }
+
+        Ok(())
+    }
+
+    fn handle_notification(
+        &self,
+        notification: ExExNotification<Primitives>,
+        collector: &LiveTrieCollector<'_, Node::Evm, Node::Provider, Storage>,
+        sync_target_tx: &watch::Sender<u64>,
+    ) -> eyre::Result<()> {
+        let latest_stored = match self.storage.get_latest_block_number()? {
+            Some((n, _)) => n,
+            None => {
+                return Err(eyre::eyre!("No blocks stored in proofs storage"));
+            }
+        };
+
+        match &notification {
+            ExExNotification::ChainCommitted { new } => {
+                self.handle_chain_committed(new.clone(), latest_stored, collector, sync_target_tx)?
+            }
+            ExExNotification::ChainReorged { old, new } => {
+                self.handle_chain_reorged(old.clone(), new.clone(), latest_stored, collector)?
+            }
+            ExExNotification::ChainReverted { old } => {
+                self.handle_chain_reverted(old.clone(), latest_stored, collector)?
+            }
+        }
+
+        if let Some(committed_chain) = notification.committed_chain() {
+            self.ctx.events.send(ExExEvent::FinishedHeight(committed_chain.tip().num_hash()))?;
+        }
+
+        Ok(())
+    }
+
+    fn handle_chain_committed(
+        &self,
+        new: Arc<Chain<Primitives>>,
+        latest_stored: u64,
+        collector: &LiveTrieCollector<'_, Node::Evm, Node::Provider, Storage>,
+        sync_target_tx: &watch::Sender<u64>,
+    ) -> eyre::Result<()> {
+        debug!(
+            target: "optimism::exex",
+            block_number = new.tip().number(),
+            block_hash = ?new.tip().hash(),
+            "ChainCommitted notification received",
+        );
+
+        // If tip is not newer than what we have, nothing to do.
+        if new.tip().number() <= latest_stored {
+            debug!(
+                target: "optimism::exex",
+                block_number = new.tip().number(),
+                latest_stored,
+                "Already processed, skipping"
+            );
+            return Ok(());
+        }
+
+        let best_block = self.ctx.provider().best_block_number()?;
+        let is_sequential = new.tip().number() == latest_stored + 1;
+        let is_near_tip =
+            best_block.saturating_sub(new.tip().number()) < REAL_TIME_BLOCKS_THRESHOLD;
+
+        if is_sequential && is_near_tip {
+            debug!(
+                target: "optimism::exex",
+                block_number = new.tip().number(),
+                latest_stored,
+                best_block,
+                "Processing in real-time"
+            );
+
+            // Process each block from latest_stored + 1 to tip
+            let start = latest_stored.saturating_add(1);
+            for block_number in start..=new.tip().number() {
+                self.process_block(block_number, &new, collector)?;
+            }
+        } else {
+            debug!(
+                target: "optimism::exex",
+                block_number = new.tip().number(),
+                latest_stored,
+                best_block,
+                is_sequential,
+                is_near_tip,
+                "Scheduling batch processing via sync task"
+            );
+
+            // Update the sync target to the new tip
+            sync_target_tx.send(new.tip().number())?;
+        }
+
+        Ok(())
+    }
+
+    /// Process a single block - either from chain or provider
+    fn process_block(
+        &self,
+        block_number: u64,
+        chain: &Chain<Primitives>,
+        collector: &LiveTrieCollector<'_, Node::Evm, Node::Provider, Storage>,
+    ) -> eyre::Result<()> {
+        // Check if this block should be verified via full execution
+        let should_verify = self.verification_interval > 0 &&
+            block_number.is_multiple_of(self.verification_interval);
+
+        // Try to get block data from the chain first
+        // 1. Fast Path: Try to use pre-computed state from the notification
+        if let Some(block) = chain.blocks().get(&block_number) {
+            // Check if we have BOTH trie updates and hashed state.
+            // If either is missing, we fall back to execution to ensure data integrity.
+            if let Some((trie_updates, hashed_state)) = chain.trie_data_at(block_number).map(|d| {
+                let SortedTrieData { hashed_state, trie_updates } = d.get();
+                (trie_updates, hashed_state)
+            }) {
+                // Use fast path only if we're not scheduled to verify this block
+                if !should_verify {
+                    debug!(
+                        target: "optimism::exex",
+                        block_number,
+                        "Using pre-computed state updates from notification"
+                    );
+
+                    collector.store_block_updates(
+                        block.block_with_parent(),
+                        (**trie_updates).clone(),
+                        (**hashed_state).clone(),
+                    )?;
+
+                    return Ok(());
+                }
+
+                info!(
+                    target: "optimism::exex",
+                    block_number,
+                    verification_interval = self.verification_interval,
+                    "Periodic verification: performing full block execution"
+                );
+            }
+
+            debug!(
+                target: "optimism::exex",
+                block_number,
+                "Block present in notification but state updates missing, falling back to execution"
+            );
+        }
+
+        // 2. Slow Path: Block not in chain (or state missing), fetch from provider and execute
+        debug!(
+            target: "optimism::exex",
+            block_number,
+            "Fetching block from provider for execution",
+        );
+
+        let block = self
+            .ctx
+            .provider()
+            .recovered_block(block_number.into(), TransactionVariant::NoHash)?
+            .ok_or_else(|| eyre::eyre!("Missing block {} in provider", block_number))?;
+
+        collector.execute_and_store_block_updates(&block)?;
+        Ok(())
+    }
+
+    fn handle_chain_reorged(
+        &self,
+        old: Arc<Chain<Primitives>>,
+        new: Arc<Chain<Primitives>>,
+        latest_stored: u64,
+        collector: &LiveTrieCollector<'_, Node::Evm, Node::Provider, Storage>,
+    ) -> eyre::Result<()> {
+        info!(
+            old_block_number = old.tip().number(),
+            old_block_hash = ?old.tip().hash(),
+            new_block_number = new.tip().number(),
+            new_block_hash = ?new.tip().hash(),
+            "ChainReorged notification received",
+        );
+
+        if old.first().number() > latest_stored {
+            debug!(target: "optimism::exex", "Reorg beyond stored blocks, skipping");
+            return Ok(());
+        }
+
+        // find the common ancestor
+        let mut block_updates: Vec<(
+            BlockWithParent,
+            Arc<TrieUpdatesSorted>,
+            Arc<HashedPostStateSorted>,
+        )> = Vec::with_capacity(new.len());
+        for block_number in new.blocks().keys() {
+            // verify if the fork point matches
+            if old.fork_block() != new.fork_block() {
+                return Err(eyre::eyre!(
+                    "Fork blocks do not match: old fork block {:?}, new fork block {:?}",
+                    old.fork_block(),
+                    new.fork_block()
+                ));
+            }
+
+            let block = new
+                .blocks()
+                .get(block_number)
+                .ok_or_else(|| eyre::eyre!("Missing block {} in new chain", block_number))?;
+            let trie_data = new
+                .trie_data_at(*block_number)
+                .ok_or_else(|| {
+                    eyre::eyre!("Missing Trie data for block {} in new chain", block_number)
+                })?
+                .get();
+            let trie_updates = &trie_data.trie_updates;
+            let hashed_state = &trie_data.hashed_state;
+
+            block_updates.push((
+                block.block_with_parent(),
+                trie_updates.clone(),
+                hashed_state.clone(),
+            ));
+        }
+
+        collector.unwind_and_store_block_updates(block_updates)?;
+
+        Ok(())
+    }
+
+    fn handle_chain_reverted(
+        &self,
+        old: Arc<Chain<Primitives>>,
+        latest_stored: u64,
+        collector: &LiveTrieCollector<'_, Node::Evm, Node::Provider, Storage>,
+    ) -> eyre::Result<()> {
+        info!(
+            target: "optimism::exex",
+            old_block_number = old.tip().number(),
+            old_block_hash = ?old.tip().hash(),
+            "ChainReverted notification received",
+        );
+
+        if old.first().number() > latest_stored {
+            debug!(
+                target: "optimism::exex",
+                first_block_number = old.first().number(),
+                latest_stored = latest_stored,
+                "Fork block number is greater than latest stored, skipping",
+            );
+            return Ok(());
+        }
+
+        collector.unwind_history(old.first().block_with_parent())?;
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use alloy_consensus::private::alloy_primitives::B256;
+    use alloy_eips::{BlockNumHash, NumHash, eip1898::BlockWithParent};
+    use reth_db::test_utils::tempdir_path;
+    use reth_ethereum_primitives::{Block, Receipt};
+    use reth_execution_types::{Chain, ExecutionOutcome};
+    use reth_optimism_trie::{
+        BlockStateDiff, OpProofsStorage, OpProofsStore, db::MdbxProofsStorage,
+    };
+    use reth_primitives_traits::RecoveredBlock;
+    use reth_trie::{HashedPostStateSorted, LazyTrieData, updates::TrieUpdatesSorted};
+    use std::{collections::BTreeMap, default::Default, sync::Arc, time::Duration};
+
+    // -------------------------------------------------------------------------
+    // Helpers: deterministic blocks and deterministic Chain with precomputed updates
+    // -------------------------------------------------------------------------
+    fn b256(byte: u8) -> B256 {
+        B256::new([byte; 32])
+    }
+
+    // deterministic hash from block number: 0 -> 0x00.., 1 -> 0x01.., etc.
+    fn hash_for_num(num: u64) -> B256 {
+        // if you only care about small test numbers, this is enough:
+        b256(num as u8)
+
+        // If you want to avoid wrapping when num > 255, use something like:
+        // let mut out = [0u8; 32];
+        // out[0..8].copy_from_slice(&num.to_be_bytes());
+        // B256::new(out)
+    }
+
+    fn mk_block(num: u64) -> RecoveredBlock<Block> {
+        let mut b: RecoveredBlock<Block> = Default::default();
+        b.set_block_number(num);
+        b.set_hash(hash_for_num(num));
+        b.set_parent_hash(hash_for_num(num - 1));
+        b
+    }
+
+    fn mk_chain_with_updates(
+        from: u64,
+        to: u64,
+        hash_override: Option<B256>,
+    ) -> Chain<reth_ethereum_primitives::EthPrimitives> {
+        let mut blocks: Vec<RecoveredBlock<Block>> = Vec::new();
+        let mut trie_data = BTreeMap::new();
+
+        for n in from..=to {
+            let mut b = mk_block(n);
+            if let Some(hash) = hash_override {
+                b.set_hash(hash);
+            }
+            blocks.push(b);
+
+            let data = LazyTrieData::ready(
+                Arc::new(HashedPostStateSorted::default()),
+                Arc::new(TrieUpdatesSorted::default()),
+            );
+            trie_data.insert(n, data);
+        }
+
+        let execution_outcome: ExecutionOutcome<Receipt> = ExecutionOutcome {
+            bundle: Default::default(),
+            receipts: Vec::new(),
+            requests: Vec::new(),
+            first_block: from,
+        };
+
+        Chain::new(blocks, execution_outcome, trie_data)
+    }
+
+    // Init_storage to the genesis block
+    fn init_storage<S: OpProofsStore>(storage: OpProofsStorage<S>) {
+        let genesis_block = NumHash::new(0, b256(0x00));
+        storage
+            .set_earliest_block_number(genesis_block.number, genesis_block.hash)
+            .expect("set earliest");
+        storage
+            .store_trie_updates(
+                BlockWithParent::new(genesis_block.hash, genesis_block),
+                BlockStateDiff::default(),
+            )
+            .expect("store trie update");
+    }
+
+    // Initialize exex with config
+    fn build_test_exex<NodeT, Store>(
+        ctx: ExExContext<NodeT>,
+        storage: OpProofsStorage<Store>,
+    ) -> OpProofsExEx<NodeT, Store>
+    where
+        NodeT: FullNodeComponents,
+        Store: OpProofsStore + Clone + 'static,
+    {
+        OpProofsExEx::builder(ctx, storage)
+            .with_proofs_history_window(20)
+            .with_proofs_history_prune_interval(Duration::from_secs(3600))
+            .with_verification_interval(1000)
+            .build()
+    }
+
+    #[tokio::test]
+    async fn handle_notification_chain_committed() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let collector = LiveTrieCollector::new(
+            ctx.components.components.evm_config.clone(),
+            ctx.components.provider.clone(),
+            &proofs,
+        );
+        let exex = build_test_exex(ctx, proofs.clone());
+
+        // Notification: chain committed 1..5
+        let new_chain = Arc::new(mk_chain_with_updates(1, 1, None));
+        let notif = ExExNotification::ChainCommitted { new: new_chain };
+
+        let (sync_target_tx, _) = tokio::sync::watch::channel(0u64);
+
+        exex.handle_notification(notif, &collector, &sync_target_tx).expect("handle chain commit");
+
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 1);
+    }
+
+    #[tokio::test]
+    async fn handle_notification_chain_committed_skips_already_processed() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let collector = LiveTrieCollector::new(
+            ctx.components.components.evm_config.clone(),
+            ctx.components.provider.clone(),
+            &proofs,
+        );
+
+        let exex = build_test_exex(ctx, proofs.clone());
+
+        let (sync_target_tx, _) = tokio::sync::watch::channel(0u64);
+        // Process blocks 1..5 sequentially to trigger real-time path (synchronous)
+        for i in 1..=5 {
+            let new_chain = Arc::new(mk_chain_with_updates(i, i, None));
+            let notif = ExExNotification::ChainCommitted { new: new_chain };
+            exex.handle_notification(notif, &collector, &sync_target_tx)
+                .expect("handle chain commit");
+        }
+
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 5);
+
+        // Try to handle already processed notification
+        let new_chain = Arc::new(mk_chain_with_updates(5, 5, Some(hash_for_num(10))));
+        let notif = ExExNotification::ChainCommitted { new: new_chain };
+        exex.handle_notification(notif, &collector, &sync_target_tx).expect("handle chain commit");
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok");
+        assert_eq!(latest.0, 5);
+        assert_eq!(latest.1, hash_for_num(5)); // block was not updated
+    }
+
+    #[tokio::test]
+    async fn handle_notification_chain_reorged() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let collector = LiveTrieCollector::new(
+            ctx.components.components.evm_config.clone(),
+            ctx.components.provider.clone(),
+            &proofs,
+        );
+
+        let exex = build_test_exex(ctx, proofs.clone());
+
+        let (sync_target_tx, _) = tokio::sync::watch::channel(0u64);
+
+        for i in 1..=10 {
+            let new_chain = Arc::new(mk_chain_with_updates(i, i, None));
+            let notif = ExExNotification::ChainCommitted { new: new_chain };
+            exex.handle_notification(notif, &collector, &sync_target_tx)
+                .expect("handle chain commit");
+        }
+
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 10);
+
+        // Now the tip is 10, and we want to reorg from block 6..12
+        let old_chain = Arc::new(mk_chain_with_updates(6, 10, None));
+        let new_chain = Arc::new(mk_chain_with_updates(6, 12, None));
+
+        // Notification: chain reorged 6..12
+        let notif = ExExNotification::ChainReorged { new: new_chain, old: old_chain };
+
+        exex.handle_notification(notif, &collector, &sync_target_tx)
+            .expect("handle chain re-orged");
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 12);
+    }
+
+    #[tokio::test]
+    async fn handle_notification_chain_reorged_skips_beyond_stored_blocks() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let collector = LiveTrieCollector::new(
+            ctx.components.components.evm_config.clone(),
+            ctx.components.provider.clone(),
+            &proofs,
+        );
+
+        let exex = build_test_exex(ctx, proofs.clone());
+
+        let (sync_target_tx, _) = tokio::sync::watch::channel(0u64);
+
+        for i in 1..=10 {
+            let new_chain = Arc::new(mk_chain_with_updates(i, i, None));
+            let notif = ExExNotification::ChainCommitted { new: new_chain };
+
+            exex.handle_notification(notif, &collector, &sync_target_tx)
+                .expect("handle chain commit");
+        }
+
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 10);
+
+        // Now the tip is 10, and we want to reorg from block 12..15
+        let old_chain = Arc::new(mk_chain_with_updates(12, 15, None));
+        let new_chain = Arc::new(mk_chain_with_updates(10, 20, None));
+
+        // Notification: chain reorged 12..15
+        let notif = ExExNotification::ChainReorged { new: new_chain, old: old_chain };
+
+        exex.handle_notification(notif, &collector, &sync_target_tx)
+            .expect("handle chain re-orged");
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 10);
+    }
+
+    #[tokio::test]
+    async fn handle_notification_chain_reverted() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let collector = LiveTrieCollector::new(
+            ctx.components.components.evm_config.clone(),
+            ctx.components.provider.clone(),
+            &proofs,
+        );
+
+        let exex = build_test_exex(ctx, proofs.clone());
+
+        let (sync_target_tx, _) = tokio::sync::watch::channel(0u64);
+
+        for i in 1..=10 {
+            let new_chain = Arc::new(mk_chain_with_updates(i, i, None));
+            let notif = ExExNotification::ChainCommitted { new: new_chain };
+
+            exex.handle_notification(notif, &collector, &sync_target_tx)
+                .expect("handle chain commit");
+        }
+
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 10);
+
+        // Now the tip is 10, and we want to revert from block 9..10
+        let old_chain = Arc::new(mk_chain_with_updates(9, 10, None));
+
+        // Notification: chain reverted 9..10
+        let notif = ExExNotification::ChainReverted { old: old_chain };
+
+        exex.handle_notification(notif, &collector, &sync_target_tx)
+            .expect("handle chain reverted");
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 8);
+    }
+
+    #[tokio::test]
+    async fn handle_notification_chain_reverted_skips_beyond_stored_blocks() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let collector = LiveTrieCollector::new(
+            ctx.components.components.evm_config.clone(),
+            ctx.components.provider.clone(),
+            &proofs,
+        );
+
+        let exex = build_test_exex(ctx, proofs.clone());
+
+        let (sync_target_tx, _) = tokio::sync::watch::channel(0u64);
+
+        for i in 1..=5 {
+            let new_chain = Arc::new(mk_chain_with_updates(i, i, None));
+            let notif = ExExNotification::ChainCommitted { new: new_chain };
+
+            exex.handle_notification(notif, &collector, &sync_target_tx)
+                .expect("handle chain commit");
+        }
+
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 5);
+
+        // Now the tip is 10, and we want to revert from block 9..10
+        let old_chain = Arc::new(mk_chain_with_updates(9, 10, None));
+
+        // Notification: chain reverted 9..10
+        let notif = ExExNotification::ChainReverted { old: old_chain };
+
+        exex.handle_notification(notif, &collector, &sync_target_tx)
+            .expect("handle chain reverted");
+        let latest = proofs.get_latest_block_number().expect("get latest block").expect("ok").0;
+        assert_eq!(latest, 5);
+    }
+
+    #[tokio::test]
+    async fn ensure_initialized_errors_on_storage_not_initialized() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let exex = build_test_exex(ctx, proofs.clone());
+        let _ = exex.ensure_initialized().expect_err("should return error");
+    }
+
+    #[tokio::test]
+    async fn ensure_initialized_errors_when_prune_exceeds_threshold() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        for i in 1..1100 {
+            proofs
+                .store_trie_updates(
+                    BlockWithParent::new(
+                        hash_for_num(i - 1),
+                        BlockNumHash::new(i, hash_for_num(i)),
+                    ),
+                    BlockStateDiff::default(),
+                )
+                .expect("store trie update");
+        }
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let exex = build_test_exex(ctx, proofs.clone());
+        let _ = exex.ensure_initialized().expect_err("should return error");
+    }
+
+    #[tokio::test]
+    async fn ensure_initialized_succeeds() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let exex = build_test_exex(ctx, proofs.clone());
+        exex.ensure_initialized().expect("should not return error");
+    }
+
+    #[tokio::test]
+    async fn handle_notification_errors_on_empty_storage() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let collector = LiveTrieCollector::new(
+            ctx.components.components.evm_config.clone(),
+            ctx.components.provider.clone(),
+            &proofs,
+        );
+
+        let exex = build_test_exex(ctx, proofs.clone());
+
+        // Any notification will do
+        let new_chain = Arc::new(mk_chain_with_updates(1, 5, None));
+        let notif = ExExNotification::ChainCommitted { new: new_chain };
+
+        let (sync_target_tx, _) = tokio::sync::watch::channel(0u64);
+        let err = exex.handle_notification(notif, &collector, &sync_target_tx).unwrap_err();
+        assert_eq!(err.to_string(), "No blocks stored in proofs storage");
+    }
+
+    #[tokio::test]
+    async fn handle_notification_schedules_async_on_gap() {
+        // MDBX proofs storage
+        let dir = tempdir_path();
+        let store = Arc::new(MdbxProofsStorage::new(dir.as_path()).expect("env"));
+        let proofs: OpProofsStorage<Arc<MdbxProofsStorage>> = store.clone().into();
+
+        init_storage(proofs.clone());
+
+        let (ctx, _handle) =
+            reth_exex_test_utils::test_exex_context().await.expect("exex test context");
+
+        let collector = LiveTrieCollector::new(
+            ctx.components.components.evm_config.clone(),
+            ctx.components.provider.clone(),
+            &proofs,
+        );
+        let exex = build_test_exex(ctx, proofs.clone());
+
+        // Notification: chain committed 5..10 (Blocks 1,2,3,4 are missing from storage)
+        let new_chain = Arc::new(mk_chain_with_updates(5, 10, None));
+        let notif = ExExNotification::ChainCommitted { new: new_chain };
+
+        let (sync_target_tx, mut sync_target_rx) = tokio::sync::watch::channel(0u64);
+
+        // Process notification
+        exex.handle_notification(notif, &collector, &sync_target_tx)
+            .expect("handle chain commit should return ok immediately");
+
+        // Verify async signal was sent
+        // The target in the channel should now be 10 (the tip of the new chain)
+        assert_eq!(
+            *sync_target_rx.borrow_and_update(),
+            10,
+            "Should have scheduled sync to block 10"
+        );
+
+        // Verify Main Thread did NOT process it
+        // Because we didn't spawn the actual worker thread in this test, storage should still be at
+        // 0. This proves the 'handle_notification' returned instantly without doing the
+        // heavy lifting.
+        let latest = proofs.get_latest_block_number().expect("get").expect("ok").0;
+        assert_eq!(latest, 0, "Main thread should not have processed the blocks synchronously");
+    }
+}
diff --git a/rust/op-reth/crates/flashblocks/Cargo.toml b/rust/op-reth/crates/flashblocks/Cargo.toml
index 413bbe0f0311c..e6b02a1d72c2a 100644
--- a/rust/op-reth/crates/flashblocks/Cargo.toml
+++ b/rust/op-reth/crates/flashblocks/Cargo.toml
@@ -4,8 +4,8 @@ version = "1.10.2"
 edition.workspace = true
 rust-version.workspace = true
 license.workspace = true
-homepage = "https://paradigmxyz.github.io/reth"
-repository = "https://github.com/paradigmxyz/reth"
+homepage.workspace = true
+repository.workspace = true
 
 [lints]
 workspace = true
@@ -38,7 +38,7 @@ op-alloy-rpc-types-engine = { workspace = true, features = ["k256"] }
 
 # io
 tokio.workspace = true
-tokio-tungstenite = { workspace = true, features = ["rustls-tls-native-roots"] }
+tokio-tungstenite.workspace = true
 serde_json.workspace = true
 url.workspace = true
 futures-util.workspace = true
diff --git a/rust/op-reth/crates/flashblocks/src/lib.rs b/rust/op-reth/crates/flashblocks/src/lib.rs
index 08c7499d58535..fe77dc18a850c 100644
--- a/rust/op-reth/crates/flashblocks/src/lib.rs
+++ b/rust/op-reth/crates/flashblocks/src/lib.rs
@@ -21,9 +21,7 @@ mod payload;
 pub use payload::{FlashBlock, PendingFlashBlock};
 
 mod sequence;
-pub use sequence::{
-    FlashBlockCompleteSequence, FlashBlockPendingSequence, SequenceExecutionOutcome,
-};
+pub use sequence::{FlashBlockCompleteSequence, FlashBlockPendingSequence};
 
 mod service;
 pub use service::{FlashBlockBuildInfo, FlashBlockService};
@@ -32,13 +30,11 @@ mod worker;
 
 mod cache;
 
-pub mod validation;
-
 #[cfg(test)]
 mod test_utils;
 
 mod ws;
-pub use ws::{FlashBlockDecoder, WsConnect, WsConnector, WsFlashBlockStream};
+pub use ws::{FlashBlockDecoder, WsConnect, WsFlashBlockStream};
 
 /// Receiver of the most recent [`PendingFlashBlock`] built out of [`FlashBlock`]s.
 ///
diff --git a/rust/op-reth/crates/flashblocks/src/sequence.rs b/rust/op-reth/crates/flashblocks/src/sequence.rs
index 64ac022729054..ddd2b2c01f5cc 100644
--- a/rust/op-reth/crates/flashblocks/src/sequence.rs
+++ b/rust/op-reth/crates/flashblocks/src/sequence.rs
@@ -14,6 +14,7 @@ const FLASHBLOCK_SEQUENCE_CHANNEL_SIZE: usize = 128;
 
 /// Outcome from executing a flashblock sequence.
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
+#[allow(unnameable_types)]
 pub struct SequenceExecutionOutcome {
     /// The block hash of the executed pending block
     pub block_hash: B256,
diff --git a/rust/op-reth/crates/flashblocks/src/service.rs b/rust/op-reth/crates/flashblocks/src/service.rs
index 490941294196c..01503b415f9c2 100644
--- a/rust/op-reth/crates/flashblocks/src/service.rs
+++ b/rust/op-reth/crates/flashblocks/src/service.rs
@@ -241,9 +241,9 @@ where
 
         let (tx, rx) = oneshot::channel();
         let builder = self.builder.clone();
-        self.spawner.spawn_blocking(Box::pin(async move {
+        self.spawner.spawn_blocking(move || {
             let _ = tx.send(builder.execute(args));
-        }));
+        });
         self.job = Some((Instant::now(), rx));
     }
 }
diff --git a/rust/op-reth/crates/flashblocks/src/ws/mod.rs b/rust/op-reth/crates/flashblocks/src/ws/mod.rs
index 4412acff24bf2..651d83c916b1a 100644
--- a/rust/op-reth/crates/flashblocks/src/ws/mod.rs
+++ b/rust/op-reth/crates/flashblocks/src/ws/mod.rs
@@ -1,4 +1,4 @@
-pub use stream::{WsConnect, WsConnector, WsFlashBlockStream};
+pub use stream::{WsConnect, WsFlashBlockStream};
 
 mod decoding;
 pub use decoding::FlashBlockDecoder;
diff --git a/rust/op-reth/crates/flashblocks/src/ws/stream.rs b/rust/op-reth/crates/flashblocks/src/ws/stream.rs
index f33c75c785c13..300a781d876a1 100644
--- a/rust/op-reth/crates/flashblocks/src/ws/stream.rs
+++ b/rust/op-reth/crates/flashblocks/src/ws/stream.rs
@@ -223,6 +223,7 @@ pub trait WsConnect {
 ///
 /// See the [`WsConnect`] documentation for details.
 #[derive(Debug, Clone)]
+#[allow(unnameable_types)]
 pub struct WsConnector;
 
 impl WsConnect for WsConnector {
diff --git a/rust/op-reth/crates/flashblocks/tests/it/stream.rs b/rust/op-reth/crates/flashblocks/tests/it/stream.rs
index a590d8f0e0c87..fc5a0e10948c8 100644
--- a/rust/op-reth/crates/flashblocks/tests/it/stream.rs
+++ b/rust/op-reth/crates/flashblocks/tests/it/stream.rs
@@ -2,6 +2,7 @@ use futures_util::stream::StreamExt;
 use reth_optimism_flashblocks::WsFlashBlockStream;
 
 #[tokio::test]
+#[ignore = "depends on external service availability"]
 async fn test_online_streaming_flashblocks_from_remote_source_is_successful() {
     let items = 3;
     let ws_url = "wss://sepolia.flashblocks.base.org/ws".parse().unwrap();
diff --git a/rust/op-reth/crates/hardforks/src/lib.rs b/rust/op-reth/crates/hardforks/src/lib.rs
index 89ac0b2dc3e21..f299f7a964550 100644
--- a/rust/op-reth/crates/hardforks/src/lib.rs
+++ b/rust/op-reth/crates/hardforks/src/lib.rs
@@ -32,7 +32,6 @@ use reth_ethereum_forks::{ChainHardforks, EthereumHardfork, ForkCondition, Hardf
 
 /// Dev hardforks
 pub static DEV_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(|| {
-    const JOVIAN_TIMESTAMP: ForkCondition = ForkCondition::Timestamp(1761840000);
     ChainHardforks::new(vec![
         (EthereumHardfork::Frontier.boxed(), ForkCondition::Block(0)),
         (EthereumHardfork::Homestead.boxed(), ForkCondition::Block(0)),
@@ -64,7 +63,7 @@ pub static DEV_HARDFORKS: LazyLock<ChainHardforks> = LazyLock::new(|| {
         (OpHardfork::Holocene.boxed(), ForkCondition::Timestamp(0)),
         (EthereumHardfork::Prague.boxed(), ForkCondition::Timestamp(0)),
         (OpHardfork::Isthmus.boxed(), ForkCondition::Timestamp(0)),
-        (OpHardfork::Jovian.boxed(), JOVIAN_TIMESTAMP),
+        (OpHardfork::Jovian.boxed(), ForkCondition::Timestamp(0)),
     ])
 });
 
diff --git a/rust/op-reth/crates/node/Cargo.toml b/rust/op-reth/crates/node/Cargo.toml
index b66a4e431ae65..78e851e081f49 100644
--- a/rust/op-reth/crates/node/Cargo.toml
+++ b/rust/op-reth/crates/node/Cargo.toml
@@ -25,12 +25,14 @@ reth-transaction-pool.workspace = true
 reth-network.workspace = true
 reth-evm.workspace = true
 reth-rpc-server-types.workspace = true
-reth-tasks = { workspace = true, optional = true }
+reth-tasks.workspace = true
 reth-trie-common.workspace = true
 reth-node-core.workspace = true
 reth-rpc-engine-api.workspace = true
 reth-engine-local = { workspace = true, features = ["op"] }
 reth-rpc-api.workspace = true
+reth-db = { workspace = true, features = ["op"] }
+reth-db-api = { workspace = true, features = ["op"] }
 
 # op-reth
 reth-optimism-payload-builder.workspace = true
@@ -41,11 +43,22 @@ reth-optimism-txpool.workspace = true
 reth-optimism-chainspec.workspace = true
 reth-optimism-consensus = { workspace = true, features = ["std"] }
 reth-optimism-forks.workspace = true
-reth-optimism-primitives = { workspace = true, features = ["serde", "serde-bincode-compat", "reth-codec"] }
+reth-optimism-primitives = { workspace = true, features = [
+  "serde",
+  "serde-bincode-compat",
+  "reth-codec",
+] }
+reth-optimism-exex = { workspace = true, features = ["metrics"] }
+reth-optimism-trie = { workspace = true, features = ["metrics"] }
 
 # revm with required optimism features
 # Note: this must be kept to ensure all features are properly enabled/forwarded
-revm = { workspace = true, features = ["secp256k1", "blst", "c-kzg", "memory_limit"] }
+revm = { workspace = true, features = [
+  "secp256k1",
+  "blst",
+  "c-kzg",
+  "memory_limit",
+] }
 op-revm.workspace = true
 
 # ethereum
@@ -64,9 +77,11 @@ clap.workspace = true
 serde.workspace = true
 eyre.workspace = true
 url.workspace = true
+humantime.workspace = true
+futures-util.workspace = true
+tracing.workspace = true
 
 # test-utils dependencies
-reth-db-api = { workspace = true, optional = true }
 reth-e2e-test-utils = { workspace = true, optional = true }
 alloy-genesis = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
@@ -92,27 +107,24 @@ op-alloy-network.workspace = true
 [features]
 default = ["reth-codec"]
 asm-keccak = [
-    "alloy-primitives/asm-keccak",
-    "reth-optimism-node/asm-keccak",
-    "reth-node-core/asm-keccak",
-    "revm/asm-keccak",
+  "alloy-primitives/asm-keccak",
+  "reth-optimism-node/asm-keccak",
+  "reth-node-core/asm-keccak",
+  "revm/asm-keccak",
 ]
 keccak-cache-global = [
-    "alloy-primitives/keccak-cache-global",
-    "reth-node-core/keccak-cache-global",
-    "reth-optimism-node/keccak-cache-global",
+  "alloy-primitives/keccak-cache-global",
+  "reth-node-core/keccak-cache-global",
+  "reth-optimism-node/keccak-cache-global",
 ]
 js-tracer = [
-    "reth-node-builder/js-tracer",
-    "reth-optimism-node/js-tracer",
-    "reth-rpc/js-tracer",
-    "reth-rpc-eth-types/js-tracer",
+  "reth-node-builder/js-tracer",
+  "reth-optimism-node/js-tracer",
+  "reth-rpc/js-tracer",
+  "reth-rpc-eth-types/js-tracer",
 ]
 test-utils = [
 	"reth-codec",
-	"reth-tasks",
-	"dep:reth-db-api",
-	"reth-db-api/op",
 	"reth-e2e-test-utils",
 	"alloy-genesis",
 	"serde_json",
@@ -132,7 +144,9 @@ test-utils = [
 	"reth-trie-common/test-utils",
 	"reth-trie-db/test-utils",
 	"reth-stages-types/test-utils",
-	"reth-db-api?/test-utils"
+	"reth-db-api/test-utils",
+	"reth-tasks/test-utils",
+	"reth-optimism-exex/test-utils"
 ]
 reth-codec = ["reth-optimism-primitives/reth-codec"]
 
diff --git a/rust/op-reth/crates/node/src/args.rs b/rust/op-reth/crates/node/src/args.rs
index abddb76109c32..4f6e1cc84b58b 100644
--- a/rust/op-reth/crates/node/src/args.rs
+++ b/rust/op-reth/crates/node/src/args.rs
@@ -2,8 +2,10 @@
 
 //! clap [Args](clap::Args) for optimism rollup configuration
 
+use clap::builder::ArgPredicate;
 use op_alloy_consensus::interop::SafetyLevel;
 use reth_optimism_txpool::supervisor::DEFAULT_SUPERVISOR_URL;
+use std::{path::PathBuf, time::Duration};
 use url::Url;
 
 /// Parameters for rollup configuration
@@ -82,6 +84,66 @@ pub struct RollupArgs {
     /// Requires `flashblocks_url` to be set.
     #[arg(long, default_value_t = false, requires = "flashblocks_url")]
     pub flashblock_consensus: bool,
+
+    /// If true, initialize external-proofs exex to save and serve trie nodes to provide proofs
+    /// faster.
+    #[arg(
+        long = "proofs-history",
+        value_name = "PROOFS_HISTORY",
+        default_value_ifs([
+            ("proofs-history.storage-path", ArgPredicate::IsPresent, "true")
+        ])
+    )]
+    pub proofs_history: bool,
+
+    /// The path to the storage DB for proofs history.
+    #[arg(long = "proofs-history.storage-path", value_name = "PROOFS_HISTORY_STORAGE_PATH")]
+    pub proofs_history_storage_path: Option<PathBuf>,
+
+    /// The window to span blocks for proofs history. Value is the number of blocks.
+    /// Default is 1 month of blocks based on 2 seconds block time.
+    /// 30 * 24 * 60 * 60 / 2 = `1_296_000`
+    #[arg(
+        long = "proofs-history.window",
+        default_value_t = 1_296_000,
+        value_name = "PROOFS_HISTORY_WINDOW"
+    )]
+    pub proofs_history_window: u64,
+
+    /// Interval between proof-storage prune runs. Accepts human-friendly durations
+    /// like "100s", "5m", "1h". Defaults to 15s.
+    ///
+    /// - Shorter intervals prune smaller batches more often, so each prune run tends to be faster
+    ///   and the blocking pause for writes is shorter, at the cost of more frequent pauses.
+    /// - Longer intervals prune larger batches less often, which reduces how often pruning runs,
+    ///   but each run can take longer and block writes for longer.
+    ///
+    /// A shorter interval is preferred so that prune
+    /// runs stay small and don’t stall writes for too long.
+    ///
+    /// CLI: `--proofs-history.prune-interval 10m`
+    #[arg(
+        long = "proofs-history.prune-interval",
+        value_name = "PROOFS_HISTORY_PRUNE_INTERVAL",
+        default_value = "15s",
+        value_parser = humantime::parse_duration
+    )]
+    pub proofs_history_prune_interval: Duration,
+    /// Verification interval: perform full block execution every N blocks for data integrity.
+    /// - 0: Disabled (Default) (always use fast path with pre-computed data from notifications)
+    /// - 1: Always verify (always execute blocks, slowest)
+    /// - N: Verify every Nth block (e.g., 100 = every 100 blocks)
+    ///
+    /// Periodic verification helps catch data corruption or consensus bugs while maintaining
+    /// good performance.
+    ///
+    /// CLI: `--proofs-history.verification-interval 100`
+    #[arg(
+        long = "proofs-history.verification-interval",
+        value_name = "PROOFS_HISTORY_VERIFICATION_INTERVAL",
+        default_value_t = 0
+    )]
+    pub proofs_history_verification_interval: u64,
 }
 
 impl Default for RollupArgs {
@@ -99,6 +161,11 @@ impl Default for RollupArgs {
             min_suggested_priority_fee: 1_000_000,
             flashblocks_url: None,
             flashblock_consensus: false,
+            proofs_history: false,
+            proofs_history_storage_path: None,
+            proofs_history_window: 1_296_000,
+            proofs_history_prune_interval: Duration::from_secs(15),
+            proofs_history_verification_interval: 0,
         }
     }
 }
diff --git a/rust/op-reth/crates/node/src/lib.rs b/rust/op-reth/crates/node/src/lib.rs
index b0e9cea4c0ba1..0f150c9afbdf2 100644
--- a/rust/op-reth/crates/node/src/lib.rs
+++ b/rust/op-reth/crates/node/src/lib.rs
@@ -11,7 +11,6 @@
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 
-// Used for feature activation only.
 #[cfg(feature = "test-utils")]
 use reth_db_api as _;
 
@@ -34,6 +33,8 @@ pub use version::OP_NAME_CLIENT;
 
 pub use reth_optimism_txpool as txpool;
 
+pub mod proof_history;
+
 /// Helpers for running test node instances.
 #[cfg(feature = "test-utils")]
 pub mod utils;
@@ -49,3 +50,6 @@ pub use reth_optimism_storage::OpStorage;
 
 use op_revm as _;
 use revm as _;
+
+#[cfg(feature = "test-utils")]
+use reth_tasks as _;
diff --git a/rust/op-reth/crates/node/src/node.rs b/rust/op-reth/crates/node/src/node.rs
index c483ed08aefe7..cbcd898f40931 100644
--- a/rust/op-reth/crates/node/src/node.rs
+++ b/rust/op-reth/crates/node/src/node.rs
@@ -208,25 +208,29 @@ impl OpNode {
     /// use reth_optimism_chainspec::BASE_MAINNET;
     /// use reth_optimism_node::OpNode;
     ///
-    /// let factory =
-    ///     OpNode::provider_factory_builder().open_read_only(BASE_MAINNET.clone(), "datadir").unwrap();
+    /// fn demo(runtime: reth_tasks::Runtime) {
+    ///     let factory = OpNode::provider_factory_builder()
+    ///         .open_read_only(BASE_MAINNET.clone(), "datadir", runtime)
+    ///         .unwrap();
+    /// }
     /// ```
     ///
-    /// # Open a Providerfactory manually with all required components
+    /// # Open a Providerfactory with custom config
     ///
     /// ```no_run
-    /// use reth_db::open_db_read_only;
     /// use reth_optimism_chainspec::OpChainSpecBuilder;
     /// use reth_optimism_node::OpNode;
-    /// use reth_provider::providers::{RocksDBProvider, StaticFileProvider};
-    /// use std::sync::Arc;
+    /// use reth_provider::providers::ReadOnlyConfig;
     ///
-    /// let factory = OpNode::provider_factory_builder()
-    ///     .db(Arc::new(open_db_read_only("db", Default::default()).unwrap()))
-    ///     .chainspec(OpChainSpecBuilder::base_mainnet().build().into())
-    ///     .static_file(StaticFileProvider::read_only("db/static_files", false).unwrap())
-    ///     .rocksdb_provider(RocksDBProvider::builder("db/rocksdb").build().unwrap())
-    ///     .build_provider_factory();
+    /// fn demo(runtime: reth_tasks::Runtime) {
+    ///     let factory = OpNode::provider_factory_builder()
+    ///         .open_read_only(
+    ///             OpChainSpecBuilder::base_mainnet().build().into(),
+    ///             ReadOnlyConfig::from_datadir("datadir").no_watch(),
+    ///             runtime,
+    ///         )
+    ///         .unwrap();
+    /// }
     /// ```
     pub fn provider_factory_builder() -> ProviderFactoryBuilder<Self> {
         ProviderFactoryBuilder::default()
@@ -1022,7 +1026,7 @@ where
         if ctx.chain_spec().is_interop_active_at_timestamp(ctx.head().timestamp) {
             // spawn the Op txpool maintenance task
             let chain_events = ctx.provider().canonical_state_stream();
-            ctx.task_executor().spawn_critical(
+            ctx.task_executor().spawn_critical_task(
                 "Op txpool interop maintenance task",
                 reth_optimism_txpool::maintain::maintain_transaction_pool_interop_future(
                     transaction_pool.clone(),
@@ -1036,7 +1040,7 @@ where
         if self.enable_tx_conditional {
             // spawn the Op txpool maintenance task
             let chain_events = ctx.provider().canonical_state_stream();
-            ctx.task_executor().spawn_critical(
+            ctx.task_executor().spawn_critical_task(
                 "Op txpool conditional maintenance task",
                 reth_optimism_txpool::maintain::maintain_transaction_pool_conditional_future(
                     transaction_pool.clone(),
diff --git a/rust/op-reth/crates/node/src/proof_history.rs b/rust/op-reth/crates/node/src/proof_history.rs
new file mode 100644
index 0000000000000..03f5f1ac4082f
--- /dev/null
+++ b/rust/op-reth/crates/node/src/proof_history.rs
@@ -0,0 +1,109 @@
+//! Node luncher with proof history support.
+
+use crate::{OpNode, args::RollupArgs};
+use eyre::ErrReport;
+use futures_util::FutureExt;
+use reth_db::DatabaseEnv;
+use reth_db_api::database_metrics::DatabaseMetrics;
+use reth_node_builder::{FullNodeComponents, NodeBuilder, WithLaunchContext};
+use reth_optimism_chainspec::OpChainSpec;
+use reth_optimism_exex::OpProofsExEx;
+use reth_optimism_rpc::{
+    debug::{DebugApiExt, DebugApiOverrideServer},
+    eth::proofs::{EthApiExt, EthApiOverrideServer},
+};
+use reth_optimism_trie::{OpProofsStorage, db::MdbxProofsStorage};
+use reth_tasks::TaskExecutor;
+use std::{sync::Arc, time::Duration};
+use tokio::time::sleep;
+use tracing::info;
+
+/// - no proofs history (plain node),
+/// - in-mem proofs storage,
+/// - MDBX proofs storage.
+pub async fn launch_node_with_proof_history(
+    builder: WithLaunchContext<NodeBuilder<Arc<DatabaseEnv>, OpChainSpec>>,
+    args: RollupArgs,
+) -> eyre::Result<(), ErrReport> {
+    let RollupArgs {
+        proofs_history,
+        proofs_history_window,
+        proofs_history_prune_interval,
+        proofs_history_verification_interval,
+        ..
+    } = args;
+
+    // Start from a plain OpNode builder
+    let mut node_builder = builder.node(OpNode::new(args.clone()));
+
+    if proofs_history {
+        let path = args
+            .proofs_history_storage_path
+            .clone()
+            .expect("Path must be provided if not using in-memory storage");
+        info!(target: "reth::cli", "Using on-disk storage for proofs history");
+
+        let mdbx = Arc::new(
+            MdbxProofsStorage::new(&path)
+                .map_err(|e| eyre::eyre!("Failed to create MdbxProofsStorage: {e}"))?,
+        );
+        let storage: OpProofsStorage<Arc<MdbxProofsStorage>> = mdbx.clone().into();
+
+        let storage_exec = storage.clone();
+
+        node_builder = node_builder
+            .on_node_started(move |node| {
+                spawn_proofs_db_metrics(
+                    node.task_executor,
+                    mdbx,
+                    node.config.metrics.push_gateway_interval,
+                );
+                Ok(())
+            })
+            .install_exex("proofs-history", async move |exex_context| {
+                Ok(OpProofsExEx::builder(exex_context, storage_exec)
+                    .with_proofs_history_window(proofs_history_window)
+                    .with_proofs_history_prune_interval(proofs_history_prune_interval)
+                    .with_verification_interval(proofs_history_verification_interval)
+                    .build()
+                    .run()
+                    .boxed())
+            })
+            .extend_rpc_modules(move |ctx| {
+                let api_ext = EthApiExt::new(ctx.registry.eth_api().clone(), storage.clone());
+                let debug_ext = DebugApiExt::new(
+                    ctx.node().provider().clone(),
+                    ctx.registry.eth_api().clone(),
+                    storage,
+                    Box::new(ctx.node().task_executor().clone()),
+                    ctx.node().evm_config().clone(),
+                );
+                ctx.modules.replace_configured(api_ext.into_rpc())?;
+                ctx.modules.replace_configured(debug_ext.into_rpc())?;
+                Ok(())
+            });
+    }
+
+    // In all cases (with or without proofs), launch the node.
+    let handle = node_builder.launch_with_debug_capabilities().await?;
+    handle.node_exit_future.await
+}
+/// Spawns a task that periodically reports metrics for the proofs DB.
+fn spawn_proofs_db_metrics(
+    executor: TaskExecutor,
+    storage: Arc<MdbxProofsStorage>,
+    metrics_report_interval: Duration,
+) {
+    executor.spawn_critical_task("op-proofs-storage-metrics", async move {
+        info!(
+            target: "reth::cli",
+            ?metrics_report_interval,
+            "Starting op-proofs-storage metrics task"
+        );
+
+        loop {
+            sleep(metrics_report_interval).await;
+            storage.report_metrics();
+        }
+    });
+}
diff --git a/rust/op-reth/crates/node/src/rpc.rs b/rust/op-reth/crates/node/src/rpc.rs
index 7268fd4f8091b..9c959a38da505 100644
--- a/rust/op-reth/crates/node/src/rpc.rs
+++ b/rust/op-reth/crates/node/src/rpc.rs
@@ -23,7 +23,7 @@
 //! use reth_provider::providers::BlockchainProvider;
 //! use reth_rpc::TraceApi;
 //! use reth_rpc_eth_types::{EthConfig, EthStateCache};
-//! use reth_tasks::{TaskManager, pool::BlockingTaskGuard};
+//! use reth_tasks::{Runtime, pool::BlockingTaskGuard};
 //! use reth_trie_db::ChangesetCache;
 //! use std::sync::Arc;
 //!
@@ -32,8 +32,8 @@
 //!     // build core node with all components disabled except EVM and state
 //!     let sepolia = NodeConfig::new(OP_SEPOLIA.clone());
 //!     let db = create_test_rw_db_with_path(sepolia.datadir());
-//!     let tasks = TaskManager::current();
-//!     let launch_ctx = LaunchContext::new(tasks.executor(), sepolia.datadir());
+//!     let runtime = Runtime::with_existing_handle(tokio::runtime::Handle::current()).unwrap();
+//!     let launch_ctx = LaunchContext::new(runtime, sepolia.datadir());
 //!     let node = launch_ctx
 //!         .with_loaded_toml_config(sepolia)
 //!         .unwrap()
diff --git a/rust/op-reth/crates/node/src/utils.rs b/rust/op-reth/crates/node/src/utils.rs
index fa29c8d00c76b..435ec2b925080 100644
--- a/rust/op-reth/crates/node/src/utils.rs
+++ b/rust/op-reth/crates/node/src/utils.rs
@@ -9,7 +9,6 @@ use reth_node_api::NodeTypesWithDBAdapter;
 use reth_optimism_chainspec::OpChainSpecBuilder;
 use reth_payload_builder::EthPayloadBuilderAttributes;
 use reth_provider::providers::BlockchainProvider;
-use reth_tasks::TaskManager;
 use std::sync::Arc;
 use tokio::sync::Mutex;
 
@@ -18,7 +17,7 @@ pub(crate) type OpNode =
     NodeHelperType<OtherOpNode, BlockchainProvider<NodeTypesWithDBAdapter<OtherOpNode, TmpDB>>>;
 
 /// Creates the initial setup with `num_nodes` of the node config, started and connected.
-pub async fn setup(num_nodes: usize) -> eyre::Result<(Vec<OpNode>, TaskManager, Wallet)> {
+pub async fn setup(num_nodes: usize) -> eyre::Result<(Vec<OpNode>, Wallet)> {
     let genesis: Genesis =
         serde_json::from_str(include_str!("../tests/assets/genesis.json")).unwrap();
     reth_e2e_test_utils::setup_engine(
diff --git a/rust/op-reth/crates/node/tests/e2e-testsuite/p2p.rs b/rust/op-reth/crates/node/tests/e2e-testsuite/p2p.rs
index 57068eb6555c2..d66aa3e753384 100644
--- a/rust/op-reth/crates/node/tests/e2e-testsuite/p2p.rs
+++ b/rust/op-reth/crates/node/tests/e2e-testsuite/p2p.rs
@@ -7,7 +7,7 @@ use tokio::sync::Mutex;
 async fn can_sync() -> eyre::Result<()> {
     reth_tracing::init_test_tracing();
 
-    let (mut nodes, _tasks, wallet) = setup(3).await?;
+    let (mut nodes, wallet) = setup(3).await?;
     let wallet = Arc::new(Mutex::new(wallet));
 
     let third_node = nodes.pop().unwrap();
diff --git a/rust/op-reth/crates/node/tests/it/custom_genesis.rs b/rust/op-reth/crates/node/tests/it/custom_genesis.rs
index 635153746a4f1..7aa9ee695a0eb 100644
--- a/rust/op-reth/crates/node/tests/it/custom_genesis.rs
+++ b/rust/op-reth/crates/node/tests/it/custom_genesis.rs
@@ -36,13 +36,10 @@ async fn test_op_node_custom_genesis_number() {
     let wallet = Arc::new(Mutex::new(Wallet::default().with_chain_id(chain_spec.chain().into())));
 
     // Configure and launch the node
-    let mut config =
-        NodeConfig::new(chain_spec.clone()).with_unused_ports().with_datadir_args(DatadirArgs {
-            datadir: reth_db::test_utils::tempdir_path().into(),
-            ..Default::default()
-        });
-    config.network.discovery.discv5_port = 0;
-    config.network.discovery.discv5_port_ipv6 = 0;
+    let config = NodeConfig::new(chain_spec.clone()).with_datadir_args(DatadirArgs {
+        datadir: reth_db::test_utils::tempdir_path().into(),
+        ..Default::default()
+    });
     let db = create_test_rw_db_with_path(
         config
             .datadir
@@ -50,7 +47,7 @@ async fn test_op_node_custom_genesis_number() {
             .unwrap_or_chain_default(config.chain.chain(), config.datadir.clone())
             .db(),
     );
-    let tasks = reth_tasks::TaskManager::current();
+    let runtime = reth_tasks::Runtime::test();
     let node_handle = NodeBuilder::new(config.clone())
         .with_database(db)
         .with_types_and_provider::<OpNode, BlockchainProvider<_>>()
@@ -58,7 +55,7 @@ async fn test_op_node_custom_genesis_number() {
         .with_add_ons(OpNode::new(Default::default()).add_ons())
         .launch_with_fn(|builder| {
             let launcher = EngineNodeLauncher::new(
-                tasks.executor(),
+                runtime.clone(),
                 builder.config.datadir(),
                 Default::default(),
             );
diff --git a/rust/op-reth/crates/node/tests/it/priority.rs b/rust/op-reth/crates/node/tests/it/priority.rs
index f6ff043966f23..08c5cf6d780f4 100644
--- a/rust/op-reth/crates/node/tests/it/priority.rs
+++ b/rust/op-reth/crates/node/tests/it/priority.rs
@@ -32,7 +32,7 @@ use reth_payload_util::{
     PayloadTransactionsFixed,
 };
 use reth_provider::providers::BlockchainProvider;
-use reth_tasks::TaskManager;
+use reth_tasks::Runtime;
 use reth_transaction_pool::PoolTransaction;
 use std::sync::Arc;
 use tokio::sync::Mutex;
@@ -134,7 +134,7 @@ async fn test_custom_block_priority_config() {
             .unwrap_or_chain_default(config.chain.chain(), config.datadir.clone())
             .db(),
     );
-    let tasks = TaskManager::current();
+    let runtime = Runtime::test();
     let node_handle = NodeBuilder::new(config.clone())
         .with_database(db)
         .with_types_and_provider::<OpNode, BlockchainProvider<_>>()
@@ -142,7 +142,7 @@ async fn test_custom_block_priority_config() {
         .with_add_ons(OpNode::new(Default::default()).add_ons())
         .launch_with_fn(|builder| {
             let launcher = EngineNodeLauncher::new(
-                tasks.executor(),
+                runtime.clone(),
                 builder.config.datadir(),
                 Default::default(),
             );
diff --git a/rust/op-reth/crates/node/tests/it/rpc.rs b/rust/op-reth/crates/node/tests/it/rpc.rs
index 72aff692e32e4..5818a2c7a03c3 100644
--- a/rust/op-reth/crates/node/tests/it/rpc.rs
+++ b/rust/op-reth/crates/node/tests/it/rpc.rs
@@ -9,15 +9,14 @@ use reth_node_core::{
 use reth_optimism_chainspec::BASE_MAINNET;
 use reth_optimism_node::OpNode;
 use reth_rpc_api::servers::AdminApiServer;
-use reth_tasks::TaskManager;
+use reth_tasks::Runtime;
 
 // <https://github.com/paradigmxyz/reth/issues/19765>
 #[tokio::test]
 async fn test_admin_external_ip() -> eyre::Result<()> {
     reth_tracing::init_test_tracing();
 
-    let exec = TaskManager::current();
-    let exec = exec.executor();
+    let exec = Runtime::test();
 
     let external_ip = "10.64.128.71".parse().unwrap();
     // Node setup
diff --git a/rust/op-reth/crates/payload/src/validator.rs b/rust/op-reth/crates/payload/src/validator.rs
index 88b424eb6bd4a..6c94d078e97dc 100644
--- a/rust/op-reth/crates/payload/src/validator.rs
+++ b/rust/op-reth/crates/payload/src/validator.rs
@@ -73,11 +73,7 @@ where
 
     // Ensure the hash included in the payload matches the block hash
     if expected_hash != sealed_block.hash() {
-        return Err(PayloadError::BlockHash {
-            execution: sealed_block.hash(),
-            consensus: expected_hash,
-        }
-        .into());
+        Err(PayloadError::BlockHash { execution: sealed_block.hash(), consensus: expected_hash })?;
     }
 
     shanghai::ensure_well_formed_fields(
diff --git a/rust/op-reth/crates/primitives/Cargo.toml b/rust/op-reth/crates/primitives/Cargo.toml
index 1a26b2c4a3a70..07e9c401f089b 100644
--- a/rust/op-reth/crates/primitives/Cargo.toml
+++ b/rust/op-reth/crates/primitives/Cargo.toml
@@ -43,7 +43,7 @@ bincode.workspace = true
 proptest-arbitrary-interop.workspace = true
 proptest.workspace = true
 rand_08.workspace = true
-secp256k1 = { workspace = true, features = ["rand", "std", "serde"] }
+secp256k1 = { workspace = true, features = ["rand"] }
 
 [features]
 default = ["std"]
@@ -57,6 +57,7 @@ std = [
     "serde_json/std",
     "serde_with?/std",
     "alloy-eips/std",
+    "secp256k1/std",
     "bytes/std",
     "reth-zstd-compressors/std",
 ]
diff --git a/rust/op-reth/crates/primitives/src/receipt.rs b/rust/op-reth/crates/primitives/src/receipt.rs
index 9d8f0294f7f1a..1a7baed9c0fbe 100644
--- a/rust/op-reth/crates/primitives/src/receipt.rs
+++ b/rust/op-reth/crates/primitives/src/receipt.rs
@@ -145,10 +145,10 @@ pub(super) mod serde_bincode_compat {
             // // ensure we don't have an invalid poststate variant
             data.receipt.as_receipt_mut().status = success.into();
 
-            let encoded =
-                bincode::serde::encode_to_vec(&data, bincode::config::standard()).unwrap();
-            let (decoded, _): (Data, _) =
-                bincode::serde::decode_from_slice(&encoded, bincode::config::standard()).unwrap();
+            let encoded = bincode::serde::encode_to_vec(&data, bincode::config::legacy()).unwrap();
+            let (decoded, _) =
+                bincode::serde::decode_from_slice::<Data, _>(&encoded, bincode::config::legacy())
+                    .unwrap();
             assert_eq!(decoded, data);
         }
     }
diff --git a/rust/op-reth/crates/primitives/src/transaction/signed.rs b/rust/op-reth/crates/primitives/src/transaction/signed.rs
index e33cef2945d45..ddfb83612d1d5 100644
--- a/rust/op-reth/crates/primitives/src/transaction/signed.rs
+++ b/rust/op-reth/crates/primitives/src/transaction/signed.rs
@@ -33,7 +33,7 @@ use reth_primitives_traits::{
 #[cfg_attr(any(test, feature = "reth-codec"), reth_codecs::add_arbitrary_tests(rlp))]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Debug, Clone, Eq)]
-pub(super) struct OpTransactionSigned {
+pub(crate) struct OpTransactionSigned {
     /// Transaction hash
     #[cfg_attr(feature = "serde", serde(skip))]
     hash: OnceLock<TxHash>,
@@ -431,19 +431,11 @@ impl reth_codecs::Compact for OpTransactionSigned {
 
         let tx_bits = if zstd_bit {
             let mut tmp = Vec::with_capacity(256);
-            if cfg!(feature = "std") {
-                reth_zstd_compressors::TRANSACTION_COMPRESSOR.with(|compressor| {
-                    let mut compressor = compressor.borrow_mut();
-                    let tx_bits = self.transaction.to_compact(&mut tmp);
-                    buf.put_slice(&compressor.compress(&tmp).expect("Failed to compress"));
-                    tx_bits as u8
-                })
-            } else {
-                let mut compressor = reth_zstd_compressors::create_tx_compressor();
+            reth_zstd_compressors::with_tx_compressor(|compressor| {
                 let tx_bits = self.transaction.to_compact(&mut tmp);
                 buf.put_slice(&compressor.compress(&tmp).expect("Failed to compress"));
                 tx_bits as u8
-            }
+            })
         } else {
             self.transaction.to_compact(buf) as u8
         };
@@ -465,29 +457,15 @@ impl reth_codecs::Compact for OpTransactionSigned {
 
         let zstd_bit = bitflags >> 3;
         let (transaction, buf) = if zstd_bit != 0 {
-            if cfg!(feature = "std") {
-                reth_zstd_compressors::TRANSACTION_DECOMPRESSOR.with(|decompressor| {
-                    let mut decompressor = decompressor.borrow_mut();
-
-                    // TODO: enforce that zstd is only present at a "top" level type
-                    let transaction_type = (bitflags & 0b110) >> 1;
-                    let (transaction, _) = OpTypedTransaction::from_compact(
-                        decompressor.decompress(buf),
-                        transaction_type,
-                    );
-
-                    (transaction, buf)
-                })
-            } else {
-                let mut decompressor = reth_zstd_compressors::create_tx_decompressor();
+            reth_zstd_compressors::with_tx_decompressor(|decompressor| {
+                // TODO: enforce that zstd is only present at a "top" level type
                 let transaction_type = (bitflags & 0b110) >> 1;
                 let (transaction, _) = OpTypedTransaction::from_compact(
                     decompressor.decompress(buf),
                     transaction_type,
                 );
-
                 (transaction, buf)
-            }
+            })
         } else {
             let transaction_type = bitflags >> 1;
             OpTypedTransaction::from_compact(buf, transaction_type)
diff --git a/rust/op-reth/crates/reth/Cargo.toml b/rust/op-reth/crates/reth/Cargo.toml
index f848645935567..0b3ebbd6f6901 100644
--- a/rust/op-reth/crates/reth/Cargo.toml
+++ b/rust/op-reth/crates/reth/Cargo.toml
@@ -84,20 +84,21 @@ keccak-cache-global = [
 	"alloy-primitives/keccak-cache-global"
 ]
 test-utils = [
-    "reth-chainspec/test-utils",
-    "reth-consensus?/test-utils",
-    "reth-db?/test-utils",
-    "reth-evm?/test-utils",
-    "reth-revm?/test-utils",
-    "reth-network?/test-utils",
-    "reth-optimism-node?/test-utils",
-    "reth-primitives-traits/test-utils",
-    "reth-provider?/test-utils",
-    "reth-trie?/test-utils",
-    "reth-transaction-pool?/test-utils",
-    "reth-node-builder?/test-utils",
-    "reth-trie-db?/test-utils",
-    "reth-codecs?/test-utils",
+	"reth-chainspec/test-utils",
+	"reth-consensus?/test-utils",
+	"reth-db?/test-utils",
+	"reth-evm?/test-utils",
+	"reth-revm?/test-utils",
+	"reth-network?/test-utils",
+	"reth-optimism-node?/test-utils",
+	"reth-primitives-traits/test-utils",
+	"reth-provider?/test-utils",
+	"reth-trie?/test-utils",
+	"reth-transaction-pool?/test-utils",
+	"reth-node-builder?/test-utils",
+	"reth-trie-db?/test-utils",
+	"reth-codecs?/test-utils",
+	"reth-tasks?/test-utils"
 ]
 
 full = ["consensus", "evm", "node", "provider", "rpc", "trie", "pool", "network"]
diff --git a/rust/op-reth/crates/rpc/Cargo.toml b/rust/op-reth/crates/rpc/Cargo.toml
index 01061ae3667a2..04a40be4fffb3 100644
--- a/rust/op-reth/crates/rpc/Cargo.toml
+++ b/rust/op-reth/crates/rpc/Cargo.toml
@@ -13,6 +13,7 @@ workspace = true
 
 [dependencies]
 # reth
+reth-basic-payload-builder.workspace = true
 reth-evm.workspace = true
 reth-primitives-traits = { workspace = true, features = ["op"] }
 reth-storage-api.workspace = true
@@ -21,6 +22,7 @@ reth-rpc-eth-types.workspace = true
 reth-rpc-server-types.workspace = true
 reth-tasks = { workspace = true, features = ["rayon"] }
 reth-transaction-pool.workspace = true
+reth-revm.workspace = true
 reth-rpc.workspace = true
 reth-rpc-api.workspace = true
 reth-node-api.workspace = true
@@ -28,6 +30,8 @@ reth-node-builder.workspace = true
 reth-chainspec.workspace = true
 reth-chain-state.workspace = true
 reth-rpc-engine-api.workspace = true
+reth-payload-util.workspace = true
+reth-provider.workspace = true
 
 # op-reth
 reth-optimism-evm.workspace = true
@@ -37,14 +41,17 @@ reth-optimism-txpool.workspace = true
 # TODO remove node-builder import
 reth-optimism-primitives = { workspace = true, features = ["reth-codec", "serde-bincode-compat", "serde"] }
 reth-optimism-forks.workspace = true
+reth-optimism-trie.workspace = true
 
 # ethereum
 alloy-eips.workspace = true
 alloy-json-rpc.workspace = true
 alloy-primitives.workspace = true
+alloy-rlp.workspace = true
 alloy-rpc-client.workspace = true
 alloy-rpc-types-eth.workspace = true
 alloy-rpc-types-debug.workspace = true
+alloy-serde.workspace = true
 alloy-transport.workspace = true
 alloy-transport-http.workspace = true
 alloy-consensus.workspace = true
@@ -58,9 +65,11 @@ revm.workspace = true
 op-revm.workspace = true
 
 # async
+serde.workspace = true
 tokio.workspace = true
 futures.workspace = true
 tokio-stream.workspace = true
+reqwest.workspace = true
 async-trait.workspace = true
 tower.workspace = true
 
@@ -80,6 +89,9 @@ derive_more = { workspace = true, features = ["constructor"] }
 reth-metrics.workspace = true
 metrics.workspace = true
 
+# enum
+strum.workspace = true
+
 [dev-dependencies]
 reth-optimism-chainspec.workspace = true
 alloy-op-hardforks.workspace = true
diff --git a/rust/op-reth/crates/rpc/src/debug.rs b/rust/op-reth/crates/rpc/src/debug.rs
new file mode 100644
index 0000000000000..c46d87b67c6ec
--- /dev/null
+++ b/rust/op-reth/crates/rpc/src/debug.rs
@@ -0,0 +1,331 @@
+//! Historical proofs RPC server implementation for `debug_` namespace.
+
+use crate::{
+    metrics::{DebugApiExtMetrics, DebugApis},
+    state::OpStateProviderFactory,
+};
+use alloy_consensus::BlockHeader;
+use alloy_eips::{BlockId, BlockNumberOrTag};
+use alloy_primitives::B256;
+use alloy_rlp::Encodable;
+use alloy_rpc_types_debug::ExecutionWitness;
+use async_trait::async_trait;
+use jsonrpsee::proc_macros::rpc;
+use jsonrpsee_core::RpcResult;
+use jsonrpsee_types::error::ErrorObject;
+use reth_basic_payload_builder::PayloadConfig;
+use reth_evm::{ConfigureEvm, execute::Executor};
+use reth_node_api::{BuildNextEnv, NodePrimitives, PayloadBuilderError};
+use reth_optimism_forks::OpHardforks;
+use reth_optimism_payload_builder::{
+    OpAttributes, OpPayloadPrimitives,
+    builder::{OpBuilder, OpPayloadBuilderCtx},
+};
+use reth_optimism_trie::{OpProofsStorage, OpProofsStore};
+use reth_optimism_txpool::OpPooledTransaction as OpPooledTx2;
+use reth_payload_util::NoopPayloadTransactions;
+use reth_primitives_traits::{SealedHeader, TxTy};
+use reth_provider::{
+    BlockReaderIdExt, ChainSpecProvider, HeaderProvider, NodePrimitivesProvider, ProviderError,
+    ProviderResult, StateProviderFactory,
+};
+use reth_revm::{State, database::StateProviderDatabase, witness::ExecutionWitnessRecord};
+use reth_rpc_api::eth::helpers::FullEthApi;
+use reth_rpc_eth_types::EthApiError;
+use reth_rpc_server_types::{ToRpcResult, result::internal_rpc_err};
+use reth_tasks::TaskSpawner;
+use serde::{Deserialize, Serialize};
+use std::{marker::PhantomData, sync::Arc};
+use tokio::sync::{Semaphore, oneshot};
+
+/// Represents the current proofs sync status.
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Eq)]
+pub struct ProofsSyncStatus {
+    /// The earliest block number for which proofs are available.
+    earliest: Option<u64>,
+    /// The latest block number for which proofs are available.
+    latest: Option<u64>,
+}
+
+#[cfg_attr(not(test), rpc(server, namespace = "debug"))]
+#[cfg_attr(test, rpc(server, client, namespace = "debug"))]
+pub trait DebugApiOverride<Attributes> {
+    /// Executes a payload and returns the execution witness.
+    #[method(name = "executePayload")]
+    async fn execute_payload(
+        &self,
+        parent_block_hash: B256,
+        attributes: Attributes,
+    ) -> RpcResult<ExecutionWitness>;
+
+    /// Returns the execution witness for a given block.
+    #[method(name = "executionWitness")]
+    async fn execution_witness(&self, block: BlockNumberOrTag) -> RpcResult<ExecutionWitness>;
+
+    /// Returns the current proofs sync status.
+    #[method(name = "proofsSyncStatus")]
+    async fn proofs_sync_status(&self) -> RpcResult<ProofsSyncStatus>;
+}
+
+#[derive(Debug)]
+/// Overrides applied to the `debug_` namespace of the RPC API for the OP Proofs ExEx.
+pub struct DebugApiExt<Eth: FullEthApi, Storage, Provider, EvmConfig, Attrs> {
+    inner: Arc<DebugApiExtInner<Eth, Storage, Provider, EvmConfig, Attrs>>,
+}
+
+impl<Eth, Storage, Provider, EvmConfig, Attrs> DebugApiExt<Eth, Storage, Provider, EvmConfig, Attrs>
+where
+    Eth: FullEthApi + Send + Sync + 'static,
+    ErrorObject<'static>: From<Eth::Error>,
+    Storage: OpProofsStore + Clone + 'static,
+    Provider: BlockReaderIdExt + NodePrimitivesProvider<Primitives: OpPayloadPrimitives>,
+    EvmConfig: ConfigureEvm<Primitives = Provider::Primitives> + 'static,
+{
+    /// Creates a new instance of the `DebugApiExt`.
+    pub fn new(
+        provider: Provider,
+        eth_api: Eth,
+        preimage_store: OpProofsStorage<Storage>,
+        task_spawner: Box<dyn TaskSpawner>,
+        evm_config: EvmConfig,
+    ) -> Self {
+        Self {
+            inner: Arc::new(DebugApiExtInner::new(
+                provider,
+                eth_api,
+                preimage_store,
+                task_spawner,
+                evm_config,
+            )),
+        }
+    }
+}
+
+#[derive(Debug)]
+/// Overrides applied to the `debug_` namespace of the RPC API for historical proofs ExEx.
+pub struct DebugApiExtInner<Eth: FullEthApi, Storage, Provider, EvmConfig, Attrs> {
+    provider: Provider,
+    eth_api: Eth,
+    storage: OpProofsStorage<Storage>,
+    state_provider_factory: OpStateProviderFactory<Eth, Storage>,
+    evm_config: EvmConfig,
+    task_spawner: Box<dyn TaskSpawner>,
+    semaphore: Semaphore,
+    _attrs: PhantomData<Attrs>,
+    metrics: DebugApiExtMetrics,
+}
+
+impl<Eth, P, Provider, EvmConfig, Attrs> DebugApiExtInner<Eth, P, Provider, EvmConfig, Attrs>
+where
+    Eth: FullEthApi + Send + Sync + 'static,
+    ErrorObject<'static>: From<Eth::Error>,
+    P: OpProofsStore + Clone + 'static,
+    Provider: NodePrimitivesProvider<Primitives: OpPayloadPrimitives>,
+{
+    fn new(
+        provider: Provider,
+        eth_api: Eth,
+        storage: OpProofsStorage<P>,
+        task_spawner: Box<dyn TaskSpawner>,
+        evm_config: EvmConfig,
+    ) -> Self {
+        Self {
+            provider,
+            storage: storage.clone(),
+            state_provider_factory: OpStateProviderFactory::new(eth_api.clone(), storage),
+            eth_api,
+            evm_config,
+            task_spawner,
+            semaphore: Semaphore::new(3),
+            _attrs: PhantomData,
+            metrics: DebugApiExtMetrics::new(),
+        }
+    }
+}
+
+impl<Eth, P, Provider, EvmConfig, Attrs> DebugApiExt<Eth, P, Provider, EvmConfig, Attrs>
+where
+    Eth: FullEthApi + Send + Sync + 'static,
+    ErrorObject<'static>: From<Eth::Error>,
+    P: OpProofsStore + Clone + 'static,
+    Provider: BlockReaderIdExt
+        + NodePrimitivesProvider<Primitives: OpPayloadPrimitives>
+        + HeaderProvider<Header = <Provider::Primitives as NodePrimitives>::BlockHeader>,
+{
+    fn parent_header(
+        &self,
+        parent_block_hash: B256,
+    ) -> ProviderResult<SealedHeader<Provider::Header>> {
+        self.inner
+            .provider
+            .sealed_header_by_hash(parent_block_hash)?
+            .ok_or_else(|| ProviderError::HeaderNotFound(parent_block_hash.into()))
+    }
+}
+
+#[async_trait]
+impl<Eth, P, Provider, EvmConfig, Attrs, N> DebugApiOverrideServer<Attrs::RpcPayloadAttributes>
+    for DebugApiExt<Eth, P, Provider, EvmConfig, Attrs>
+where
+    Eth: FullEthApi + Send + Sync + 'static,
+    ErrorObject<'static>: From<Eth::Error>,
+    P: OpProofsStore + Clone + 'static,
+    Attrs: OpAttributes<Transaction = TxTy<EvmConfig::Primitives>>,
+    N: OpPayloadPrimitives,
+    EvmConfig: ConfigureEvm<
+            Primitives = N,
+            NextBlockEnvCtx: BuildNextEnv<Attrs, N::BlockHeader, Provider::ChainSpec>,
+        > + 'static,
+    Provider: BlockReaderIdExt<Header = N::BlockHeader>
+        + StateProviderFactory
+        + ChainSpecProvider<ChainSpec: OpHardforks>
+        + NodePrimitivesProvider<Primitives = N>
+        + HeaderProvider<Header = N::BlockHeader>
+        + Clone
+        + 'static,
+    op_alloy_consensus::OpPooledTransaction:
+        TryFrom<<N as OpPayloadPrimitives>::_TX, Error: core::error::Error>,
+    <N as OpPayloadPrimitives>::_TX: From<op_alloy_consensus::OpPooledTransaction>,
+{
+    async fn execute_payload(
+        &self,
+        parent_block_hash: B256,
+        attributes: Attrs::RpcPayloadAttributes,
+    ) -> RpcResult<ExecutionWitness> {
+        self.inner
+            .metrics
+            .record_operation_async(DebugApis::DebugExecutePayload, async {
+                let _permit = self.inner.semaphore.acquire().await;
+
+                let parent_header = self.parent_header(parent_block_hash).to_rpc_result()?;
+
+                let (tx, rx) = oneshot::channel();
+                let this = self.inner.clone();
+                self.inner.task_spawner.spawn_blocking_task(Box::pin(async move {
+                    let result = async {
+                        let parent_hash = parent_header.hash();
+                        let attributes = Attrs::try_new(parent_hash, attributes, 3)
+                            .map_err(PayloadBuilderError::other)?;
+
+                        let config =
+                            PayloadConfig { parent_header: Arc::new(parent_header), attributes };
+                        let ctx = OpPayloadBuilderCtx {
+                            evm_config: this.evm_config.clone(),
+                            chain_spec: this.provider.chain_spec(),
+                            config,
+                            cancel: Default::default(),
+                            best_payload: Default::default(),
+                            builder_config: Default::default(),
+                        };
+
+                        let state_provider = this
+                            .state_provider_factory
+                            .state_provider(Some(BlockId::Hash(parent_hash.into())))
+                            .await
+                            .map_err(PayloadBuilderError::other)?;
+
+                        let builder = OpBuilder::new(|_| {
+                            NoopPayloadTransactions::<
+                                OpPooledTx2<
+                                    <N as OpPayloadPrimitives>::_TX,
+                                    op_alloy_consensus::OpPooledTransaction,
+                                >,
+                            >::default()
+                        });
+
+                        builder.witness(state_provider, &ctx).map_err(PayloadBuilderError::other)
+                    };
+
+                    let _ = tx.send(result.await);
+                }));
+
+                rx.await
+                    .map_err(|err| internal_rpc_err(err.to_string()))?
+                    .map_err(|err| internal_rpc_err(err.to_string()))
+            })
+            .await
+    }
+
+    async fn execution_witness(&self, block_id: BlockNumberOrTag) -> RpcResult<ExecutionWitness> {
+        self.inner
+            .metrics
+            .record_operation_async(DebugApis::DebugExecutionWitness, async {
+                let _permit = self.inner.semaphore.acquire().await;
+
+                let block = self
+                    .inner
+                    .eth_api
+                    .recovered_block(block_id.into())
+                    .await?
+                    .ok_or(EthApiError::HeaderNotFound(block_id.into()))?;
+
+                let this = self.inner.clone();
+                let block_number = block.header().number();
+
+                let state_provider = this
+                    .state_provider_factory
+                    .state_provider(Some(BlockId::Number(block.parent_num_hash().number.into())))
+                    .await
+                    .map_err(EthApiError::from)?;
+                let db = StateProviderDatabase::new(&state_provider);
+                let block_executor = this.eth_api.evm_config().executor(db);
+
+                let mut witness_record = ExecutionWitnessRecord::default();
+
+                let _ = block_executor
+                    .execute_with_state_closure(&block, |statedb: &State<_>| {
+                        witness_record.record_executed_state(statedb);
+                    })
+                    .map_err(EthApiError::from)?;
+
+                let ExecutionWitnessRecord { hashed_state, codes, keys, lowest_block_number } =
+                    witness_record;
+
+                let state = state_provider
+                    .witness(Default::default(), hashed_state)
+                    .map_err(EthApiError::from)?;
+                let mut exec_witness =
+                    ExecutionWitness { state, codes, keys, ..Default::default() };
+
+                // If there were no calls to the BLOCKHASH opcode, return only the
+                // parent header.
+                let smallest =
+                    lowest_block_number.unwrap_or_else(|| block_number.saturating_sub(1));
+
+                let range = smallest..block_number;
+                exec_witness.headers = self
+                    .inner
+                    .provider
+                    .headers_range(range)
+                    .map_err(EthApiError::from)?
+                    .into_iter()
+                    .map(|header| {
+                        let mut serialized_header = Vec::new();
+                        header.encode(&mut serialized_header);
+                        serialized_header.into()
+                    })
+                    .collect();
+
+                Ok(exec_witness)
+            })
+            .await
+    }
+
+    async fn proofs_sync_status(&self) -> RpcResult<ProofsSyncStatus> {
+        let earliest = self
+            .inner
+            .storage
+            .get_earliest_block_number()
+            .map_err(|err| internal_rpc_err(err.to_string()))?;
+        let latest = self
+            .inner
+            .storage
+            .get_latest_block_number()
+            .map_err(|err| internal_rpc_err(err.to_string()))?;
+
+        Ok(ProofsSyncStatus {
+            earliest: earliest.map(|(block_number, _)| block_number),
+            latest: latest.map(|(block_number, _)| block_number),
+        })
+    }
+}
diff --git a/rust/op-reth/crates/rpc/src/eth/mod.rs b/rust/op-reth/crates/rpc/src/eth/mod.rs
index 52eff8d26adcd..483cd4a7efc33 100644
--- a/rust/op-reth/crates/rpc/src/eth/mod.rs
+++ b/rust/op-reth/crates/rpc/src/eth/mod.rs
@@ -1,6 +1,7 @@
 //! OP-Reth `eth_` endpoint implementation.
 
 pub mod ext;
+pub mod proofs;
 pub mod receipt;
 pub mod transaction;
 
@@ -16,12 +17,12 @@ use alloy_consensus::BlockHeader;
 use alloy_eips::BlockNumHash;
 use alloy_primitives::{B256, U256};
 use alloy_rpc_types_eth::{Filter, Log};
-use alloy_transport_http::reqwest::Url;
 use eyre::WrapErr;
 use futures::StreamExt;
 use op_alloy_network::Optimism;
 use op_alloy_rpc_types_engine::OpFlashblockPayloadBase;
 pub use receipt::{OpReceiptBuilder, OpReceiptFieldsBuilder};
+use reqwest::Url;
 use reth_chainspec::{EthereumHardforks, Hardforks};
 use reth_evm::ConfigureEvm;
 use reth_node_api::{FullNodeComponents, FullNodeTypes, HeaderTy, NodeTypes};
@@ -590,7 +591,7 @@ where
             let flashblocks_sequence = service.block_sequence_broadcaster().clone();
             let received_flashblocks = service.flashblocks_broadcaster().clone();
             let in_progress_rx = service.subscribe_in_progress();
-            ctx.components.task_executor().spawn(Box::pin(service.run(tx)));
+            ctx.components.task_executor().spawn_task(Box::pin(service.run(tx)));
 
             if flashblock_consensus {
                 info!(target: "reth::cli", "Launching FlashBlockConsensusClient");
@@ -598,7 +599,7 @@ where
                     ctx.engine_handle.clone(),
                     flashblocks_sequence.subscribe(),
                 )?;
-                ctx.components.task_executor().spawn(Box::pin(flashblock_client.run()));
+                ctx.components.task_executor().spawn_task(Box::pin(flashblock_client.run()));
             }
 
             Some(FlashblocksListeners::new(
diff --git a/rust/op-reth/crates/rpc/src/eth/proofs.rs b/rust/op-reth/crates/rpc/src/eth/proofs.rs
new file mode 100644
index 0000000000000..07522c96b20f8
--- /dev/null
+++ b/rust/op-reth/crates/rpc/src/eth/proofs.rs
@@ -0,0 +1,95 @@
+//! Historical proofs RPC server implementation.
+
+use crate::{metrics::EthApiExtMetrics, state::OpStateProviderFactory};
+use alloy_eips::BlockId;
+use alloy_primitives::Address;
+use alloy_rpc_types_eth::EIP1186AccountProofResponse;
+use alloy_serde::JsonStorageKey;
+use async_trait::async_trait;
+use jsonrpsee::proc_macros::rpc;
+use jsonrpsee_core::RpcResult;
+use jsonrpsee_types::error::ErrorObject;
+use reth_optimism_trie::{OpProofsStorage, OpProofsStore};
+use reth_provider::StateProofProvider;
+use reth_rpc_api::eth::helpers::FullEthApi;
+use std::time::Instant;
+
+#[cfg_attr(not(test), rpc(server, namespace = "eth"))]
+#[cfg_attr(test, rpc(server, client, namespace = "eth"))]
+pub trait EthApiOverride {
+    /// Returns the account and storage values of the specified account including the Merkle-proof.
+    /// This call can be used to verify that the data you are pulling from is not tampered with.
+    #[method(name = "getProof")]
+    async fn get_proof(
+        &self,
+        address: Address,
+        keys: Vec<JsonStorageKey>,
+        block_number: Option<BlockId>,
+    ) -> RpcResult<EIP1186AccountProofResponse>;
+}
+
+#[derive(Debug)]
+/// Overrides applied to the `eth_` namespace of the RPC API for historical proofs ExEx.
+pub struct EthApiExt<Eth, P> {
+    state_provider_factory: OpStateProviderFactory<Eth, P>,
+    metrics: EthApiExtMetrics,
+}
+
+impl<Eth, P> EthApiExt<Eth, P>
+where
+    Eth: FullEthApi + Send + Sync + 'static,
+    ErrorObject<'static>: From<Eth::Error>,
+    P: OpProofsStore + Clone + 'static,
+{
+    /// Creates a new instance of the `EthApiExt`.
+    pub fn new(eth_api: Eth, preimage_store: OpProofsStorage<P>) -> Self {
+        let metrics = EthApiExtMetrics::default();
+        Self {
+            state_provider_factory: OpStateProviderFactory::new(eth_api, preimage_store),
+            metrics,
+        }
+    }
+}
+
+#[async_trait]
+impl<Eth, P> EthApiOverrideServer for EthApiExt<Eth, P>
+where
+    Eth: FullEthApi + Send + Sync + 'static,
+    ErrorObject<'static>: From<Eth::Error>,
+    P: OpProofsStore + Clone + 'static,
+{
+    async fn get_proof(
+        &self,
+        address: Address,
+        keys: Vec<JsonStorageKey>,
+        block_number: Option<BlockId>,
+    ) -> RpcResult<EIP1186AccountProofResponse> {
+        let start = Instant::now();
+        self.metrics.get_proof_requests.increment(1);
+
+        let storage_keys = keys.iter().map(|key| key.as_b256()).collect::<Vec<_>>();
+
+        let result = async {
+            let proof = self
+                .state_provider_factory
+                .state_provider(block_number)
+                .await
+                .map_err(Into::into)?
+                .proof(Default::default(), address, &storage_keys)
+                .map_err(Into::into)?;
+
+            Ok(proof.into_eip1186_response(keys))
+        }
+        .await;
+
+        match &result {
+            Ok(_) => {
+                self.metrics.get_proof_latency.record(start.elapsed().as_secs_f64());
+                self.metrics.get_proof_successful_responses.increment(1);
+            }
+            Err(_) => self.metrics.get_proof_failures.increment(1),
+        }
+
+        result
+    }
+}
diff --git a/rust/op-reth/crates/rpc/src/eth/transaction.rs b/rust/op-reth/crates/rpc/src/eth/transaction.rs
index bfd17ce662d13..3af2d59bee427 100644
--- a/rust/op-reth/crates/rpc/src/eth/transaction.rs
+++ b/rust/op-reth/crates/rpc/src/eth/transaction.rs
@@ -44,6 +44,7 @@ where
 
     async fn send_transaction(
         &self,
+        origin: TransactionOrigin,
         tx: WithEncoded<Recovered<PoolPooledTx<Self::Pool>>>,
     ) -> Result<B256, Self::Error> {
         let (tx, recovered) = tx.split();
@@ -62,17 +63,17 @@ where
                 })?;
 
             // Retain tx in local tx pool after forwarding, for local RPC usage.
-            let _ = self.inner.eth_api.add_pool_transaction(pool_transaction).await.inspect_err(|err| {
+            let _ = self.inner.eth_api.add_pool_transaction(origin, pool_transaction).await.inspect_err(|err| {
                 tracing::warn!(target: "rpc::eth", %err, %hash, "successfully sent tx to sequencer, but failed to persist in local tx pool");
             });
 
             return Ok(hash);
         }
 
-        // submit the transaction to the pool with a `Local` origin
+        // submit the transaction to the pool with the given origin
         let AddedTransactionOutcome { hash, .. } = self
             .pool()
-            .add_transaction(TransactionOrigin::Local, pool_transaction)
+            .add_transaction(origin, pool_transaction)
             .await
             .map_err(Self::Error::from_eth_err)?;
 
diff --git a/rust/op-reth/crates/rpc/src/historical.rs b/rust/op-reth/crates/rpc/src/historical.rs
index 5c9d26f96f315..dd992ecf8254a 100644
--- a/rust/op-reth/crates/rpc/src/historical.rs
+++ b/rust/op-reth/crates/rpc/src/historical.rs
@@ -5,7 +5,6 @@ use alloy_eips::BlockId;
 use alloy_json_rpc::{RpcRecv, RpcSend};
 use alloy_primitives::{B256, BlockNumber};
 use alloy_rpc_client::RpcClient;
-use alloy_transport_http::reqwest;
 use jsonrpsee::BatchResponseBuilder;
 use jsonrpsee_core::{
     middleware::{Batch, BatchEntry, Notification, RpcServiceT},
diff --git a/rust/op-reth/crates/rpc/src/lib.rs b/rust/op-reth/crates/rpc/src/lib.rs
index d1f8e8dbdd0b9..475322c3b3cf9 100644
--- a/rust/op-reth/crates/rpc/src/lib.rs
+++ b/rust/op-reth/crates/rpc/src/lib.rs
@@ -8,6 +8,7 @@
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
+pub mod debug;
 pub mod engine;
 pub mod error;
 pub mod eth;
@@ -15,6 +16,7 @@ pub mod historical;
 pub mod metrics;
 pub mod miner;
 pub mod sequencer;
+pub mod state;
 pub mod witness;
 
 #[cfg(feature = "client")]
@@ -22,5 +24,5 @@ pub use engine::OpEngineApiClient;
 pub use engine::{OP_ENGINE_CAPABILITIES, OpEngineApi, OpEngineApiServer};
 pub use error::{OpEthApiError, OpInvalidTransactionError, SequencerClientError};
 pub use eth::{OpEthApi, OpEthApiBuilder, OpReceiptBuilder};
-pub use metrics::SequencerMetrics;
+pub use metrics::{EthApiExtMetrics, SequencerMetrics};
 pub use sequencer::SequencerClient;
diff --git a/rust/op-reth/crates/rpc/src/metrics.rs b/rust/op-reth/crates/rpc/src/metrics.rs
index 5aa5e3eff3d6e..17ac94f6aa610 100644
--- a/rust/op-reth/crates/rpc/src/metrics.rs
+++ b/rust/op-reth/crates/rpc/src/metrics.rs
@@ -1,8 +1,11 @@
 //! RPC metrics unique for OP-stack.
 
+use alloy_primitives::map::HashMap;
 use core::time::Duration;
-use metrics::Histogram;
+use metrics::{Counter, Histogram};
 use reth_metrics::Metrics;
+use std::time::Instant;
+use strum::{EnumCount, EnumIter, IntoEnumIterator};
 
 /// Optimism sequencer metrics
 #[derive(Metrics, Clone)]
@@ -19,3 +22,114 @@ impl SequencerMetrics {
         self.sequencer_forward_latency.record(duration.as_secs_f64());
     }
 }
+
+/// Optimism ETH API extension metrics
+#[derive(Metrics, Clone)]
+#[metrics(scope = "optimism_rpc.eth_api_ext")]
+pub struct EthApiExtMetrics {
+    /// How long it takes to handle a `eth_getProof` request successfully
+    pub(crate) get_proof_latency: Histogram,
+
+    /// Total number of `eth_getProof` requests
+    pub(crate) get_proof_requests: Counter,
+
+    /// Total number of successful `eth_getProof` responses
+    pub(crate) get_proof_successful_responses: Counter,
+
+    /// Total number of failures handling `eth_getProof` requests
+    pub(crate) get_proof_failures: Counter,
+}
+
+/// Types of debug apis
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, EnumCount, EnumIter)]
+pub enum DebugApis {
+    /// `DebugExecutePayload` Api
+    DebugExecutePayload,
+    /// `DebugExecutionWitness` Api
+    DebugExecutionWitness,
+}
+
+impl DebugApis {
+    /// Returns the operation as a string for metrics labels.
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::DebugExecutePayload => "debug_execute_payload",
+            Self::DebugExecutionWitness => "debug_execution_witness",
+        }
+    }
+}
+
+/// Metrics for Debug API extension calls.
+#[derive(Debug)]
+pub struct DebugApiExtMetrics {
+    /// Per-api metrics handles
+    apis: HashMap<DebugApis, DebugApiExtRpcMetrics>,
+}
+
+impl DebugApiExtMetrics {
+    /// Initializes new `DebugApiExtMetrics`
+    pub fn new() -> Self {
+        let mut apis = HashMap::default();
+        for api in DebugApis::iter() {
+            apis.insert(api, DebugApiExtRpcMetrics::new_with_labels(&[("api", api.as_str())]));
+        }
+        Self { apis }
+    }
+
+    /// Record a Debug API call async (tracks latency, requests, success, failures).
+    pub async fn record_operation_async<F, T, E>(&self, api: DebugApis, f: F) -> Result<T, E>
+    where
+        F: Future<Output = Result<T, E>>,
+    {
+        if let Some(metrics) = self.apis.get(&api) {
+            metrics.record_async(f).await
+        } else {
+            f.await
+        }
+    }
+}
+
+impl Default for DebugApiExtMetrics {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// Optimism Debug API extension metrics
+#[derive(Metrics, Clone)]
+#[metrics(scope = "optimism_rpc.debug_api_ext")]
+pub struct DebugApiExtRpcMetrics {
+    /// End-to-end time to handle this API call
+    pub(crate) latency: Histogram,
+
+    /// Total number of requests for this API
+    pub(crate) requests: Counter,
+
+    /// Total number of successful responses for this API
+    pub(crate) successful_responses: Counter,
+
+    /// Total number of failures for this API
+    pub(crate) failures: Counter,
+}
+
+impl DebugApiExtRpcMetrics {
+    /// Record rpc api call async.
+    async fn record_async<T, E, F>(&self, f: F) -> Result<T, E>
+    where
+        F: Future<Output = Result<T, E>>,
+    {
+        let start = Instant::now();
+        let result = f.await;
+
+        self.latency.record(start.elapsed().as_secs_f64());
+        self.requests.increment(1);
+
+        if result.is_ok() {
+            self.successful_responses.increment(1);
+        } else {
+            self.failures.increment(1);
+        }
+
+        result
+    }
+}
diff --git a/rust/op-reth/crates/rpc/src/sequencer.rs b/rust/op-reth/crates/rpc/src/sequencer.rs
index 11bc7477322fd..b4fd70bb44b99 100644
--- a/rust/op-reth/crates/rpc/src/sequencer.rs
+++ b/rust/op-reth/crates/rpc/src/sequencer.rs
@@ -5,7 +5,7 @@ use alloy_json_rpc::{RpcRecv, RpcSend};
 use alloy_primitives::{B256, hex};
 use alloy_rpc_client::{BuiltInConnectionString, ClientBuilder, RpcClient as Client};
 use alloy_rpc_types_eth::erc4337::TransactionConditional;
-use alloy_transport_http::{Http, reqwest};
+use alloy_transport_http::{Http, reqwest as alloy_reqwest};
 use std::{str::FromStr, sync::Arc, time::Instant};
 use thiserror::Error;
 use tracing::warn;
@@ -34,7 +34,7 @@ pub enum Error {
     ReqwestError(
         #[from]
         #[source]
-        reqwest::Error,
+        alloy_transport_http::reqwest::Error,
     ),
 }
 
@@ -70,21 +70,21 @@ impl SequencerClient {
         let sequencer_endpoint = sequencer_endpoint.into();
         let endpoint = BuiltInConnectionString::from_str(&sequencer_endpoint)?;
         if let BuiltInConnectionString::Http(url) = endpoint {
-            let mut builder = reqwest::Client::builder()
+            let mut builder = alloy_reqwest::Client::builder()
                 // we force use tls to prevent native issues
                 .use_rustls_tls();
 
             if !headers.is_empty() {
-                let mut header_map = reqwest::header::HeaderMap::new();
+                let mut header_map = alloy_reqwest::header::HeaderMap::new();
                 for header in headers {
                     if let Some((key, value)) = header.split_once('=') {
                         header_map.insert(
                             key.trim()
-                                .parse::<reqwest::header::HeaderName>()
+                                .parse::<alloy_reqwest::header::HeaderName>()
                                 .map_err(|err| Error::InvalidHeader(err.to_string()))?,
                             value
                                 .trim()
-                                .parse::<reqwest::header::HeaderValue>()
+                                .parse::<alloy_reqwest::header::HeaderValue>()
                                 .map_err(|err| Error::InvalidHeader(err.to_string()))?,
                         );
                     }
@@ -104,7 +104,7 @@ impl SequencerClient {
     /// Creates a new [`SequencerClient`] with http transport with the given http client.
     pub fn with_http_client(
         sequencer_endpoint: impl Into<String>,
-        client: reqwest::Client,
+        client: alloy_reqwest::Client,
     ) -> Result<Self, Error> {
         let sequencer_endpoint: String = sequencer_endpoint.into();
         let url = sequencer_endpoint
diff --git a/rust/op-reth/crates/rpc/src/state.rs b/rust/op-reth/crates/rpc/src/state.rs
new file mode 100644
index 0000000000000..7fd5c2a0d3618
--- /dev/null
+++ b/rust/op-reth/crates/rpc/src/state.rs
@@ -0,0 +1,62 @@
+//! State provider factory for OP Proofs ExEx.
+
+use alloy_eips::BlockId;
+use derive_more::Constructor;
+use jsonrpsee_types::error::ErrorObject;
+use reth_optimism_trie::{OpProofsStorage, OpProofsStore, provider::OpProofsStateProviderRef};
+use reth_provider::{BlockIdReader, ProviderError, ProviderResult, StateProvider};
+use reth_rpc_api::eth::helpers::FullEthApi;
+use reth_rpc_eth_types::EthApiError;
+
+/// Creates a factory for state providers using OP Proofs external proofs storage.
+#[derive(Debug, Constructor)]
+pub struct OpStateProviderFactory<Eth, P> {
+    eth_api: Eth,
+    preimage_store: OpProofsStorage<P>,
+}
+
+impl<'a, Eth, P> OpStateProviderFactory<Eth, P>
+where
+    Eth: FullEthApi + Send + Sync + 'static,
+    ErrorObject<'static>: From<Eth::Error>,
+    P: OpProofsStore + Clone + 'a,
+{
+    /// Creates a state provider for the given block id.
+    pub async fn state_provider(
+        &'a self,
+        block_id: Option<BlockId>,
+    ) -> ProviderResult<Box<dyn StateProvider + 'a>> {
+        let block_id = block_id.unwrap_or_default();
+        // Check whether the distance to the block exceeds the maximum configured window.
+        let block_number = self
+            .eth_api
+            .provider()
+            .block_number_for_id(block_id)?
+            .ok_or(EthApiError::HeaderNotFound(block_id))
+            .map_err(ProviderError::other)?;
+
+        let historical_provider =
+            self.eth_api.state_at_block_id(block_id).await.map_err(ProviderError::other)?;
+
+        let (Some((latest_block_number, _)), Some((earliest_block_number, _))) = (
+            self.preimage_store
+                .get_latest_block_number()
+                .map_err(|e| ProviderError::Database(e.into()))?,
+            self.preimage_store
+                .get_earliest_block_number()
+                .map_err(|e| ProviderError::Database(e.into()))?,
+        ) else {
+            // if no earliest block, db is empty - use historical provider
+            return Ok(historical_provider);
+        };
+
+        if block_number < earliest_block_number || block_number > latest_block_number {
+            return Ok(historical_provider);
+        }
+
+        let external_overlay_provider =
+            OpProofsStateProviderRef::new(historical_provider, &self.preimage_store, block_number);
+
+        Ok(Box::new(external_overlay_provider))
+    }
+}
diff --git a/rust/op-reth/crates/rpc/src/witness.rs b/rust/op-reth/crates/rpc/src/witness.rs
index f1095b7d9623a..0da4fe418b017 100644
--- a/rust/op-reth/crates/rpc/src/witness.rs
+++ b/rust/op-reth/crates/rpc/src/witness.rs
@@ -87,7 +87,7 @@ where
 
         let (tx, rx) = oneshot::channel();
         let this = self.clone();
-        self.inner.task_spawner.spawn_blocking(Box::pin(async move {
+        self.inner.task_spawner.spawn_blocking_task(Box::pin(async move {
             let res = this.inner.builder.payload_witness(parent_header, attributes);
             let _ = tx.send(res);
         }));
diff --git a/rust/op-reth/crates/tests/Makefile b/rust/op-reth/crates/tests/Makefile
new file mode 100644
index 0000000000000..23bd092a1d0af
--- /dev/null
+++ b/rust/op-reth/crates/tests/Makefile
@@ -0,0 +1,93 @@
+# Variables
+DOCKER_IMAGE_NAME := op-reth
+DOCKER_TAG := local
+DOCKERFILE_PATH := ../../../DockerfileOpProof
+KURTOSIS_PACKAGE := github.com/ethpandaops/optimism-package@998796c0f3bb478d63d729e65f0b76e24112e00d
+DEVNET ?= opgeth-seq-opreth-val
+GO_PKG_NAME ?= proofs/core
+SOURCE_DIR := $(shell pwd)
+OP_DEVSTACK_PROOF_SEQUENCER_EL ?= op-geth
+OP_DEVSTACK_PROOF_VALIDATOR_EL ?= op-reth-with-proof
+
+.PHONY: all build-docker build-contracts unzip-contract-artifacts update-packages run clean help
+
+# Default target
+all: build-docker run
+
+# Build op-reth
+build:
+	@echo "Building op-reth binary..."
+	cd ../../../ && cargo build --bin op-reth --manifest-path crates/optimism/bin/op-reth/Cargo.toml
+
+# Build the op-reth Docker image
+build-docker:
+	@echo "Building $(DOCKER_IMAGE_NAME):$(DOCKER_TAG) Docker image..."
+	cd ../../../ && docker build -f $(notdir $(DOCKERFILE_PATH)) -t $(DOCKER_IMAGE_NAME):$(DOCKER_TAG) .
+
+# Build coverage-enabled op-reth Docker image
+build-docker-with-cov:
+	@echo "Building coverage-enabled $(DOCKER_IMAGE_NAME):cov Docker image..."
+	cd ../../../ && docker build \
+	  --build-arg RUSTFLAGS="-Cinstrument-coverage" \
+	  --build-arg CARGO_INCREMENTAL=0 \
+	  --build-arg LLVM_PROFILE_FILE="/coverage/%m-%p.profraw" \
+	  -f $(notdir $(DOCKERFILE_PATH)) \
+	  -t $(DOCKER_IMAGE_NAME):$(DOCKER_TAG) .
+
+# Run Kurtosis with the optimism devnet
+run:
+	@echo "Starting Optimism devnet with historical proof configuration..."
+	@DEVNET_PATH="./devnets/$(DEVNET).yaml"; \
+    if [ ! -z "$(DEVNET_CUSTOM_PATH)" ]; then \
+        DEVNET_PATH="$(DEVNET_CUSTOM_PATH)"; \
+    fi; \
+    kurtosis run $(KURTOSIS_PACKAGE) --args-file $$DEVNET_PATH --enclave $(DEVNET)
+
+# Build smart contract artifacts with Foundry
+build-contracts:
+	@echo "Building contracts with forge..."
+	@cd "$(SOURCE_DIR)/proofs/contracts" && forge build || { echo "forge build failed"; exit 1; }
+
+# Unzip contract artifacts
+unzip-contract-artifacts:
+	@echo "Unzipping contract artifacts..."
+	mkdir -p "$(SOURCE_DIR)/artifacts/src"; \
+	tar --zstd -xf "$(SOURCE_DIR)/artifacts/compressed/artifacts.tzst" -C "$(SOURCE_DIR)/artifacts/src"
+
+# Update contract artifacts from the optimism submodule
+update-packages:
+	@echo "Updating contract artifacts from optimism submodule..."
+	cd "$(SOURCE_DIR)/optimism/op-deployer" && just build-contracts copy-contract-artifacts
+	mkdir -p "$(SOURCE_DIR)/artifacts/compressed"
+	cp "$(SOURCE_DIR)/optimism/op-deployer/pkg/deployer/artifacts/forge-artifacts/artifacts.tzst" "$(SOURCE_DIR)/artifacts/compressed/artifacts.tzst"
+
+# Run E2E tests using Kurtosis
+test-e2e-kurtosis: build-contracts
+	@echo "Running E2E tests with Kurtosis for $(DEVNET)"
+	@DEVNET_PATH="$(SOURCE_DIR)/devnets/$(DEVNET).yaml"; \
+    if [ ! -z "$(DEVNET_CUSTOM_PATH)" ]; then \
+        DEVNET_PATH="$(DEVNET_CUSTOM_PATH)"; \
+    fi; \
+	export OP_DEPLOYER_ARTIFACTS="$(SOURCE_DIR)/artifacts/src/forge-artifacts"; \
+	export DEVNET_ENV_URL="ktnative://$(DEVNET)$$DEVNET_PATH"; \
+	export DISABLE_OP_E2E_LEGACY=true; \
+	export DEVSTACK_ORCHESTRATOR=sysext; \
+	go test -count=1 -timeout 40m -v ./$(GO_PKG_NAME)
+
+# Run E2E tests using Sysgo
+test-e2e-sysgo: unzip-contract-artifacts build-contracts
+	@echo "Running E2E tests with Sysgo"
+	export OP_DEPLOYER_ARTIFACTS="$(SOURCE_DIR)/artifacts/src/forge-artifacts"; \
+	export DISABLE_OP_E2E_LEGACY=true; \
+	export DEVSTACK_ORCHESTRATOR=sysgo; \
+	export OP_RETH_ENABLE_PROOF_HISTORY=true; \
+	export SKIP_P2P_CONNECTION_CHECK=true; \
+	export OP_RETH_EXEC_PATH="${SOURCE_DIR}/../../../target/debug/op-reth"; \
+	export OP_DEVSTACK_PROOF_SEQUENCER_EL=$(OP_DEVSTACK_PROOF_SEQUENCER_EL); \
+	export OP_DEVSTACK_PROOF_VALIDATOR_EL=$(OP_DEVSTACK_PROOF_VALIDATOR_EL); \
+	go test -count=1 -timeout 40m -v ./$(GO_PKG_NAME)
+
+# Stop and clean Kurtosis services
+clean:
+	@echo "Cleaning up Kurtosis services..."
+	kurtosis clean -a
diff --git a/rust/op-reth/crates/tests/README.md b/rust/op-reth/crates/tests/README.md
new file mode 100644
index 0000000000000..7169c09da70b8
--- /dev/null
+++ b/rust/op-reth/crates/tests/README.md
@@ -0,0 +1,67 @@
+# E2E tests for op-reth
+
+This folder contains the end-to-end testing resources for op-reth. Tests use the Optimism "devstack" (from the Optimism monorepo) and Kurtosis to deploy ephemeral devnets.
+
+This README documents common workflows and Makefile commands used to build the local Docker image, start the devnet with Kurtosis, run e2e tests, and clean up resources.
+
+## Prerequisites
+
+- Docker (Desktop) running on your machine
+- Kurtosis CLI installed and able to reach the Kurtosis engine
+- Go (to run Go-based e2e tests)
+
+## Commands (Makefile targets)
+
+Build the Docker image used by the devnet (tags `op-reth:local`):
+
+```sh
+make build
+```
+
+Start the Optimism devnet (default: `simple-historical-proof`):
+
+```sh
+# uses the Makefile's DEVNET variable (devnets/<DEVNET>.yaml)
+# OPTIONAL. Default: opgeth-seq-opreth-val
+make run DEVNET=<name_of_YAML_without_file_extension>
+
+# or with a custom devnet YAML path
+make run DEVNET_CUSTOM_PATH=/absolute/path/to/devnet.yaml
+```
+
+Run the e2e test suite that exercises the deployed devnet (Go tests):
+
+```sh
+# runs go test with a long timeout; set GO_PKG_NAME to the package to test
+make test-e2e-kurtosis
+
+# run a specific test or package
+make test-e2e-kurtosis GO_PKG_NAME=path/to/pkg
+```
+
+Stop and remove Kurtosis resources (cleanup):
+
+```sh
+make clean
+```
+
+## Implementation notes
+
+- The Makefile in this directory calls the repository root `DockerfileOp` to build an op-reth image tagged `op-reth:local`.
+- The default Kurtosis package used is `github.com/ethpandaops/optimism-package@1.4.0`. The Makefile passes the YAML under `devnets/$(DEVNET).yaml` to `kurtosis run`.
+
+## Quick workflow example
+
+```sh
+# build image
+make build
+
+# start devnet
+make run
+
+# run tests (set GO_PKG_NAME if needed)
+make test-e2e-kurtosis GO_PKG_NAME=proofs
+
+# cleanup
+make clean
+```
diff --git a/rust/op-reth/crates/tests/artifacts/.gitignore b/rust/op-reth/crates/tests/artifacts/.gitignore
new file mode 100644
index 0000000000000..e1b09822c7963
--- /dev/null
+++ b/rust/op-reth/crates/tests/artifacts/.gitignore
@@ -0,0 +1,2 @@
+forge-artifacts
+src
\ No newline at end of file
diff --git a/rust/op-reth/crates/tests/artifacts/compressed/README.md b/rust/op-reth/crates/tests/artifacts/compressed/README.md
new file mode 100644
index 0000000000000..cc09a72587329
--- /dev/null
+++ b/rust/op-reth/crates/tests/artifacts/compressed/README.md
@@ -0,0 +1,2 @@
+Artifacts in this directory will be embedded inside the `op-deployer` binary. The directory can be populated by running
+`make unzip-contract-artifacts`.
\ No newline at end of file
diff --git a/rust/op-reth/crates/tests/artifacts/compressed/artifacts.tzst b/rust/op-reth/crates/tests/artifacts/compressed/artifacts.tzst
new file mode 100644
index 0000000000000..a3ebbe3866d73
Binary files /dev/null and b/rust/op-reth/crates/tests/artifacts/compressed/artifacts.tzst differ
diff --git a/rust/op-reth/crates/tests/devnets/opgeth-seq-opreth-val.yaml b/rust/op-reth/crates/tests/devnets/opgeth-seq-opreth-val.yaml
new file mode 100644
index 0000000000000..65aaa2f32034d
--- /dev/null
+++ b/rust/op-reth/crates/tests/devnets/opgeth-seq-opreth-val.yaml
@@ -0,0 +1,74 @@
+# A simple network configuration for kurtosis (https://github.com/ethpandaops/optimism-package)
+# Spins up chain with two participating EL/CL pairs.
+# One with op-geth/op-node (sequencer role) and one with op-reth/op-node (verifier role).
+
+optimism_package:
+  observability:
+    enabled: true
+    grafana_params:
+      # Will load the dashboards from default branch.
+      dashboard_sources:
+        - github.com/op-rs/op-reth/etc/grafana
+      image: "grafana/grafana:12.3.0"
+  faucet:
+    enabled: true
+  test-sequencers:
+    sequencer:
+      image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-test-sequencer:9243bb0452efa3fd255556631688d1255723384a
+      enabled: true
+  chains:
+    chain0:
+      # Chain with only two nodes
+      participants:
+        sequencer:
+          el:
+            type: op-geth
+            log_level: "debug"
+          cl:
+            type: op-node
+            log_level: "debug"
+            extra_params: [--experimental.sequencer-api=true]
+          sequencer: true
+        verifier:
+          el:
+            type: op-reth
+            # Note: we use the local image for now. This allows us to run the tests in CI pipelines without publishing new docker images every time.
+            image: op-reth:local
+            extra_params: [
+              --proofs-history,
+              --proofs-history.window=200,
+              --proofs-history.prune-interval=1m,
+              --proofs-history.storage-path=/data/proofs-history
+            ]
+          cl: 
+            type: op-node
+            log_level: "debug"
+            extra_params: [--experimental.sequencer-api=true]
+          sequencer: false
+      network_params:
+        network: "kurtosis"
+        network_id: "2151908"
+        seconds_per_slot: 2
+
+  global_log_level: "info"
+  global_node_selectors: {}
+  global_tolerations: []
+  persistent: false
+ethereum_package:
+  participants:
+  - el_type: geth
+    cl_type: teku
+    cl_image: consensys/teku:25.7.1
+  network_params:
+    preset: minimal
+    genesis_delay: 5
+    additional_preloaded_contracts: '
+      {
+        "0x4e59b44847b379578588920cA78FbF26c0B4956C": {
+          "balance": "0ETH",
+          "code": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3",
+          "storage": {},
+          "nonce": "1"
+        }
+      }
+    '
diff --git a/rust/op-reth/crates/tests/devnets/opreth-seq-opgeth-val.yaml b/rust/op-reth/crates/tests/devnets/opreth-seq-opgeth-val.yaml
new file mode 100644
index 0000000000000..2b43aa72d173e
--- /dev/null
+++ b/rust/op-reth/crates/tests/devnets/opreth-seq-opgeth-val.yaml
@@ -0,0 +1,74 @@
+# A simple network configuration for kurtosis (https://github.com/ethpandaops/optimism-package)
+# Spins up chain with two participating EL/CL pairs.
+# One with op-geth/op-node (verifier role) and one with op-reth/op-node (sequencer role).
+
+optimism_package:
+  observability:
+    enabled: true
+    grafana_params:
+      # Will load the dashboards from default branch.
+      dashboard_sources:
+        - github.com/op-rs/op-reth/etc/grafana
+      image: "grafana/grafana:12.3.0"
+  faucet:
+    enabled: true
+  test-sequencers:
+    sequencer:
+      image: us-docker.pkg.dev/oplabs-tools-artifacts/images/op-test-sequencer:9243bb0452efa3fd255556631688d1255723384a
+      enabled: true
+  chains:
+    chain0:
+      # Chain with only two nodes
+      participants:
+        sequencer:
+          el:
+            type: op-reth
+            # Note: we use the local image for now. This allows us to run the tests in CI pipelines without publishing new docker images every time.
+            image: op-reth:local
+            extra_params: [
+              --proofs-history,
+              --proofs-history.window=200,
+              --proofs-history.prune-interval=1m,
+              --proofs-history.storage-path=/data/proofs-history
+            ]
+          cl:
+            type: op-node
+            log_level: "debug"
+            extra_params: [--experimental.sequencer-api=true]
+          sequencer: true
+        verifier:
+          el:
+            type: op-geth
+            log_level: "debug"
+          cl:
+            type: op-node
+            log_level: "debug"
+            extra_params: [--experimental.sequencer-api=true]
+          sequencer: false
+
+      network_params:
+        network: "kurtosis"
+        network_id: "2151908"
+        seconds_per_slot: 2
+  global_log_level: "info"
+  global_node_selectors: {}
+  global_tolerations: []
+  persistent: false
+ethereum_package:
+  participants:
+  - el_type: geth
+    cl_type: teku
+    cl_image: consensys/teku:25.7.1
+  network_params:
+    preset: minimal
+    genesis_delay: 5
+    additional_preloaded_contracts: '
+      {
+        "0x4e59b44847b379578588920cA78FbF26c0B4956C": {
+          "balance": "0ETH",
+          "code": "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe03601600081602082378035828234f58015156039578182fd5b8082525050506014600cf3",
+          "storage": {},
+          "nonce": "1"
+        }
+      }
+    '
diff --git a/rust/op-reth/crates/tests/go.mod b/rust/op-reth/crates/tests/go.mod
new file mode 100644
index 0000000000000..323b57f1dfa9d
--- /dev/null
+++ b/rust/op-reth/crates/tests/go.mod
@@ -0,0 +1,286 @@
+module github.com/op-rs/op-geth
+
+go 1.24.0
+
+// We're using the "develop" branch of the Optimism repo to include the latest changes to the `devstack` package.
+require github.com/ethereum-optimism/optimism v1.16.4
+
+require (
+	github.com/BurntSushi/toml v1.5.0
+	github.com/bmatcuk/doublestar/v4 v4.8.1
+	github.com/chelnak/ysmrr v0.6.0
+	github.com/ethereum/go-ethereum v1.16.3
+	github.com/stretchr/testify v1.10.0
+	golang.org/x/sync v0.18.0
+	gopkg.in/yaml.v3 v3.0.1
+)
+
+require (
+	github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c // indirect
+	github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e // indirect
+	github.com/Masterminds/semver/v3 v3.3.1 // indirect
+	github.com/Microsoft/go-winio v0.6.2 // indirect
+	github.com/VictoriaMetrics/fastcache v1.13.0 // indirect
+	github.com/adrg/xdg v0.4.0 // indirect
+	github.com/andybalholm/brotli v1.1.0 // indirect
+	github.com/armon/go-metrics v0.4.1 // indirect
+	github.com/base/go-bip39 v1.1.0 // indirect
+	github.com/benbjohnson/clock v1.3.5 // indirect
+	github.com/beorn7/perks v1.0.1 // indirect
+	github.com/bits-and-blooms/bitset v1.20.0 // indirect
+	github.com/boltdb/bolt v1.3.1 // indirect
+	github.com/btcsuite/btcd v0.24.2 // indirect
+	github.com/btcsuite/btcd/btcec/v2 v2.3.4 // indirect
+	github.com/btcsuite/btcd/btcutil v1.1.5 // indirect
+	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
+	github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect
+	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
+	github.com/cockroachdb/errors v1.11.3 // indirect
+	github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce // indirect
+	github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
+	github.com/cockroachdb/pebble v1.1.5 // indirect
+	github.com/cockroachdb/redact v1.1.5 // indirect
+	github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
+	github.com/coder/websocket v1.8.13 // indirect
+	github.com/consensys/gnark-crypto v0.18.1 // indirect
+	github.com/containerd/cgroups v1.1.0 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
+	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
+	github.com/crate-crypto/go-eth-kzg v1.4.0 // indirect
+	github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
+	github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c // indirect
+	github.com/dchest/siphash v1.2.3 // indirect
+	github.com/deckarep/golang-set/v2 v2.6.0 // indirect
+	github.com/decred/dcrd/crypto/blake256 v1.0.1 // indirect
+	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
+	github.com/deepmap/oapi-codegen v1.8.2 // indirect
+	github.com/distribution/reference v0.6.0 // indirect
+	github.com/dlclark/regexp2 v1.7.0 // indirect
+	github.com/docker/docker v27.5.1+incompatible // indirect
+	github.com/docker/go-connections v0.5.0 // indirect
+	github.com/docker/go-units v0.5.0 // indirect
+	github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
+	github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 // indirect
+	github.com/elastic/gosigar v0.14.3 // indirect
+	github.com/emicklei/dot v1.6.2 // indirect
+	github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e // indirect
+	github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20260115192958-fb86a23cd30e // indirect
+	github.com/ethereum/c-kzg-4844/v2 v2.1.5 // indirect
+	github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab // indirect
+	github.com/ethereum/go-verkle v0.2.2 // indirect
+	github.com/fatih/color v1.18.0 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/ferranbt/fastssz v0.1.4 // indirect
+	github.com/flynn/noise v1.1.0 // indirect
+	github.com/francoispqt/gojay v1.2.13 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 // indirect
+	github.com/getsentry/sentry-go v0.27.0 // indirect
+	github.com/ghodss/yaml v1.0.0 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/stdr v1.2.2 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
+	github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
+	github.com/go-yaml/yaml v2.1.0+incompatible // indirect
+	github.com/godbus/dbus/v5 v5.1.0 // indirect
+	github.com/gofrs/flock v0.12.1 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v4 v4.5.2 // indirect
+	github.com/golang/snappy v1.0.0 // indirect
+	github.com/google/gopacket v1.1.19 // indirect
+	github.com/google/pprof v0.0.0-20241009165004-a3522334989c // indirect
+	github.com/google/uuid v1.6.0 // indirect
+	github.com/gorilla/websocket v1.5.3 // indirect
+	github.com/graph-gophers/graphql-go v1.3.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
+	github.com/hashicorp/go-bexpr v0.1.11 // indirect
+	github.com/hashicorp/go-hclog v1.6.2 // indirect
+	github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
+	github.com/hashicorp/go-metrics v0.5.4 // indirect
+	github.com/hashicorp/go-msgpack/v2 v2.1.2 // indirect
+	github.com/hashicorp/go-multierror v1.1.1 // indirect
+	github.com/hashicorp/golang-lru v0.5.0 // indirect
+	github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
+	github.com/hashicorp/raft v1.7.3 // indirect
+	github.com/hashicorp/raft-boltdb/v2 v2.3.1 // indirect
+	github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db // indirect
+	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
+	github.com/holiman/uint256 v1.3.2 // indirect
+	github.com/honeycombio/otel-config-go v1.17.0 // indirect
+	github.com/huin/goupnp v1.3.0 // indirect
+	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
+	github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c // indirect
+	github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 // indirect
+	github.com/ipfs/go-cid v0.4.1 // indirect
+	github.com/ipfs/go-datastore v0.6.0 // indirect
+	github.com/ipfs/go-ds-leveldb v0.5.0 // indirect
+	github.com/ipfs/go-log/v2 v2.5.1 // indirect
+	github.com/jackpal/go-nat-pmp v1.0.2 // indirect
+	github.com/jbenet/go-temp-err-catcher v0.1.0 // indirect
+	github.com/jbenet/goprocess v0.1.4 // indirect
+	github.com/klauspost/compress v1.18.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/koron/go-ssdp v0.0.4 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
+	github.com/kr/text v0.2.0 // indirect
+	github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2 // indirect
+	github.com/kurtosis-tech/kurtosis/api/golang v1.8.2-0.20250602144112-2b7d06430e48 // indirect
+	github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b // indirect
+	github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc // indirect
+	github.com/kurtosis-tech/kurtosis/path-compression v0.0.0-20250108161014-0819b8ca912f // indirect
+	github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409 // indirect
+	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
+	github.com/libp2p/go-flow-metrics v0.1.0 // indirect
+	github.com/libp2p/go-libp2p v0.36.2 // indirect
+	github.com/libp2p/go-libp2p-asn-util v0.4.1 // indirect
+	github.com/libp2p/go-libp2p-mplex v0.9.0 // indirect
+	github.com/libp2p/go-libp2p-pubsub v0.12.0 // indirect
+	github.com/libp2p/go-libp2p-testing v0.12.0 // indirect
+	github.com/libp2p/go-mplex v0.7.0 // indirect
+	github.com/libp2p/go-msgio v0.3.0 // indirect
+	github.com/libp2p/go-nat v0.2.0 // indirect
+	github.com/libp2p/go-netroute v0.2.1 // indirect
+	github.com/libp2p/go-reuseport v0.4.0 // indirect
+	github.com/libp2p/go-yamux/v4 v4.0.1 // indirect
+	github.com/lmittmann/w3 v0.19.5 // indirect
+	github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae // indirect
+	github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.16 // indirect
+	github.com/mholt/archiver v3.1.1+incompatible // indirect
+	github.com/miekg/dns v1.1.62 // indirect
+	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
+	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
+	github.com/minio/sha256-simd v1.0.1 // indirect
+	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
+	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/mitchellh/pointerstructure v1.2.1 // indirect
+	github.com/moby/docker-image-spec v1.3.1 // indirect
+	github.com/mr-tron/base58 v1.2.0 // indirect
+	github.com/multiformats/go-base32 v0.1.0 // indirect
+	github.com/multiformats/go-base36 v0.2.0 // indirect
+	github.com/multiformats/go-multiaddr v0.14.0 // indirect
+	github.com/multiformats/go-multiaddr-dns v0.4.1 // indirect
+	github.com/multiformats/go-multiaddr-fmt v0.1.0 // indirect
+	github.com/multiformats/go-multibase v0.2.0 // indirect
+	github.com/multiformats/go-multicodec v0.9.0 // indirect
+	github.com/multiformats/go-multihash v0.2.3 // indirect
+	github.com/multiformats/go-multistream v0.5.0 // indirect
+	github.com/multiformats/go-varint v0.0.7 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
+	github.com/naoina/go-stringutil v0.1.0 // indirect
+	github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 // indirect
+	github.com/nwaples/rardecode v1.1.3 // indirect
+	github.com/olekukonko/tablewriter v0.0.5 // indirect
+	github.com/onsi/ginkgo/v2 v2.20.0 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0 // indirect
+	github.com/opencontainers/runtime-spec v1.2.0 // indirect
+	github.com/opentracing/opentracing-go v1.2.0 // indirect
+	github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
+	github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 // indirect
+	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+	github.com/pion/datachannel v1.5.8 // indirect
+	github.com/pion/dtls/v2 v2.2.12 // indirect
+	github.com/pion/ice/v2 v2.3.34 // indirect
+	github.com/pion/interceptor v0.1.30 // indirect
+	github.com/pion/logging v0.2.2 // indirect
+	github.com/pion/mdns v0.0.12 // indirect
+	github.com/pion/randutil v0.1.0 // indirect
+	github.com/pion/rtcp v1.2.14 // indirect
+	github.com/pion/rtp v1.8.9 // indirect
+	github.com/pion/sctp v1.8.33 // indirect
+	github.com/pion/sdp/v3 v3.0.9 // indirect
+	github.com/pion/srtp/v2 v2.0.20 // indirect
+	github.com/pion/stun v0.6.1 // indirect
+	github.com/pion/stun/v2 v2.0.0 // indirect
+	github.com/pion/transport/v2 v2.2.10 // indirect
+	github.com/pion/transport/v3 v3.0.7 // indirect
+	github.com/pion/turn/v2 v2.1.6 // indirect
+	github.com/pion/webrtc/v3 v3.3.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect
+	github.com/prometheus/client_golang v1.22.0 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/protolambda/ctxlock v0.1.0 // indirect
+	github.com/quic-go/qpack v0.4.0 // indirect
+	github.com/quic-go/quic-go v0.46.0 // indirect
+	github.com/quic-go/webtransport-go v0.8.0 // indirect
+	github.com/raulk/go-watchdog v1.3.0 // indirect
+	github.com/rivo/uniseg v0.4.7 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/rs/cors v1.11.0 // indirect
+	github.com/russross/blackfriday/v2 v2.1.0 // indirect
+	github.com/schollz/progressbar/v3 v3.18.0 // indirect
+	github.com/sethvargo/go-envconfig v1.1.0 // indirect
+	github.com/shirou/gopsutil v3.21.11+incompatible // indirect
+	github.com/shirou/gopsutil/v4 v4.24.6 // indirect
+	github.com/shoenig/go-m1cpu v0.1.6 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/spaolacci/murmur3 v1.1.0 // indirect
+	github.com/spf13/afero v1.12.0 // indirect
+	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe // indirect
+	github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
+	github.com/tklauser/go-sysconf v0.3.14 // indirect
+	github.com/tklauser/numcpus v0.8.0 // indirect
+	github.com/ulikunitz/xz v0.5.12 // indirect
+	github.com/urfave/cli/v2 v2.27.6 // indirect
+	github.com/wlynxg/anet v0.0.4 // indirect
+	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
+	go.etcd.io/bbolt v1.3.5 // indirect
+	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/host v0.53.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/runtime v0.53.0 // indirect
+	go.opentelemetry.io/contrib/propagators/b3 v1.28.0 // indirect
+	go.opentelemetry.io/contrib/propagators/ot v1.28.0 // indirect
+	go.opentelemetry.io/otel v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 // indirect
+	go.opentelemetry.io/otel/metric v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
+	go.opentelemetry.io/otel/sdk/metric v1.31.0 // indirect
+	go.opentelemetry.io/otel/trace v1.34.0 // indirect
+	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
+	go.uber.org/dig v1.18.0 // indirect
+	go.uber.org/fx v1.22.2 // indirect
+	go.uber.org/mock v0.4.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
+	golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
+	golang.org/x/mod v0.29.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 // indirect
+	golang.org/x/term v0.37.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/time v0.11.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
+	google.golang.org/grpc v1.69.4 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
+	lukechampine.com/blake3 v1.3.0 // indirect
+)
+
+replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101605.0-rc.1
+
+replace github.com/ethereum-optimism/optimism => ./optimism
diff --git a/rust/op-reth/crates/tests/go.sum b/rust/op-reth/crates/tests/go.sum
new file mode 100644
index 0000000000000..fc2c7004e3e61
--- /dev/null
+++ b/rust/op-reth/crates/tests/go.sum
@@ -0,0 +1,1192 @@
+cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
+cloud.google.com/go v0.37.0/go.mod h1:TS1dMSSfndXH133OKGwekG838Om/cQT0BUHV3HcBgoo=
+dmitri.shuralyov.com/app/changes v0.0.0-20180602232624-0a106ad413e3/go.mod h1:Yl+fi1br7+Rr3LqpNJf1/uxUdtRUV+Tnj0o93V2B9MU=
+dmitri.shuralyov.com/html/belt v0.0.0-20180602232347-f7d459c86be0/go.mod h1:JLBrvjyP0v+ecvNYvCpyZgu5/xkfAUhi6wJj28eUfSU=
+dmitri.shuralyov.com/service/change v0.0.0-20181023043359-a85b471d5412/go.mod h1:a1inKt/atXimZ4Mv927x+r7UpyzRUf4emIoiiSC2TN4=
+dmitri.shuralyov.com/state v0.0.0-20180228185332-28bcc343414c/go.mod h1:0PRwlb0D6DFvNNtx+9ybjezNCa8XF0xaYcETyp6rHWU=
+git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg=
+github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96 h1:cTp8I5+VIoKjsnZuH8vjyaysT/ses3EvZeaV/1UkF2M=
+github.com/AndreasBriese/bbloom v0.0.0-20190825152654-46b345b51c96/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c h1:udKWzYgxTojEKWjV8V+WSxDXJ4NFATAsZjh8iIbsQIg=
+github.com/Azure/go-ansiterm v0.0.0-20250102033503-faa5f7b0171c/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg=
+github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
+github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e h1:ZIWapoIRN1VqT8GR8jAwb1Ie9GyehWjVcGh32Y2MznE=
+github.com/DataDog/zstd v1.5.6-0.20230824185856-869dae002e5e/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw=
+github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
+github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
+github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/VictoriaMetrics/fastcache v1.13.0 h1:AW4mheMR5Vd9FkAPUv+NH6Nhw+fmbTMGMsNAoA/+4G0=
+github.com/VictoriaMetrics/fastcache v1.13.0/go.mod h1:hHXhl4DA2fTL2HTZDJFXWgW0LNjo6B+4aj2Wmng3TjU=
+github.com/adrg/xdg v0.4.0 h1:RzRqFcjH4nE5C6oTAxhBtoE2IRyjBSa62SCbyPidvls=
+github.com/adrg/xdg v0.4.0/go.mod h1:N6ag73EX4wyxeaoeHctc1mas01KZgsj5tYiAIwqJE/E=
+github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
+github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
+github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc=
+github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
+github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
+github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c=
+github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA=
+github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4=
+github.com/base/go-bip39 v1.1.0 h1:ely6zK09KaQbfX8wpcmN4pRXy0SbbqMT2QF45P1BNh0=
+github.com/base/go-bip39 v1.1.0/go.mod h1:grZZXX8gYycovDC4cLS/RS0DmctofwHN+MUhedYCbO0=
+github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/benbjohnson/clock v1.3.5 h1:VvXlSJBzZpA/zum6Sj74hxwYI2DIxRWuNIoXAzHZz5o=
+github.com/benbjohnson/clock v1.3.5/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
+github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
+github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
+github.com/bits-and-blooms/bitset v1.20.0 h1:2F+rfL86jE2d/bmw7OhqUg2Sj/1rURkBn3MdfoPyRVU=
+github.com/bits-and-blooms/bitset v1.20.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
+github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
+github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
+github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4=
+github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
+github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g=
+github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
+github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
+github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
+github.com/btcsuite/btcd v0.24.2 h1:aLmxPguqxza+4ag8R1I2nnJjSu2iFn/kqtHTIImswcY=
+github.com/btcsuite/btcd v0.24.2/go.mod h1:5C8ChTkl5ejr3WHj8tkQSCmydiMEPB0ZhQhehpq7Dgg=
+github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
+github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
+github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=
+github.com/btcsuite/btcd/btcec/v2 v2.3.4/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
+github.com/btcsuite/btcd/btcutil v1.0.0/go.mod h1:Uoxwv0pqYWhD//tfTiipkxNfdhG9UrLwaeswfjfdF0A=
+github.com/btcsuite/btcd/btcutil v1.1.0/go.mod h1:5OapHB7A2hBBWLm48mmw4MOHNJCcUBTwmWH/0Jn8VHE=
+github.com/btcsuite/btcd/btcutil v1.1.5 h1:+wER79R5670vs/ZusMTF1yTcRYE5GUsFbdjdisflzM8=
+github.com/btcsuite/btcd/btcutil v1.1.5/go.mod h1:PSZZ4UitpLBWzxGd5VGOrLnmOjtPP/a6HaFo12zMs00=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ=
+github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc=
+github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f h1:bAs4lUbRJpnnkd9VhRV3jjAVU7DJVjMaK+IsvSeZvFo=
+github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
+github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
+github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
+github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
+github.com/btcsuite/goleveldb v1.0.0/go.mod h1:QiK9vBlgftBg6rWQIj6wFzbPfRjiykIEhBH4obrXJ/I=
+github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
+github.com/btcsuite/snappy-go v1.0.0/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
+github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792/go.mod h1:ghJtEyQwv5/p4Mg4C0fgbePVuGr935/5ddU9Z3TmDRY=
+github.com/btcsuite/winsvc v1.0.0/go.mod h1:jsenWakMcC0zFBFurPLEAyrnc/teJEM1O46fmI40EZs=
+github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
+github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
+github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
+github.com/cespare/cp v0.1.0 h1:SE+dxFebS7Iik5LK0tsi1k9ZCxEaFX4AjQmoyA+1dJk=
+github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s=
+github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko=
+github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/chelnak/ysmrr v0.6.0 h1:kMhO0oI02tl/9szvxrOE0yeImtrK4KQhER0oXu1K/iM=
+github.com/chelnak/ysmrr v0.6.0/go.mod h1:56JSrmQgb7/7xoMvuD87h3PE/qW6K1+BQcrgWtVLTUo=
+github.com/chengxilo/virtualterm v1.0.4 h1:Z6IpERbRVlfB8WkOmtbHiDbBANU7cimRIof7mk9/PwM=
+github.com/chengxilo/virtualterm v1.0.4/go.mod h1:DyxxBZz/x1iqJjFxTFcr6/x+jSpqN0iwWCOK1q10rlY=
+github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
+github.com/chzyer/logex v1.2.0/go.mod h1:9+9sk7u7pGNWYMkh0hdiL++6OeibzJccyQU4p4MedaY=
+github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
+github.com/chzyer/readline v1.5.0/go.mod h1:x22KAscuvRqlLoK9CsoYsmxoXZMMFVyOl86cAH8qUic=
+github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/chzyer/test v0.0.0-20210722231415-061457976a23/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
+github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs=
+github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
+github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
+github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
+github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f h1:otljaYPt5hWxV3MUfO5dFPFiOXg9CyG5/kCfayTqsJ4=
+github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU=
+github.com/cockroachdb/errors v1.11.3 h1:5bA+k2Y6r+oz/6Z/RFlNeVCesGARKuC6YymtcDrbC/I=
+github.com/cockroachdb/errors v1.11.3/go.mod h1:m4UIW4CDjx+R5cybPsNrRbreomiFqt8o1h1wUVazSd8=
+github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce h1:giXvy4KSc/6g/esnpM7Geqxka4WSqI1SZc7sMJFd3y4=
+github.com/cockroachdb/fifo v0.0.0-20240606204812-0bbfbd93a7ce/go.mod h1:9/y3cnZ5GKakj/H4y9r9GTjCvAFta7KLgSHPJJYc52M=
+github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
+github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
+github.com/cockroachdb/pebble v1.1.5 h1:5AAWCBWbat0uE0blr8qzufZP5tBjkRyy/jWe1QWLnvw=
+github.com/cockroachdb/pebble v1.1.5/go.mod h1:17wO9el1YEigxkP/YtV8NtCivQDgoCyBg5c4VR/eOWo=
+github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
+github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
+github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
+github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06/go.mod h1:7nc4anLGjupUW/PeY5qiNYsdNXj7zopG+eqsS7To5IQ=
+github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
+github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
+github.com/consensys/gnark-crypto v0.18.1 h1:RyLV6UhPRoYYzaFnPQA4qK3DyuDgkTgskDdoGqFt3fI=
+github.com/consensys/gnark-crypto v0.18.1/go.mod h1:L3mXGFTe1ZN+RSJ+CLjUt9x7PNdx8ubaYfDROyp2Z8c=
+github.com/containerd/cgroups v0.0.0-20201119153540-4cbc285b3327/go.mod h1:ZJeTFisyysqgcCdecO57Dj79RfL0LNeGiFUqLYQRYLE=
+github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM=
+github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw=
+github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
+github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
+github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
+github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
+github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
+github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/crate-crypto/go-eth-kzg v1.4.0 h1:WzDGjHk4gFg6YzV0rJOAsTK4z3Qkz5jd4RE3DAvPFkg=
+github.com/crate-crypto/go-eth-kzg v1.4.0/go.mod h1:J9/u5sWfznSObptgfa92Jq8rTswn6ahQWEuiLHOjCUI=
+github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a h1:W8mUrRp6NOVl3J+MYp5kPMoUZPp7aOYHtaua31lwRHg=
+github.com/crate-crypto/go-ipa v0.0.0-20240724233137-53bbb0ceb27a/go.mod h1:sTwzHBvIzm2RfVCGNEBZgRyjwK40bVoun3ZnGOCafNM=
+github.com/crate-crypto/go-kzg-4844 v1.1.0 h1:EN/u9k2TF6OWSHrCCDBBU6GLNMq88OspHHlMnHfoyU4=
+github.com/crate-crypto/go-kzg-4844 v1.1.0/go.mod h1:JolLjpSff1tCCJKaJx4psrlEdlXuJEC996PL3tTAFks=
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
+github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c h1:pFUpOrbxDR6AkioZ1ySsx5yxlDQZ8stG2b88gTPxgJU=
+github.com/davidlazar/go-crypto v0.0.0-20200604182044-b73af7476f6c/go.mod h1:6UhI8N9EjYm1c2odKpFpAYeR8dsBeM7PtzQhRgxRr9U=
+github.com/dchest/siphash v1.2.3 h1:QXwFc8cFOR2dSa/gE6o/HokBMWtLUaNDVd+22aKHeEA=
+github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIXMPAkHc=
+github.com/deckarep/golang-set/v2 v2.6.0 h1:XfcQbWM1LlMB8BsJ8N9vW5ehnnPVIw0je80NsVHagjM=
+github.com/deckarep/golang-set/v2 v2.6.0/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
+github.com/decred/dcrd/crypto/blake256 v1.0.0/go.mod h1:sQl2p6Y26YV+ZOcSTP6thNdn47hh8kt6rqSlvmrXFAc=
+github.com/decred/dcrd/crypto/blake256 v1.0.1 h1:7PltbUIQB7u/FfZ39+DGa/ShuMyJ5ilcvdfma9wOH6Y=
+github.com/decred/dcrd/crypto/blake256 v1.0.1/go.mod h1:2OfgNZ5wDpcsFmHmCK5gZTPcCXqlm2ArzUIkw9czNJo=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1/go.mod h1:hyedUtir6IdtD/7lIxGeCxkaw7y45JueMRL4DIyJDKs=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 h1:rpfIENRNNilwHwZeG5+P150SMrnNEcHYvcCuK6dPZSg=
+github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0/go.mod h1:v57UDF4pDQJcEfFUCRop3lJL149eHGSe9Jvczhzjo/0=
+github.com/decred/dcrd/lru v1.0.0/go.mod h1:mxKOwFd7lFjN2GZYsiz/ecgqR6kkYAl+0pz0tEMk218=
+github.com/deepmap/oapi-codegen v1.6.0/go.mod h1:ryDa9AgbELGeB+YEXE1dR53yAjHwFvE9iAUlWl9Al3M=
+github.com/deepmap/oapi-codegen v1.8.2 h1:SegyeYGcdi0jLLrpbCMoJxnUUn8GBXHsvr4rbzjuhfU=
+github.com/deepmap/oapi-codegen v1.8.2/go.mod h1:YLgSKSDv/bZQB7N4ws6luhozi3cEdRktEqrX88CvjIw=
+github.com/dgraph-io/badger v1.6.2 h1:mNw0qs90GVgGGWylh0umH5iag1j6n/PeJtNvL6KY/x8=
+github.com/dgraph-io/badger v1.6.2/go.mod h1:JW2yswe3V058sS0kZ2h/AXeDSqFjxnZcRrVH//y2UQE=
+github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de h1:t0UHb5vdojIDUqktM6+xJAfScFBsVpXZmqC9dsgJmeA=
+github.com/dgraph-io/ristretto v0.0.3-0.20200630154024-f66de99634de/go.mod h1:KPxhHT9ZxKefz+PCeOGsrHpl1qZ7i70dGTu2u+Ahh6E=
+github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
+github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
+github.com/dlclark/regexp2 v1.4.1-0.20201116162257-a2a8dda75c91/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
+github.com/dlclark/regexp2 v1.7.0 h1:7lJfhqlPssTb1WQx4yvTHN0uElPEv52sbaECrAQxjAo=
+github.com/dlclark/regexp2 v1.7.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
+github.com/docker/docker v27.5.1+incompatible h1:4PYU5dnBYqRQi0294d1FBECqT9ECWeQAIfE8q4YnPY8=
+github.com/docker/docker v27.5.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
+github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
+github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
+github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
+github.com/dop251/goja v0.0.0-20211022113120-dc8c55024d06/go.mod h1:R9ET47fwRVRPZnOGvHxxhuZcbrMCuiqOz3Rlrh4KSnk=
+github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 h1:qwcF+vdFrvPSEUDSX5RVoRccG8a5DhOdWdQ4zN62zzo=
+github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127/go.mod h1:QMWlm50DNe14hD7t24KEqZuUdC9sOTy8W6XbCU1mlw4=
+github.com/dop251/goja_nodejs v0.0.0-20210225215109-d91c329300e7/go.mod h1:hn7BA7c8pLvoGndExHudxTDKZ84Pyvv+90pbBjbTz0Y=
+github.com/dop251/goja_nodejs v0.0.0-20211022123610-8dd9abb0616d/go.mod h1:DngW8aVqWbuLRMHItjPUyqdj+HWPvnQe8V8y1nDpIbM=
+github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5 h1:iFaUwBSo5Svw6L7HYpRu/0lE3e0BaElwnNO1qkNQxBY=
+github.com/dsnet/compress v0.0.2-0.20210315054119-f66993602bf5/go.mod h1:qssHWj60/X5sZFNxpG4HBPDHVqxNm4DfnCKgrbZOT+s=
+github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
+github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
+github.com/elastic/gosigar v0.12.0/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
+github.com/elastic/gosigar v0.14.3 h1:xwkKwPia+hSfg9GqrCUKYdId102m9qTJIIr7egmK/uo=
+github.com/elastic/gosigar v0.14.3/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
+github.com/emicklei/dot v1.6.2 h1:08GN+DD79cy/tzN6uLCT84+2Wk9u+wvqP+Hkx/dIR8A=
+github.com/emicklei/dot v1.6.2/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
+github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e h1:iy1vBIzACYUyOVyoADUwvAiq2eOPC0yVsDUdolPwQjk=
+github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e/go.mod h1:DYj7+vYJ4cIB7zera9mv4LcAynCL5u4YVfoeUu6Wa+w=
+github.com/ethereum-optimism/op-geth v1.101605.0-rc.1 h1:rzmwuBKOMZnQc4QNBm5iEqBrnEo1M5cbklWHkC5Oszo=
+github.com/ethereum-optimism/op-geth v1.101605.0-rc.1/go.mod h1:9J7De8kDwXE/lrMgVEHc0F33TZqcN1Lb5nYaW6UZt38=
+github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20260115192958-fb86a23cd30e h1:TO1tUcwbhIrNuea/LCsQJSQ5HDWCHdrzT/5MLC1aIU4=
+github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20260115192958-fb86a23cd30e/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y=
+github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s=
+github.com/ethereum/c-kzg-4844/v2 v2.1.5/go.mod h1:u59hRTTah4Co6i9fDWtiCjTrblJv0UwsqZKCc0GfgUs=
+github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab h1:rvv6MJhy07IMfEKuARQ9TKojGqLVNxQajaXEp/BoqSk=
+github.com/ethereum/go-bigmodexpfix v0.0.0-20250911101455-f9e208c548ab/go.mod h1:IuLm4IsPipXKF7CW5Lzf68PIbZ5yl7FFd74l/E0o9A8=
+github.com/ethereum/go-verkle v0.2.2 h1:I2W0WjnrFUIzzVPwm8ykY+7pL2d4VhlsePn4j7cnFk8=
+github.com/ethereum/go-verkle v0.2.2/go.mod h1:M3b90YRnzqKyyzBEWJGqj8Qff4IDeXnzFw0P9bFw3uk=
+github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
+github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
+github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/ferranbt/fastssz v0.1.4 h1:OCDB+dYDEQDvAgtAGnTSidK1Pe2tW3nFV40XyMkTeDY=
+github.com/ferranbt/fastssz v0.1.4/go.mod h1:Ea3+oeoRGGLGm5shYAeDgu6PGUlcvQhE2fILyD9+tGg=
+github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
+github.com/flynn/noise v1.1.0 h1:KjPQoQCEFdZDiP03phOvGi11+SVVhBG2wOWAorLsstg=
+github.com/flynn/noise v1.1.0/go.mod h1:xbMo+0i6+IGbYdJhF31t2eR1BIU0CYc12+BNAKwUTag=
+github.com/francoispqt/gojay v1.2.13 h1:d2m3sFjloqoIUQU3TsHBgj6qg/BVGlTBeHDUmyJnXKk=
+github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08 h1:f6D9Hr8xV8uYKlyuj8XIruxlh9WjVjdh1gIicAS7ays=
+github.com/gballet/go-libpcsclite v0.0.0-20191108122812-4678299bea08/go.mod h1:x7DCsMOv1taUwEWCzT4cmDeAkigA5/QCwUodaVOe8Ww=
+github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
+github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
+github.com/getsentry/sentry-go v0.27.0 h1:Pv98CIbtB3LkMWmXi4Joa5OOcwbmnX88sF5qbK3r3Ps=
+github.com/getsentry/sentry-go v0.27.0/go.mod h1:lc76E2QywIyW8WuBnwl8Lc4bkmQH4+w1gwTf25trprY=
+github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
+github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
+github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0=
+github.com/go-chi/chi/v5 v5.0.0/go.mod h1:BBug9lr0cqtdAhsu6R4AAdvufI0/XBzAQSsUqJpoZOs=
+github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q=
+github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
+github.com/go-errors/errors v1.4.2/go.mod h1:sIVyrIiJhuEF+Pj9Ebtd6P/rEYROXFi3BopGUQ5a5Og=
+github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
+github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
+github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
+github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
+github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
+github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE=
+github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78=
+github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
+github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible h1:W1iEw64niKVGogNgBN3ePyLFfuisuzeidWPMPWmECqU=
+github.com/go-sourcemap/sourcemap v2.1.3+incompatible/go.mod h1:F8jJfvm2KbVjc5NqelyYJmf/v5J0dwNLS2mL4sNA1Jg=
+github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
+github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
+github.com/go-yaml/yaml v2.1.0+incompatible h1:RYi2hDdss1u4YE7GwixGzWwVo47T8UQwnTLB6vQiq+o=
+github.com/go-yaml/yaml v2.1.0+incompatible/go.mod h1:w2MrLa16VYP0jy6N7M5kHaCkaLENm+P+Tv+MfurjSw0=
+github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk=
+github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
+github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
+github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
+github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
+github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
+github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
+github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
+github.com/golang-jwt/jwt/v4 v4.5.2 h1:YtQM7lnr8iZ+j5q71MGKkNw9Mn7AjHM68uc9g5fXeUI=
+github.com/golang-jwt/jwt/v4 v4.5.2/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
+github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
+github.com/golang/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:tluoj9z5200jBnyusfRPU2LqT6J+DAorxEvtC7LHB+E=
+github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
+github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
+github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs=
+github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219/go.mod h1:/X8TswGSh1pIozq4ZwCfxS0WA5JGXguxk94ar/4c87Y=
+github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
+github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-github v17.0.0+incompatible/go.mod h1:zLgOLi98H3fifZn+44m+umXrS52loVEgC2AApnigrVQ=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gofuzz v1.2.1-0.20220503160820-4a35382e8fc8 h1:Ep/joEub9YwcjRY6ND3+Y/w0ncE540RtGatVhtZL0/Q=
+github.com/google/gofuzz v1.2.1-0.20220503160820-4a35382e8fc8/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/gopacket v1.1.19 h1:ves8RnFZPGiFnTS0uPQStjwru6uO6h+nlr9j6fL7kF8=
+github.com/google/gopacket v1.1.19/go.mod h1:iJ8V8n6KS+z2U1A8pUwu8bW5SyEMkXJB8Yo/Vo+TKTo=
+github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
+github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/pprof v0.0.0-20230207041349-798e818bf904/go.mod h1:uglQLonpP8qtYCYyzA+8c/9qtqgA3qsXGYqCPKARAFg=
+github.com/google/pprof v0.0.0-20241009165004-a3522334989c h1:NDovD0SMpBYXlE1zJmS1q55vWB/fUQBcPAqAboZSccA=
+github.com/google/pprof v0.0.0-20241009165004-a3522334989c/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
+github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
+github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
+github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/graph-gophers/graphql-go v1.3.0 h1:Eb9x/q6MFpCLz7jBCiP/WTxjSDrYLR1QY41SORZyNJ0=
+github.com/graph-gophers/graphql-go v1.3.0/go.mod h1:9CQHMSxwO4MprSdzoIEobiHpoLtHm77vfxsvsIN5Vuc=
+github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
+github.com/grpc-ecosystem/grpc-gateway v1.5.0/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1/go.mod h1:RBRO7fro65R6tjKzYgLAFo0t1QEXY1Dp+i/bvpRiqiQ=
+github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
+github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
+github.com/hashicorp/go-bexpr v0.1.11 h1:6DqdA/KBjurGby9yTY0bmkathya0lfwF2SeuubCI7dY=
+github.com/hashicorp/go-bexpr v0.1.11/go.mod h1:f03lAo0duBlDIUMGCuad8oLcgejw4m7U+N8T+6Kz1AE=
+github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
+github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I=
+github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-immutable-radix v1.0.0 h1:AKDB1HM5PWEA7i4nhcpwOrO2byshxBjXVn/J/3+z5/0=
+github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
+github.com/hashicorp/go-metrics v0.5.4 h1:8mmPiIJkTPPEbAiV97IxdAGNdRdaWwVap1BU6elejKY=
+github.com/hashicorp/go-metrics v0.5.4/go.mod h1:CG5yz4NZ/AI/aQt9Ucm/vdBnbh7fvmv4lxZ350i+QQI=
+github.com/hashicorp/go-msgpack v0.5.5 h1:i9R9JSrqIz0QVLz3sz+i3YJdT7TTSLcfLLzJi9aZTuI=
+github.com/hashicorp/go-msgpack v0.5.5/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
+github.com/hashicorp/go-msgpack/v2 v2.1.2 h1:4Ee8FTp834e+ewB71RDrQ0VKpyFdrKOjvYtnQ/ltVj0=
+github.com/hashicorp/go-msgpack/v2 v2.1.2/go.mod h1:upybraOAblm4S7rx0+jeNy+CWWhzywQsSRV5033mMu4=
+github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
+github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
+github.com/hashicorp/go-uuid v1.0.0 h1:RS8zrF7PhGwyNPOtxSClXXj9HA8feRnJzgnI1RJCSnM=
+github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
+github.com/hashicorp/golang-lru v0.5.0 h1:CL2msUPvZTLb5O648aiLNJw3hnBxN2+1Jq8rCOH9wdo=
+github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru/arc/v2 v2.0.7 h1:QxkVTxwColcduO+LP7eJO56r2hFiG8zEbfAAzRv52KQ=
+github.com/hashicorp/golang-lru/arc/v2 v2.0.7/go.mod h1:Pe7gBlGdc8clY5LJ0LpJXMt5AmgmWNH1g+oFFVUHOEc=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
+github.com/hashicorp/raft v1.7.3 h1:DxpEqZJysHN0wK+fviai5mFcSYsCkNpFUl1xpAW8Rbo=
+github.com/hashicorp/raft v1.7.3/go.mod h1:DfvCGFxpAUPE0L4Uc8JLlTPtc3GzSbdH0MTJCLgnmJQ=
+github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e h1:SK4y8oR4ZMHPvwVHryKI88kJPJda4UyWYvG5A6iEQxc=
+github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e/go.mod h1:EMz/UIuG93P0MBeHh6CbXQAEe8ckVJLZjhD17lBzK5Q=
+github.com/hashicorp/raft-boltdb/v2 v2.3.1 h1:ackhdCNPKblmOhjEU9+4lHSJYFkJd6Jqyvj6eW9pwkc=
+github.com/hashicorp/raft-boltdb/v2 v2.3.1/go.mod h1:n4S+g43dXF1tqDT+yzcXHhXM6y7MrlUd3TTwGRcUvQE=
+github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db h1:IZUYC/xb3giYwBLMnr8d0TGTzPKFGNTCGgGLoyeX330=
+github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db/go.mod h1:xTEYN9KCHxuYHs+NmrmzFcnvHMzLLNiGFafCb1n3Mfg=
+github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
+github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
+github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA=
+github.com/holiman/uint256 v1.3.2/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E=
+github.com/honeycombio/otel-config-go v1.17.0 h1:3/zig0L3IGnfgiCrEfAwBsM0rF57+TKTyJ/a8yqW2eM=
+github.com/honeycombio/otel-config-go v1.17.0/go.mod h1:g2mMdfih4sYKfXBtz2mNGvo3HiQYqX4Up4pdA8JOF2s=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/huin/goupnp v1.3.0 h1:UvLUlWDNpoUdYzb2TCn+MuTWtcjXKSza2n6CBdQ0xXc=
+github.com/huin/goupnp v1.3.0/go.mod h1:gnGPsThkYa7bFi/KWmEysQRf48l2dvR5bxr2OFckNX8=
+github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
+github.com/ianlancetaylor/demangle v0.0.0-20220319035150-800ac71e25c2/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w=
+github.com/influxdata/influxdb-client-go/v2 v2.4.0 h1:HGBfZYStlx3Kqvsv1h2pJixbCl/jhnFtxpKFAv9Tu5k=
+github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8=
+github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c h1:qSHzRbhzK8RdXOsAdfDgO49TtqC1oZ+acxPrkfTxcCs=
+github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
+github.com/influxdata/line-protocol v0.0.0-20200327222509-2487e7298839/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
+github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097 h1:vilfsDSy7TDxedi9gyBkMvAirat/oRcL0lFdJBf6tdM=
+github.com/influxdata/line-protocol v0.0.0-20210311194329-9aa0e372d097/go.mod h1:xaLFMmpvUxqXtVkUJfg9QmT88cDaCJ3ZKgdZ78oO8Qo=
+github.com/ipfs/go-cid v0.4.1 h1:A/T3qGvxi4kpKWWcPC/PgbvDA2bjVLO7n4UeVwnbs/s=
+github.com/ipfs/go-cid v0.4.1/go.mod h1:uQHwDeX4c6CtyrFwdqyhpNcxVewur1M7l7fNU7LKwZk=
+github.com/ipfs/go-datastore v0.5.0/go.mod h1:9zhEApYMTl17C8YDp7JmU7sQZi2/wqiYh73hakZ90Bk=
+github.com/ipfs/go-datastore v0.6.0 h1:JKyz+Gvz1QEZw0LsX1IBn+JFCJQH4SJVFtM4uWU0Myk=
+github.com/ipfs/go-datastore v0.6.0/go.mod h1:rt5M3nNbSO/8q1t4LNkLyUwRs8HupMeN/8O4Vn9YAT8=
+github.com/ipfs/go-detect-race v0.0.1 h1:qX/xay2W3E4Q1U7d9lNs1sU9nvguX0a7319XbyQ6cOk=
+github.com/ipfs/go-detect-race v0.0.1/go.mod h1:8BNT7shDZPo99Q74BpGMK+4D8Mn4j46UU0LZ723meps=
+github.com/ipfs/go-ds-badger v0.3.0 h1:xREL3V0EH9S219kFFueOYJJTcjgNSZ2HY1iSvN7U1Ro=
+github.com/ipfs/go-ds-badger v0.3.0/go.mod h1:1ke6mXNqeV8K3y5Ak2bAA0osoTfmxUdupVCGm4QUIek=
+github.com/ipfs/go-ds-leveldb v0.5.0 h1:s++MEBbD3ZKc9/8/njrn4flZLnCuY9I79v94gBUNumo=
+github.com/ipfs/go-ds-leveldb v0.5.0/go.mod h1:d3XG9RUDzQ6V4SHi8+Xgj9j1XuEk1z82lquxrVbml/Q=
+github.com/ipfs/go-ipfs-delay v0.0.0-20181109222059-70721b86a9a8/go.mod h1:8SP1YXK1M1kXuc4KJZINY3TQQ03J2rwBG9QfXmbRPrw=
+github.com/ipfs/go-log/v2 v2.5.1 h1:1XdUzF7048prq4aBjDQQ4SL5RxftpRGdXhNRwKSAlcY=
+github.com/ipfs/go-log/v2 v2.5.1/go.mod h1:prSpmC1Gpllc9UYWxDiZDreBYw7zp4Iqp1kOLU9U5UI=
+github.com/jackpal/go-nat-pmp v1.0.2 h1:KzKSgb7qkJvOUTqYl9/Hg/me3pWgBmERKrTGD7BdWus=
+github.com/jackpal/go-nat-pmp v1.0.2/go.mod h1:QPH045xvCAeXUZOxsnwmrtiCoxIr9eob+4orBN1SBKc=
+github.com/jbenet/go-cienv v0.1.0/go.mod h1:TqNnHUmJgXau0nCzC7kXWeotg3J9W34CUv5Djy1+FlA=
+github.com/jbenet/go-temp-err-catcher v0.1.0 h1:zpb3ZH6wIE8Shj2sKS+khgRvf7T7RABoLk/+KKHggpk=
+github.com/jbenet/go-temp-err-catcher v0.1.0/go.mod h1:0kJRvmDZXNMIiJirNPEYfhpPwbGVtZVWC34vc5WLsDk=
+github.com/jbenet/goprocess v0.1.4 h1:DRGOFReOMqqDNXwW70QkacFW0YN9QnwLV0Vqk+3oU0o=
+github.com/jbenet/goprocess v0.1.4/go.mod h1:5yspPrukOVuOLORacaBi858NqyClJPQxYZlqdZVfqY4=
+github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU=
+github.com/jessevdk/go-flags v0.0.0-20141203071132-1679536dcc89/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
+github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
+github.com/jrick/logrotate v1.0.0/go.mod h1:LNinyqDIJnpAur+b8yyulnQw/wDuN1+BYKlTRt3OuAQ=
+github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
+github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
+github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
+github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/kkdai/bstream v0.0.0-20161212061736-f391b8402d23/go.mod h1:J+Gs4SYgM6CZQHDETBtE9HaSEkGmuNXF86RwHhHUvq4=
+github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
+github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo=
+github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ=
+github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
+github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
+github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
+github.com/koron/go-ssdp v0.0.4 h1:1IDwrghSKYM7yLf7XCzbByg2sJ/JcNOZRXS2jczTwz0=
+github.com/koron/go-ssdp v0.0.4/go.mod h1:oDXq+E5IL5q0U8uSBcoAXzTzInwy5lEgC91HoKtbmZk=
+github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2 h1:izciXrFyFR+ihJ7nLTOkoIX5GzBPIp8gVKlw94gIc98=
+github.com/kurtosis-tech/kurtosis-portal/api/golang v0.0.0-20230818182330-1a86869414d2/go.mod h1:bWSMQK3WHVTGHX9CjxPAb/LtzcmfOxID2wdzakSWQxo=
+github.com/kurtosis-tech/kurtosis/api/golang v1.8.2-0.20250602144112-2b7d06430e48 h1:iBbwJrQQ+9Erq9FiEJAp/Rk4ZdMBvA8UX+irXleWu+c=
+github.com/kurtosis-tech/kurtosis/api/golang v1.8.2-0.20250602144112-2b7d06430e48/go.mod h1:VZXj/IVyUGVSFy27sD6BJp+6dhZgveuOLPT/crpGjxg=
+github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b h1:hMoIM99QKcYQqsnK4AF7Lovi9ZD9ac6lZLZ5D/jx2x8=
+github.com/kurtosis-tech/kurtosis/contexts-config-store v0.0.0-20230818184218-f4e3e773463b/go.mod h1:4pFdrRwDz5R+Fov2ZuTaPhAVgjA2jhGh1Izf832sX7A=
+github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc h1:7IlEpSehmWcNXOFpNP24Cu5HQI3af7GCBQw//m+LnvQ=
+github.com/kurtosis-tech/kurtosis/grpc-file-transfer/golang v0.0.0-20230803130419-099ee7a4e3dc/go.mod h1:TOWMQgvAJH/NiWWERGXg/plT9lS7aFcXFxCa0M5sfHo=
+github.com/kurtosis-tech/kurtosis/path-compression v0.0.0-20250108161014-0819b8ca912f h1:kys3RDy0uHk+VwYS1mVh48YnogkRTAxUUCV7kpwMNOQ=
+github.com/kurtosis-tech/kurtosis/path-compression v0.0.0-20250108161014-0819b8ca912f/go.mod h1:aDMrPeS7Gii8W6SDKSKyrBNgEQAUYidriyeKGf+Ml3I=
+github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409 h1:YQTATifMUwZEtZYb0LVA7DK2pj8s71iY8rzweuUQ5+g=
+github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409/go.mod h1:y5weVs5d9wXXHcDA1awRxkIhhHC1xxYJN8a7aXnE6S8=
+github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
+github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
+github.com/labstack/echo/v4 v4.2.1/go.mod h1:AA49e0DZ8kk5jTOOCKNuPR6oTnBS0dYiM4FW1e6jwpg=
+github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k=
+github.com/leanovate/gopter v0.2.11 h1:vRjThO1EKPb/1NsDXuDrzldR28RLkBflWYcU9CvzWu4=
+github.com/leanovate/gopter v0.2.11/go.mod h1:aK3tzZP/C+p1m3SPRE4SYZFGP7jjkuSI4f7Xvpt0S9c=
+github.com/libp2p/go-buffer-pool v0.1.0 h1:oK4mSFcQz7cTQIfqbe4MIj9gLW+mnanjyFtc6cdF0Y8=
+github.com/libp2p/go-buffer-pool v0.1.0/go.mod h1:N+vh8gMqimBzdKkSMVuydVDq+UV5QTWy5HSiZacSbPg=
+github.com/libp2p/go-flow-metrics v0.1.0 h1:0iPhMI8PskQwzh57jB9WxIuIOQ0r+15PChFGkx3Q3WM=
+github.com/libp2p/go-flow-metrics v0.1.0/go.mod h1:4Xi8MX8wj5aWNDAZttg6UPmc0ZrnFNsMtpsYUClFtro=
+github.com/libp2p/go-libp2p v0.36.2 h1:BbqRkDaGC3/5xfaJakLV/BrpjlAuYqSB0lRvtzL3B/U=
+github.com/libp2p/go-libp2p v0.36.2/go.mod h1:XO3joasRE4Eup8yCTTP/+kX+g92mOgRaadk46LmPhHY=
+github.com/libp2p/go-libp2p-asn-util v0.4.1 h1:xqL7++IKD9TBFMgnLPZR6/6iYhawHKHl950SO9L6n94=
+github.com/libp2p/go-libp2p-asn-util v0.4.1/go.mod h1:d/NI6XZ9qxw67b4e+NgpQexCIiFYJjErASrYW4PFDN8=
+github.com/libp2p/go-libp2p-mplex v0.9.0 h1:R58pDRAmuBXkYugbSSXR9wrTX3+1pFM1xP2bLuodIq8=
+github.com/libp2p/go-libp2p-mplex v0.9.0/go.mod h1:ro1i4kuwiFT+uMPbIDIFkcLs1KRbNp0QwnUXM+P64Og=
+github.com/libp2p/go-libp2p-pubsub v0.12.0 h1:PENNZjSfk8KYxANRlpipdS7+BfLmOl3L2E/6vSNjbdI=
+github.com/libp2p/go-libp2p-pubsub v0.12.0/go.mod h1:Oi0zw9aw8/Y5GC99zt+Ef2gYAl+0nZlwdJonDyOz/sE=
+github.com/libp2p/go-libp2p-testing v0.12.0 h1:EPvBb4kKMWO29qP4mZGyhVzUyR25dvfUIK5WDu6iPUA=
+github.com/libp2p/go-libp2p-testing v0.12.0/go.mod h1:KcGDRXyN7sQCllucn1cOOS+Dmm7ujhfEyXQL5lvkcPg=
+github.com/libp2p/go-mplex v0.7.0 h1:BDhFZdlk5tbr0oyFq/xv/NPGfjbnrsDam1EvutpBDbY=
+github.com/libp2p/go-mplex v0.7.0/go.mod h1:rW8ThnRcYWft/Jb2jeORBmPd6xuG3dGxWN/W168L9EU=
+github.com/libp2p/go-msgio v0.3.0 h1:mf3Z8B1xcFN314sWX+2vOTShIE0Mmn2TXn3YCUQGNj0=
+github.com/libp2p/go-msgio v0.3.0/go.mod h1:nyRM819GmVaF9LX3l03RMh10QdOroF++NBbxAb0mmDM=
+github.com/libp2p/go-nat v0.2.0 h1:Tyz+bUFAYqGyJ/ppPPymMGbIgNRH+WqC5QrT5fKrrGk=
+github.com/libp2p/go-nat v0.2.0/go.mod h1:3MJr+GRpRkyT65EpVPBstXLvOlAPzUVlG6Pwg9ohLJk=
+github.com/libp2p/go-netroute v0.2.1 h1:V8kVrpD8GK0Riv15/7VN6RbUQ3URNZVosw7H2v9tksU=
+github.com/libp2p/go-netroute v0.2.1/go.mod h1:hraioZr0fhBjG0ZRXJJ6Zj2IVEVNx6tDTFQfSmcq7mQ=
+github.com/libp2p/go-reuseport v0.4.0 h1:nR5KU7hD0WxXCJbmw7r2rhRYruNRl2koHw8fQscQm2s=
+github.com/libp2p/go-reuseport v0.4.0/go.mod h1:ZtI03j/wO5hZVDFo2jKywN6bYKWLOy8Se6DrI2E1cLU=
+github.com/libp2p/go-yamux/v4 v4.0.1 h1:FfDR4S1wj6Bw2Pqbc8Uz7pCxeRBPbwsBbEdfwiCypkQ=
+github.com/libp2p/go-yamux/v4 v4.0.1/go.mod h1:NWjl8ZTLOGlozrXSOZ/HlfG++39iKNnM5wwmtQP1YB4=
+github.com/lmittmann/w3 v0.19.5 h1:WwVRyIwhRLfIahmpB1EglsB3o1XWsgydgrxIUp5upFQ=
+github.com/lmittmann/w3 v0.19.5/go.mod h1:pN97sGGYGvsbqOYj/ms3Pd+7k/aiK/9OpNcxMmmzSOI=
+github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae h1:dIZY4ULFcto4tAFlj1FYZl8ztUZ13bdq+PLY+NOfbyI=
+github.com/lufia/plan9stats v0.0.0-20240513124658-fba389f38bae/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k=
+github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI=
+github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
+github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd h1:br0buuQ854V8u83wA0rVZ8ttrq5CpaPZdvrK0LP2lOk=
+github.com/marten-seemann/tcp v0.0.0-20210406111302-dfbc87cc63fd/go.mod h1:QuCEs1Nt24+FYQEqAAncTDPJIuGs+LxK1MCiFL25pMU=
+github.com/matryer/moq v0.0.0-20190312154309-6cfb0558e1bd/go.mod h1:9ELz6aaclSIGnZBoaSLZ3NAl1VTufbOrXBPvtcy6WiQ=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-colorable v0.1.7/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
+github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
+github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU=
+github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
+github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
+github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1wBi7mF09cbNkU=
+github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
+github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4=
+github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
+github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c h1:bzE/A84HN25pxAuk9Eej1Kz9OUelF97nAc82bDquQI8=
+github.com/mikioh/tcp v0.0.0-20190314235350-803a9b46060c/go.mod h1:0SQS9kMwD2VsyFEB++InYyBJroV/FRmBgcydeSUcJms=
+github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b h1:z78hV3sbSMAUoyUMM0I83AUIT6Hu17AWfgjzIbtrYFc=
+github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b/go.mod h1:lxPUiZwKoFL8DUUmalo2yJJUCxbPKtm8OKfqr2/FTNU=
+github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc h1:PTfri+PuQmWDqERdnNMiD9ZejrlswWrCpBEZgWOiTrc=
+github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc/go.mod h1:cGKTAVKx4SxOuR/czcZ/E2RSJ3sfHs8FpHhQ5CWMf9s=
+github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8RvIylQ358TN4wwqatJ8rNavkEINozVn9DtGI3dfQ=
+github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
+github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
+github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
+github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db h1:62I3jR2EmQ4l5rM/4FEfDWcRD+abF5XlKShorW5LRoQ=
+github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
+github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
+github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/mitchellh/pointerstructure v1.2.1 h1:ZhBBeX8tSlRpu/FFhXH4RC4OJzFlqsQhoHZAz4x7TIw=
+github.com/mitchellh/pointerstructure v1.2.1/go.mod h1:BRAsLI5zgXmw97Lf6s25bs8ohIXc3tViBH44KcwB2g4=
+github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
+github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
+github.com/moby/term v0.5.2 h1:6qk3FJAFDs6i/q3W/pQ97SX192qKfZgGjCQqfCJkgzQ=
+github.com/moby/term v0.5.2/go.mod h1:d3djjFCrjnB+fl8NJux+EJzu0msscUP+f8it8hPkFLc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
+github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/mr-tron/base58 v1.1.2/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
+github.com/mr-tron/base58 v1.2.0 h1:T/HDJBh4ZCPbU39/+c3rRvE0uKBQlU27+QI8LJ4t64o=
+github.com/mr-tron/base58 v1.2.0/go.mod h1:BinMc/sQntlIE1frQmRFPUoPA1Zkr8VRgBdjWI2mNwc=
+github.com/multiformats/go-base32 v0.1.0 h1:pVx9xoSPqEIQG8o+UbAe7DNi51oej1NtK+aGkbLYxPE=
+github.com/multiformats/go-base32 v0.1.0/go.mod h1:Kj3tFY6zNr+ABYMqeUNeGvkIC/UYgtWibDcT0rExnbI=
+github.com/multiformats/go-base36 v0.2.0 h1:lFsAbNOGeKtuKozrtBsAkSVhv1p9D0/qedU9rQyccr0=
+github.com/multiformats/go-base36 v0.2.0/go.mod h1:qvnKE++v+2MWCfePClUEjE78Z7P2a1UV0xHgWc0hkp4=
+github.com/multiformats/go-multiaddr v0.1.1/go.mod h1:aMKBKNEYmzmDmxfX88/vz+J5IU55txyt0p4aiWVohjo=
+github.com/multiformats/go-multiaddr v0.14.0 h1:bfrHrJhrRuh/NXH5mCnemjpbGjzRw/b+tJFOD41g2tU=
+github.com/multiformats/go-multiaddr v0.14.0/go.mod h1:6EkVAxtznq2yC3QT5CM1UTAwG0GTP3EWAIcjHuzQ+r4=
+github.com/multiformats/go-multiaddr-dns v0.4.1 h1:whi/uCLbDS3mSEUMb1MsoT4uzUeZB0N32yzufqS0i5M=
+github.com/multiformats/go-multiaddr-dns v0.4.1/go.mod h1:7hfthtB4E4pQwirrz+J0CcDUfbWzTqEzVyYKKIKpgkc=
+github.com/multiformats/go-multiaddr-fmt v0.1.0 h1:WLEFClPycPkp4fnIzoFoV9FVd49/eQsuaL3/CWe167E=
+github.com/multiformats/go-multiaddr-fmt v0.1.0/go.mod h1:hGtDIW4PU4BqJ50gW2quDuPVjyWNZxToGUh/HwTZYJo=
+github.com/multiformats/go-multibase v0.2.0 h1:isdYCVLvksgWlMW9OZRYJEa9pZETFivncJHmHnnd87g=
+github.com/multiformats/go-multibase v0.2.0/go.mod h1:bFBZX4lKCA/2lyOFSAoKH5SS6oPyjtnzK/XTFDPkNuk=
+github.com/multiformats/go-multicodec v0.9.0 h1:pb/dlPnzee/Sxv/j4PmkDRxCOi3hXTz3IbPKOXWJkmg=
+github.com/multiformats/go-multicodec v0.9.0/go.mod h1:L3QTQvMIaVBkXOXXtVmYE+LI16i14xuaojr/H7Ai54k=
+github.com/multiformats/go-multihash v0.0.8/go.mod h1:YSLudS+Pi8NHE7o6tb3D8vrpKa63epEDmG8nTduyAew=
+github.com/multiformats/go-multihash v0.2.3 h1:7Lyc8XfX/IY2jWb/gI7JP+o7JEq9hOa7BFvVU9RSh+U=
+github.com/multiformats/go-multihash v0.2.3/go.mod h1:dXgKXCXjBzdscBLk9JkjINiEsCKRVch90MdaGiKsvSM=
+github.com/multiformats/go-multistream v0.5.0 h1:5htLSLl7lvJk3xx3qT/8Zm9J4K8vEOf/QGkvOGQAyiE=
+github.com/multiformats/go-multistream v0.5.0/go.mod h1:n6tMZiwiP2wUsR8DgfDWw1dydlEqV3l6N3/GBsX6ILA=
+github.com/multiformats/go-varint v0.0.7 h1:sWSGR+f/eu5ABZA2ZpYKBILXTTs9JWpdEM/nEGOHFS8=
+github.com/multiformats/go-varint v0.0.7/go.mod h1:r8PUYw/fD/SjBCiKOoDlGF6QawOELpZAu9eioSos/OU=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
+github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/naoina/go-stringutil v0.1.0 h1:rCUeRUHjBjGTSHl0VC00jUPLz8/F9dDzYI70Hzifhks=
+github.com/naoina/go-stringutil v0.1.0/go.mod h1:XJ2SJL9jCtBh+P9q5btrd/Ylo8XwT/h1USek5+NqSA0=
+github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416 h1:shk/vn9oCoOTmwcouEdwIeOtOGA/ELRUw/GwvxwfT+0=
+github.com/naoina/toml v0.1.2-0.20170918210437-9fafd6967416/go.mod h1:NBIhNtsFMo3G2szEBne+bO4gS192HuIYRqfvOWb4i1E=
+github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo=
+github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM=
+github.com/nwaples/rardecode v1.1.3 h1:cWCaZwfM5H7nAD6PyEdcVnczzV8i/JtotnyW/dD9lEc=
+github.com/nwaples/rardecode v1.1.3/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/nxadm/tail v1.4.11 h1:8feyoE3OzPrcshW5/MJ4sGESc5cqmGkGCWlco4l0bqY=
+github.com/nxadm/tail v1.4.11/go.mod h1:OTaG3NK980DZzxbRq6lEuzgU+mug70nY11sMd4JXXHc=
+github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
+github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c=
+github.com/onsi/ginkgo/v2 v2.20.0 h1:PE84V2mHqoT1sglvHc8ZdQtPcwmvvt29WLEEO3xmdZw=
+github.com/onsi/ginkgo/v2 v2.20.0/go.mod h1:lG9ey2Z29hR41WMVthyJBGUBcBhGOtoPF2VFMvBXFCI=
+github.com/onsi/gomega v1.4.1/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY=
+github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro=
+github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
+github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
+github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
+github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
+github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
+github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
+github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
+github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
+github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
+github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8=
+github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
+github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 h1:onHthvaw9LFnH4t2DcNVpwGmV9E1BkGknEliJkfwQj0=
+github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58/go.mod h1:DXv8WO4yhMYhSNPKjeNKa5WY9YCIEBRbNzFFPJbWO6Y=
+github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7 h1:oYW+YCJ1pachXTQmzR3rNLYGGz4g/UgFcjb28p/viDM=
+github.com/peterh/liner v1.1.1-0.20190123174540-a2c9a5303de7/go.mod h1:CRroGNssyjTd/qIG2FyxByd2S8JEAZXBl4qUrZf8GS0=
+github.com/pierrec/lz4 v2.6.1+incompatible h1:9UY3+iC23yxF0UfGaYrGplQ+79Rg+h/q9FV9ix19jjM=
+github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
+github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4=
+github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8=
+github.com/pion/datachannel v1.5.8 h1:ph1P1NsGkazkjrvyMfhRBUAWMxugJjq2HfQifaOoSNo=
+github.com/pion/datachannel v1.5.8/go.mod h1:PgmdpoaNBLX9HNzNClmdki4DYW5JtI7Yibu8QzbL3tI=
+github.com/pion/dtls/v2 v2.2.7/go.mod h1:8WiMkebSHFD0T+dIU+UeBaoV7kDhOW5oDCzZ7WZ/F9s=
+github.com/pion/dtls/v2 v2.2.12 h1:KP7H5/c1EiVAAKUmXyCzPiQe5+bCJrpOeKg/L05dunk=
+github.com/pion/dtls/v2 v2.2.12/go.mod h1:d9SYc9fch0CqK90mRk1dC7AkzzpwJj6u2GU3u+9pqFE=
+github.com/pion/ice/v2 v2.3.34 h1:Ic1ppYCj4tUOcPAp76U6F3fVrlSw8A9JtRXLqw6BbUM=
+github.com/pion/ice/v2 v2.3.34/go.mod h1:mBF7lnigdqgtB+YHkaY/Y6s6tsyRyo4u4rPGRuOjUBQ=
+github.com/pion/interceptor v0.1.30 h1:au5rlVHsgmxNi+v/mjOPazbW1SHzfx7/hYOEYQnUcxA=
+github.com/pion/interceptor v0.1.30/go.mod h1:RQuKT5HTdkP2Fi0cuOS5G5WNymTjzXaGF75J4k7z2nc=
+github.com/pion/logging v0.2.2 h1:M9+AIj/+pxNsDfAT64+MAVgJO0rsyLnoJKCqf//DoeY=
+github.com/pion/logging v0.2.2/go.mod h1:k0/tDVsRCX2Mb2ZEmTqNa7CWsQPc+YYCB7Q+5pahoms=
+github.com/pion/mdns v0.0.12 h1:CiMYlY+O0azojWDmxdNr7ADGrnZ+V6Ilfner+6mSVK8=
+github.com/pion/mdns v0.0.12/go.mod h1:VExJjv8to/6Wqm1FXK+Ii/Z9tsVk/F5sD/N70cnYFbk=
+github.com/pion/randutil v0.1.0 h1:CFG1UdESneORglEsnimhUjf33Rwjubwj6xfiOXBa3mA=
+github.com/pion/randutil v0.1.0/go.mod h1:XcJrSMMbbMRhASFVOlj/5hQial/Y8oH/HVo7TBZq+j8=
+github.com/pion/rtcp v1.2.12/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4=
+github.com/pion/rtcp v1.2.14 h1:KCkGV3vJ+4DAJmvP0vaQShsb0xkRfWkO540Gy102KyE=
+github.com/pion/rtcp v1.2.14/go.mod h1:sn6qjxvnwyAkkPzPULIbVqSKI5Dv54Rv7VG0kNxh9L4=
+github.com/pion/rtp v1.8.3/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/rtp v1.8.9 h1:E2HX740TZKaqdcPmf4pw6ZZuG8u5RlMMt+l3dxeu6Wk=
+github.com/pion/rtp v1.8.9/go.mod h1:pBGHaFt/yW7bf1jjWAoUjpSNoDnw98KTMg+jWWvziqU=
+github.com/pion/sctp v1.8.33 h1:dSE4wX6uTJBcNm8+YlMg7lw1wqyKHggsP5uKbdj+NZw=
+github.com/pion/sctp v1.8.33/go.mod h1:beTnqSzewI53KWoG3nqB282oDMGrhNxBdb+JZnkCwRM=
+github.com/pion/sdp/v3 v3.0.9 h1:pX++dCHoHUwq43kuwf3PyJfHlwIj4hXA7Vrifiq0IJY=
+github.com/pion/sdp/v3 v3.0.9/go.mod h1:B5xmvENq5IXJimIO4zfp6LAe1fD9N+kFv+V/1lOdz8M=
+github.com/pion/srtp/v2 v2.0.20 h1:HNNny4s+OUmG280ETrCdgFndp4ufx3/uy85EawYEhTk=
+github.com/pion/srtp/v2 v2.0.20/go.mod h1:0KJQjA99A6/a0DOVTu1PhDSw0CXF2jTkqOoMg3ODqdA=
+github.com/pion/stun v0.6.1 h1:8lp6YejULeHBF8NmV8e2787BogQhduZugh5PdhDyyN4=
+github.com/pion/stun v0.6.1/go.mod h1:/hO7APkX4hZKu/D0f2lHzNyvdkTGtIy3NDmLR7kSz/8=
+github.com/pion/stun/v2 v2.0.0 h1:A5+wXKLAypxQri59+tmQKVs7+l6mMM+3d+eER9ifRU0=
+github.com/pion/stun/v2 v2.0.0/go.mod h1:22qRSh08fSEttYUmJZGlriq9+03jtVmXNODgLccj8GQ=
+github.com/pion/transport/v2 v2.2.1/go.mod h1:cXXWavvCnFF6McHTft3DWS9iic2Mftcz1Aq29pGcU5g=
+github.com/pion/transport/v2 v2.2.3/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
+github.com/pion/transport/v2 v2.2.4/go.mod h1:q2U/tf9FEfnSBGSW6w5Qp5PFWRLRj3NjLhCCgpRK4p0=
+github.com/pion/transport/v2 v2.2.10 h1:ucLBLE8nuxiHfvkFKnkDQRYWYfp8ejf4YBOPfaQpw6Q=
+github.com/pion/transport/v2 v2.2.10/go.mod h1:sq1kSLWs+cHW9E+2fJP95QudkzbK7wscs8yYgQToO5E=
+github.com/pion/transport/v3 v3.0.1/go.mod h1:UY7kiITrlMv7/IKgd5eTUcaahZx5oUN3l9SzK5f5xE0=
+github.com/pion/transport/v3 v3.0.7 h1:iRbMH05BzSNwhILHoBoAPxoB9xQgOaJk+591KC9P1o0=
+github.com/pion/transport/v3 v3.0.7/go.mod h1:YleKiTZ4vqNxVwh77Z0zytYi7rXHl7j6uPLGhhz9rwo=
+github.com/pion/turn/v2 v2.1.3/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY=
+github.com/pion/turn/v2 v2.1.6 h1:Xr2niVsiPTB0FPtt+yAWKFUkU1eotQbGgpTIld4x1Gc=
+github.com/pion/turn/v2 v2.1.6/go.mod h1:huEpByKKHix2/b9kmTAM3YoX6MKP+/D//0ClgUYR2fY=
+github.com/pion/webrtc/v3 v3.3.0 h1:Rf4u6n6U5t5sUxhYPQk/samzU/oDv7jk6BA5hyO2F9I=
+github.com/pion/webrtc/v3 v3.3.0/go.mod h1:hVmrDJvwhEertRWObeb1xzulzHGeVUoPlWvxdGzcfU0=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU=
+github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
+github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
+github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
+github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
+github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
+github.com/prometheus/client_golang v1.22.0 h1:rb93p9lokFEsctTys46VnV1kLCDpVZ0a/Y92Vm0Zc6Q=
+github.com/prometheus/client_golang v1.22.0/go.mod h1:R7ljNsLXhuQXYZYtw6GAE9AZg8Y7vEW5scdCXrWRXC0=
+github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
+github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
+github.com/prometheus/client_model v0.6.2 h1:oBsgwpGs7iVziMvrGhE53c/GrLUsZdHnqNwqPLxwZyk=
+github.com/prometheus/client_model v0.6.2/go.mod h1:y3m2F6Gdpfy6Ut/GBsUqTWZqCUvMVzSfMLjcu6wAwpE=
+github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
+github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
+github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
+github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
+github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
+github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
+github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
+github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
+github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
+github.com/protolambda/ctxlock v0.1.0 h1:rCUY3+vRdcdZXqT07iXgyr744J2DU2LCBIXowYAjBCE=
+github.com/protolambda/ctxlock v0.1.0/go.mod h1:vefhX6rIZH8rsg5ZpOJfEDYQOppZi19SfPiGOFrNnwM=
+github.com/prysmaticlabs/gohashtree v0.0.4-beta h1:H/EbCuXPeTV3lpKeXGPpEV9gsUpkqOOVnWapUyeWro4=
+github.com/prysmaticlabs/gohashtree v0.0.4-beta/go.mod h1:BFdtALS+Ffhg3lGQIHv9HDWuHS8cTvHZzrHWxwOtGOs=
+github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
+github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
+github.com/quic-go/quic-go v0.46.0 h1:uuwLClEEyk1DNvchH8uCByQVjo3yKL9opKulExNDs7Y=
+github.com/quic-go/quic-go v0.46.0/go.mod h1:1dLehS7TIR64+vxGR70GDcatWTOtMX2PUtnKsjbTurI=
+github.com/quic-go/webtransport-go v0.8.0 h1:HxSrwun11U+LlmwpgM1kEqIqH90IT4N8auv/cD7QFJg=
+github.com/quic-go/webtransport-go v0.8.0/go.mod h1:N99tjprW432Ut5ONql/aUhSLT0YVSlwHohQsuac9WaM=
+github.com/raulk/go-watchdog v1.3.0 h1:oUmdlHxdkXRJlwfG0O9omj8ukerm8MEQavSiDTEtBsk=
+github.com/raulk/go-watchdog v1.3.0/go.mod h1:fIvOnLbF0b0ZwkB9YU4mOW9Did//4vPZtDqv66NfsMU=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
+github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
+github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
+github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
+github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
+github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/schollz/progressbar/v3 v3.18.0 h1:uXdoHABRFmNIjUfte/Ex7WtuyVslrw2wVPQmCN62HpA=
+github.com/schollz/progressbar/v3 v3.18.0/go.mod h1:IsO3lpbaGuzh8zIMzgY3+J8l4C8GjO0Y9S69eFvNsec=
+github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
+github.com/sethvargo/go-envconfig v1.1.0 h1:cWZiJxeTm7AlCvzGXrEXaSTCNgip5oJepekh/BOQuog=
+github.com/sethvargo/go-envconfig v1.1.0/go.mod h1:JLd0KFWQYzyENqnEPWWZ49i4vzZo/6nRidxI8YvGiHw=
+github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
+github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
+github.com/shirou/gopsutil/v4 v4.24.6 h1:9qqCSYF2pgOU+t+NgJtp7Co5+5mHF/HyKBUckySQL64=
+github.com/shirou/gopsutil/v4 v4.24.6/go.mod h1:aoebb2vxetJ/yIDZISmduFvVNPHqXQ9SEJwRXxkf0RA=
+github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM=
+github.com/shoenig/go-m1cpu v0.1.6/go.mod h1:1JJMcUBvfNwpq05QDQVAnx3gUHr9IYF7GNg9SUEw2VQ=
+github.com/shoenig/test v0.6.4 h1:kVTaSd7WLz5WZ2IaoM0RSzRsUD+m8wRR+5qvntpn4LU=
+github.com/shoenig/test v0.6.4/go.mod h1:byHiCGXqrVaflBLAMq/srcZIHynQPQgeyvkvXnjqq0k=
+github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
+github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
+github.com/shurcooL/github_flavored_markdown v0.0.0-20181002035957-2122de532470/go.mod h1:2dOwnU2uBioM+SGy2aZoq1f/Sd1l9OkAeAUvjSyvgU0=
+github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
+github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
+github.com/shurcooL/gofontwoff v0.0.0-20180329035133-29b52fc0a18d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
+github.com/shurcooL/gopherjslib v0.0.0-20160914041154-feb6d3990c2c/go.mod h1:8d3azKNyqcHP1GaQE/c6dDgjkgSx2BZ4IoEi4F1reUI=
+github.com/shurcooL/highlight_diff v0.0.0-20170515013008-09bb4053de1b/go.mod h1:ZpfEhSmds4ytuByIcDnOLkTHGUI6KNqRNPDLHDk+mUU=
+github.com/shurcooL/highlight_go v0.0.0-20181028180052-98c3abbbae20/go.mod h1:UDKB5a1T23gOMUJrI+uSuH0VRDStOiUVSjBTRDVBVag=
+github.com/shurcooL/home v0.0.0-20181020052607-80b7ffcb30f9/go.mod h1:+rgNQw2P9ARFAs37qieuu7ohDNQ3gds9msbT2yn85sg=
+github.com/shurcooL/htmlg v0.0.0-20170918183704-d01228ac9e50/go.mod h1:zPn1wHpTIePGnXSHpsVPWEktKXHr6+SS6x/IKRb7cpw=
+github.com/shurcooL/httperror v0.0.0-20170206035902-86b7830d14cc/go.mod h1:aYMfkZ6DWSJPJ6c4Wwz3QtW22G7mf/PEgaB9k/ik5+Y=
+github.com/shurcooL/httpfs v0.0.0-20171119174359-809beceb2371/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
+github.com/shurcooL/httpgzip v0.0.0-20180522190206-b1c53ac65af9/go.mod h1:919LwcH0M7/W4fcZ0/jy0qGght1GIhqyS/EgWGH2j5Q=
+github.com/shurcooL/issues v0.0.0-20181008053335-6292fdc1e191/go.mod h1:e2qWDig5bLteJ4fwvDAc2NHzqFEthkqn7aOZAOpj+PQ=
+github.com/shurcooL/issuesapp v0.0.0-20180602232740-048589ce2241/go.mod h1:NPpHK2TI7iSaM0buivtFUc9offApnI0Alt/K8hcHy0I=
+github.com/shurcooL/notifications v0.0.0-20181007000457-627ab5aea122/go.mod h1:b5uSkrEVM1jQUspwbixRBhaIjIzL2xazXp6kntxYle0=
+github.com/shurcooL/octicon v0.0.0-20181028054416-fa4f57f9efb2/go.mod h1:eWdoE5JD4R5UVWDucdOPg1g2fqQRq78IQa9zlOV1vpQ=
+github.com/shurcooL/reactions v0.0.0-20181006231557-f2e0b4ca5b82/go.mod h1:TCR1lToEk4d2s07G3XGfz2QrgHXg4RJBvjrOozvoWfk=
+github.com/shurcooL/sanitized_anchor_name v0.0.0-20170918181015-86672fcb3f95/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
+github.com/shurcooL/users v0.0.0-20180125191416-49c67e49c537/go.mod h1:QJTqeLYEDaXHZDBsXlPCDqdhQuJkuw4NOtaxYe3xii4=
+github.com/shurcooL/webdavfs v0.0.0-20170829043945-18c3829fa133/go.mod h1:hKmq5kWdCj2z2KEozexVbfEZIWiTjhE0+UjmZgPqehw=
+github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
+github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
+github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
+github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE=
+github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA=
+github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI=
+github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
+github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
+github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
+github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe h1:nbdqkIGOGfUAD54q1s2YBcBz/WcsxCO9HUQ4aGV5hUw=
+github.com/supranational/blst v0.3.16-0.20250831170142-f48500c1fdbe/go.mod h1:jZJtfjgudtNl4en1tzwPIV3KjUnQUvG3/j+w+fVonLw=
+github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
+github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7/go.mod h1:q4W45IWZaF22tdD+VEXcAWRA037jwmWEB5VWYORlTpc=
+github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a h1:1ur3QoCqvE5fl+nylMaIr9PVV1w343YRDtsy+Rwu7XI=
+github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
+github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
+github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU=
+github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY=
+github.com/tklauser/numcpus v0.8.0 h1:Mx4Wwe/FjZLeQsK/6kt2EOepwwSl7SmJrK5bV/dXYgY=
+github.com/tklauser/numcpus v0.8.0/go.mod h1:ZJZlAY+dmR4eut8epnzf0u/VwodKmryxR8txiloSqBE=
+github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
+github.com/ulikunitz/xz v0.5.8/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc=
+github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
+github.com/urfave/cli v1.22.2/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
+github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
+github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+github.com/viant/assertly v0.4.8/go.mod h1:aGifi++jvCrUaklKEKT0BU95igDNaqkvz+49uaYMPRU=
+github.com/viant/toolbox v0.24.0/go.mod h1:OxMCG57V0PXuIP2HNQrtJf2CjqdmbrOx5EkMILuUhzM=
+github.com/wlynxg/anet v0.0.3/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
+github.com/wlynxg/anet v0.0.4 h1:0de1OFQxnNqAu+x2FAKKCVIrnfGKQbs7FQz++tB0+Uw=
+github.com/wlynxg/anet v0.0.4/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
+github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
+github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
+github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
+github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
+go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
+go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
+go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
+go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
+go.opentelemetry.io/contrib/detectors/aws/lambda v0.53.0 h1:KG6fOUk3EwSH1dEpsAbsLKFbn3cFwN9xDu8plGu55zI=
+go.opentelemetry.io/contrib/detectors/aws/lambda v0.53.0/go.mod h1:bSd579exEkh/P5msRcom8YzVB6NsUxYKyV+D/FYOY7Y=
+go.opentelemetry.io/contrib/instrumentation/host v0.53.0 h1:X4r+5n6bSqaQUbPlSO5baoM7tBvipkT0mJFyuPFnPAU=
+go.opentelemetry.io/contrib/instrumentation/host v0.53.0/go.mod h1:NTaDj8VCnJxWleEcRQRQaN36+aCZjO9foNIdJunEjUQ=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0 h1:CV7UdSGJt/Ao6Gp4CXckLxVRRsRgDHoI8XjbL3PDl8s=
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0/go.mod h1:FRmFuRJfag1IZ2dPkHnEoSFVgTVPUd2qf5Vi69hLb8I=
+go.opentelemetry.io/contrib/instrumentation/runtime v0.53.0 h1:nOlJEAJyrcy8hexK65M+dsCHIx7CVVbybcFDNkcTcAc=
+go.opentelemetry.io/contrib/instrumentation/runtime v0.53.0/go.mod h1:u79lGGIlkg3Ryw425RbMjEkGYNxSnXRyR286O840+u4=
+go.opentelemetry.io/contrib/propagators/b3 v1.28.0 h1:XR6CFQrQ/ttAYmTBX2loUEFGdk1h17pxYI8828dk/1Y=
+go.opentelemetry.io/contrib/propagators/b3 v1.28.0/go.mod h1:DWRkzJONLquRz7OJPh2rRbZ7MugQj62rk7g6HRnEqh0=
+go.opentelemetry.io/contrib/propagators/ot v1.28.0 h1:rmlG+2pc5k5M7Y7izDrxAHZUIwDERdGMTD9oMV7llMk=
+go.opentelemetry.io/contrib/propagators/ot v1.28.0/go.mod h1:MNgXIn+UrMbNGpd7xyckyo2LCHIgCdmdjEE7YNZGG+w=
+go.opentelemetry.io/otel v1.34.0 h1:zRLXxLCgL1WyKsPVrgbSdMN4c0FMkDAskSTQP+0hdUY=
+go.opentelemetry.io/otel v1.34.0/go.mod h1:OWFPOQ+h4G8xpyjgqo4SxJYdDQ/qmRH+wivy7zzx9oI=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 h1:U2guen0GhqH8o/G2un8f/aG/y++OuW6MyCo6hT9prXk=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0/go.mod h1:yeGZANgEcpdx/WK0IvvRFC+2oLiMS2u4L/0Rj2M2Qr0=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0 h1:aLmmtjRke7LPDQ3lvpFz+kNEH43faFhzW7v8BFIEydg=
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0/go.mod h1:TC1pyCt6G9Sjb4bQpShH+P5R53pO6ZuGnHuuln9xMeE=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 h1:OeNbIYk/2C15ckl7glBlOBp5+WlYsOElzTNmiPW/x60=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0/go.mod h1:7Bept48yIeqxP2OZ9/AqIpYS94h2or0aB4FypJTc8ZM=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 h1:R3X6ZXmNPRR8ul6i3WgFURCHzaXjHdm0karRG/+dj3s=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0/go.mod h1:QWFXnDavXWwMx2EEcZsf3yxgEKAqsxQ+Syjp+seyInw=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0 h1:BEj3SPM81McUZHYjRS5pEgNgnmzGJ5tRpU5krWnV8Bs=
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.34.0/go.mod h1:9cKLGBDzI/F3NoHLQGm4ZrYdIHsvGt6ej6hUowxY0J4=
+go.opentelemetry.io/otel/metric v1.34.0 h1:+eTR3U0MyfWjRDhmFMxe2SsW64QrZ84AOhvqS7Y+PoQ=
+go.opentelemetry.io/otel/metric v1.34.0/go.mod h1:CEDrp0fy2D0MvkXE+dPV7cMi8tWZwX3dmaIhwPOaqHE=
+go.opentelemetry.io/otel/sdk v1.34.0 h1:95zS4k/2GOy069d321O8jWgYsW3MzVV+KuSPKp7Wr1A=
+go.opentelemetry.io/otel/sdk v1.34.0/go.mod h1:0e/pNiaMAqaykJGKbi+tSjWfNNHMTxoC9qANsCzbyxU=
+go.opentelemetry.io/otel/sdk/metric v1.31.0 h1:i9hxxLJF/9kkvfHppyLL55aW7iIJz4JjxTeYusH7zMc=
+go.opentelemetry.io/otel/sdk/metric v1.31.0/go.mod h1:CRInTMVvNhUKgSAMbKyTMxqOBC0zgyxzW55lZzX43Y8=
+go.opentelemetry.io/otel/trace v1.34.0 h1:+ouXS2V8Rd4hp4580a8q23bg0azF2nI8cqLYnC8mh/k=
+go.opentelemetry.io/otel/trace v1.34.0/go.mod h1:Svm7lSjQD7kG7KJ/MUHPVXSDGz2OX4h0M2jHBhmSfRE=
+go.opentelemetry.io/proto/otlp v1.5.0 h1:xJvq7gMzB31/d406fB8U5CBdyQGw4P399D1aQWU/3i4=
+go.opentelemetry.io/proto/otlp v1.5.0/go.mod h1:keN8WnHxOy8PG0rQZjJJ5A2ebUoafqWp0eVQ4yIXvJ4=
+go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/dig v1.18.0 h1:imUL1UiY0Mg4bqbFfsRQO5G4CGRBec/ZujWTvSVp3pw=
+go.uber.org/dig v1.18.0/go.mod h1:Us0rSJiThwCv2GteUN0Q7OKvU7n5J4dxZ9JKUXozFdE=
+go.uber.org/fx v1.22.2 h1:iPW+OPxv0G8w75OemJ1RAnTUrF55zOJlXlo1TbJ0Buw=
+go.uber.org/fx v1.22.2/go.mod h1:o/D9n+2mLP6v1EG+qsdT1O8wKopYAsqZasju97SDFCU=
+go.uber.org/goleak v1.1.11-0.20210813005559-691160354723/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
+go.uber.org/mock v0.4.0 h1:VcM4ZOtdbR4f6VXfiOpwpVJDL6lCReaZ6mw31wqh7KU=
+go.uber.org/mock v0.4.0/go.mod h1:a6FSlNadKUHUa9IP5Vyt1zh4fC7uAwxMutEAscFbkZc=
+go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA=
+go.uber.org/zap v1.19.1/go.mod h1:j3DNczoxDZroyBnOT1L/Q79cfUMGZxlv/9dzN7SM1rI=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE=
+golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw=
+golang.org/x/crypto v0.0.0-20170930174604-9419663f5a44/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190313024323-a1f597ede03a/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200602180216-279210d13fed/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I=
+golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.8.0/go.mod h1:mRqEX+O9/h5TFCrQhkgjo2yKi0yYA+9ecGkdQoHrywE=
+golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
+golang.org/x/crypto v0.18.0/go.mod h1:R0j02AL6hcrfOiy9T4ZYp/rcWeMxM3L6QYxlOuEG1mg=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
+golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c h1:7dEasQXItcW1xKJ2+gg5VOiBnqWrJc+rq0DPKyvvdbY=
+golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c/go.mod h1:NQtJDoLvd6faHhE7m4T/1IY708gDefGGjR/iUW8yQQ8=
+golang.org/x/lint v0.0.0-20180702182130-06c8688daad7/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
+golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
+golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
+golang.org/x/net v0.0.0-20180719180050-a680a1efc54d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181029044818-c44066c5c816/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181106065722-10aee1819953/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190313220215-9f648a60d977/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
+golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
+golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
+golang.org/x/net v0.9.0/go.mod h1:d48xBJpPfHeWQsugry2m+kC02ZBRGRgulfHnEXEuWns=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
+golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20181203162652-d668ce993890/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
+golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181029174526-d69651ed3497/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190316082340-a2f829d7f35f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200602225109-6fdc65e7d980/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8 h1:LvzTn0GQhWuvKH/kVRS3R3bVAsdQWI7hvfLHGgh9+lU=
+golang.org/x/telemetry v0.0.0-20251008203120-078029d740a8/go.mod h1:Pi4ztBfryZoJEkyFTI5/Ocsu2jXyDr6iSdgJiYE/uwE=
+golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
+golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
+golang.org/x/term v0.7.0/go.mod h1:P32HKFT3hSsZrRxla30E9HqToFYAQPCMs/zFMBUFqPY=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
+golang.org/x/term v0.16.0/go.mod h1:yn7UURbUtPyrVJPGPq404EukNFxcm/foM+bV/bfcDsY=
+golang.org/x/term v0.37.0 h1:8EGAD0qCmHYZg6J17DvsMy9/wJ7/D/4pV/wfnld5lTU=
+golang.org/x/term v0.37.0/go.mod h1:5pB4lxRNYYVZuTLmy8oR2BH8dflOR+IbTYFD8fi3254=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
+golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.11.0 h1:/bpjEDfN9tkoN/ryeYHnv5hcMlc8ncjMcM4XBk5NWV0=
+golang.org/x/time v0.11.0/go.mod h1:CDIdPxbZBQxdj6cxyCIdrNogrJKMJ7pr37NYpMcMDSg=
+golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
+golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=
+google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0=
+google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y=
+google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
+google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.3.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20180831171423-11092d34479b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20181029155118-b69ba1387ce2/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
+google.golang.org/genproto v0.0.0-20181202183823-bd91e49a0898/go.mod h1:7Ep/1NZk928CDR8SjdVbjWNpdIf6nzjE3BTgJDr2Atg=
+google.golang.org/genproto v0.0.0-20190306203927-b5d61aea6440/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
+google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f h1:gap6+3Gk41EItBuyi4XX/bp4oqJ3UwuIMl25yGinuAA=
+google.golang.org/genproto/googleapis/api v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:Ic02D47M+zbarjYYUlK57y316f2MoN0gjAwI3f2S95o=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f h1:OxYkA3wjPsZyBylwymxSHa7ViiW1Sml4ToBrncvFehI=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f/go.mod h1:+2Yz8+CLJbIfL9z73EW45avw8Lmge3xVElCP9zEKi50=
+google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.16.0/go.mod h1:0JHn/cJsOMiMfNA9+DeHDlAU7KAAB5GDlYFpa9MZMio=
+google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs=
+google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
+google.golang.org/grpc v1.69.4 h1:MF5TftSMkd8GLw/m0KM6V8CMOCY6NZ1NQDPGFgbTt4A=
+google.golang.org/grpc v1.69.4/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
+google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
+gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
+gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
+gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=
+grpc.go4.org v0.0.0-20170609214715-11d0a25b4919/go.mod h1:77eQGdRu53HpSqPFJFmuJdjuHRquDANNeA4x7B8WQ9o=
+honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+lukechampine.com/blake3 v1.3.0 h1:sJ3XhFINmHSrYCgl958hscfIa3bw8x4DqMP3u1YvoYE=
+lukechampine.com/blake3 v1.3.0/go.mod h1:0OFRp7fBtAylGVCO40o87sbupkyIGgbpv1+M1k1LM6k=
+sourcegraph.com/sourcegraph/go-diff v0.5.0/go.mod h1:kuch7UrkMzY0X+p9CRK03kfuPQ2zzQcaEFbx8wA8rck=
+sourcegraph.com/sqs/pbtypes v0.0.0-20180604144634-d3ebe8f20ae4/go.mod h1:ketZ/q3QxT9HOBeFhu6RdvsftgpsbFHBF5Cas6cDKZ0=
diff --git a/rust/op-reth/crates/tests/proofs/contracts/foundry.toml b/rust/op-reth/crates/tests/proofs/contracts/foundry.toml
new file mode 100644
index 0000000000000..cad32fb0c14b8
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/contracts/foundry.toml
@@ -0,0 +1,3 @@
+[profile.default]
+src = "src"
+out = "artifacts"
diff --git a/rust/op-reth/crates/tests/proofs/contracts/src/MultiStorage.sol b/rust/op-reth/crates/tests/proofs/contracts/src/MultiStorage.sol
new file mode 100644
index 0000000000000..fc0bac34e7460
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/contracts/src/MultiStorage.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+contract MultiStorage {
+    uint256 public slotA;
+    uint256 public slotB;
+    address public owner;
+
+    constructor() {
+        owner = msg.sender;
+    }
+
+    function setValues(uint256 _a, uint256 _b) external {
+        slotA = _a;
+        slotB = _b;
+    }
+}
\ No newline at end of file
diff --git a/rust/op-reth/crates/tests/proofs/contracts/src/SimpleStorage.sol b/rust/op-reth/crates/tests/proofs/contracts/src/SimpleStorage.sol
new file mode 100644
index 0000000000000..a975eab781f13
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/contracts/src/SimpleStorage.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.20;
+
+contract SimpleStorage {
+    uint256 public value;
+
+    function setValue(uint256 newValue) external {
+        value = newValue;
+    }
+}
\ No newline at end of file
diff --git a/rust/op-reth/crates/tests/proofs/contracts/src/TokenVault.sol b/rust/op-reth/crates/tests/proofs/contracts/src/TokenVault.sol
new file mode 100644
index 0000000000000..3ee6f2564133b
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/contracts/src/TokenVault.sol
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+/// @title TokenVault - realistic contract for eth_getProof testing
+/// @notice Demonstrates mappings, nested mappings, and dynamic arrays
+contract TokenVault {
+    struct Allowance {
+        uint256 amount;
+        bool active;
+    }
+
+    // Mapping: user => balance
+    mapping(address => uint256) public balances;
+
+    // Nested Mapping: owner => spender => allowance info
+    mapping(address => mapping(address => Allowance)) public allowances;
+
+    // Dynamic array: list of all depositors
+    address[] public depositors;
+
+    constructor() {
+        // initialize contract with a few entries
+        address alice = address(0xA11CE);
+        address bob = address(0xB0B);
+
+        balances[alice] = 1000;
+        balances[bob] = 2000;
+
+        allowances[alice][bob] = Allowance({amount: 300, active: true});
+        allowances[bob][alice] = Allowance({amount: 150, active: false});
+
+        depositors.push(alice);
+        depositors.push(bob);
+    }
+
+    function deposit() external payable {
+        balances[msg.sender] += msg.value;
+        depositors.push(msg.sender);
+    }
+
+    function approve(address spender, uint256 amount) external {
+        allowances[msg.sender][spender] = Allowance({
+            amount: amount,
+            active: true
+        });
+    }
+
+    function deactivateAllowance(address spender) external {
+        allowances[msg.sender][spender].active = false;
+    }
+
+    function getDepositors() external view returns (address[] memory) {
+        return depositors;
+    }
+}
\ No newline at end of file
diff --git a/rust/op-reth/crates/tests/proofs/core/account_proofs_test.go b/rust/op-reth/crates/tests/proofs/core/account_proofs_test.go
new file mode 100644
index 0000000000000..15772bdafab91
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/core/account_proofs_test.go
@@ -0,0 +1,119 @@
+package core
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/op-rs/op-geth/proofs/utils"
+	"github.com/stretchr/testify/require"
+)
+
+// TestL2MultipleTransactionsInDifferentBlocks tests transactions from different accounts
+// on L2 across multiple blocks. This verifies account state changes across multiple L2 blocks.
+// Check if the proof retrieved from geth and reth match for each account at each block height,
+// and verify the proofs against the respective block state roots.
+func TestL2MultipleTransactionsInDifferentBlocks(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	ctx := t.Ctx()
+	sys := utils.NewMixedOpProofPreset(t)
+
+	const numAccounts = 2
+	const initialFunding = 10
+	accounts := sys.FunderL2.NewFundedEOAs(numAccounts, eth.Ether(initialFunding))
+
+	recipient := sys.FunderL2.NewFundedEOA(eth.Ether(1))
+	recipientAddr := recipient.Address()
+
+	// Block 1: Send transaction from first account
+	currentBlock := sys.L2ELSequencerNode().WaitForBlock()
+	t.Logf("Current L2 block number: %d", currentBlock.Number)
+
+	transferAmount := eth.Ether(1)
+	tx1 := accounts[0].Transfer(recipientAddr, transferAmount)
+	t.Logf("Sent transaction from account 0: %s", accounts[0].Address().Hex())
+	receipt1, err := tx1.Included.Eval(ctx)
+	require.NoError(t, err)
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt1.Status)
+	t.Logf("Transaction 1 included in block: %d", receipt1.BlockNumber.Uint64())
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(receipt1.BlockNumber.Uint64())
+	utils.FetchAndVerifyProofs(t, sys, accounts[0].Address(), []common.Hash{}, receipt1.BlockNumber.Uint64())
+	sys.L2ELSequencerNode().WaitForBlockNumber(currentBlock.Number + 1)
+
+	// Block 2: Send transaction from second account
+	currentBlock = sys.L2ELSequencerNode().WaitForBlock()
+	t.Logf("Current L2 block number: %d", currentBlock.Number)
+
+	tx2 := accounts[1].Transfer(recipientAddr, transferAmount)
+	t.Logf("Sent transaction from account 1: %s", accounts[1].Address().Hex())
+	receipt2, err := tx2.Included.Eval(ctx)
+	require.NoError(t, err)
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt2.Status)
+	t.Logf("Transaction 2 included in block: %d", receipt2.BlockNumber.Uint64())
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(receipt2.BlockNumber.Uint64())
+	utils.FetchAndVerifyProofs(t, sys, accounts[1].Address(), []common.Hash{}, receipt2.BlockNumber.Uint64())
+
+	// Also verify we can get proofs for account 0 at block 2 (different block height)
+	utils.FetchAndVerifyProofs(t, sys, accounts[0].Address(), []common.Hash{}, receipt2.BlockNumber.Uint64())
+}
+
+// TestL2MultipleTransactionsInSingleBlock tests 2 different accounts sending transactions
+// that get included in the same L2 block.
+// It verifies that the account proofs for both accounts can be retrieved and verified
+// against the same block's state root, and that the proofs from geth and reth match.
+func TestL2MultipleTransactionsInSingleBlock(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	ctx := t.Ctx()
+	sys := utils.NewMixedOpProofPreset(t)
+
+	const numAccounts = 2
+	const initialFunding = 10
+	accounts := sys.FunderL2.NewFundedEOAs(numAccounts, eth.Ether(initialFunding))
+
+	recipient := sys.FunderL2.NewFundedEOA(eth.Ether(1))
+	recipientAddr := recipient.Address()
+
+	transferAmount := eth.Ether(1)
+
+	t.Log("Sending transactions from both accounts")
+	tx0 := accounts[0].Transfer(recipientAddr, transferAmount)
+	t.Logf("Sent transaction from account 0: %s", accounts[0].Address().Hex())
+
+	tx1 := accounts[1].Transfer(recipientAddr, transferAmount)
+	t.Logf("Sent transaction from account 1: %s", accounts[1].Address().Hex())
+
+	// Wait for both transactions to be included
+	receipt0, err := tx0.Included.Eval(ctx)
+	require.NoError(t, err)
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt0.Status)
+	t.Logf("Transaction 0 included in block %d", receipt0.BlockNumber.Uint64())
+
+	receipt1, err := tx1.Included.Eval(ctx)
+	require.NoError(t, err)
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt1.Status)
+	t.Logf("Transaction 1 included in block %d", receipt1.BlockNumber.Uint64())
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(receipt1.BlockNumber.Uint64())
+	// Txns can land in the same or different blocks depending on timing.
+	if receipt0.BlockNumber.Uint64() == receipt1.BlockNumber.Uint64() {
+		t.Logf("Both transactions included in the same L2 block: %d", receipt0.BlockNumber.Uint64())
+
+		// Verify both proofs against the same block state root
+		utils.FetchAndVerifyProofs(t, sys, accounts[0].Address(), []common.Hash{}, receipt0.BlockNumber.Uint64())
+		utils.FetchAndVerifyProofs(t, sys, accounts[1].Address(), []common.Hash{}, receipt0.BlockNumber.Uint64())
+
+	} else {
+		t.Logf("Transactions in different blocks: %d and %d",
+			receipt0.BlockNumber.Uint64(), receipt1.BlockNumber.Uint64())
+
+		// Different blocks: verify each proof's merkle root matches its respective block's state root
+		utils.FetchAndVerifyProofs(t, sys, accounts[0].Address(), []common.Hash{}, receipt0.BlockNumber.Uint64())
+		utils.FetchAndVerifyProofs(t, sys, accounts[1].Address(), []common.Hash{}, receipt1.BlockNumber.Uint64())
+	}
+
+	t.Logf("Proof for account 0 and 1 verified successfully")
+}
diff --git a/rust/op-reth/crates/tests/proofs/core/execute_payload_test.go b/rust/op-reth/crates/tests/proofs/core/execute_payload_test.go
new file mode 100644
index 0000000000000..d49a82b945116
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/core/execute_payload_test.go
@@ -0,0 +1,118 @@
+package core
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/txplan"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/op-rs/op-geth/proofs/utils"
+)
+
+func TestExecutePayloadSuccess(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	ctx := t.Ctx()
+	sys := utils.NewMixedOpProofPreset(t)
+	user := sys.FunderL2.NewFundedEOA(eth.OneHundredthEther)
+	opRethELNode := sys.RethWithProofL2ELNode()
+
+	plannedTxOption := user.PlanTransfer(user.Address(), eth.OneWei)
+	plannedTx := txplan.NewPlannedTx(plannedTxOption)
+	signedTx, err := plannedTx.Signed.Eval(ctx)
+	if err != nil {
+		gt.Fatal(err)
+	}
+
+	raw, err := signedTx.MarshalBinary()
+	if err != nil {
+		gt.Fatal(err)
+	}
+
+	lastBlock, err := opRethELNode.Escape().L2EthClient().InfoByLabel(ctx, eth.Unsafe)
+	if err != nil {
+		gt.Fatal(err)
+	}
+
+	blockTime := lastBlock.Time() + 1
+	gasLimit := eth.Uint64Quantity(lastBlock.GasLimit())
+
+	var prevRandao eth.Bytes32
+	copy(prevRandao[:], lastBlock.MixDigest().Bytes())
+
+	var zero1559 eth.Bytes8
+	minBaseFee := uint64(10)
+
+	attrs := eth.PayloadAttributes{
+		Timestamp:             eth.Uint64Quantity(blockTime),
+		PrevRandao:            prevRandao,
+		SuggestedFeeRecipient: lastBlock.Coinbase(),
+		Withdrawals:           nil,
+		ParentBeaconBlockRoot: lastBlock.ParentBeaconRoot(),
+		Transactions:          []eth.Data{eth.Data(raw)},
+		NoTxPool:              true,
+		GasLimit:              &gasLimit,
+		EIP1559Params:         &zero1559,
+		MinBaseFee:            &minBaseFee,
+	}
+
+	witness, err := opRethELNode.Escape().L2EthClient().PayloadExecutionWitness(ctx, lastBlock.Hash(), attrs)
+	if err != nil {
+		gt.Fatal(err)
+	}
+	if witness == nil {
+		gt.Fatal("empty witness")
+	}
+}
+
+func TestExecutePayloadWithInvalidParentHash(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	ctx := t.Ctx()
+	sys := utils.NewMixedOpProofPreset(t)
+	user := sys.FunderL2.NewFundedEOA(eth.OneHundredthEther)
+	opRethELNode := sys.RethWithProofL2ELNode()
+
+	plannedTxOption := user.PlanTransfer(user.Address(), eth.OneWei)
+	plannedTx := txplan.NewPlannedTx(plannedTxOption)
+	signedTx, err := plannedTx.Signed.Eval(ctx)
+	if err != nil {
+		gt.Fatal(err)
+	}
+
+	raw, err := signedTx.MarshalBinary()
+	if err != nil {
+		gt.Fatal(err)
+	}
+
+	lastBlock, err := opRethELNode.Escape().L2EthClient().InfoByLabel(ctx, eth.Unsafe)
+	if err != nil {
+		gt.Fatal(err)
+	}
+
+	blockTime := lastBlock.Time() + 1
+	gasLimit := eth.Uint64Quantity(lastBlock.GasLimit())
+
+	var prevRandao eth.Bytes32
+	copy(prevRandao[:], lastBlock.MixDigest().Bytes())
+
+	var zero1559 eth.Bytes8
+	minBaseFee := uint64(10)
+
+	attrs := eth.PayloadAttributes{
+		Timestamp:             eth.Uint64Quantity(blockTime),
+		PrevRandao:            prevRandao,
+		SuggestedFeeRecipient: lastBlock.Coinbase(),
+		Withdrawals:           nil,
+		ParentBeaconBlockRoot: lastBlock.ParentBeaconRoot(),
+		Transactions:          []eth.Data{eth.Data(raw)},
+		NoTxPool:              true,
+		GasLimit:              &gasLimit,
+		EIP1559Params:         &zero1559,
+		MinBaseFee:            &minBaseFee,
+	}
+
+	_, err = opRethELNode.Escape().L2EthClient().PayloadExecutionWitness(ctx, common.Hash{}, attrs)
+	if err == nil {
+		gt.Fatal("expected error")
+	}
+}
diff --git a/rust/op-reth/crates/tests/proofs/core/execution_witness_test.go b/rust/op-reth/crates/tests/proofs/core/execution_witness_test.go
new file mode 100644
index 0000000000000..eaf0742e1041f
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/core/execution_witness_test.go
@@ -0,0 +1,126 @@
+package core
+
+import (
+	"strings"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/op-rs/op-geth/proofs/utils"
+	"github.com/stretchr/testify/require"
+)
+
+// ExecutionWitness represents the response from debug_executionWitness
+type ExecutionWitness struct {
+	Keys    []hexutil.Bytes `json:"keys"`
+	Codes   []hexutil.Bytes `json:"codes"`
+	State   []hexutil.Bytes `json:"state"`
+	Headers []hexutil.Bytes `json:"headers"`
+}
+
+// TestDebugExecutionWitness tests the debug_executionWitness RPC method on Reth L2.
+// This verifies that the execution witness can be retrieved for a block containing transactions
+// and that the response contains valid state, codes, keys, and headers data.
+func TestDebugExecutionWitness(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	sys := utils.NewMixedOpProofPreset(t)
+	opRethELNode := sys.RethWithProofL2ELNode()
+
+	// Create a funded account and recipient
+	account := sys.FunderL2.NewFundedEOA(eth.Ether(10))
+	recipient := sys.FunderL2.NewFundedEOA(eth.Ether(1))
+	recipientAddr := recipient.Address()
+
+	// Wait for current block
+	currentBlock := sys.L2ELSequencerNode().WaitForBlock()
+	t.Logf("Current L2 block number: %d", currentBlock.Number)
+
+	// Send a transaction to create some state changes
+	transferAmount := eth.Ether(1)
+	tx := account.Transfer(recipientAddr, transferAmount)
+	t.Logf("Sent transaction from account: %s to recipient: %s", account.Address().Hex(), recipientAddr.Hex())
+
+	receipt, err := tx.Included.Eval(t.Ctx())
+	require.NoError(t, err)
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt.Status)
+	t.Logf("Transaction included in block: %d", receipt.BlockNumber.Uint64())
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(receipt.BlockNumber.Uint64())
+	l2RethClient := opRethELNode.Escape().L2EthClient()
+
+	// Get the block to inspect the state changes
+	block, err := l2RethClient.InfoByNumber(t.Ctx(), receipt.BlockNumber.Uint64())
+	require.NoError(t, err)
+	t.Logf("Block %d has state root: %s", block.NumberU64(), block.Root().Hex())
+
+	// Call debug_executionWitness via RPC
+	var witness ExecutionWitness
+	blockNumberHex := hexutil.EncodeUint64(block.NumberU64())
+
+	// Use the RPC client's CallContext method directly
+	err = l2RethClient.RPC().CallContext(t.Ctx(), &witness, "debug_executionWitness", blockNumberHex)
+	require.NoError(t, err, "debug_executionWitness RPC call should succeed")
+
+	// Verify the witness contains expected data
+	require.NotEmpty(t, witness.Keys, "Witness should contain keys data")
+	require.NotEmpty(t, witness.Codes, "Witness should contain codes data")
+	require.NotEmpty(t, witness.State, "State should not be empty")
+	require.NotNil(t, witness.Headers, "Witness should contain headers data")
+
+	// Verify the parent header is present and decode it
+	require.NotEmpty(t, witness.Headers, "Headers should contain at least the parent block")
+	parentHeaderBytes := witness.Headers[len(witness.Headers)-1]
+	require.NotEmpty(t, parentHeaderBytes, "Parent header should not be empty")
+	t.Logf("Parent header size: %d bytes", len(parentHeaderBytes))
+
+	// Decode the parent header to verify it's valid RLP and extract state root
+	var parentHeader types.Header
+	err = rlp.DecodeBytes(parentHeaderBytes, &parentHeader)
+	require.NoError(t, err, "Parent header should be valid RLP-encoded")
+
+	// Verify the parent header matches the expected parent block
+	expectedParentNumber := block.NumberU64() - 1
+	require.Equal(t, expectedParentNumber, parentHeader.Number.Uint64(),
+		"Parent header should be for block %d", expectedParentNumber)
+
+	// Get the actual parent block from the chain to verify state root
+	actualParentBlock, err := l2RethClient.InfoByNumber(t.Ctx(), expectedParentNumber)
+	require.NoError(t, err, "Should be able to fetch parent block from chain")
+
+	// Verify the parent header's state root matches the actual parent block's state root
+	require.Equal(t, actualParentBlock.Root(), parentHeader.Root,
+		"Parent header state root in witness should match actual parent block state root")
+	t.Logf("Verified parent header state root matches chain: %s", parentHeader.Root.Hex())
+
+	// Verify that the witness contains keys for the accounts involved in the transaction
+	senderAddrHex := strings.ToLower(account.Address().Hex())
+	recipientAddrHex := strings.ToLower(recipientAddr.Hex())
+
+	// Check if the witness keys contains the accounts
+	// The witness format may vary, so we check for the presence of either the address or its hash
+	foundSender := false
+	foundRecipient := false
+
+	for _, value := range witness.Keys {
+		keyLower := strings.ToLower(value.String())
+		if strings.Contains(keyLower, senderAddrHex) {
+			foundSender = true
+		}
+		if strings.Contains(keyLower, recipientAddrHex) {
+			foundRecipient = true
+		}
+	}
+
+	// We should find at least the sender since they initiated the transaction
+	require.True(t, foundSender, "Witness should contain state data for the transaction sender")
+	t.Logf("Verified sender account is present in execution witness")
+
+	// The recipient might not always be in the witness depending on the implementation
+	if foundRecipient {
+		t.Logf("Verified recipient account is present in execution witness")
+	}
+	t.Log("Successfully retrieved and validated execution witness from Reth")
+}
diff --git a/rust/op-reth/crates/tests/proofs/core/init_test.go b/rust/op-reth/crates/tests/proofs/core/init_test.go
new file mode 100644
index 0000000000000..df6fe1ec27d7a
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/core/init_test.go
@@ -0,0 +1,14 @@
+package core
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+	"github.com/op-rs/op-geth/proofs/utils"
+)
+
+// TestMain creates the test-setups against the shared backend
+func TestMain(m *testing.M) {
+	// Other setups may be added here, hydrated from the same orchestrator
+	presets.DoMain(m, utils.WithMixedOpProofPreset())
+}
diff --git a/rust/op-reth/crates/tests/proofs/core/resyncing_test.go b/rust/op-reth/crates/tests/proofs/core/resyncing_test.go
new file mode 100644
index 0000000000000..1e7722a3055f2
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/core/resyncing_test.go
@@ -0,0 +1,64 @@
+package core
+
+import (
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/op-rs/op-geth/proofs/utils"
+	"github.com/stretchr/testify/require"
+)
+
+func TestResyncing(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	ctx := t.Ctx()
+
+	sys := utils.NewMixedOpProofPreset(t)
+
+	alice := sys.FunderL2.NewFundedEOA(eth.OneEther)
+	bob := sys.FunderL2.NewFundedEOA(eth.OneEther)
+
+	tx := alice.Transfer(bob.Address(), eth.OneHundredthEther)
+	receipt, err := tx.Included.Eval(ctx)
+	require.NoError(gt, err)
+	require.Equal(gt, types.ReceiptStatusSuccessful, receipt.Status)
+
+	t.Logf("Stopping validator L2 CL and EL to simulate downtime")
+	// According to devnet config, `B` will be the validator node.
+	sys.L2ELValidatorNode().Stop()
+	sys.L2CLValidator.Stop()
+
+	var blockNumbers []uint64
+	// produce some transactions while the node is down
+	for i := 0; i < 5; i++ {
+		tx := alice.Transfer(bob.Address(), eth.OneHundredthEther)
+		receipt, err := tx.Included.Eval(ctx)
+		require.NoError(gt, err)
+		require.Equal(gt, types.ReceiptStatusSuccessful, receipt.Status)
+		blockNumbers = append(blockNumbers, receipt.BlockNumber.Uint64())
+	}
+
+	// restart the node and ensure it can sync the missing blocks
+	t.Logf("Restarting validator L2 CL and EL to resync")
+	sys.L2ELValidatorNode().Start()
+	sys.L2CLValidator.Start()
+
+	time.Sleep(3 * time.Second)
+
+	err = wait.For(t.Ctx(), 2*time.Second, func() (bool, error) {
+		status := sys.L2CLValidator.SyncStatus()
+		return status.UnsafeL2.Number > blockNumbers[len(blockNumbers)-1], nil
+	})
+	require.NoError(gt, err, "Validator L2 CL failed to resync to latest block")
+
+	t.Logf("Fetching and verifying proofs for transactions produced while node was down")
+	// verify the proofs for the transactions produced while the node was down
+	for _, blockNumber := range blockNumbers {
+		utils.FetchAndVerifyProofs(t, sys, bob.Address(), []common.Hash{}, blockNumber)
+		utils.FetchAndVerifyProofs(t, sys, alice.Address(), []common.Hash{}, blockNumber)
+	}
+}
diff --git a/rust/op-reth/crates/tests/proofs/core/simple_storage_test.go b/rust/op-reth/crates/tests/proofs/core/simple_storage_test.go
new file mode 100644
index 0000000000000..e2c59f6900081
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/core/simple_storage_test.go
@@ -0,0 +1,172 @@
+package core
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/op-rs/op-geth/proofs/utils"
+)
+
+func TestStorageProofUsingSimpleStorageContract(gt *testing.T) {
+	t := devtest.SerialT(gt)
+
+	sys := utils.NewMixedOpProofPreset(t)
+	user := sys.FunderL2.NewFundedEOA(eth.OneHundredthEther)
+
+	// deploy contract via helper
+	contract, receipt := utils.DeploySimpleStorage(t, user)
+	t.Logf("contract deployed at address %s in L2 block %d", contract.Address().Hex(), receipt.BlockNumber.Uint64())
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(receipt.BlockNumber.Uint64())
+	// fetch and verify initial proof (should be zeroed storage)
+	utils.FetchAndVerifyProofs(t, sys, contract.Address(), []common.Hash{common.HexToHash("0x0")}, receipt.BlockNumber.Uint64())
+
+	type caseEntry struct {
+		Block uint64
+		Value *big.Int
+	}
+	var cases []caseEntry
+	for i := 1; i <= 5; i++ {
+		writeVal := big.NewInt(int64(i * 10))
+		callRes := contract.SetValue(user, writeVal)
+
+		cases = append(cases, caseEntry{
+			Block: callRes.BlockNumber.Uint64(),
+			Value: writeVal,
+		})
+		t.Logf("setValue transaction included in L2 block %d", callRes.BlockNumber)
+	}
+
+	// test reset storage to zero
+	callRes := contract.SetValue(user, big.NewInt(0))
+	cases = append(cases, caseEntry{
+		Block: callRes.BlockNumber.Uint64(),
+		Value: big.NewInt(0),
+	})
+	t.Logf("reset setValue transaction included in L2 block %d", callRes.BlockNumber)
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(callRes.BlockNumber.Uint64())
+	// for each case, get proof and verify
+	for _, c := range cases {
+		utils.FetchAndVerifyProofs(t, sys, contract.Address(), []common.Hash{common.HexToHash("0x0")}, c.Block)
+	}
+
+	// test with non-existent storage slot
+	nonExistentSlot := common.HexToHash("0xdeadbeef")
+	utils.FetchAndVerifyProofs(t, sys, contract.Address(), []common.Hash{nonExistentSlot}, cases[len(cases)-1].Block)
+}
+
+func TestStorageProofUsingMultiStorageContract(gt *testing.T) {
+	t := devtest.SerialT(gt)
+
+	sys := utils.NewMixedOpProofPreset(t)
+	user := sys.FunderL2.NewFundedEOA(eth.OneHundredthEther)
+
+	// deploy contract via helper
+	contract, receipt := utils.DeployMultiStorage(t, user)
+	t.Logf("contract deployed at address %s in L2 block %d", contract.Address().Hex(), receipt.BlockNumber.Uint64())
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(receipt.BlockNumber.Uint64())
+	// fetch and verify initial proof (should be zeroed storage)
+	utils.FetchAndVerifyProofs(t, sys, contract.Address(), []common.Hash{common.HexToHash("0x0"), common.HexToHash("0x1")}, receipt.BlockNumber.Uint64())
+
+	// set multiple storage slots
+	type caseEntry struct {
+		Block      uint64
+		SlotValues map[common.Hash]*big.Int
+	}
+	var cases []caseEntry
+
+	for i := 1; i <= 5; i++ {
+		aVal := big.NewInt(int64(i * 10))
+		bVal := big.NewInt(int64(i * 20))
+		callRes := contract.SetValues(user, aVal, bVal)
+
+		cases = append(cases, caseEntry{
+			Block: callRes.BlockNumber.Uint64(),
+			SlotValues: map[common.Hash]*big.Int{
+				common.HexToHash("0x0"): aVal,
+				common.HexToHash("0x1"): bVal,
+			},
+		})
+		t.Logf("setValues transaction included in L2 block %d", callRes.BlockNumber)
+	}
+
+	// test reset storage slots to zero
+	callRes := contract.SetValues(user, big.NewInt(0), big.NewInt(0))
+	cases = append(cases, caseEntry{
+		Block: callRes.BlockNumber.Uint64(),
+		SlotValues: map[common.Hash]*big.Int{
+			common.HexToHash("0x0"): big.NewInt(0),
+			common.HexToHash("0x1"): big.NewInt(0),
+		},
+	})
+	t.Logf("reset setValues transaction included in L2 block %d", callRes.BlockNumber)
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(callRes.BlockNumber.Uint64())
+	// for each case, get proof and verify
+	for _, c := range cases {
+		var slots []common.Hash
+		for slot := range c.SlotValues {
+			slots = append(slots, slot)
+		}
+
+		utils.FetchAndVerifyProofs(t, sys, contract.Address(), slots, c.Block)
+	}
+}
+
+func TestTokenVaultStorageProofs(gt *testing.T) {
+	t := devtest.SerialT(gt)
+
+	sys := utils.NewMixedOpProofPreset(t)
+	// funder EOA that will deploy / interact
+	alice := sys.FunderL2.NewFundedEOA(eth.OneEther)
+	bob := sys.FunderL2.NewFundedEOA(eth.OneEther)
+
+	// deploy contract
+	contract, deployBlock := utils.DeployTokenVault(t, alice)
+	t.Logf("TokenVault deployed at %s block=%d", contract.Address().Hex(), deployBlock.BlockNumber.Uint64())
+
+	userAddr := alice.Address()
+
+	// call deposit (payable)
+	depositAmount := eth.OneHundredthEther
+	depRes := contract.Deposit(alice, depositAmount)
+	depositBlock := depRes.BlockNumber.Uint64()
+	t.Logf("deposit included in block %d", depositBlock)
+
+	// call approve(spender, amount) - use same user as spender for simplicity, or create another funded EOA
+	approveAmount := big.NewInt(100)
+	spenderAddr := bob.Address()
+	approveRes := contract.Approve(alice, spenderAddr, approveAmount)
+	approveBlock := approveRes.BlockNumber.Uint64()
+	t.Logf("approve included in block %d", approveBlock)
+
+	// call deactivateAllowance(spender)
+	deactRes := contract.DeactivateAllowance(alice, spenderAddr)
+	deactBlock := deactRes.BlockNumber.Uint64()
+	t.Logf("deactivateAllowance included in block %d", deactBlock)
+
+	sys.L2ELValidatorNode().WaitForBlockNumber(deactBlock)
+
+	// balance slot for user
+	balanceSlot := contract.GetBalanceSlot(userAddr)
+	// nested allowance slot owner=user, spender=spenderAddr
+	allowanceSlot := contract.GetAllowanceSlot(userAddr, spenderAddr)
+	// depositors[0] element slot
+	depositor0Slot := contract.GetDepositorSlot(0)
+
+	// fetch & verify proofs at appropriate blocks
+	// balance after deposit (depositBlock)
+	t.Logf("Verifying balance slot %s at deposit block %d", balanceSlot.Hex(), depositBlock)
+	utils.FetchAndVerifyProofs(t, sys, contract.Address(), []common.Hash{balanceSlot, depositor0Slot}, depositBlock)
+	// allowance after approve (approveBlock)
+	t.Logf("Verifying allowance slot %s at approve block %d", allowanceSlot.Hex(), approveBlock)
+	utils.FetchAndVerifyProofs(t, sys, contract.Address(), []common.Hash{allowanceSlot}, approveBlock)
+	// after deactivation, allowance should be zero at deactBlock
+	t.Logf("Verifying allowance slot %s at deactivate block %d", allowanceSlot.Hex(), deactBlock)
+	utils.FetchAndVerifyProofs(t, sys, contract.Address(), []common.Hash{allowanceSlot}, deactBlock)
+}
diff --git a/rust/op-reth/crates/tests/proofs/prune/init_test.go b/rust/op-reth/crates/tests/proofs/prune/init_test.go
new file mode 100644
index 0000000000000..bd9082e259d41
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/prune/init_test.go
@@ -0,0 +1,14 @@
+package prune
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+	"github.com/op-rs/op-geth/proofs/utils"
+)
+
+// TestMain creates the test-setups against the shared backend
+func TestMain(m *testing.M) {
+	// Other setups may be added here, hydrated from the same orchestrator
+	presets.DoMain(m, utils.WithMixedOpProofPreset())
+}
diff --git a/rust/op-reth/crates/tests/proofs/prune/prune_test.go b/rust/op-reth/crates/tests/proofs/prune/prune_test.go
new file mode 100644
index 0000000000000..528851a82c3a1
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/prune/prune_test.go
@@ -0,0 +1,138 @@
+package prune
+
+import (
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-service/apis"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/op-rs/op-geth/proofs/utils"
+	"github.com/stretchr/testify/require"
+)
+
+// Steps:
+// 1) Create some tx and validate proof for a block (pre-prune):
+// 2) Wait for that specific block to be pruned:
+//   - Ensure the chain advances enough so the pruner *can* move `earliest` past `targetBlock`
+//     (i.e. latest >= targetBlock + proofWindow).
+//   - Poll debug_proofsSyncStatus until earliest > targetBlock (meaning targetBlock is now pruned).
+//
+// 3) Call validate checks for getProof and check everything is consistent for the new earliest block.
+func TestPruneProofStorageWithGetProofConsistency(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	ctx := t.Ctx()
+
+	sys := utils.NewMixedOpProofPreset(t)
+
+	// Defined in the devnet yaml
+	var proofWindow = uint64(200)
+
+	// An expected time within the prune should be detected.
+	var pruneDetectTimeout = 5 * time.Minute
+
+	opRethELNode := sys.RethWithProofL2ELNode()
+	ethClient := opRethELNode.Escape().EthClient()
+
+	// -----------------------------
+	// (1) Create tx + validate proof pre-prune
+	// -----------------------------
+	const numAccounts = 2
+	const initialFunding = 10
+
+	accounts := sys.FunderL2.NewFundedEOAs(numAccounts, eth.Ether(initialFunding))
+	recipient := sys.FunderL2.NewFundedEOA(eth.Ether(1))
+	recipientAddr := recipient.Address()
+	transferAmount := eth.Ether(1)
+
+	t.Log("Sending transactions from both accounts (to create state changes)")
+	tx0 := accounts[0].Transfer(recipientAddr, transferAmount)
+	tx1 := accounts[1].Transfer(recipientAddr, transferAmount)
+
+	receipt0, err := tx0.Included.Eval(ctx)
+	require.NoError(t, err)
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt0.Status)
+
+	receipt1, err := tx1.Included.Eval(ctx)
+	require.NoError(t, err)
+	require.Equal(t, types.ReceiptStatusSuccessful, receipt1.Status)
+
+	// Choose a deterministic target block: the later of the two inclusion blocks.
+	targetBlock := receipt0.BlockNumber.Uint64()
+	if receipt1.BlockNumber.Uint64() > targetBlock {
+		targetBlock = receipt1.BlockNumber.Uint64()
+	}
+	t.Logf("Target block for proof validation (pre-prune): %d", targetBlock)
+
+	// Make sure validator has the block too (keeps the test stable).
+	sys.L2ELValidatorNode().WaitForBlockNumber(targetBlock)
+
+	// Pre-prune proof verification at targetBlock.
+	// This verifies the proof against the block's state root (efficient correctness check).
+	t.Logf("Pre-prune: verifying getProof proofs at block %d", targetBlock)
+	utils.FetchAndVerifyProofs(t, sys, accounts[0].Address(), []common.Hash{}, targetBlock)
+	utils.FetchAndVerifyProofs(t, sys, accounts[1].Address(), []common.Hash{}, targetBlock)
+	t.Log("Pre-prune: proofs verified successfully")
+
+	// -----------------------------
+	// (2) Wait until targetBlock is pruned (earliest > targetBlock)
+	// -----------------------------
+	initialStatus := getProofSyncStatus(t, ethClient)
+	t.Logf("Initial proofs sync status: earliest=%d latest=%d", initialStatus.Earliest, initialStatus.Latest)
+
+	// Ensure we advance far enough that pruning *can* move earliest past targetBlock.
+	// If latest < targetBlock + proofWindow, earliest cannot advance beyond targetBlock yet.
+	requiredLatest := targetBlock + proofWindow
+	if initialStatus.Latest < requiredLatest {
+		t.Logf("Waiting for chain to advance to at least block %d so pruning can pass targetBlock", requiredLatest)
+		opRethELNode.WaitForBlockNumber(requiredLatest)
+	}
+
+	t.Logf("Waiting for pruner to advance earliest past targetBlock=%d ...", targetBlock)
+	waitUntil := time.Now().Add(pruneDetectTimeout)
+
+	var prunedStatus proofSyncStatus
+	for {
+		if time.Now().After(waitUntil) {
+			t.Errorf("Timed out waiting for prune: earliest did not advance past targetBlock=%d within %s", targetBlock, pruneDetectTimeout)
+		}
+
+		prunedStatus = getProofSyncStatus(t, ethClient)
+		t.Logf("Polling proofs sync status: earliest=%d latest=%d (target=%d)", prunedStatus.Earliest, prunedStatus.Latest, targetBlock)
+
+		// This is the key condition: the specific block we validated earlier is now out of window.
+		if prunedStatus.Earliest > targetBlock {
+			break
+		}
+
+		time.Sleep(5 * time.Second)
+	}
+
+	currentProofWindow := prunedStatus.Latest - prunedStatus.Earliest
+	require.GreaterOrEqual(t, currentProofWindow, proofWindow, "pruner should maintain at least the configured proof window")
+	t.Logf("Detected prune past targetBlock. Now earliest=%d latest=%d window=%d", prunedStatus.Earliest, prunedStatus.Latest, currentProofWindow)
+
+	// -----------------------------
+	// (3) Post-prune consistency checks for getProof
+	// -----------------------------
+	t.Logf("Post-prune: expecting getProof verification to succeed at new earliest block=%d", prunedStatus.Earliest)
+	utils.FetchAndVerifyProofs(t, sys, accounts[0].Address(), []common.Hash{}, prunedStatus.Earliest)
+	utils.FetchAndVerifyProofs(t, sys, accounts[1].Address(), []common.Hash{}, prunedStatus.Earliest)
+	t.Log("Post-prune: getProof consistency checks passed")
+}
+
+type proofSyncStatus struct {
+	Earliest uint64 `json:"earliest"`
+	Latest   uint64 `json:"latest"`
+}
+
+func getProofSyncStatus(t devtest.T, client apis.EthClient) proofSyncStatus {
+	var result proofSyncStatus
+	err := client.RPC().CallContext(t.Ctx(), &result, "debug_proofsSyncStatus")
+	if err != nil {
+		t.Errorf("debug_proofsSyncStatus call failed: %v", err)
+	}
+	return result
+}
diff --git a/rust/op-reth/crates/tests/proofs/reorg/init_test.go b/rust/op-reth/crates/tests/proofs/reorg/init_test.go
new file mode 100644
index 0000000000000..cfcf49cbe55a3
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/reorg/init_test.go
@@ -0,0 +1,14 @@
+package reorg
+
+import (
+	"testing"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+	"github.com/op-rs/op-geth/proofs/utils"
+)
+
+// TestMain creates the test-setups against the shared backend
+func TestMain(m *testing.M) {
+	// Other setups may be added here, hydrated from the same orchestrator
+	presets.DoMain(m, utils.WithMixedOpProofPreset())
+}
diff --git a/rust/op-reth/crates/tests/proofs/reorg/reorg_test.go b/rust/op-reth/crates/tests/proofs/reorg/reorg_test.go
new file mode 100644
index 0000000000000..69e1e0718bd24
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/reorg/reorg_test.go
@@ -0,0 +1,199 @@
+package reorg
+
+import (
+	"math/big"
+	"testing"
+	"time"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/wait"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/txplan"
+	"github.com/ethereum-optimism/optimism/op-test-sequencer/sequencer/seqtypes"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/op-rs/op-geth/proofs/utils"
+	"github.com/stretchr/testify/require"
+)
+
+func TestReorgUsingAccountProof(gt *testing.T) {
+	t := devtest.SerialT(gt)
+	ctx := t.Ctx()
+
+	sys := utils.NewMixedOpProofPreset(t)
+	l := sys.Log
+
+	ia := sys.TestSequencer.Escape().ControlAPI(sys.L2Chain.ChainID())
+
+	// stop batcher on chain A
+	sys.L2Batcher.Stop()
+
+	// two EOAs for a sample transfer tx used later in a conflicting block
+	alice := sys.FunderL2.NewFundedEOA(eth.OneHundredthEther)
+	bob := sys.FunderL2.NewFundedEOA(eth.OneHundredthEther)
+
+	user := sys.FunderL2.NewFundedEOA(eth.OneEther)
+	contract, deployBlock := utils.DeploySimpleStorage(t, user)
+	t.Logf("SimpleStorage deployed at %s block=%d", contract.Address().Hex(), deployBlock.BlockNumber.Uint64())
+
+	time.Sleep(12 * time.Second)
+	divergenceHead := sys.L2Chain.WaitForBlock()
+	// build up some blocks that will be reorged away
+
+	type caseEntry struct {
+		Block uint64
+		addr  common.Address
+		slots []common.Hash
+	}
+	var cases []caseEntry
+
+	// deploy another contract in the reorged blocks
+	{
+		rContract, rDeployBlock := utils.DeploySimpleStorage(t, user)
+		t.Logf("Reorg SimpleStorage deployed at %s block=%d", rContract.Address().Hex(), rDeployBlock.BlockNumber.Uint64())
+
+		cases = append(cases, caseEntry{
+			Block: rDeployBlock.BlockNumber.Uint64(),
+			addr:  rContract.Address(),
+			slots: []common.Hash{common.HexToHash("0x0")},
+		})
+	}
+
+	for i := 0; i < 3; i++ {
+		tx := alice.Transfer(bob.Address(), eth.OneGWei)
+		receipt, err := tx.Included.Eval(ctx)
+		require.NoError(gt, err)
+		require.Equal(gt, types.ReceiptStatusSuccessful, receipt.Status)
+
+		cases = append(cases, caseEntry{
+			Block: receipt.BlockNumber.Uint64(),
+			addr:  alice.Address(),
+			slots: []common.Hash{},
+		})
+		cases = append(cases, caseEntry{
+			Block: receipt.BlockNumber.Uint64(),
+			addr:  bob.Address(),
+			slots: []common.Hash{},
+		})
+
+		// also include the contract account in the proofs to verify
+		val := big.NewInt(int64(i * 10))
+		callRes := contract.SetValue(user, val)
+
+		cases = append(cases, caseEntry{
+			Block: callRes.BlockNumber.Uint64(),
+			addr:  contract.Address(),
+			slots: []common.Hash{common.HexToHash("0x0")},
+		})
+	}
+
+	sys.L2CLSequencer.StopSequencer()
+
+	var divergenceBlockNumber uint64
+	var originalRef eth.L2BlockRef
+	// prepare and sequence a conflicting block for the L2A chain
+	{
+		divergenceBlockRef := sys.L2ELSequencerNode().BlockRefByNumber(divergenceHead.Number)
+
+		l.Info("Expect to reorg the chain on block", "number", divergenceBlockRef.Number, "head", divergenceHead, "parent", divergenceBlockRef.ParentID().Hash)
+		divergenceBlockNumber = divergenceBlockRef.Number
+		originalRef = divergenceBlockRef
+
+		parentOfDivergenceHead := divergenceBlockRef.ParentID()
+
+		l.Info("Sequencing a conflicting block", "divergenceBlockRef", divergenceBlockRef, "parent", parentOfDivergenceHead)
+
+		// sequence a conflicting block with a simple transfer tx, based on the parent of the parent of the unsafe head
+		{
+			err := ia.New(ctx, seqtypes.BuildOpts{
+				Parent:   parentOfDivergenceHead.Hash,
+				L1Origin: nil,
+			})
+			require.NoError(t, err, "Expected to be able to create a new block job for sequencing on op-test-sequencer, but got error")
+
+			// include simple transfer tx in opened block
+			{
+				to := bob.PlanTransfer(alice.Address(), eth.OneGWei)
+				opt := txplan.Combine(to)
+				ptx := txplan.NewPlannedTx(opt)
+				signed_tx, err := ptx.Signed.Eval(ctx)
+				require.NoError(t, err, "Expected to be able to evaluate a planned transaction on op-test-sequencer, but got error")
+				txdata, err := signed_tx.MarshalBinary()
+				require.NoError(t, err, "Expected to be able to marshal a signed transaction on op-test-sequencer, but got error")
+
+				err = ia.IncludeTx(ctx, txdata)
+				require.NoError(t, err, "Expected to be able to include a signed transaction on op-test-sequencer, but got error")
+
+				cases = append(cases, caseEntry{
+					Block: divergenceHead.Number,
+					addr:  alice.Address(),
+					slots: []common.Hash{},
+				})
+				cases = append(cases, caseEntry{
+					Block: divergenceHead.Number,
+					addr:  bob.Address(),
+					slots: []common.Hash{},
+				})
+			}
+
+			err = ia.Next(ctx)
+			require.NoError(t, err, "Expected to be able to call Next() after New() on op-test-sequencer, but got error")
+		}
+	}
+
+	// start batcher on chain A
+	sys.L2Batcher.Start()
+
+	// sequence a second block with op-test-sequencer (no L1 origin override)
+	{
+		l.Info("Sequencing with op-test-sequencer (no L1 origin override)")
+		err := ia.New(ctx, seqtypes.BuildOpts{
+			Parent:   sys.L2ELSequencerNode().BlockRefByLabel(eth.Unsafe).Hash,
+			L1Origin: nil,
+		})
+		require.NoError(t, err, "Expected to be able to create a new block job for sequencing on op-test-sequencer, but got error")
+		time.Sleep(2 * time.Second)
+
+		err = ia.Next(ctx)
+		require.NoError(t, err, "Expected to be able to call Next() after New() on op-test-sequencer, but got error")
+		time.Sleep(2 * time.Second)
+	}
+
+	// continue sequencing with consensus node (op-node)
+	sys.L2CLSequencer.StartSequencer()
+
+	for i := 0; i < 3; i++ {
+		sys.L2Chain.WaitForBlock()
+	}
+
+	latestBlock := sys.L2Chain.WaitForBlock()
+	sys.L2ELValidatorNode().WaitForBlockNumber(latestBlock.Number)
+
+	// verify that the L2A validator has reorged and reached the latest block
+	err := wait.For(t.Ctx(), 2*time.Second, func() (bool, error) {
+		blockRef, err := sys.L2ELValidatorNode().Escape().EthClient().BlockRefByNumber(ctx, latestBlock.Number)
+		if err != nil {
+			// this could happen if the validator is still syncing after reorg
+			l.Warn("Error fetching block reference from validator", "error", err)
+			return false, nil
+		}
+		return blockRef.Hash == latestBlock.Hash, nil
+	})
+	require.NoError(t, err, "Expected block hash to match latest block hash on validator")
+
+	reorgedRef_A, err := sys.L2ELSequencerNode().Escape().EthClient().BlockRefByNumber(ctx, divergenceBlockNumber)
+	require.NoError(t, err, "Expected to be able to call BlockRefByNumber API, but got error")
+
+	l.Info("Reorged chain on divergence block number (prior the reorg)", "number", divergenceBlockNumber, "head", originalRef.Hash, "parent", originalRef.ParentID().Hash)
+	l.Info("Reorged chain on divergence block number (after the reorg)", "number", divergenceBlockNumber, "head", reorgedRef_A.Hash, "parent", reorgedRef_A.ParentID().Hash)
+	require.NotEqual(t, originalRef.Hash, reorgedRef_A.Hash, "Expected to get different heads on divergence block number, but got the same hash, so no reorg happened on chain A")
+	require.Equal(t, originalRef.ParentID().Hash, reorgedRef_A.ParentHash, "Expected to get same parent hashes on divergence block number, but got different hashes")
+
+	time.Sleep(10 * time.Second)
+
+	// verify that the accounts involved in the conflicting blocks
+	for i, c := range cases {
+		l.Info("Verifying proof", "case", i, "addr", c.addr.Hex(), "block", c.Block)
+		utils.FetchAndVerifyProofs(t, sys, c.addr, c.slots, c.Block)
+	}
+}
diff --git a/rust/op-reth/crates/tests/proofs/utils/contract.go b/rust/op-reth/crates/tests/proofs/utils/contract.go
new file mode 100644
index 0000000000000..e4e5cffa49141
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/utils/contract.go
@@ -0,0 +1,26 @@
+package utils
+
+import (
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common"
+)
+
+type Contract struct {
+	address   common.Address
+	parsedABI abi.ABI
+}
+
+func NewContract(address common.Address, parsedABI abi.ABI) *Contract {
+	return &Contract{
+		address:   address,
+		parsedABI: parsedABI,
+	}
+}
+
+func (c *Contract) Address() common.Address {
+	return c.address
+}
+
+func (c *Contract) ABI() abi.ABI {
+	return c.parsedABI
+}
diff --git a/rust/op-reth/crates/tests/proofs/utils/multistorage.go b/rust/op-reth/crates/tests/proofs/utils/multistorage.go
new file mode 100644
index 0000000000000..9c3ae260f1635
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/utils/multistorage.go
@@ -0,0 +1,45 @@
+package utils
+
+import (
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
+	"github.com/ethereum-optimism/optimism/op-service/txplan"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/stretchr/testify/require"
+)
+
+const MultiStorageArtifact = "../contracts/artifacts/MultiStorage.sol/MultiStorage.json"
+
+type MultiStorage struct {
+	*Contract
+	t devtest.T
+}
+
+func (c *MultiStorage) SetValues(user *dsl.EOA, a, b *big.Int) *types.Receipt {
+	ctx := c.t.Ctx()
+	callData, err := c.parsedABI.Pack("setValues", a, b)
+	if err != nil {
+		require.NoError(c.t, err, "failed to pack set call data")
+	}
+
+	callTx := txplan.NewPlannedTx(user.Plan(), txplan.WithTo(&c.Contract.address), txplan.WithData(callData))
+	callRes, err := callTx.Included.Eval(ctx)
+	if err != nil {
+		require.NoError(c.t, err, "failed to create set tx")
+	}
+
+	if callRes.Status != types.ReceiptStatusSuccessful {
+		require.NoError(c.t, err, "set transaction failed")
+	}
+
+	return callRes
+}
+
+func DeployMultiStorage(t devtest.T, user *dsl.EOA) (*MultiStorage, *types.Receipt) {
+	parsedABI, bin := LoadArtifact(t, MultiStorageArtifact)
+	contractAddress, receipt := DeployContract(t, user, bin)
+	contract := NewContract(contractAddress, parsedABI)
+	return &MultiStorage{contract, t}, receipt
+}
diff --git a/rust/op-reth/crates/tests/proofs/utils/preset.go b/rust/op-reth/crates/tests/proofs/utils/preset.go
new file mode 100644
index 0000000000000..166adec2edad2
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/utils/preset.go
@@ -0,0 +1,372 @@
+package utils
+
+import (
+	"os"
+	"strings"
+
+	"github.com/ethereum/go-ethereum/log"
+
+	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
+	"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
+	"github.com/ethereum-optimism/optimism/op-devstack/presets"
+	"github.com/ethereum-optimism/optimism/op-devstack/shim"
+	"github.com/ethereum-optimism/optimism/op-devstack/stack"
+	"github.com/ethereum-optimism/optimism/op-devstack/stack/match"
+	"github.com/ethereum-optimism/optimism/op-devstack/sysgo"
+	"github.com/ethereum-optimism/optimism/op-e2e/e2eutils/intentbuilder"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+)
+
+type L2ELClient string
+
+const (
+	L2ELClientGeth L2ELClient = "geth"
+	L2ELClientReth L2ELClient = "reth"
+	L2ELClientRethWithProofs L2ELClient = "reth-with-proof"
+)
+
+type L2ELNodeID struct {
+	stack.L2ELNodeID
+	Client L2ELClient
+}
+
+type L2ELNode struct {
+	*dsl.L2ELNode
+	Client L2ELClient
+}
+
+type MixedOpProofPreset struct {
+	Log          log.Logger
+	T            devtest.T
+	ControlPlane stack.ControlPlane
+
+	L1Network *dsl.L1Network
+	L1EL      *dsl.L1ELNode
+
+	L2Chain   *dsl.L2Network
+	L2Batcher *dsl.L2Batcher
+
+	L2ELSequencer *L2ELNode
+	L2CLSequencer *dsl.L2CLNode
+
+	L2ELValidator *L2ELNode
+	L2CLValidator *dsl.L2CLNode
+
+	Wallet *dsl.HDWallet
+
+	FaucetL1 *dsl.Faucet
+	FaucetL2 *dsl.Faucet
+	FunderL1 *dsl.Funder
+	FunderL2 *dsl.Funder
+
+	TestSequencer *dsl.TestSequencer
+}
+
+func (m *MixedOpProofPreset) L2Network() *dsl.L2Network {
+	return m.L2Chain
+}
+
+func (m *MixedOpProofPreset) L2ELSequencerNode() *dsl.L2ELNode {
+	return m.L2ELSequencer.L2ELNode
+}
+
+func (m *MixedOpProofPreset) L2ELValidatorNode() *dsl.L2ELNode {
+	return m.L2ELValidator.L2ELNode
+}
+
+// GethL2ELNode returns first L2 EL nodes that are running op-geth
+func (m *MixedOpProofPreset) GethL2ELNode() *dsl.L2ELNode {
+	if m.L2ELSequencer.Client == L2ELClientGeth {
+		return m.L2ELSequencer.L2ELNode
+	}
+
+	if m.L2ELValidator.Client == L2ELClientGeth {
+		return m.L2ELValidator.L2ELNode
+	}
+
+	return nil
+}
+
+// RethL2ELNode returns first L2 EL nodes that are running op-reth
+func (m *MixedOpProofPreset) RethL2ELNode() *dsl.L2ELNode {
+	if m.L2ELSequencer.Client == L2ELClientReth {
+		return m.L2ELSequencer.L2ELNode
+	}
+
+	if m.L2ELValidator.Client == L2ELClientReth {
+		return m.L2ELValidator.L2ELNode
+	}
+	return nil
+}
+
+// RethWithProofL2ELNode returns first L2 EL nodes that are running op-reth with proof
+func (m *MixedOpProofPreset) RethWithProofL2ELNode() *dsl.L2ELNode {
+	if m.L2ELSequencer.Client == L2ELClientRethWithProofs {
+		return m.L2ELSequencer.L2ELNode
+	}
+
+	if m.L2ELValidator.Client == L2ELClientRethWithProofs {
+		return m.L2ELValidator.L2ELNode
+	}
+	return nil
+}
+
+func WithMixedOpProofPreset() stack.CommonOption {
+	return stack.MakeCommon(DefaultMixedOpProofSystem(&DefaultMixedOpProofSystemIDs{}))
+}
+
+func L2NodeMatcher[
+	I interface {
+		comparable
+		Key() string
+	}, E stack.Identifiable[I]](value ...string) stack.Matcher[I, E] {
+	return match.MatchElemFn[I, E](func(elem E) bool {
+		for _, v := range value {
+			if !strings.Contains(elem.ID().Key(), v) {
+				return false
+			}
+		}
+		return true
+	})
+}
+
+func NewMixedOpProofPreset(t devtest.T) *MixedOpProofPreset {
+	system := shim.NewSystem(t)
+	orch := presets.Orchestrator()
+	orch.Hydrate(system)
+
+	t.Gate().Equal(len(system.L2Networks()), 1, "expected exactly one L2 network")
+	t.Gate().Equal(len(system.L1Networks()), 1, "expected exactly one L1 network")
+
+	l1Net := system.L1Network(match.FirstL1Network)
+	l2Net := system.L2Network(match.Assume(t, match.L2ChainA))
+
+	t.Gate().GreaterOrEqual(len(l2Net.L2CLNodes()), 2, "expected at least two L2CL nodes")
+
+	sequencerCL := l2Net.L2CLNode(match.Assume(t, match.WithSequencerActive(t.Ctx())))
+	sequencerELInner := l2Net.L2ELNode(match.Assume(t, match.EngineFor(sequencerCL)))
+	var sequencerEL *L2ELNode
+	if strings.Contains(sequencerELInner.ID().String(), "op-reth-with-proof") {
+		sequencerEL = &L2ELNode{
+			L2ELNode: dsl.NewL2ELNode(sequencerELInner, orch.ControlPlane()),
+			Client:   L2ELClientRethWithProofs,
+		}
+	} else if strings.Contains(sequencerELInner.ID().String(), "op-reth") {
+		sequencerEL = &L2ELNode{
+			L2ELNode: dsl.NewL2ELNode(sequencerELInner, orch.ControlPlane()),
+			Client:   L2ELClientReth,
+		}
+	} else if strings.Contains(sequencerELInner.ID().String(), "op-geth") {
+		sequencerEL = &L2ELNode{
+			L2ELNode: dsl.NewL2ELNode(sequencerELInner, orch.ControlPlane()),
+			Client:   L2ELClientGeth,
+		}
+	} else {
+		t.Error("unexpected L2EL client for sequencer")
+		t.FailNow()
+	}
+
+	verifierCL := l2Net.L2CLNode(match.Assume(t,
+		match.And(
+			match.Not(match.WithSequencerActive(t.Ctx())),
+			match.Not(sequencerCL.ID()),
+		)))
+	verifierELInner := l2Net.L2ELNode(match.Assume(t,
+		match.And(
+			match.EngineFor(verifierCL),
+			match.Not(sequencerEL.ID()),
+		)))
+	var verifierEL *L2ELNode
+	if strings.Contains(verifierELInner.ID().String(), "op-reth-with-proof") {
+		verifierEL = &L2ELNode{
+			L2ELNode: dsl.NewL2ELNode(verifierELInner, orch.ControlPlane()),
+			Client:   L2ELClientRethWithProofs,
+		}
+	} else if strings.Contains(verifierELInner.ID().String(), "op-reth") {
+		verifierEL = &L2ELNode{
+			L2ELNode: dsl.NewL2ELNode(verifierELInner, orch.ControlPlane()),
+			Client:   L2ELClientReth,
+		}
+	} else if strings.Contains(verifierELInner.ID().String(), "op-geth") {
+		verifierEL = &L2ELNode{
+			L2ELNode: dsl.NewL2ELNode(verifierELInner, orch.ControlPlane()),
+			Client:   L2ELClientGeth,
+		}
+	} else {
+		t.Error("unexpected L2EL client for verifier")
+		t.FailNow()
+	}
+
+	out := &MixedOpProofPreset{
+		Log:           t.Logger(),
+		T:             t,
+		ControlPlane:  orch.ControlPlane(),
+		L1Network:     dsl.NewL1Network(l1Net),
+		L1EL:          dsl.NewL1ELNode(l1Net.L1ELNode(match.Assume(t, match.FirstL1EL))),
+		L2Chain:       dsl.NewL2Network(l2Net, orch.ControlPlane()),
+		L2Batcher:     dsl.NewL2Batcher(l2Net.L2Batcher(match.Assume(t, match.FirstL2Batcher))),
+		L2ELSequencer: sequencerEL,
+		L2CLSequencer: dsl.NewL2CLNode(sequencerCL, orch.ControlPlane()),
+		L2ELValidator: verifierEL,
+		L2CLValidator: dsl.NewL2CLNode(verifierCL, orch.ControlPlane()),
+		Wallet:        dsl.NewRandomHDWallet(t, 30), // Random for test isolation
+		FaucetL2:      dsl.NewFaucet(l2Net.Faucet(match.Assume(t, match.FirstFaucet))),
+
+		TestSequencer: dsl.NewTestSequencer(system.TestSequencer(match.Assume(t, match.FirstTestSequencer))),
+	}
+	out.FaucetL1 = dsl.NewFaucet(out.L1Network.Escape().Faucet(match.Assume(t, match.FirstFaucet)))
+	out.FunderL1 = dsl.NewFunder(out.Wallet, out.FaucetL1, out.L1EL)
+	out.FunderL2 = dsl.NewFunder(out.Wallet, out.FaucetL2, out.L2ELSequencer)
+	return out
+}
+
+type DefaultMixedOpProofSystemIDs struct {
+	L1   stack.L1NetworkID
+	L1EL stack.L1ELNodeID
+	L1CL stack.L1CLNodeID
+
+	L2 stack.L2NetworkID
+
+	L2CLSequencer stack.L2CLNodeID
+	L2ELSequencer L2ELNodeID
+
+	L2CLValidator stack.L2CLNodeID
+	L2ELValidator L2ELNodeID
+
+	L2Batcher    stack.L2BatcherID
+	L2Proposer   stack.L2ProposerID
+	L2Challenger stack.L2ChallengerID
+
+	TestSequencer stack.TestSequencerID
+}
+
+func NewDefaultMixedOpProofSystemIDs(l1ID, l2ID eth.ChainID) DefaultMixedOpProofSystemIDs {
+	ids := DefaultMixedOpProofSystemIDs{
+		L1:            stack.L1NetworkID(l1ID),
+		L1EL:          stack.NewL1ELNodeID("l1", l1ID),
+		L1CL:          stack.NewL1CLNodeID("l1", l1ID),
+		L2:            stack.L2NetworkID(l2ID),
+		L2CLSequencer: stack.NewL2CLNodeID("sequencer", l2ID),
+		L2CLValidator: stack.NewL2CLNodeID("validator", l2ID),
+		L2Batcher:     stack.NewL2BatcherID("main", l2ID),
+		L2Proposer:    stack.NewL2ProposerID("main", l2ID),
+		L2Challenger:  stack.NewL2ChallengerID("main", l2ID),
+		TestSequencer: "test-sequencer",
+	}
+
+	// default to op-geth for sequencer and op-reth-with-proof for validator
+	switch os.Getenv("OP_DEVSTACK_PROOF_SEQUENCER_EL") {
+	case "op-reth-with-proof":
+		ids.L2ELSequencer = L2ELNodeID{
+			L2ELNodeID: stack.NewL2ELNodeID("sequencer-op-reth-with-proof", l2ID),
+			Client:     L2ELClientRethWithProofs,
+		}
+	case "op-reth":
+		ids.L2ELSequencer = L2ELNodeID{
+			L2ELNodeID: stack.NewL2ELNodeID("sequencer-op-reth", l2ID),
+			Client:     L2ELClientReth,
+		}
+	default:
+		ids.L2ELSequencer = L2ELNodeID{
+			L2ELNodeID: stack.NewL2ELNodeID("sequencer-op-geth", l2ID),
+			Client:     L2ELClientGeth,
+		}
+	}
+
+	switch os.Getenv("OP_DEVSTACK_PROOF_VALIDATOR_EL") {
+	case "op-geth":
+		ids.L2ELValidator = L2ELNodeID{
+			L2ELNodeID: stack.NewL2ELNodeID("validator-op-geth", l2ID),
+			Client:     L2ELClientGeth,
+		}
+	case "op-reth":
+		ids.L2ELValidator = L2ELNodeID{
+			L2ELNodeID: stack.NewL2ELNodeID("validator-op-reth", l2ID),
+			Client:     L2ELClientReth,
+		}
+	default:
+		ids.L2ELValidator = L2ELNodeID{
+			L2ELNodeID: stack.NewL2ELNodeID("validator-op-reth-with-proof", l2ID),
+			Client:     L2ELClientRethWithProofs,
+		}
+	}
+
+	return ids
+}
+
+func DefaultMixedOpProofSystem(dest *DefaultMixedOpProofSystemIDs) stack.Option[*sysgo.Orchestrator] {
+	ids := NewDefaultMixedOpProofSystemIDs(sysgo.DefaultL1ID, sysgo.DefaultL2AID)
+	return defaultMixedOpProofSystemOpts(&ids, dest)
+}
+
+func defaultMixedOpProofSystemOpts(src, dest *DefaultMixedOpProofSystemIDs) stack.CombinedOption[*sysgo.Orchestrator] {
+	opt := stack.Combine[*sysgo.Orchestrator]()
+	opt.Add(stack.BeforeDeploy(func(o *sysgo.Orchestrator) {
+		o.P().Logger().Info("Setting up")
+	}))
+
+	opt.Add(sysgo.WithMnemonicKeys(devkeys.TestMnemonic))
+
+	// Get artifacts path
+	artifactsPath := os.Getenv("OP_DEPLOYER_ARTIFACTS")
+	if artifactsPath == "" {
+		panic("OP_DEPLOYER_ARTIFACTS is not set")
+	}
+
+	opt.Add(sysgo.WithDeployer(),
+		sysgo.WithDeployerPipelineOption(
+			sysgo.WithDeployerCacheDir(artifactsPath),
+		),
+		sysgo.WithDeployerOptions(
+			func(_ devtest.P, _ devkeys.Keys, builder intentbuilder.Builder) {
+				builder.WithL1ContractsLocator(artifacts.MustNewFileLocator(artifactsPath))
+				builder.WithL2ContractsLocator(artifacts.MustNewFileLocator(artifactsPath))
+			},
+			sysgo.WithCommons(src.L1.ChainID()),
+			sysgo.WithPrefundedL2(src.L1.ChainID(), src.L2.ChainID()),
+		),
+	)
+
+	opt.Add(sysgo.WithL1Nodes(src.L1EL, src.L1CL))
+
+	// Spawn L2 sequencer nodes
+	switch src.L2ELSequencer.Client {
+	case L2ELClientRethWithProofs:
+		opt.Add(sysgo.WithOpReth(src.L2ELSequencer.L2ELNodeID, sysgo.L2ELWithProofHistory(true)))
+	case L2ELClientReth:
+		opt.Add(sysgo.WithOpReth(src.L2ELSequencer.L2ELNodeID))
+	case L2ELClientGeth:
+		opt.Add(sysgo.WithOpGeth(src.L2ELSequencer.L2ELNodeID))
+	default:
+		panic("unknown L2 EL client for sequencer")
+	}
+	opt.Add(sysgo.WithL2CLNode(src.L2CLSequencer, src.L1CL, src.L1EL, src.L2ELSequencer.L2ELNodeID, sysgo.L2CLSequencer()))
+
+	// Spawn L2 validator nodes
+	switch src.L2ELValidator.Client {
+	case L2ELClientRethWithProofs:
+		opt.Add(sysgo.WithOpReth(src.L2ELValidator.L2ELNodeID, sysgo.L2ELWithProofHistory(true)))
+	case L2ELClientReth:
+		opt.Add(sysgo.WithOpReth(src.L2ELValidator.L2ELNodeID))
+	case L2ELClientGeth:
+		opt.Add(sysgo.WithOpGeth(src.L2ELValidator.L2ELNodeID))
+	default:
+		panic("unknown L2 EL client for validator")
+	}
+	opt.Add(sysgo.WithL2CLNode(src.L2CLValidator, src.L1CL, src.L1EL, src.L2ELValidator.L2ELNodeID))
+
+	opt.Add(sysgo.WithBatcher(src.L2Batcher, src.L1EL, src.L2CLSequencer, src.L2ELSequencer.L2ELNodeID))
+	opt.Add(sysgo.WithProposer(src.L2Proposer, src.L1EL, &src.L2CLSequencer, nil))
+
+	opt.Add(sysgo.WithFaucets([]stack.L1ELNodeID{src.L1EL}, []stack.L2ELNodeID{src.L2ELSequencer.L2ELNodeID}))
+
+	opt.Add(sysgo.WithTestSequencer(src.TestSequencer, src.L1CL, src.L2CLSequencer, src.L1EL, src.L2ELSequencer.L2ELNodeID))
+
+	opt.Add(stack.Finally(func(orch *sysgo.Orchestrator) {
+		*dest = *src
+	}))
+
+	return opt
+}
diff --git a/rust/op-reth/crates/tests/proofs/utils/proof.go b/rust/op-reth/crates/tests/proofs/utils/proof.go
new file mode 100644
index 0000000000000..89bf42f2b3821
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/utils/proof.go
@@ -0,0 +1,154 @@
+package utils
+
+import (
+	"bytes"
+	"fmt"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/ethereum/go-ethereum/ethdb/memorydb"
+	"github.com/ethereum/go-ethereum/rlp"
+	"github.com/ethereum/go-ethereum/trie"
+	"github.com/stretchr/testify/require"
+)
+
+// NormalizeProofResponse standardizes an AccountResult obtained from eth_getProof
+// across different client implementations (e.g., Geth, Reth) so that they can be
+// compared meaningfully in tests.
+//
+// Ethereum clients may encode empty or zeroed data structures differently while
+// still representing the same logical state. For example:
+//   - An empty storage proof may appear as [] (Geth) or ["0x80"] (Reth).
+//
+// This function normalizes such differences by:
+//   - Converting single-element proofs containing "0x80" to an empty proof slice.
+func NormalizeProofResponse(res *eth.AccountResult) {
+	for i := range res.StorageProof {
+		if len(res.StorageProof[i].Proof) == 1 && bytes.Equal(res.StorageProof[i].Proof[0], []byte{0x80}) {
+			res.StorageProof[i].Proof = []hexutil.Bytes{}
+		}
+	}
+
+	// Normalize empty CodeHash
+	// Geth returns 0x0000000000000000000000000000000000000000000000000000000000000000
+	// Reth returns 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
+	if res.CodeHash == (common.Hash{}) {
+		res.CodeHash = crypto.Keccak256Hash(nil)
+	}
+
+	// Normalize empty StorageHash
+	// Geth returns 0x0000000000000000000000000000000000000000000000000000000000000000
+	// Reth returns 0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421
+	if res.StorageHash == (common.Hash{}) {
+		res.StorageHash = types.EmptyRootHash
+	}
+}
+
+// VerifyProof verifies an account and its storage proofs against a given state root.
+//
+// This function extends the standard behavior of go-ethereum’s AccountResult.Verify()
+// by gracefully handling the case where the account’s storage trie root is empty
+// (0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421).
+func VerifyProof(res *eth.AccountResult, stateRoot common.Hash) error {
+	// Skip storage proof verification if the storage trie is empty.
+	if res.StorageHash != types.EmptyRootHash {
+		for i, entry := range res.StorageProof {
+			// load all MPT nodes into a DB
+			db := memorydb.New()
+			for j, encodedNode := range entry.Proof {
+				nodeKey := encodedNode
+				if len(encodedNode) >= 32 { // small MPT nodes are not hashed
+					nodeKey = crypto.Keccak256(encodedNode)
+				}
+				if err := db.Put(nodeKey, encodedNode); err != nil {
+					return fmt.Errorf("failed to load storage proof node %d of storage value %d into mem db: %w", j, i, err)
+				}
+			}
+			path := crypto.Keccak256(entry.Key)
+			val, err := trie.VerifyProof(res.StorageHash, path, db)
+			if err != nil {
+				return fmt.Errorf("failed to verify storage value %d with key %s (path %x) in storage trie %s: %w", i, entry.Key.String(), path, res.StorageHash, err)
+			}
+			if val == nil && entry.Value.ToInt().Cmp(common.Big0) == 0 { // empty storage is zero by default
+				continue
+			}
+			comparison, err := rlp.EncodeToBytes(entry.Value.ToInt().Bytes())
+			if err != nil {
+				return fmt.Errorf("failed to encode storage value %d with key %s (path %x) in storage trie %s: %w", i, entry.Key.String(), path, res.StorageHash, err)
+			}
+			if !bytes.Equal(val, comparison) {
+				return fmt.Errorf("value %d in storage proof does not match proven value at key %s (path %x)", i, entry.Key.String(), path)
+			}
+		}
+	}
+
+	accountClaimed := []any{uint64(res.Nonce), res.Balance.ToInt().Bytes(), res.StorageHash, res.CodeHash}
+	accountClaimedValue, err := rlp.EncodeToBytes(accountClaimed)
+	if err != nil {
+		return fmt.Errorf("failed to encode account from retrieved values: %w", err)
+	}
+
+	// create a db with all account trie nodes
+	db := memorydb.New()
+	for i, encodedNode := range res.AccountProof {
+		nodeKey := encodedNode
+		if len(encodedNode) >= 32 { // small MPT nodes are not hashed
+			nodeKey = crypto.Keccak256(encodedNode)
+		}
+		if err := db.Put(nodeKey, encodedNode); err != nil {
+			return fmt.Errorf("failed to load account proof node %d into mem db: %w", i, err)
+		}
+	}
+	path := crypto.Keccak256(res.Address[:])
+	accountProofValue, err := trie.VerifyProof(stateRoot, path, db)
+	if err != nil {
+		return fmt.Errorf("failed to verify account value with key %s (path %x) in account trie %s: %w", res.Address, path, stateRoot, err)
+	}
+
+	// If the proof demonstrates non-existence (nil value), we must check if the RPC claimed the account is empty.
+	if len(accountProofValue) == 0 {
+		isEmpty := res.Nonce == 0 &&
+			res.Balance.ToInt().Sign() == 0 &&
+			(res.StorageHash == types.EmptyRootHash || res.StorageHash == common.Hash{}) &&
+			(res.CodeHash == crypto.Keccak256Hash(nil) || res.CodeHash == common.Hash{})
+
+		if isEmpty {
+			return nil
+		}
+	}
+
+	if !bytes.Equal(accountClaimedValue, accountProofValue) {
+		return fmt.Errorf("L1 RPC is tricking us, account proof does not match provided deserialized values:\n"+
+			"  claimed: %x\n"+
+			"  proof:   %x", accountClaimedValue, accountProofValue)
+	}
+	return nil
+}
+
+// FetchAndVerifyProofs fetches account proofs from both L2EL and L2ELB for the given address
+func FetchAndVerifyProofs(t devtest.T, sys *MixedOpProofPreset, address common.Address, slots []common.Hash, block uint64) {
+	ctx := t.Ctx()
+	blockInfo, err := sys.L2ELSequencerNode().Escape().L2EthClient().InfoByNumber(ctx, block)
+	require.NoError(t, err, "failed to get block info for block %d", block)
+
+	seqProofRes, err := sys.L2ELSequencerNode().Escape().L2EthClient().GetProof(ctx, address, slots, hexutil.Uint64(block).String())
+	require.NoError(t, err, "failed to get proof from L2EL at block %d", block)
+
+	valProofRes, err := sys.L2ELValidatorNode().Escape().L2EthClient().GetProof(ctx, address, slots, hexutil.Uint64(block).String())
+	require.NoError(t, err, "failed to get proof from L2ELB at block %d", block)
+
+	NormalizeProofResponse(seqProofRes)
+	NormalizeProofResponse(valProofRes)
+
+	require.Equal(t, seqProofRes, valProofRes, "sequencer and validator proofs should match")
+
+	err = VerifyProof(seqProofRes, blockInfo.Root())
+	require.NoError(t, err, "geth proof verification failed at block %d", block)
+
+	err = VerifyProof(valProofRes, blockInfo.Root())
+	require.NoError(t, err, "reth proof verification failed at block %d", block)
+}
diff --git a/rust/op-reth/crates/tests/proofs/utils/simplestorage.go b/rust/op-reth/crates/tests/proofs/utils/simplestorage.go
new file mode 100644
index 0000000000000..2e080ff9ad9ef
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/utils/simplestorage.go
@@ -0,0 +1,54 @@
+package utils
+
+import (
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
+	"github.com/ethereum-optimism/optimism/op-service/txplan"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/stretchr/testify/require"
+)
+
+const SimpleStorageArtifact = "../contracts/artifacts/SimpleStorage.sol/SimpleStorage.json"
+
+type SimpleStorage struct {
+	*Contract
+	t devtest.T
+}
+
+func (c *SimpleStorage) SetValue(user *dsl.EOA, value *big.Int) *types.Receipt {
+	ctx := c.t.Ctx()
+	callData, err := c.parsedABI.Pack("setValue", value)
+	if err != nil {
+		require.NoError(c.t, err, "failed to pack set call data")
+	}
+
+	callTx := txplan.NewPlannedTx(user.Plan(), txplan.WithTo(&c.Contract.address), txplan.WithData(callData))
+	callRes, err := callTx.Included.Eval(ctx)
+	if err != nil {
+		require.NoError(c.t, err, "failed to create set tx")
+	}
+
+	if callRes.Status != types.ReceiptStatusSuccessful {
+		require.NoError(c.t, err, "set transaction failed")
+	}
+	return callRes
+}
+
+func (c *SimpleStorage) PlanSetValue(user *dsl.EOA, value *big.Int) *txplan.PlannedTx {
+	callData, err := c.parsedABI.Pack("setValue", value)
+	if err != nil {
+		require.NoError(c.t, err, "failed to pack set call data")
+	}
+
+	callTx := txplan.NewPlannedTx(user.Plan(), txplan.WithTo(&c.Contract.address), txplan.WithData(callData))
+	return callTx
+}
+
+func DeploySimpleStorage(t devtest.T, user *dsl.EOA) (*SimpleStorage, *types.Receipt) {
+	parsedABI, bin := LoadArtifact(t, SimpleStorageArtifact)
+	contractAddress, receipt := DeployContract(t, user, bin)
+	contract := NewContract(contractAddress, parsedABI)
+	return &SimpleStorage{contract, t}, receipt
+}
diff --git a/rust/op-reth/crates/tests/proofs/utils/tokenvault.go b/rust/op-reth/crates/tests/proofs/utils/tokenvault.go
new file mode 100644
index 0000000000000..1c1fbe2d12ae8
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/utils/tokenvault.go
@@ -0,0 +1,106 @@
+package utils
+
+import (
+	"math/big"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
+	"github.com/ethereum-optimism/optimism/op-service/eth"
+	"github.com/ethereum-optimism/optimism/op-service/txplan"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/ethereum/go-ethereum/crypto"
+	"github.com/stretchr/testify/require"
+)
+
+const TokenVaultArtifact = "../contracts/artifacts/TokenVault.sol/TokenVault.json"
+const BalanceSlotIndex = 0
+const AllowanceSlotIndex = 1
+const DepositorSlotIndex = 2
+
+type TokenVault struct {
+	*Contract
+	t devtest.T
+}
+
+func (c *TokenVault) Deposit(user *dsl.EOA, amount eth.ETH) *types.Receipt {
+	depositCalldata, err := c.Contract.parsedABI.Pack("deposit")
+	if err != nil {
+		require.NoError(c.t, err, "failed to pack deposit calldata")
+	}
+	depTx := txplan.NewPlannedTx(user.Plan(), txplan.WithTo(&c.Contract.address), txplan.WithData(depositCalldata), txplan.WithValue(amount))
+	depRes, err := depTx.Included.Eval(c.t.Ctx())
+	if err != nil {
+		require.NoError(c.t, err, "deposit tx failed")
+	}
+
+	if depRes.Status != types.ReceiptStatusSuccessful {
+		require.NoError(c.t, err, "deposit transaction failed")
+	}
+
+	return depRes
+}
+
+func (c *TokenVault) Approve(user *dsl.EOA, spender common.Address, amount *big.Int) *types.Receipt {
+	approveCalldata, err := c.Contract.parsedABI.Pack("approve", spender, amount)
+	if err != nil {
+		require.NoError(c.t, err, "failed to pack approve calldata")
+	}
+
+	approveTx := txplan.NewPlannedTx(user.Plan(), txplan.WithTo(&c.Contract.address), txplan.WithData(approveCalldata))
+	approveRes, err := approveTx.Included.Eval(c.t.Ctx())
+	if err != nil {
+		require.NoError(c.t, err, "approve tx failed")
+	}
+
+	if approveRes.Status != types.ReceiptStatusSuccessful {
+		require.NoError(c.t, err, "approve transaction failed")
+	}
+	return approveRes
+}
+
+func (c *TokenVault) DeactivateAllowance(user *dsl.EOA, spender common.Address) *types.Receipt {
+	deactCalldata, err := c.Contract.parsedABI.Pack("deactivateAllowance", spender)
+	if err != nil {
+		require.NoError(c.t, err, "failed to pack deactivateAllowance calldata")
+	}
+	deactTx := txplan.NewPlannedTx(user.Plan(), txplan.WithTo(&c.Contract.address), txplan.WithData(deactCalldata))
+	deactRes, err := deactTx.Included.Eval(c.t.Ctx())
+	if err != nil {
+		require.NoError(c.t, err, "deactivateAllowance tx failed")
+	}
+
+	if deactRes.Status != types.ReceiptStatusSuccessful {
+		require.NoError(c.t, err, "deactivateAllowance transaction failed")
+	}
+	return deactRes
+}
+
+func (c *TokenVault) GetBalanceSlot(user common.Address) common.Hash {
+	keyBytes := common.LeftPadBytes(user.Bytes(), 32)
+	slotBytes := common.LeftPadBytes(new(big.Int).SetUint64(BalanceSlotIndex).Bytes(), 32)
+	return crypto.Keccak256Hash(append(keyBytes, slotBytes...))
+}
+
+func (c *TokenVault) GetAllowanceSlot(owner, spender common.Address) common.Hash {
+	ownerBytes := common.LeftPadBytes(owner.Bytes(), 32)
+	slotBytes := common.LeftPadBytes(new(big.Int).SetUint64(AllowanceSlotIndex).Bytes(), 32)
+	inner := crypto.Keccak256(ownerBytes, slotBytes)
+	spenderBytes := common.LeftPadBytes(spender.Bytes(), 32)
+	return crypto.Keccak256Hash(append(spenderBytes, inner...))
+}
+
+func (c *TokenVault) GetDepositorSlot(index uint64) common.Hash {
+	slotBytes := common.LeftPadBytes(new(big.Int).SetUint64(DepositorSlotIndex).Bytes(), 32)
+	base := crypto.Keccak256(slotBytes)
+	baseInt := new(big.Int).SetBytes(base)
+	elem := new(big.Int).Add(baseInt, new(big.Int).SetUint64(index))
+	return common.BigToHash(elem)
+}
+
+func DeployTokenVault(t devtest.T, user *dsl.EOA) (*TokenVault, *types.Receipt) {
+	parsedABI, bin := LoadArtifact(t, TokenVaultArtifact)
+	contractAddress, receipt := DeployContract(t, user, bin)
+	contract := NewContract(contractAddress, parsedABI)
+	return &TokenVault{contract, t}, receipt
+}
diff --git a/rust/op-reth/crates/tests/proofs/utils/utils.go b/rust/op-reth/crates/tests/proofs/utils/utils.go
new file mode 100644
index 0000000000000..e47fdc47e15b8
--- /dev/null
+++ b/rust/op-reth/crates/tests/proofs/utils/utils.go
@@ -0,0 +1,66 @@
+package utils
+
+import (
+	"encoding/json"
+	"os"
+	"strings"
+
+	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
+	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
+	"github.com/ethereum-optimism/optimism/op-service/txplan"
+	"github.com/ethereum/go-ethereum/accounts/abi"
+	"github.com/ethereum/go-ethereum/common"
+	"github.com/ethereum/go-ethereum/core/types"
+	"github.com/stretchr/testify/require"
+)
+
+// minimal parts of artifact
+type Artifact struct {
+	ABI      json.RawMessage `json:"abi"`
+	Bytecode struct {
+		Object string `json:"object"`
+	} `json:"bytecode"`
+}
+
+// LoadArtifact reads the forge artifact JSON at artifactPath and returns the parsed ABI
+// and the creation bytecode (as bytes). It prefers bytecode.object (creation) and falls
+// back to deployedBytecode.object if needed.
+func LoadArtifact(t devtest.T, artifactPath string) (abi.ABI, []byte) {
+	data, err := os.ReadFile(artifactPath)
+	if err != nil {
+		require.NoError(t, err, "failed to read artifact file")
+	}
+
+	var art Artifact
+	if err := json.Unmarshal(data, &art); err != nil {
+		require.NoError(t, err, "failed to unmarshal artifact JSON")
+	}
+
+	parsedABI, err := abi.JSON(strings.NewReader(string(art.ABI)))
+	if err != nil {
+		require.NoError(t, err, "failed to parse contract ABI")
+	}
+
+	binHex := strings.TrimSpace(art.Bytecode.Object)
+	if binHex == "" {
+		require.NoError(t, err, "artifact has no bytecode")
+	}
+
+	return parsedABI, common.FromHex(binHex)
+}
+
+// DeployContract deploys the contract creation bytecode from the given artifact.
+// user must provide a Plan() method compatible with txplan.NewPlannedTx (kept generic).
+func DeployContract(t devtest.T, user *dsl.EOA, bin []byte) (common.Address, *types.Receipt) {
+	tx := txplan.NewPlannedTx(user.Plan(), txplan.WithData(bin))
+	res, err := tx.Included.Eval(t.Ctx())
+	if err != nil {
+		require.NoError(t, err, "contract deployment tx failed")
+	}
+
+	if res.Status != types.ReceiptStatusSuccessful {
+		require.NoError(t, err, "contract deployment transaction failed")
+	}
+
+	return res.ContractAddress, res
+}
diff --git a/rust/op-reth/crates/tests/scripts/op-reth-entrypoint.sh b/rust/op-reth/crates/tests/scripts/op-reth-entrypoint.sh
new file mode 100644
index 0000000000000..08b9b1385ff32
--- /dev/null
+++ b/rust/op-reth/crates/tests/scripts/op-reth-entrypoint.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+set -e
+
+# Variables to extract
+DATADIR=""
+PROOFS_PATH=""
+CHAIN=""
+
+# Helper: require a value after flag
+require_value() {
+  if [ -z "$2" ] || printf "%s" "$2" | grep -q "^--"; then
+    echo "ERROR: Missing value for $1" >&2
+    exit 1
+  fi
+}
+
+# Parse arguments using a prev_flag pattern to avoid eval
+prev_flag=""
+for arg in "$@"; do
+  if [ -n "$prev_flag" ]; then
+    require_value "$prev_flag" "$arg"
+    case "$prev_flag" in
+      --datadir) DATADIR="$arg" ;;
+      --proofs-history.storage-path) PROOFS_PATH="$arg" ;;
+      --chain) CHAIN="$arg" ;;
+    esac
+    prev_flag=""
+    continue
+  fi
+
+  case "$arg" in
+    --datadir=*)
+      DATADIR="${arg#*=}"
+      ;;
+    --datadir)
+      prev_flag="$arg"
+      ;;
+    --proofs-history.storage-path=*)
+      PROOFS_PATH="${arg#*=}"
+      ;;
+    --proofs-history.storage-path)
+      prev_flag="$arg"
+      ;;
+    --chain=*)
+      CHAIN="${arg#*=}"
+      ;;
+    --chain)
+      prev_flag="$arg"
+      ;;
+  esac
+done
+
+# Check if a flag was left without a value at the end
+if [ -n "$prev_flag" ]; then
+  echo "ERROR: Missing value for $prev_flag" >&2
+  exit 1
+fi
+
+# Log extracted values
+echo "extracted --datadir: ${DATADIR:-<not-set>}"
+echo "extracted --proofs-history.storage-path: ${PROOFS_PATH:-<not-set>}"
+echo "extracted --chain: ${CHAIN:-<not-set>}"
+
+echo "Initializing op-reth"
+op-reth init --datadir="$DATADIR" --chain="$CHAIN"
+echo "Initializing op-reth proofs"
+op-reth proofs init --datadir="$DATADIR" --chain="$CHAIN" --proofs-history.storage-path="$PROOFS_PATH"
+echo "Starting op-reth with args: $*"
+op-reth "$@"
diff --git a/rust/op-reth/crates/trie/Cargo.toml b/rust/op-reth/crates/trie/Cargo.toml
new file mode 100644
index 0000000000000..3cf894c579b7f
--- /dev/null
+++ b/rust/op-reth/crates/trie/Cargo.toml
@@ -0,0 +1,98 @@
+[package]
+name = "reth-optimism-trie"
+version = "1.10.2"
+edition.workspace = true
+rust-version.workspace = true
+license.workspace = true
+homepage = "https://paradigmxyz.github.io/reth"
+repository = "https://github.com/paradigmxyz/reth"
+description = "Trie node storage for serving proofs in FP window fast"
+
+[lints]
+workspace = true
+
+[dependencies]
+# reth
+reth-db = { workspace = true, features = ["mdbx"] }
+reth-evm.workspace = true
+reth-execution-errors.workspace = true
+reth-primitives-traits.workspace = true
+reth-provider.workspace = true
+reth-revm.workspace = true
+reth-trie = { workspace = true, features = ["serde"] }
+reth-trie-common = { workspace = true, features = ["serde"] }
+reth-tasks.workspace = true
+
+# workaround: reth-trie/serde-bincode-compat activates serde-bincode-compat on
+# reth-ethereum-primitives (a transitive dep) without also activating its serde feature,
+# breaking compilation. Adding it as an optional dep lets us enable both features together.
+reth-ethereum-primitives = { workspace = true, optional = true }
+
+# `metrics` feature
+metrics = { workspace = true, optional = true }
+reth-metrics = { workspace = true, features = ["common"], optional = true }
+
+# ethereum
+alloy-primitives.workspace = true
+alloy-eips.workspace = true
+
+# async
+tokio = { workspace = true, features = ["sync"] }
+
+# codec
+bytes.workspace = true
+serde.workspace = true
+bincode.workspace = true
+
+# misc
+parking_lot.workspace = true
+thiserror.workspace = true
+auto_impl.workspace = true
+eyre = { workspace = true, optional = true }
+strum.workspace = true
+tracing.workspace = true
+derive_more.workspace = true
+
+[dev-dependencies]
+reth-codecs = { workspace = true, features = ["test-utils"] }
+tempfile.workspace = true
+tokio = { workspace = true, features = ["test-util", "rt-multi-thread", "macros"] }
+test-case.workspace = true
+reth-db = { workspace = true, features = ["test-utils"] }
+# workaround for failing doc test <https://github.com/op-rs/op-reth/pull/234>
+reth-db-api = { workspace = true, features = ["test-utils"] }
+reth-trie = { workspace = true, features = ["test-utils"] }
+reth-provider = { workspace = true, features = ["test-utils"] }
+reth-node-api.workspace = true
+alloy-consensus.workspace = true
+alloy-genesis.workspace = true
+reth-chainspec.workspace = true
+reth-db-common.workspace = true
+reth-ethereum-primitives.workspace = true
+reth-evm-ethereum.workspace = true
+reth-storage-errors.workspace = true
+secp256k1 = { workspace = true, features = ["rand", "std"] }
+mockall.workspace = true
+eyre.workspace = true
+
+# misc
+serial_test.workspace = true
+
+[features]
+serde-bincode-compat = [
+	"reth-primitives-traits/serde-bincode-compat",
+	"reth-trie-common/serde-bincode-compat",
+	"alloy-consensus/serde-bincode-compat",
+	"alloy-eips/serde-bincode-compat",
+	"reth-trie/serde-bincode-compat",
+	"dep:reth-ethereum-primitives",
+	"reth-ethereum-primitives?/serde-bincode-compat",
+	"reth-ethereum-primitives?/serde",
+]
+metrics = [
+	"reth-trie/metrics",
+	"dep:reth-metrics",
+	"dep:metrics",
+	"dep:eyre",
+	"reth-evm/metrics"
+]
diff --git a/rust/op-reth/crates/trie/src/api.rs b/rust/op-reth/crates/trie/src/api.rs
new file mode 100644
index 0000000000000..58f943b810806
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/api.rs
@@ -0,0 +1,231 @@
+//! Storage API for external storage of intermediary trie nodes.
+
+use crate::{
+    OpProofsStorageResult,
+    db::{HashedStorageKey, StorageTrieKey},
+};
+use alloy_eips::{BlockNumHash, eip1898::BlockWithParent};
+use alloy_primitives::{B256, U256};
+use auto_impl::auto_impl;
+use derive_more::{AddAssign, Constructor};
+use reth_primitives_traits::Account;
+use reth_trie::{
+    hashed_cursor::{HashedCursor, HashedStorageCursor},
+    trie_cursor::{TrieCursor, TrieStorageCursor},
+};
+use reth_trie_common::{
+    BranchNodeCompact, HashedPostStateSorted, Nibbles, StoredNibbles, updates::TrieUpdatesSorted,
+};
+use std::{fmt::Debug, time::Duration};
+
+/// Diff of trie updates and post state for a block.
+#[derive(Debug, Clone, Default)]
+pub struct BlockStateDiff {
+    /// Trie updates for branch nodes
+    pub sorted_trie_updates: TrieUpdatesSorted,
+    /// Post state for leaf nodes (accounts and storage)
+    pub sorted_post_state: HashedPostStateSorted,
+}
+
+impl BlockStateDiff {
+    /// Extend the [` BlockStateDiff`] from other latest [`BlockStateDiff`]
+    pub fn extend_ref(&mut self, other: &Self) {
+        self.sorted_trie_updates.extend_ref_and_sort(&other.sorted_trie_updates);
+        self.sorted_post_state.extend_ref_and_sort(&other.sorted_post_state);
+    }
+}
+
+/// Counts of trie updates written to storage.
+#[derive(Debug, Clone, Default, AddAssign, Constructor, Eq, PartialEq)]
+pub struct WriteCounts {
+    /// Number of account trie updates written
+    pub account_trie_updates_written_total: u64,
+    /// Number of storage trie updates written
+    pub storage_trie_updates_written_total: u64,
+    /// Number of hashed accounts written
+    pub hashed_accounts_written_total: u64,
+    /// Number of hashed storages written
+    pub hashed_storages_written_total: u64,
+}
+
+/// Duration metrics for block processing.
+#[derive(Debug, Default, Clone)]
+pub struct OperationDurations {
+    /// Total time to process a block (end-to-end) in seconds
+    pub total_duration_seconds: Duration,
+    /// Time spent executing the block (EVM) in seconds
+    pub execution_duration_seconds: Duration,
+    /// Time spent calculating state root in seconds
+    pub state_root_duration_seconds: Duration,
+    /// Time spent writing trie updates to storage in seconds
+    pub write_duration_seconds: Duration,
+}
+
+/// Trait for reading trie nodes from the database.
+///
+/// Only leaf nodes and some branch nodes are stored. The bottom layer of branch nodes
+/// are not stored to reduce write amplification. This matches Reth's non-historical trie storage.
+#[auto_impl(Arc)]
+pub trait OpProofsStore: Send + Sync + Debug {
+    /// Cursor for iterating over trie branches.
+    type StorageTrieCursor<'tx>: TrieStorageCursor + 'tx
+    where
+        Self: 'tx;
+
+    /// Cursor for iterating over account trie branches.
+    type AccountTrieCursor<'tx>: TrieCursor + 'tx
+    where
+        Self: 'tx;
+
+    /// Cursor for iterating over storage leaves.
+    type StorageCursor<'tx>: HashedStorageCursor<Value = U256> + Send + Sync + 'tx
+    where
+        Self: 'tx;
+
+    /// Cursor for iterating over account leaves.
+    type AccountHashedCursor<'tx>: HashedCursor<Value = Account> + Send + Sync + 'tx
+    where
+        Self: 'tx;
+
+    /// Get the earliest block number and hash that has been stored
+    ///
+    /// This is used to determine the block number of trie nodes with block number 0.
+    /// All earliest block numbers are stored in 0 to reduce updates required to prune trie nodes.
+    fn get_earliest_block_number(&self) -> OpProofsStorageResult<Option<(u64, B256)>>;
+
+    /// Get the latest block number and hash that has been stored
+    fn get_latest_block_number(&self) -> OpProofsStorageResult<Option<(u64, B256)>>;
+
+    /// Get a trie cursor for the storage backend
+    fn storage_trie_cursor<'tx>(
+        &self,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::StorageTrieCursor<'tx>>;
+
+    /// Get a trie cursor for the account backend
+    fn account_trie_cursor<'tx>(
+        &self,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::AccountTrieCursor<'tx>>;
+
+    /// Get a storage cursor for the storage backend
+    fn storage_hashed_cursor<'tx>(
+        &self,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::StorageCursor<'tx>>;
+
+    /// Get an account hashed cursor for the storage backend
+    fn account_hashed_cursor<'tx>(
+        &self,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::AccountHashedCursor<'tx>>;
+
+    /// Store a batch of trie updates.
+    ///
+    /// If wiped is true, the entire storage trie is wiped, but this is unsupported going forward,
+    /// so should only happen for legacy reasons.
+    fn store_trie_updates(
+        &self,
+        block_ref: BlockWithParent,
+        block_state_diff: BlockStateDiff,
+    ) -> OpProofsStorageResult<WriteCounts>;
+
+    /// Fetch all updates for a given block number.
+    fn fetch_trie_updates(&self, block_number: u64) -> OpProofsStorageResult<BlockStateDiff>;
+
+    /// Applies [`BlockStateDiff`] to the earliest state (updating/deleting nodes) and updates the
+    /// earliest block number.
+    fn prune_earliest_state(
+        &self,
+        new_earliest_block_ref: BlockWithParent,
+    ) -> OpProofsStorageResult<WriteCounts>;
+
+    /// Remove account, storage and trie updates from historical storage for all blocks till
+    /// the specified block (inclusive).
+    fn unwind_history(&self, to: BlockWithParent) -> OpProofsStorageResult<()>;
+
+    /// Deletes all updates > `latest_common_block` and replaces them with the new updates.
+    fn replace_updates(
+        &self,
+        latest_common_block: BlockNumHash,
+        blocks_to_add: Vec<(BlockWithParent, BlockStateDiff)>,
+    ) -> OpProofsStorageResult<()>;
+
+    /// Set the earliest block number and hash that has been stored
+    fn set_earliest_block_number(&self, block_number: u64, hash: B256)
+    -> OpProofsStorageResult<()>;
+}
+
+/// Status of the initial state anchor.
+#[derive(Debug, Clone, Copy, Default)]
+pub enum InitialStateStatus {
+    /// Init isn't yet started
+    #[default]
+    NotStarted,
+    /// Init is in progress (some tables may already be populated)
+    InProgress,
+    /// Init completed successfully (all tables done + earliest block set)
+    Completed,
+}
+
+/// Anchor for the initial state.
+#[derive(Debug, Clone, Default)]
+pub struct InitialStateAnchor {
+    /// The block for which the initial state is being initialized. None if initialization is not
+    /// yet started.
+    pub block: Option<BlockNumHash>,
+    /// Whether initialization is still running or completed.
+    pub status: InitialStateStatus,
+    /// The latest key stored for `AccountTrieHistory`.
+    pub latest_account_trie_key: Option<StoredNibbles>,
+    /// The latest key stored for `StorageTrieHistory`.
+    pub latest_storage_trie_key: Option<StorageTrieKey>,
+    /// The latest key stored for `HashedAccountHistory`.
+    pub latest_hashed_account_key: Option<B256>,
+    /// The latest key stored for `HashedStorageHistory`.
+    pub latest_hashed_storage_key: Option<HashedStorageKey>,
+}
+
+/// Trait for storing and retrieving the initial state anchor.
+#[auto_impl(Arc)]
+pub trait OpProofsInitialStateStore: Send + Sync + Debug {
+    /// Read the current anchor.
+    fn initial_state_anchor(&self) -> OpProofsStorageResult<InitialStateAnchor>;
+
+    /// Create the anchor if it doesn't exist.
+    /// Returns `Err` if an anchor already exists (prevents accidental overwrite).
+    fn set_initial_state_anchor(&self, anchor: BlockNumHash) -> OpProofsStorageResult<()>;
+
+    /// Store a batch of account trie branches. Used for saving existing state. For live state
+    /// capture, use [store_trie_updates](OpProofsStore::store_trie_updates).
+    fn store_account_branches(
+        &self,
+        account_nodes: Vec<(Nibbles, Option<BranchNodeCompact>)>,
+    ) -> OpProofsStorageResult<()>;
+
+    /// Store a batch of storage trie branches. Used for saving existing state.
+    fn store_storage_branches(
+        &self,
+        hashed_address: B256,
+        storage_nodes: Vec<(Nibbles, Option<BranchNodeCompact>)>,
+    ) -> OpProofsStorageResult<()>;
+
+    /// Store a batch of account trie leaf nodes. Used for saving existing state.
+    fn store_hashed_accounts(
+        &self,
+        accounts: Vec<(B256, Option<Account>)>,
+    ) -> OpProofsStorageResult<()>;
+
+    /// Store a batch of storage trie leaf nodes. Used for saving existing state.
+    fn store_hashed_storages(
+        &self,
+        hashed_address: B256,
+        storages: Vec<(B256, U256)>,
+    ) -> OpProofsStorageResult<()>;
+
+    /// Commit the initial state - mark the anchor as completed and also set the earliest block
+    /// number to anchor.
+    fn commit_initial_state(&self) -> OpProofsStorageResult<BlockNumHash>;
+}
diff --git a/rust/op-reth/crates/trie/src/cursor.rs b/rust/op-reth/crates/trie/src/cursor.rs
new file mode 100644
index 0000000000000..500d6e26ab538
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/cursor.rs
@@ -0,0 +1,129 @@
+//! Implementation of [`HashedCursor`] and [`TrieCursor`] for
+//! [`OpProofsStorage`](crate::OpProofsStorage).
+
+use alloy_primitives::{B256, U256};
+use derive_more::Constructor;
+use reth_db::DatabaseError;
+use reth_primitives_traits::Account;
+use reth_trie::{
+    hashed_cursor::{HashedCursor, HashedStorageCursor},
+    trie_cursor::{TrieCursor, TrieStorageCursor},
+};
+use reth_trie_common::{BranchNodeCompact, Nibbles};
+
+/// Manages reading storage or account trie nodes from [`TrieCursor`].
+#[derive(Debug, Clone, Constructor)]
+pub struct OpProofsTrieCursor<C>(pub C);
+
+impl<C> TrieCursor for OpProofsTrieCursor<C>
+where
+    C: TrieCursor,
+{
+    #[inline]
+    fn seek_exact(
+        &mut self,
+        key: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.0.seek_exact(key)
+    }
+
+    #[inline]
+    fn seek(
+        &mut self,
+        key: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.0.seek(key)
+    }
+
+    #[inline]
+    fn next(&mut self) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.0.next()
+    }
+
+    #[inline]
+    fn current(&mut self) -> Result<Option<Nibbles>, DatabaseError> {
+        self.0.current()
+    }
+
+    #[inline]
+    fn reset(&mut self) {
+        self.0.reset()
+    }
+}
+
+impl<C> TrieStorageCursor for OpProofsTrieCursor<C>
+where
+    C: TrieStorageCursor,
+{
+    #[inline]
+    fn set_hashed_address(&mut self, hashed_address: B256) {
+        self.0.set_hashed_address(hashed_address)
+    }
+}
+
+/// Manages reading hashed account nodes from external storage.
+#[derive(Debug, Clone, Constructor)]
+pub struct OpProofsHashedAccountCursor<C>(pub C);
+
+impl<C> HashedCursor for OpProofsHashedAccountCursor<C>
+where
+    C: HashedCursor<Value = Account> + Send + Sync,
+{
+    type Value = Account;
+
+    #[inline]
+    fn seek(&mut self, key: B256) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.0.seek(key)
+    }
+
+    #[inline]
+    fn next(&mut self) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.0.next()
+    }
+
+    #[inline]
+    fn reset(&mut self) {
+        self.0.reset()
+    }
+}
+
+/// Manages reading hashed storage nodes from external storage.
+#[derive(Debug, Clone, Constructor)]
+pub struct OpProofsHashedStorageCursor<C>(pub C);
+
+impl<C> HashedCursor for OpProofsHashedStorageCursor<C>
+where
+    C: HashedCursor<Value = U256> + Send + Sync,
+{
+    type Value = U256;
+
+    #[inline]
+    fn seek(&mut self, key: B256) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.0.seek(key)
+    }
+
+    #[inline]
+    fn next(&mut self) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.0.next()
+    }
+
+    #[inline]
+    fn reset(&mut self) {
+        self.0.reset()
+    }
+}
+
+impl<C> HashedStorageCursor for OpProofsHashedStorageCursor<C>
+where
+    C: HashedStorageCursor<Value = U256> + Send + Sync,
+{
+    #[inline]
+    fn is_storage_empty(&mut self) -> Result<bool, DatabaseError> {
+        self.0.is_storage_empty()
+    }
+
+    #[inline]
+    fn set_hashed_address(&mut self, hashed_address: B256) {
+        self.0.set_hashed_address(hashed_address)
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/cursor_factory.rs b/rust/op-reth/crates/trie/src/cursor_factory.rs
new file mode 100644
index 0000000000000..ff47c9137cac7
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/cursor_factory.rs
@@ -0,0 +1,100 @@
+//! Implements [`TrieCursorFactory`] and [`HashedCursorFactory`] for [`OpProofsStore`] types.
+
+use crate::{
+    OpProofsHashedAccountCursor, OpProofsHashedStorageCursor, OpProofsStorage, OpProofsStore,
+    OpProofsTrieCursor,
+};
+use alloy_primitives::B256;
+use reth_db::DatabaseError;
+use reth_trie::{hashed_cursor::HashedCursorFactory, trie_cursor::TrieCursorFactory};
+use std::marker::PhantomData;
+
+/// Factory for creating trie cursors for [`OpProofsStore`].
+#[derive(Debug, Clone)]
+pub struct OpProofsTrieCursorFactory<'tx, S: OpProofsStore> {
+    storage: &'tx OpProofsStorage<S>,
+    block_number: u64,
+    _marker: PhantomData<&'tx ()>,
+}
+
+impl<'tx, S: OpProofsStore> OpProofsTrieCursorFactory<'tx, S> {
+    /// Initializes new `OpProofsTrieCursorFactory`
+    pub const fn new(storage: &'tx OpProofsStorage<S>, block_number: u64) -> Self {
+        Self { storage, block_number, _marker: PhantomData }
+    }
+}
+
+impl<'tx, S> TrieCursorFactory for OpProofsTrieCursorFactory<'tx, S>
+where
+    for<'a> S: OpProofsStore + 'tx,
+{
+    type AccountTrieCursor<'a>
+        = OpProofsTrieCursor<S::AccountTrieCursor<'a>>
+    where
+        Self: 'a;
+    type StorageTrieCursor<'a>
+        = OpProofsTrieCursor<S::StorageTrieCursor<'a>>
+    where
+        Self: 'a;
+
+    fn account_trie_cursor(&self) -> Result<Self::AccountTrieCursor<'_>, DatabaseError> {
+        Ok(OpProofsTrieCursor::new(
+            self.storage
+                .account_trie_cursor(self.block_number)
+                .map_err(Into::<DatabaseError>::into)?,
+        ))
+    }
+
+    fn storage_trie_cursor(
+        &self,
+        hashed_address: B256,
+    ) -> Result<Self::StorageTrieCursor<'_>, DatabaseError> {
+        Ok(OpProofsTrieCursor::new(
+            self.storage
+                .storage_trie_cursor(hashed_address, self.block_number)
+                .map_err(Into::<DatabaseError>::into)?,
+        ))
+    }
+}
+
+/// Factory for creating hashed account cursors for [`OpProofsStore`].
+#[derive(Debug, Clone)]
+pub struct OpProofsHashedAccountCursorFactory<'tx, S: OpProofsStore> {
+    storage: &'tx OpProofsStorage<S>,
+    block_number: u64,
+    _marker: PhantomData<&'tx ()>,
+}
+
+impl<'tx, S: OpProofsStore> OpProofsHashedAccountCursorFactory<'tx, S> {
+    /// Creates a new `OpProofsHashedAccountCursorFactory` instance.
+    pub const fn new(storage: &'tx OpProofsStorage<S>, block_number: u64) -> Self {
+        Self { storage, block_number, _marker: PhantomData }
+    }
+}
+
+impl<'tx, S> HashedCursorFactory for OpProofsHashedAccountCursorFactory<'tx, S>
+where
+    S: OpProofsStore + 'tx,
+{
+    type AccountCursor<'a>
+        = OpProofsHashedAccountCursor<S::AccountHashedCursor<'a>>
+    where
+        Self: 'a;
+    type StorageCursor<'a>
+        = OpProofsHashedStorageCursor<S::StorageCursor<'a>>
+    where
+        Self: 'a;
+
+    fn hashed_account_cursor(&self) -> Result<Self::AccountCursor<'_>, DatabaseError> {
+        Ok(OpProofsHashedAccountCursor::new(self.storage.account_hashed_cursor(self.block_number)?))
+    }
+
+    fn hashed_storage_cursor(
+        &self,
+        hashed_address: B256,
+    ) -> Result<Self::StorageCursor<'_>, DatabaseError> {
+        Ok(OpProofsHashedStorageCursor::new(
+            self.storage.storage_hashed_cursor(hashed_address, self.block_number)?,
+        ))
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/db/cursor.rs b/rust/op-reth/crates/trie/src/db/cursor.rs
new file mode 100644
index 0000000000000..b4551eadf1340
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/cursor.rs
@@ -0,0 +1,1465 @@
+use std::marker::PhantomData;
+
+use crate::{
+    OpProofsStorageResult,
+    db::{
+        AccountTrieHistory, HashedAccountHistory, HashedStorageHistory, HashedStorageKey,
+        MaybeDeleted, StorageTrieHistory, StorageTrieKey, VersionedValue,
+    },
+};
+use alloy_primitives::{B256, U256};
+use reth_db::{
+    Database, DatabaseEnv, DatabaseError,
+    cursor::{DbCursorRO, DbDupCursorRO},
+    table::{DupSort, Table},
+    transaction::DbTx,
+};
+use reth_primitives_traits::Account;
+use reth_trie::{
+    hashed_cursor::{HashedCursor, HashedStorageCursor},
+    trie_cursor::{TrieCursor, TrieStorageCursor},
+};
+use reth_trie_common::{BranchNodeCompact, Nibbles, StoredNibbles};
+
+/// Generic alias for dup cursor for T
+pub(crate) type Dup<'tx, T> = <<DatabaseEnv as Database>::TX as DbTx>::DupCursor<T>;
+
+/// Iterates versioned dup-sorted rows and returns the latest value (<= `max_block_number`),
+/// skipping tombstones.
+#[derive(Debug, Clone)]
+pub struct BlockNumberVersionedCursor<T: Table + DupSort, Cursor> {
+    _table: PhantomData<T>,
+    cursor: Cursor,
+    max_block_number: u64,
+}
+
+impl<V, T, Cursor> BlockNumberVersionedCursor<T, Cursor>
+where
+    T: Table<Value = VersionedValue<V>> + DupSort<SubKey = u64>,
+    Cursor: DbCursorRO<T> + DbDupCursorRO<T>,
+{
+    /// Initializes new [`BlockNumberVersionedCursor`].
+    pub const fn new(cursor: Cursor, max_block_number: u64) -> Self {
+        Self { _table: PhantomData, cursor, max_block_number }
+    }
+
+    /// Check if the cursor is currently positioned at a valid row.
+    fn is_positioned(&mut self) -> OpProofsStorageResult<bool> {
+        Ok(self.cursor.current()?.is_some())
+    }
+
+    /// Resolve the latest version for `key` with `block_number` <= `max_block_number`.
+    /// Strategy:
+    /// - `seek_by_key_subkey(key, max)` gives first dup >= max.
+    ///   - if exactly == max → it's our latest
+    ///   - if > max → `prev_dup()` is latest < max (or None)
+    /// - if no dup >= max:
+    ///   - if key exists → `last_dup()` is latest < max
+    ///   - else → None
+    fn latest_version_for_key(
+        &mut self,
+        key: T::Key,
+    ) -> OpProofsStorageResult<Option<(T::Key, T::Value)>> {
+        // First dup with subkey >= max_block_number
+        let seek_res = self.cursor.seek_by_key_subkey(key.clone(), self.max_block_number)?;
+
+        if let Some(vv) = seek_res {
+            if vv.block_number > self.max_block_number {
+                // step back to the last dup < max
+                return Ok(self.cursor.prev_dup()?);
+            }
+            // already at the dup = max
+            return Ok(Some((key, vv)));
+        }
+
+        // No dup >= max ⇒ either key absent or all dups < max. Check if key exists:
+        if self.cursor.seek_exact(key.clone())?.is_none() {
+            return Ok(None);
+        }
+
+        // Key exists ⇒ take last dup (< max).
+        if let Some(vv) = self.cursor.last_dup()? {
+            return Ok(Some((key, vv)));
+        }
+        Ok(None)
+    }
+
+    /// Returns a non-deleted latest version for exactly `key`, if any.
+    fn seek_exact(&mut self, key: T::Key) -> OpProofsStorageResult<Option<(T::Key, V)>> {
+        if let Some((latest_key, latest_value)) = self.latest_version_for_key(key)? &&
+            let MaybeDeleted(Some(v)) = latest_value.value
+        {
+            return Ok(Some((latest_key, v)));
+        }
+        Ok(None)
+    }
+
+    /// Walk forward from `first_key` (inclusive) until we find a *live* latest-≤-max value.
+    /// `first_key` must already be a *real key* in the table.
+    fn next_live_from(
+        &mut self,
+        mut first_key: T::Key,
+    ) -> OpProofsStorageResult<Option<(T::Key, V)>> {
+        loop {
+            // Compute latest version ≤ max for this key
+            if let Some((k, v)) = self.seek_exact(first_key.clone())? {
+                return Ok(Some((k, v)));
+            }
+
+            // Move to next distinct key, or EOF
+            let Some((next_key, _)) = self.cursor.next_no_dup()? else {
+                return Ok(None);
+            };
+
+            first_key = next_key;
+        }
+    }
+
+    /// Seek to the first non-deleted latest version at or after `start_key`.
+    /// Logic:
+    /// - Try exact key first (above). If alive, return it.
+    /// - Otherwise hop to next distinct key and repeat until we find a live version or hit EOF.
+    fn seek(&mut self, start_key: T::Key) -> OpProofsStorageResult<Option<(T::Key, V)>> {
+        // Position MDBX at first key >= start_key
+        if let Some((first_key, _)) = self.cursor.seek(start_key)? {
+            return self.next_live_from(first_key);
+        }
+        Ok(None)
+    }
+
+    /// Advance to the next distinct key from the current MDBX position
+    /// and return its non-deleted latest version, if any.
+    /// Next distinct key; if not positioned, start from `T::Key::default()`.
+    fn next(&mut self) -> OpProofsStorageResult<Option<(T::Key, V)>>
+    where
+        T::Key: Default,
+    {
+        // If not positioned, start from the beginning (default key).
+        if self.cursor.current()?.is_none() {
+            let Some((first_key, _)) = self.cursor.seek(T::Key::default())? else {
+                return Ok(None);
+            };
+            return self.next_live_from(first_key);
+        }
+
+        // Otherwise advance to next distinct key and resume the walk.
+        let Some((next_key, _)) = self.cursor.next_no_dup()? else {
+            return Ok(None);
+        };
+        self.next_live_from(next_key)
+    }
+}
+
+/// MDBX implementation of [`TrieCursor`].
+#[derive(Debug)]
+pub struct MdbxTrieCursor<T: Table + DupSort, Cursor> {
+    inner: BlockNumberVersionedCursor<T, Cursor>,
+    hashed_address: Option<B256>,
+}
+
+impl<
+    V,
+    T: Table<Value = VersionedValue<V>> + DupSort<SubKey = u64>,
+    Cursor: DbCursorRO<T> + DbDupCursorRO<T>,
+> MdbxTrieCursor<T, Cursor>
+{
+    /// Initializes new [`MdbxTrieCursor`].
+    pub const fn new(cursor: Cursor, max_block_number: u64, hashed_address: Option<B256>) -> Self {
+        Self { inner: BlockNumberVersionedCursor::new(cursor, max_block_number), hashed_address }
+    }
+}
+
+impl<Cursor> TrieCursor for MdbxTrieCursor<AccountTrieHistory, Cursor>
+where
+    Cursor: DbCursorRO<AccountTrieHistory> + DbDupCursorRO<AccountTrieHistory> + Send + Sync,
+{
+    fn seek_exact(
+        &mut self,
+        path: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        Ok(self
+            .inner
+            .seek_exact(StoredNibbles(path))
+            .map(|opt| opt.map(|(StoredNibbles(n), node)| (n, node)))?)
+    }
+
+    fn seek(
+        &mut self,
+        path: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        Ok(self
+            .inner
+            .seek(StoredNibbles(path))
+            .map(|opt| opt.map(|(StoredNibbles(n), node)| (n, node)))?)
+    }
+
+    fn next(&mut self) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        Ok(self.inner.next().map(|opt| opt.map(|(StoredNibbles(n), node)| (n, node)))?)
+    }
+
+    fn current(&mut self) -> Result<Option<Nibbles>, DatabaseError> {
+        self.inner.cursor.current().map(|opt| opt.map(|(StoredNibbles(n), _)| n))
+    }
+
+    fn reset(&mut self) {
+        // Database cursors are stateless, no reset needed
+    }
+}
+
+impl<Cursor> TrieCursor for MdbxTrieCursor<StorageTrieHistory, Cursor>
+where
+    Cursor: DbCursorRO<StorageTrieHistory> + DbDupCursorRO<StorageTrieHistory> + Send + Sync,
+{
+    fn seek_exact(
+        &mut self,
+        path: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        if let Some(address) = self.hashed_address {
+            let key = StorageTrieKey::new(address, StoredNibbles(path));
+            return Ok(self.inner.seek_exact(key).map(|opt| {
+                opt.and_then(|(k, node)| (k.hashed_address == address).then_some((k.path.0, node)))
+            })?);
+        }
+        Ok(None)
+    }
+
+    fn seek(
+        &mut self,
+        path: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        if let Some(address) = self.hashed_address {
+            let key = StorageTrieKey::new(address, StoredNibbles(path));
+            return Ok(self.inner.seek(key).map(|opt| {
+                opt.and_then(|(k, node)| (k.hashed_address == address).then_some((k.path.0, node)))
+            })?);
+        }
+        Ok(None)
+    }
+
+    fn next(&mut self) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        if let Some(address) = self.hashed_address {
+            // If the cursor is not positioned, we need to seek to the first key for our bound
+            // address to ensure we start iterating from the correct position in the
+            // table. This is necessary because BlockNumberVersionedCursor::next() would
+            // otherwise start from T::Key::default() (the beginning of the entire
+            // table), which would cause us to miss entries for non-first addresses.
+            if !self.inner.is_positioned()? {
+                return self.seek(Nibbles::default());
+            }
+
+            return Ok(self.inner.next().map(|opt| {
+                opt.and_then(|(k, node)| (k.hashed_address == address).then_some((k.path.0, node)))
+            })?);
+        }
+        Ok(None)
+    }
+
+    fn current(&mut self) -> Result<Option<Nibbles>, DatabaseError> {
+        if let Some(address) = self.hashed_address {
+            return self.inner.cursor.current().map(|opt| {
+                opt.and_then(|(k, _)| (k.hashed_address == address).then_some(k.path.0))
+            });
+        }
+        Ok(None)
+    }
+
+    fn reset(&mut self) {
+        // Database cursors are stateless, no reset needed
+    }
+}
+
+impl<Cursor> TrieStorageCursor for MdbxTrieCursor<StorageTrieHistory, Cursor>
+where
+    Cursor: DbCursorRO<StorageTrieHistory> + DbDupCursorRO<StorageTrieHistory> + Send + Sync,
+{
+    fn set_hashed_address(&mut self, hashed_address: B256) {
+        self.hashed_address = Some(hashed_address);
+    }
+}
+
+/// MDBX implementation of [`HashedCursor`] for storage state.
+#[derive(Debug)]
+pub struct MdbxStorageCursor<Cursor> {
+    inner: BlockNumberVersionedCursor<HashedStorageHistory, Cursor>,
+    hashed_address: B256,
+}
+
+impl<Cursor> MdbxStorageCursor<Cursor>
+where
+    Cursor: DbCursorRO<HashedStorageHistory> + DbDupCursorRO<HashedStorageHistory> + Send + Sync,
+{
+    ///  Initializes new [`MdbxStorageCursor`]
+    pub const fn new(cursor: Cursor, block_number: u64, hashed_address: B256) -> Self {
+        Self { inner: BlockNumberVersionedCursor::new(cursor, block_number), hashed_address }
+    }
+}
+
+impl<Cursor> HashedCursor for MdbxStorageCursor<Cursor>
+where
+    Cursor: DbCursorRO<HashedStorageHistory> + DbDupCursorRO<HashedStorageHistory> + Send + Sync,
+{
+    type Value = U256;
+
+    fn seek(&mut self, key: B256) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        let storage_key = HashedStorageKey::new(self.hashed_address, key);
+
+        // hashed storage values can be zero, which means the storage slot is deleted, so we should
+        // skip those
+        let result = self.inner.seek(storage_key).map(|opt| {
+            opt.and_then(|(k, v)| {
+                // Only return entries that belong to the bound address
+                (k.hashed_address == self.hashed_address).then_some((k.hashed_storage_key, v.0))
+            })
+        })?;
+
+        if let Some((_, v)) = result &&
+            v.is_zero()
+        {
+            return self.next();
+        }
+
+        Ok(result)
+    }
+
+    fn next(&mut self) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        // If the cursor is not positioned, we need to seek to the first key for our bound address
+        // to ensure we start iterating from the correct position in the table.
+        // This is necessary because BlockNumberVersionedCursor::next() would otherwise start
+        // from T::Key::default() (the beginning of the entire table), which would cause us
+        // to miss entries for non-first addresses.
+        if !self.inner.is_positioned()? {
+            return self.seek(B256::ZERO);
+        }
+
+        loop {
+            let result = self.inner.next().map(|opt| {
+                opt.and_then(|(k, v)| {
+                    // Only return entries that belong to the bound address
+                    (k.hashed_address == self.hashed_address).then_some((k.hashed_storage_key, v.0))
+                })
+            })?;
+
+            // hashed storage values can be zero, which means the storage slot is deleted, so we
+            // should skip those
+            if let Some((_, v)) = result &&
+                v.is_zero()
+            {
+                continue;
+            }
+
+            return Ok(result);
+        }
+    }
+
+    fn reset(&mut self) {
+        // Database cursors are stateless, no reset needed
+    }
+}
+
+impl HashedStorageCursor for MdbxStorageCursor<Dup<'_, HashedStorageHistory>> {
+    fn is_storage_empty(&mut self) -> Result<bool, DatabaseError> {
+        Ok(self.seek(B256::ZERO)?.is_none())
+    }
+
+    fn set_hashed_address(&mut self, hashed_address: B256) {
+        self.hashed_address = hashed_address
+    }
+}
+
+/// MDBX implementation of [`HashedCursor`] for account state.
+#[derive(Debug)]
+pub struct MdbxAccountCursor<Cursor> {
+    inner: BlockNumberVersionedCursor<HashedAccountHistory, Cursor>,
+}
+
+impl<Cursor> MdbxAccountCursor<Cursor>
+where
+    Cursor: DbCursorRO<HashedAccountHistory> + DbDupCursorRO<HashedAccountHistory> + Send + Sync,
+{
+    /// Initializes new `MdbxAccountCursor`
+    pub const fn new(cursor: Cursor, block_number: u64) -> Self {
+        Self { inner: BlockNumberVersionedCursor::new(cursor, block_number) }
+    }
+}
+
+impl<Cursor> HashedCursor for MdbxAccountCursor<Cursor>
+where
+    Cursor: DbCursorRO<HashedAccountHistory> + DbDupCursorRO<HashedAccountHistory> + Send + Sync,
+{
+    type Value = Account;
+
+    fn seek(&mut self, key: B256) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        Ok(self.inner.seek(key)?)
+    }
+
+    fn next(&mut self) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        Ok(self.inner.next()?)
+    }
+
+    fn reset(&mut self) {
+        // Database cursors are stateless, no reset needed
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::db::{StorageValue, models};
+    use reth_db::{
+        DatabaseEnv,
+        mdbx::{DatabaseArguments, init_db_for},
+    };
+    use reth_db_api::{
+        Database,
+        cursor::DbDupCursorRW,
+        transaction::{DbTx, DbTxMut},
+    };
+    use reth_trie::{BranchNodeCompact, Nibbles, StoredNibbles};
+    use tempfile::TempDir;
+
+    fn setup_db() -> DatabaseEnv {
+        let tmp = TempDir::new().expect("create tmpdir");
+        init_db_for::<_, models::Tables>(tmp, DatabaseArguments::default()).expect("init db")
+    }
+
+    fn stored(path: Nibbles) -> StoredNibbles {
+        StoredNibbles(path)
+    }
+
+    fn node() -> BranchNodeCompact {
+        BranchNodeCompact::default()
+    }
+
+    fn append_account_trie(
+        wtx: &<DatabaseEnv as Database>::TXMut,
+        key: StoredNibbles,
+        block: u64,
+        val: Option<BranchNodeCompact>,
+    ) {
+        let mut c = wtx.cursor_dup_write::<AccountTrieHistory>().expect("dup write cursor");
+        let vv = VersionedValue { block_number: block, value: MaybeDeleted(val) };
+        c.append_dup(key, vv).expect("append dup");
+    }
+
+    fn append_storage_trie(
+        wtx: &<DatabaseEnv as Database>::TXMut,
+        address: B256,
+        path: Nibbles,
+        block: u64,
+        val: Option<BranchNodeCompact>,
+    ) {
+        let mut c = wtx.cursor_dup_write::<StorageTrieHistory>().expect("dup write cursor");
+        let key = StorageTrieKey::new(address, StoredNibbles(path));
+        let vv = VersionedValue { block_number: block, value: MaybeDeleted(val) };
+        c.append_dup(key, vv).expect("append dup");
+    }
+
+    fn append_hashed_storage(
+        wtx: &<DatabaseEnv as Database>::TXMut,
+        addr: B256,
+        slot: B256,
+        block: u64,
+        val: Option<U256>,
+    ) {
+        let mut c = wtx.cursor_dup_write::<HashedStorageHistory>().expect("dup write");
+        let key = HashedStorageKey::new(addr, slot);
+        let vv = VersionedValue { block_number: block, value: MaybeDeleted(val.map(StorageValue)) };
+        c.append_dup(key, vv).expect("append dup");
+    }
+
+    fn append_hashed_account(
+        wtx: &<DatabaseEnv as Database>::TXMut,
+        key: B256,
+        block: u64,
+        val: Option<Account>,
+    ) {
+        let mut c = wtx.cursor_dup_write::<HashedAccountHistory>().expect("dup write");
+        let vv = VersionedValue { block_number: block, value: MaybeDeleted(val) };
+        c.append_dup(key, vv).expect("append dup");
+    }
+
+    // Open a dup-RO cursor and wrap it in a BlockNumberVersionedCursor with a given bound.
+    fn version_cursor(
+        tx: &<DatabaseEnv as Database>::TX,
+        max_block: u64,
+    ) -> BlockNumberVersionedCursor<AccountTrieHistory, Dup<'_, AccountTrieHistory>> {
+        let cur = tx.cursor_dup_read::<AccountTrieHistory>().expect("dup ro cursor");
+        BlockNumberVersionedCursor::new(cur, max_block)
+    }
+
+    fn account_trie_cursor(
+        tx: &'_ <DatabaseEnv as Database>::TX,
+        max_block: u64,
+    ) -> MdbxTrieCursor<AccountTrieHistory, Dup<'_, AccountTrieHistory>> {
+        let c = tx.cursor_dup_read::<AccountTrieHistory>().expect("dup ro cursor");
+        // For account trie the address is not used; pass None.
+        MdbxTrieCursor::new(c, max_block, None)
+    }
+
+    // Helper: build a Storage trie cursor bound to an address
+    fn storage_trie_cursor(
+        tx: &'_ <DatabaseEnv as Database>::TX,
+        max_block: u64,
+        address: B256,
+    ) -> MdbxTrieCursor<StorageTrieHistory, Dup<'_, StorageTrieHistory>> {
+        let c = tx.cursor_dup_read::<StorageTrieHistory>().expect("dup ro cursor");
+        MdbxTrieCursor::new(c, max_block, Some(address))
+    }
+
+    fn storage_cursor(
+        tx: &'_ <DatabaseEnv as Database>::TX,
+        max_block: u64,
+        address: B256,
+    ) -> MdbxStorageCursor<Dup<'_, HashedStorageHistory>> {
+        let c = tx.cursor_dup_read::<HashedStorageHistory>().expect("dup ro cursor");
+        MdbxStorageCursor::new(c, max_block, address)
+    }
+
+    fn account_cursor(
+        tx: &'_ <DatabaseEnv as Database>::TX,
+        max_block: u64,
+    ) -> MdbxAccountCursor<Dup<'_, HashedAccountHistory>> {
+        let c = tx.cursor_dup_read::<HashedAccountHistory>().expect("dup ro cursor");
+        MdbxAccountCursor::new(c, max_block)
+    }
+
+    // Assert helper: ensure the chosen VersionedValue has the expected block and deletion flag.
+    fn assert_block(
+        got: Option<(StoredNibbles, VersionedValue<BranchNodeCompact>)>,
+        expected_block: u64,
+        expect_deleted: bool,
+    ) {
+        let (_, vv) = got.expect("expected Some(..)");
+        assert_eq!(vv.block_number, expected_block, "wrong block chosen");
+        let is_deleted = matches!(vv.value, MaybeDeleted(None));
+        assert_eq!(is_deleted, expect_deleted, "tombstone mismatch");
+    }
+
+    /// No entry for key → None.
+    #[test]
+    fn latest_version_for_key_none_when_key_absent() {
+        let db = setup_db();
+        let tx = db.tx().expect("ro tx");
+        let mut cursor = version_cursor(&tx, 100);
+
+        let out = cursor
+            .latest_version_for_key(stored(Nibbles::default()))
+            .expect("should not return error");
+        assert!(out.is_none(), "absent key must return None");
+    }
+
+    /// Exact match at max (live) → pick it.
+    #[test]
+    fn latest_version_for_key_picks_value_at_max_if_present() {
+        let db = setup_db();
+        let k = stored(Nibbles::from_nibbles([0x0A]));
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k.clone(), 50, Some(node())); // == max
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut core = version_cursor(&tx, 50);
+
+        let out = core.latest_version_for_key(k).expect("ok");
+        assert_block(out, 50, false);
+    }
+
+    /// When `seek_by_key_subkey` points to the subkey > max - fallback to the prev.
+    #[test]
+    fn latest_version_for_key_picks_latest_below_max_when_next_is_above() {
+        let db = setup_db();
+        let k = stored(Nibbles::from_nibbles([0x0A]));
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k.clone(), 30, Some(node())); // expected
+            append_account_trie(&wtx, k.clone(), 70, Some(node())); // > max
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut core = version_cursor(&tx, 50);
+
+        let out = core.latest_version_for_key(k).expect("ok");
+        assert_block(out, 30, false);
+    }
+
+    /// No ≥ max but key exists → use last < max.
+    #[test]
+    fn latest_version_for_key_picks_last_below_max_when_none_at_or_above() {
+        let db = setup_db();
+        let k = stored(Nibbles::from_nibbles([0x0A]));
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k.clone(), 40, Some(node())); // expected (max=100)
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut core = version_cursor(&tx, 100);
+
+        let out = core.latest_version_for_key(k).expect("ok");
+        assert_block(out, 40, false);
+    }
+
+    /// All entries are > max → None.
+    #[test]
+    fn latest_version_for_key_none_when_everything_is_above_max() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B]));
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k1.clone(), 60, Some(node()));
+            append_account_trie(&wtx, k1.clone(), 70, Some(node()));
+            append_account_trie(&wtx, k2, 40, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut core = version_cursor(&tx, 50);
+
+        let out = core.latest_version_for_key(k1).expect("ok");
+        assert!(out.is_none(), "no dup ≤ max ⇒ None");
+    }
+
+    /// Single dup < max → pick it.
+    #[test]
+    fn latest_version_for_key_picks_single_below_max() {
+        let db = setup_db();
+        let k = stored(Nibbles::from_nibbles([0x0A]));
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k.clone(), 25, Some(node())); // < max
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut core = version_cursor(&tx, 50);
+
+        let out = core.latest_version_for_key(k).expect("ok");
+        assert_block(out, 25, false);
+    }
+
+    /// Single dup == max → pick it.
+    #[test]
+    fn latest_version_for_key_picks_single_at_max() {
+        let db = setup_db();
+        let k = stored(Nibbles::from_nibbles([0x0A]));
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k.clone(), 50, Some(node())); // == max
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut core = version_cursor(&tx, 50);
+
+        let out = core.latest_version_for_key(k).expect("ok");
+        assert_block(out, 50, false);
+    }
+
+    /// Latest ≤ max is a tombstone → return it (this API doesn't filter).
+    #[test]
+    fn latest_version_for_key_returns_tombstone_if_latest_is_deleted() {
+        let db = setup_db();
+        let k = stored(Nibbles::from_nibbles([0x0A]));
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k.clone(), 90, None); // latest ≤ max, but deleted
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut core = version_cursor(&tx, 100);
+
+        let out = core.latest_version_for_key(k).expect("ok");
+        assert_block(out, 90, true);
+    }
+
+    /// Should skip tombstones and return None when the latest ≤ max is deleted.
+    #[test]
+    fn seek_exact_skips_tombstone_returns_none() {
+        let db = setup_db();
+        let k = stored(Nibbles::from_nibbles([0x0A]));
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k.clone(), 90, None); // latest ≤ max is tombstoned
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut core = version_cursor(&tx, 100);
+
+        let out = core.seek_exact(k).expect("ok");
+        assert!(out.is_none(), "seek_exact must filter out deleted latest value");
+    }
+
+    /// Empty table → None.
+    #[test]
+    fn seek_empty_returns_none() {
+        let db = setup_db();
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 100);
+
+        let out = cur.seek(stored(Nibbles::from_nibbles([0x0A]))).expect("ok");
+        assert!(out.is_none());
+    }
+
+    /// Start at an existing key whose latest ≤ max is live → returns that key.
+    #[test]
+    fn seek_at_live_key_returns_it() {
+        let db = setup_db();
+        let k = stored(Nibbles::from_nibbles([0x0A]));
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k.clone(), 20, Some(node())); // latest ≤ max
+            wtx.commit().expect("commit");
+        }
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 50);
+
+        let out = cur.seek(k.clone()).expect("ok").expect("some");
+        assert_eq!(out.0, k);
+    }
+
+    /// Start at an existing key whose latest ≤ max is tombstoned → skip to next key with live
+    /// value.
+    #[test]
+    fn seek_skips_tombstoned_key_to_next_live_key() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B]));
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            // Key 0x10 latest ≤ max is deleted
+            append_account_trie(&wtx, k1.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k1.clone(), 20, None); // tombstone at latest ≤ max
+            // Next key has live
+            append_account_trie(&wtx, k2.clone(), 5, Some(node()));
+            wtx.commit().expect("commit");
+        }
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 50);
+
+        let out = cur.seek(k1).expect("ok").expect("some");
+        assert_eq!(out.0, k2);
+    }
+
+    /// Start between keys → returns the next key’s live latest ≤ max.
+    #[test]
+    fn seek_between_keys_returns_next_key() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0C]));
+        let k3 = stored(Nibbles::from_nibbles([0x0B]));
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k1, 10, Some(node()));
+            append_account_trie(&wtx, k2.clone(), 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 100);
+
+        // Start at 0x15 (between 0x10 and 0x20)
+
+        let out = cur.seek(k3).expect("ok").expect("some");
+        assert_eq!(out.0, k2);
+    }
+
+    /// Start after the last key → None.
+    #[test]
+    fn seek_after_last_returns_none() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B]));
+        let k3 = stored(Nibbles::from_nibbles([0x0C]));
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k1, 10, Some(node()));
+            append_account_trie(&wtx, k2, 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 100);
+
+        let out = cur.seek(k3).expect("ok");
+        assert!(out.is_none());
+    }
+
+    /// If the first key at-or-after has only versions > max, it is effectively not visible → skip
+    /// to next.
+    #[test]
+    fn seek_skips_keys_with_only_versions_above_max() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B]));
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k1.clone(), 60, Some(node()));
+            append_account_trie(&wtx, k2.clone(), 40, Some(node()));
+            wtx.commit().expect("commit");
+        }
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 50);
+
+        let out = cur.seek(k1).expect("ok").expect("some");
+        assert_eq!(out.0, k2);
+    }
+
+    /// Start at a key with mixed versions; latest ≤ max is tombstone → skip to next key with live.
+    #[test]
+    fn seek_mixed_versions_tombstone_latest_skips_to_next_key() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B]));
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k1.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k1.clone(), 30, None);
+            append_account_trie(&wtx, k2.clone(), 5, Some(node()));
+            wtx.commit().expect("commit");
+        }
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 30);
+
+        let out = cur.seek(k1).expect("ok").expect("some");
+        assert_eq!(out.0, k2);
+    }
+
+    /// When not positioned should start from default key and return the first live key.
+    #[test]
+    fn next_unpositioned_starts_from_default_returns_first_live() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B]));
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k1.clone(), 10, Some(node())); // first live
+            append_account_trie(&wtx, k2, 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        // Unpositioned cursor
+        let mut cur = version_cursor(&tx, 100);
+
+        let out = cur.next().expect("ok").expect("some");
+        assert_eq!(out.0, k1);
+    }
+
+    /// After positioning on a live key via `seek()`, `next()` should advance to the next live key.
+    #[test]
+    fn next_advances_from_current_live_to_next_live() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B]));
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k1.clone(), 10, Some(node())); // live
+            append_account_trie(&wtx, k2.clone(), 10, Some(node())); // next live
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 100);
+
+        // Position at k1
+        let _ = cur.seek(k1).expect("ok").expect("some");
+        // Next should yield k2
+        let out = cur.next().expect("ok").expect("some");
+        assert_eq!(out.0, k2);
+    }
+
+    /// If the next key's latest ≤ max is tombstone, `next()` should skip to the next live key.
+    #[test]
+    fn next_skips_tombstoned_key_to_next_live() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B])); // will be tombstoned at latest ≤ max
+        let k3 = stored(Nibbles::from_nibbles([0x0C])); // next live
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            // k1 live
+            append_account_trie(&wtx, k1.clone(), 10, Some(node()));
+            // k2: latest ≤ max is tombstone
+            append_account_trie(&wtx, k2.clone(), 10, Some(node()));
+            append_account_trie(&wtx, k2, 20, None);
+            // k3 live
+            append_account_trie(&wtx, k3.clone(), 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 50);
+
+        // Position at k1
+        let _ = cur.seek(k1).expect("ok").expect("some");
+        // next should skip k2 (tombstoned latest) and return k3
+        let out = cur.next().expect("ok").expect("some");
+        assert_eq!(out.0, k3);
+    }
+
+    /// If positioned on the last live key, `next()` should return None (EOF).
+    #[test]
+    fn next_returns_none_at_eof() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A]));
+        let k2 = stored(Nibbles::from_nibbles([0x0B])); // last key
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, k1, 10, Some(node()));
+            append_account_trie(&wtx, k2.clone(), 10, Some(node())); // last live
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 100);
+
+        // Position at the last key k2
+        let _ = cur.seek(k2).expect("ok").expect("some");
+        // `next()` should hit EOF
+        let out = cur.next().expect("ok");
+        assert!(out.is_none());
+    }
+
+    /// If the first key has only versions > max, `next()` should skip it and return the next live
+    /// key.
+    #[test]
+    fn next_skips_keys_with_only_versions_above_max() {
+        let db = setup_db();
+        let k1 = stored(Nibbles::from_nibbles([0x0A])); // only > max
+        let k2 = stored(Nibbles::from_nibbles([0x0B])); // ≤ max live
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            // k1 only above max (max=50)
+            append_account_trie(&wtx, k1, 60, Some(node()));
+            // k2 within max
+            append_account_trie(&wtx, k2.clone(), 40, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        // Unpositioned; `next()` will start from default and walk
+        let mut cur = version_cursor(&tx, 50);
+
+        let out = cur.next().expect("ok").expect("some");
+        assert_eq!(out.0, k2);
+    }
+
+    /// Empty table: `next()` should return None.
+    #[test]
+    fn next_on_empty_returns_none() {
+        let db = setup_db();
+        let tx = db.tx().expect("ro tx");
+        let mut cur = version_cursor(&tx, 100);
+
+        let out = cur.next().expect("ok");
+        assert!(out.is_none());
+    }
+
+    // ----------------- Account trie cursor thin-wrapper checks -----------------
+
+    #[test]
+    fn account_seek_exact_live_maps_key_and_value() {
+        let db = setup_db();
+        let k = Nibbles::from_nibbles([0x0A]);
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, StoredNibbles(k), 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+
+        // Build wrapper
+        let mut cur = account_trie_cursor(&tx, 100);
+
+        // Wrapper should return (Nibbles, BranchNodeCompact)
+        let out = TrieCursor::seek_exact(&mut cur, k).expect("ok").expect("some");
+        assert_eq!(out.0, k);
+    }
+
+    #[test]
+    fn account_seek_exact_filters_tombstone() {
+        let db = setup_db();
+        let k = Nibbles::from_nibbles([0x0B]);
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, StoredNibbles(k), 5, Some(node()));
+            append_account_trie(&wtx, StoredNibbles(k), 9, None); // latest ≤ max tombstone
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut cur = account_trie_cursor(&tx, 10);
+
+        let out = TrieCursor::seek_exact(&mut cur, k).expect("ok");
+        assert!(out.is_none(), "account seek_exact must filter tombstone");
+    }
+
+    #[test]
+    fn account_seek_and_next_and_current_roundtrip() {
+        let db = setup_db();
+        let k1 = Nibbles::from_nibbles([0x01]);
+        let k2 = Nibbles::from_nibbles([0x02]);
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_account_trie(&wtx, StoredNibbles(k1), 10, Some(node()));
+            append_account_trie(&wtx, StoredNibbles(k2), 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut cur = account_trie_cursor(&tx, 100);
+
+        // seek at k1
+        let out1 = TrieCursor::seek(&mut cur, k1).expect("ok").expect("some");
+        assert_eq!(out1.0, k1);
+
+        // current should be k1
+        let cur_k = TrieCursor::current(&mut cur).expect("ok").expect("some");
+        assert_eq!(cur_k, k1);
+
+        // next should move to k2
+        let out2 = TrieCursor::next(&mut cur).expect("ok").expect("some");
+        assert_eq!(out2.0, k2);
+    }
+
+    // ----------------- Storage trie cursor thin-wrapper checks -----------------
+
+    #[test]
+    fn storage_seek_exact_respects_address_filter() {
+        let db = setup_db();
+
+        let addr_a = B256::from([0xAA; 32]);
+        let addr_b = B256::from([0xBB; 32]);
+
+        let path = Nibbles::from_nibbles([0x0D]);
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            // insert only under B
+            append_storage_trie(&wtx, addr_b, path, 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+
+        // Cursor bound to A must not see B’s data
+        let mut cur_a = storage_trie_cursor(&tx, 100, addr_a);
+        let out_a = TrieCursor::seek_exact(&mut cur_a, path).expect("ok");
+        assert!(out_a.is_none(), "no data for addr A");
+
+        // Cursor bound to B should see it
+        let mut cur_b = storage_trie_cursor(&tx, 100, addr_b);
+        let out_b = TrieCursor::seek_exact(&mut cur_b, path).expect("ok").expect("some");
+        assert_eq!(out_b.0, path);
+    }
+
+    #[test]
+    fn storage_seek_returns_first_key_for_bound_address() {
+        let db = setup_db();
+
+        let addr_a = B256::from([0x11; 32]);
+        let addr_b = B256::from([0x22; 32]);
+
+        let p1 = Nibbles::from_nibbles([0x01]);
+        let p2 = Nibbles::from_nibbles([0x02]);
+        let p3 = Nibbles::from_nibbles([0x03]);
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            // For A: only p2
+            append_storage_trie(&wtx, addr_a, p2, 10, Some(node()));
+            // For B: p1
+            append_storage_trie(&wtx, addr_b, p1, 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        // test seek behaviour
+        {
+            let tx = db.tx().expect("ro tx");
+            let mut cur_a = storage_trie_cursor(&tx, 100, addr_a);
+
+            // seek at p1: for A there is no p1; the next key >= p1 under A is p2
+            let out = TrieCursor::seek(&mut cur_a, p1).expect("ok").expect("some");
+            assert_eq!(out.0, p2);
+
+            // seek at p2: exact match
+            let out = TrieCursor::seek(&mut cur_a, p2).expect("ok").expect("some");
+            assert_eq!(out.0, p2);
+
+            // seek at p3: no p3 under A; no next key ≥ p3 under A → None
+            let out = TrieCursor::seek(&mut cur_a, p3).expect("ok");
+            assert!(out.is_none(), "no key ≥ p3 under A");
+        }
+
+        // test next behaviour
+        {
+            let tx = db.tx().expect("ro tx");
+            let mut cur_a = storage_trie_cursor(&tx, 100, addr_a);
+
+            let out = TrieCursor::next(&mut cur_a).expect("ok").expect("some");
+            assert_eq!(out.0, p2);
+
+            // next should yield None as there is no further key under A
+            let out = TrieCursor::next(&mut cur_a).expect("ok");
+            assert!(out.is_none(), "no more keys under A");
+
+            // current should return None
+            let out = TrieCursor::current(&mut cur_a).expect("ok");
+            assert!(out.is_none(), "no current key after EOF");
+        }
+
+        // test seek_exact behaviour
+        {
+            let tx = db.tx().expect("ro tx");
+            let mut cur_a = storage_trie_cursor(&tx, 100, addr_a);
+
+            // seek_exact at p1: no exact match
+            let out = TrieCursor::seek_exact(&mut cur_a, p1).expect("ok");
+            assert!(out.is_none(), "no exact p1 under A");
+
+            // seek_exact at p2: exact match
+            let out = TrieCursor::seek_exact(&mut cur_a, p2).expect("ok").expect("some");
+            assert_eq!(out.0, p2);
+
+            // seek_exact at p3: no exact match
+            let out = TrieCursor::seek_exact(&mut cur_a, p3).expect("ok");
+            assert!(out.is_none(), "no exact p3 under A");
+        }
+    }
+
+    #[test]
+    fn storage_next_stops_at_address_boundary() {
+        let db = setup_db();
+
+        let addr_a = B256::from([0x33; 32]);
+        let addr_b = B256::from([0x44; 32]);
+
+        let p1 = Nibbles::from_nibbles([0x05]); // under A
+        let p2 = Nibbles::from_nibbles([0x06]); // under B (next key overall)
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_storage_trie(&wtx, addr_a, p1, 10, Some(node()));
+            append_storage_trie(&wtx, addr_b, p2, 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut cur_a = storage_trie_cursor(&tx, 100, addr_a);
+
+        // position at p1 (A)
+        let _ = TrieCursor::seek_exact(&mut cur_a, p1).expect("ok").expect("some");
+
+        // next should reach boundary; impl filters different address and returns None
+        let out = TrieCursor::next(&mut cur_a).expect("ok");
+        assert!(out.is_none(), "next() should stop when next key is a different address");
+    }
+
+    #[test]
+    fn storage_current_maps_key() {
+        let db = setup_db();
+
+        let addr = B256::from([0x55; 32]);
+        let p = Nibbles::from_nibbles([0x09]);
+
+        {
+            let wtx = db.tx_mut().expect("rw tx");
+            append_storage_trie(&wtx, addr, p, 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro tx");
+        let mut cur = storage_trie_cursor(&tx, 100, addr);
+
+        let _ = TrieCursor::seek_exact(&mut cur, p).expect("ok").expect("some");
+
+        let now = TrieCursor::current(&mut cur).expect("ok").expect("some");
+        assert_eq!(now, p);
+    }
+
+    #[test]
+    fn hashed_storage_seek_maps_slot_and_value() {
+        let db = setup_db();
+        let addr = B256::from([0xAA; 32]);
+        let slot = B256::from([0x10; 32]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_hashed_storage(&wtx, addr, slot, 10, Some(U256::from(7)));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+        let mut cur = storage_cursor(&tx, 100, addr);
+
+        let (got_slot, got_val) = cur.seek(slot).expect("ok").expect("some");
+        assert_eq!(got_slot, slot);
+        assert_eq!(got_val, U256::from(7));
+    }
+
+    #[test]
+    fn hashed_storage_seek_filters_tombstone() {
+        let db = setup_db();
+        let addr = B256::from([0xAB; 32]);
+        let slot = B256::from([0x11; 32]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_hashed_storage(&wtx, addr, slot, 5, Some(U256::from(1)));
+            append_hashed_storage(&wtx, addr, slot, 9, None); // latest ≤ max is tombstone
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+        let mut cur = storage_cursor(&tx, 10, addr);
+
+        let out = cur.seek(slot).expect("ok");
+        assert!(out.is_none(), "wrapper must filter tombstoned latest");
+    }
+
+    #[test]
+    fn hashed_storage_seek_and_next_roundtrip() {
+        let db = setup_db();
+        let addr = B256::from([0xAC; 32]);
+        let s1 = B256::from([0x01; 32]);
+        let s2 = B256::from([0x02; 32]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_hashed_storage(&wtx, addr, s1, 10, Some(U256::from(11)));
+            append_hashed_storage(&wtx, addr, s2, 10, Some(U256::from(22)));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+        let mut cur = storage_cursor(&tx, 100, addr);
+
+        let (k1, v1) = cur.seek(s1).expect("ok").expect("some");
+        assert_eq!((k1, v1), (s1, U256::from(11)));
+
+        let (k2, v2) = cur.next().expect("ok").expect("some");
+        assert_eq!((k2, v2), (s2, U256::from(22)));
+    }
+
+    #[test]
+    fn hashed_storage_address_boundary() {
+        let db = setup_db();
+        let addr1 = B256::from([0xAC; 32]);
+        let addr2 = B256::from([0xAD; 32]);
+        let s1 = B256::from([0x01; 32]);
+        let s2 = B256::from([0x02; 32]);
+        let s3 = B256::from([0x03; 32]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_hashed_storage(&wtx, addr1, s1, 10, Some(U256::from(11)));
+            append_hashed_storage(&wtx, addr1, s2, 10, Some(U256::from(22)));
+            wtx.commit().expect("commit");
+        }
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_hashed_storage(&wtx, addr2, s1, 10, Some(U256::from(33)));
+            append_hashed_storage(&wtx, addr2, s2, 10, Some(U256::from(44)));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+        let mut cur = storage_cursor(&tx, 100, addr1);
+
+        let (k1, v1) = cur.next().expect("ok").expect("some");
+        assert_eq!((k1, v1), (s1, U256::from(11)));
+
+        let (k2, v2) = cur.next().expect("ok").expect("some");
+        assert_eq!((k2, v2), (s2, U256::from(22)));
+
+        let out = cur.next().expect("ok");
+        assert!(out.is_none(), "should stop at address boundary");
+
+        let (k1, v1) = cur.seek(s1).expect("ok").expect("some");
+        assert_eq!((k1, v1), (s1, U256::from(11)));
+
+        let (k2, v2) = cur.seek(s2).expect("ok").expect("some");
+        assert_eq!((k2, v2), (s2, U256::from(22)));
+
+        let out = cur.seek(s3).expect("ok");
+        assert!(out.is_none(), "should not see keys from other address");
+    }
+
+    #[test]
+    fn hashed_account_seek_maps_key_and_value() {
+        let db = setup_db();
+        let key = B256::from([0x20; 32]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_hashed_account(&wtx, key, 10, Some(Account::default()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+        let mut cur = account_cursor(&tx, 100);
+
+        let (got_key, _acc) = cur.seek(key).expect("ok").expect("some");
+        assert_eq!(got_key, key);
+    }
+
+    #[test]
+    fn hashed_account_seek_filters_tombstone() {
+        let db = setup_db();
+        let key = B256::from([0x21; 32]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_hashed_account(&wtx, key, 5, Some(Account::default()));
+            append_hashed_account(&wtx, key, 9, None); // latest ≤ max is tombstone
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+        let mut cur = account_cursor(&tx, 10);
+
+        let out = cur.seek(key).expect("ok");
+        assert!(out.is_none(), "wrapper must filter tombstoned latest");
+    }
+
+    #[test]
+    fn hashed_account_seek_and_next_roundtrip() {
+        let db = setup_db();
+        let k1 = B256::from([0x01; 32]);
+        let k2 = B256::from([0x02; 32]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_hashed_account(&wtx, k1, 10, Some(Account::default()));
+            append_hashed_account(&wtx, k2, 10, Some(Account::default()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+        let mut cur = account_cursor(&tx, 100);
+
+        let (got1, _) = cur.seek(k1).expect("ok").expect("some");
+        assert_eq!(got1, k1);
+
+        let (got2, _) = cur.next().expect("ok").expect("some");
+        assert_eq!(got2, k2);
+    }
+
+    /// Regression test: `MdbxStorageCursor` `next()` should work without explicit `seek()`
+    /// when cursor is constructed for a non-first key.
+    ///
+    /// Bug: When a storage cursor is created for a specific address (e.g., 0x02),
+    /// calling `next()` without first calling `seek()` returns None instead of the first
+    /// slot for that address. This only manifests when the address is not the first
+    /// in the table.
+    #[test]
+    fn storage_cursor_next_without_seek_for_non_first_address() {
+        let db = setup_db();
+        let addr1 = B256::from([0x01; 32]); // First address
+        let addr2 = B256::from([0x02; 32]); // Second address (non-first)
+        let slot1 = B256::from([0x11; 32]);
+        let slot2 = B256::from([0x12; 32]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            // Add storage for first address
+            append_hashed_storage(&wtx, addr1, slot1, 10, Some(U256::from(100)));
+
+            // Add storage for second address
+            append_hashed_storage(&wtx, addr2, slot2, 10, Some(U256::from(200)));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+
+        // Test with addr1 (first address) - this typically works
+        let mut cur1 = storage_cursor(&tx, 100, addr1);
+        let result1 = cur1.next().expect("ok");
+        assert!(result1.is_some(), "next() should return data for first address without seek()");
+        if let Some((key, val)) = result1 {
+            assert_eq!(key, slot1);
+            assert_eq!(val, U256::from(100));
+        }
+
+        // Test with addr2 (non-first address) - this demonstrates the bug fix
+        let mut cur2 = storage_cursor(&tx, 100, addr2);
+        let result2_without_seek = cur2.next().expect("ok");
+
+        assert!(
+            result2_without_seek.is_some(),
+            "next() should return data for non-first address without seek()"
+        );
+        if let Some((key, val)) = result2_without_seek {
+            assert_eq!(key, slot2);
+            assert_eq!(val, U256::from(200));
+        }
+
+        // Verify that seek() works correctly
+        let mut cur3 = storage_cursor(&tx, 100, addr2);
+        let result3_with_seek = cur3.seek(slot2).expect("ok");
+        assert!(result3_with_seek.is_some(), "seek() should find the slot for addr2");
+        if let Some((key, val)) = result3_with_seek {
+            assert_eq!(key, slot2);
+            assert_eq!(val, U256::from(200));
+        }
+    }
+
+    /// Regression test: `MdbxTrieCursor`<StorageTrieHistory> `next()` should work without `seek()`
+    /// for non-first addresses.
+    #[test]
+    fn storage_trie_cursor_next_without_seek_for_non_first_address() {
+        let db = setup_db();
+        let addr1 = B256::from([0x01; 32]);
+        let addr2 = B256::from([0x02; 32]);
+        let path1 = Nibbles::from_nibbles([0x0A]);
+        let path2 = Nibbles::from_nibbles([0x0B]);
+
+        {
+            let wtx = db.tx_mut().expect("rw");
+            append_storage_trie(&wtx, addr1, path1, 10, Some(node()));
+            append_storage_trie(&wtx, addr2, path2, 10, Some(node()));
+            wtx.commit().expect("commit");
+        }
+
+        let tx = db.tx().expect("ro");
+
+        // Test addr1 (first) - works
+        let mut cur1 = storage_trie_cursor(&tx, 100, addr1);
+        let result1 = TrieCursor::next(&mut cur1).expect("ok");
+        assert!(result1.is_some());
+        assert_eq!(result1.unwrap().0, path1);
+
+        // Test addr2 (non-first) - should also work now
+        let mut cur2 = storage_trie_cursor(&tx, 100, addr2);
+        let result2 = TrieCursor::next(&mut cur2).expect("ok");
+        assert!(result2.is_some(), "next() should work for non-first address without seek()");
+        assert_eq!(result2.unwrap().0, path2);
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/db/mod.rs b/rust/op-reth/crates/trie/src/db/mod.rs
new file mode 100644
index 0000000000000..042b682074f6e
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/mod.rs
@@ -0,0 +1,17 @@
+//! MDBX implementation of [`OpProofsStore`](crate::OpProofsStore).
+//!
+//! This module provides a complete MDBX implementation of the
+//! [`OpProofsStore`](crate::OpProofsStore) trait. It uses the [`reth_db`]
+//! crate for database interactions and defines the necessary tables and models for storing trie
+//! branches, accounts, and storage leaves.
+
+mod models;
+pub use models::*;
+
+mod store;
+pub use store::MdbxProofsStorage;
+
+mod cursor;
+pub use cursor::{
+    BlockNumberVersionedCursor, MdbxAccountCursor, MdbxStorageCursor, MdbxTrieCursor,
+};
diff --git a/rust/op-reth/crates/trie/src/db/models/block.rs b/rust/op-reth/crates/trie/src/db/models/block.rs
new file mode 100644
index 0000000000000..c2066dad1f6ca
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/models/block.rs
@@ -0,0 +1,76 @@
+use alloy_eips::BlockNumHash;
+use alloy_primitives::B256;
+use bytes::BufMut;
+use derive_more::{From, Into};
+use reth_db::{
+    DatabaseError,
+    table::{Compress, Decompress},
+};
+use serde::{Deserialize, Serialize};
+
+/// Wrapper for block number and block hash tuple to implement [`Compress`]/[`Decompress`].
+///
+/// Used for storing block metadata (number + hash).
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, From, Into)]
+pub struct BlockNumberHash(BlockNumHash);
+
+impl Compress for BlockNumberHash {
+    type Compressed = Vec<u8>;
+
+    fn compress_to_buf<B: BufMut + AsMut<[u8]>>(&self, buf: &mut B) {
+        // Encode block number (8 bytes, big-endian) + hash (32 bytes) = 40 bytes total
+        buf.put_u64(self.0.number);
+        buf.put_slice(self.0.hash.as_slice());
+    }
+}
+
+impl Decompress for BlockNumberHash {
+    fn decompress(value: &[u8]) -> Result<Self, DatabaseError> {
+        if value.len() != 40 {
+            return Err(DatabaseError::Decode);
+        }
+
+        let number = u64::from_be_bytes(value[..8].try_into().map_err(|_| DatabaseError::Decode)?);
+        let hash = B256::from_slice(&value[8..40]);
+
+        Ok(Self(BlockNumHash { number, hash }))
+    }
+}
+
+impl BlockNumberHash {
+    /// Create new instance.
+    pub const fn new(number: u64, hash: B256) -> Self {
+        Self(BlockNumHash { number, hash })
+    }
+
+    /// Get the block number.
+    pub const fn number(&self) -> u64 {
+        self.0.number
+    }
+
+    /// Get the block hash.
+    pub const fn hash(&self) -> &B256 {
+        &self.0.hash
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use alloy_primitives::B256;
+
+    #[test]
+    fn test_block_number_hash_roundtrip() {
+        let test_cases = vec![
+            BlockNumberHash::new(0, B256::ZERO),
+            BlockNumberHash::new(42, B256::repeat_byte(0xaa)),
+            BlockNumberHash::new(u64::MAX, B256::repeat_byte(0xff)),
+        ];
+
+        for original in test_cases {
+            let compressed = original.compress();
+            let decompressed = BlockNumberHash::decompress(&compressed).unwrap();
+            assert_eq!(original, decompressed);
+        }
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/db/models/change_set.rs b/rust/op-reth/crates/trie/src/db/models/change_set.rs
new file mode 100644
index 0000000000000..dbfdc815e434e
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/models/change_set.rs
@@ -0,0 +1,128 @@
+use crate::db::{HashedStorageKey, StorageTrieKey};
+use alloy_primitives::B256;
+use reth_db::{
+    DatabaseError,
+    table::{self, Decode, Encode},
+};
+use reth_trie_common::StoredNibbles;
+use serde::{Deserialize, Serialize};
+
+/// The keys of the entries in the history tables.
+#[derive(Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+pub struct ChangeSet {
+    /// Keys changed in [`AccountTrieHistory`](super::AccountTrieHistory) table.
+    pub account_trie_keys: Vec<StoredNibbles>,
+    /// Keys changed in [`StorageTrieHistory`](super::StorageTrieHistory) table.
+    pub storage_trie_keys: Vec<StorageTrieKey>,
+    /// Keys changed in [`HashedAccountHistory`](super::HashedAccountHistory) table.
+    pub hashed_account_keys: Vec<B256>,
+    /// Keys changed in [`HashedStorageHistory`](super::HashedStorageHistory) table.
+    pub hashed_storage_keys: Vec<HashedStorageKey>,
+}
+
+impl table::Encode for ChangeSet {
+    type Encoded = Vec<u8>;
+
+    fn encode(self) -> Self::Encoded {
+        bincode::serde::encode_to_vec(&self, bincode::config::standard())
+            .expect("ChangeSet serialization should not fail")
+    }
+}
+
+impl table::Decode for ChangeSet {
+    fn decode(value: &[u8]) -> Result<Self, DatabaseError> {
+        bincode::serde::decode_from_slice(value, bincode::config::standard())
+            .map(|(v, _)| v)
+            .map_err(|_| DatabaseError::Decode)
+    }
+}
+
+impl table::Compress for ChangeSet {
+    type Compressed = Vec<u8>;
+
+    fn compress_to_buf<B: bytes::BufMut + AsMut<[u8]>>(&self, buf: &mut B) {
+        let encoded = self.clone().encode();
+        buf.put_slice(&encoded);
+    }
+}
+
+impl table::Decompress for ChangeSet {
+    fn decompress(value: &[u8]) -> Result<Self, DatabaseError> {
+        Self::decode(value)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use alloy_primitives::B256;
+    use reth_db::table::{Compress, Decompress};
+
+    #[test]
+    fn test_encode_decode_empty_change_set() {
+        let change_set = ChangeSet {
+            account_trie_keys: vec![],
+            storage_trie_keys: vec![],
+            hashed_account_keys: vec![],
+            hashed_storage_keys: vec![],
+        };
+
+        let encoded = change_set.clone().encode();
+        let decoded = ChangeSet::decode(&encoded).expect("Failed to decode");
+        assert_eq!(change_set, decoded);
+    }
+
+    #[test]
+    fn test_encode_decode_populated_change_set() {
+        let account_key = StoredNibbles::from(vec![1, 2, 3, 4]);
+        let storage_key = StorageTrieKey {
+            hashed_address: B256::repeat_byte(0x11),
+            path: StoredNibbles::from(vec![5, 6, 7, 8]),
+        };
+        let hashed_storage_key = HashedStorageKey {
+            hashed_address: B256::repeat_byte(0x22),
+            hashed_storage_key: B256::repeat_byte(0x33),
+        };
+
+        let change_set = ChangeSet {
+            account_trie_keys: vec![account_key],
+            storage_trie_keys: vec![storage_key],
+            hashed_account_keys: vec![B256::repeat_byte(0x44)],
+            hashed_storage_keys: vec![hashed_storage_key],
+        };
+
+        let encoded = change_set.clone().encode();
+        let decoded = ChangeSet::decode(&encoded).expect("Failed to decode");
+        assert_eq!(change_set, decoded);
+    }
+
+    #[test]
+    fn test_decode_invalid_data() {
+        let invalid_data = vec![0xFF; 32];
+        let result = ChangeSet::decode(&invalid_data);
+        assert!(result.is_err());
+        assert!(matches!(result.unwrap_err(), DatabaseError::Decode));
+    }
+
+    #[test]
+    fn test_compress_decompress() {
+        let change_set = ChangeSet {
+            account_trie_keys: vec![StoredNibbles::from(vec![1, 2, 3])],
+            storage_trie_keys: vec![StorageTrieKey {
+                hashed_address: B256::ZERO,
+                path: StoredNibbles::from(vec![4, 5, 6]),
+            }],
+            hashed_account_keys: vec![B256::ZERO],
+            hashed_storage_keys: vec![HashedStorageKey {
+                hashed_address: B256::ZERO,
+                hashed_storage_key: B256::repeat_byte(0x42),
+            }],
+        };
+
+        let mut buf = Vec::new();
+        change_set.compress_to_buf(&mut buf);
+
+        let decompressed = ChangeSet::decompress(&buf).expect("Failed to decompress");
+        assert_eq!(change_set, decompressed);
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/db/models/kv.rs b/rust/op-reth/crates/trie/src/db/models/kv.rs
new file mode 100644
index 0000000000000..5585336f4bba1
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/models/kv.rs
@@ -0,0 +1,66 @@
+use crate::db::{
+    AccountTrieHistory, HashedAccountHistory, HashedStorageHistory, HashedStorageKey, MaybeDeleted,
+    StorageTrieHistory, StorageTrieKey, StorageValue, VersionedValue,
+};
+use alloy_primitives::B256;
+use reth_db::table::{DupSort, Table};
+use reth_primitives_traits::Account;
+use reth_trie_common::{BranchNodeCompact, Nibbles, StoredNibbles};
+
+/// Helper to convert inputs into a table key or kv pair.
+pub trait IntoKV<Tab: Table + DupSort> {
+    /// Convert `self` into the table key.
+    fn into_key(self) -> Tab::Key;
+
+    /// Convert `self` into kv for the given `block_number`.
+    fn into_kv(self, block_number: u64) -> (Tab::Key, Tab::Value);
+}
+
+impl IntoKV<AccountTrieHistory> for (Nibbles, Option<BranchNodeCompact>) {
+    fn into_key(self) -> StoredNibbles {
+        StoredNibbles::from(self.0)
+    }
+
+    fn into_kv(self, block_number: u64) -> (StoredNibbles, VersionedValue<BranchNodeCompact>) {
+        let (path, node) = self;
+        (StoredNibbles::from(path), VersionedValue { block_number, value: MaybeDeleted(node) })
+    }
+}
+
+impl IntoKV<StorageTrieHistory> for (B256, Nibbles, Option<BranchNodeCompact>) {
+    fn into_key(self) -> StorageTrieKey {
+        let (hashed_address, path, _) = self;
+        StorageTrieKey::new(hashed_address, StoredNibbles::from(path))
+    }
+    fn into_kv(self, block_number: u64) -> (StorageTrieKey, VersionedValue<BranchNodeCompact>) {
+        let (hashed_address, path, node) = self;
+        (
+            StorageTrieKey::new(hashed_address, StoredNibbles::from(path)),
+            VersionedValue { block_number, value: MaybeDeleted(node) },
+        )
+    }
+}
+
+impl IntoKV<HashedAccountHistory> for (B256, Option<Account>) {
+    fn into_key(self) -> B256 {
+        self.0
+    }
+    fn into_kv(self, block_number: u64) -> (B256, VersionedValue<Account>) {
+        let (hashed_address, account) = self;
+        (hashed_address, VersionedValue { block_number, value: MaybeDeleted(account) })
+    }
+}
+
+impl IntoKV<HashedStorageHistory> for (B256, B256, Option<StorageValue>) {
+    fn into_key(self) -> HashedStorageKey {
+        let (hashed_address, hashed_storage_key, _) = self;
+        HashedStorageKey::new(hashed_address, hashed_storage_key)
+    }
+    fn into_kv(self, block_number: u64) -> (HashedStorageKey, VersionedValue<StorageValue>) {
+        let (hashed_address, hashed_storage_key, value) = self;
+        (
+            HashedStorageKey::new(hashed_address, hashed_storage_key),
+            VersionedValue { block_number, value: MaybeDeleted(value) },
+        )
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/db/models/mod.rs b/rust/op-reth/crates/trie/src/db/models/mod.rs
new file mode 100644
index 0000000000000..b6d524528c6f9
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/models/mod.rs
@@ -0,0 +1,85 @@
+//! MDBX implementation of [`OpProofsStore`](crate::OpProofsStore).
+//!
+//! This module provides a complete MDBX implementation of the
+//! [`OpProofsStore`](crate::OpProofsStore) trait. It uses the [`reth_db`] crate for
+//! database interactions and defines the necessary tables and models for storing trie branches,
+//! accounts, and storage leaves.
+
+mod block;
+pub use block::*;
+mod version;
+pub use version::*;
+mod storage;
+pub use storage::*;
+mod change_set;
+pub(crate) mod kv;
+pub use change_set::*;
+pub use kv::*;
+
+use alloy_primitives::B256;
+use reth_db::{
+    TableSet, TableType, TableViewer,
+    table::{DupSort, TableInfo},
+    tables,
+};
+use reth_primitives_traits::Account;
+use reth_trie_common::{BranchNodeCompact, StoredNibbles};
+use std::fmt;
+
+tables! {
+    /// Stores historical branch nodes for the account state trie.
+    ///
+    /// Each entry maps a compact-encoded trie path (`StoredNibbles`) to its versioned branch node.
+    /// Multiple versions of the same node are stored using the block number as a subkey.
+    table AccountTrieHistory {
+        type Key = StoredNibbles;
+        type Value = VersionedValue<BranchNodeCompact>;
+        type SubKey = u64; // block number
+    }
+
+    /// Stores historical branch nodes for the storage trie of each account.
+    ///
+    /// Each entry is identified by a composite key combining the account’s hashed address and the
+    /// compact-encoded trie path. Versions are tracked using block numbers as subkeys.
+    table StorageTrieHistory {
+        type Key = StorageTrieKey;
+        type Value = VersionedValue<BranchNodeCompact>;
+        type SubKey = u64; // block number
+    }
+
+    /// Stores versioned account state across block history.
+    ///
+    /// Each entry maps a hashed account address to its serialized account data (balance, nonce,
+    /// code hash, storage root).
+    table HashedAccountHistory {
+        type Key = B256;
+        type Value = VersionedValue<Account>;
+        type SubKey = u64; // block number
+    }
+
+    /// Stores versioned storage state across block history.
+    ///
+    /// Each entry maps a composite key of (hashed address, storage key) to its stored value.
+    /// Used for reconstructing contract storage at any historical block height.
+    table HashedStorageHistory {
+        type Key = HashedStorageKey;
+        type Value = VersionedValue<StorageValue>;
+        type SubKey = u64; // block number
+    }
+
+    /// Tracks the active proof window in the external historical storage.
+    ///
+    /// Stores the earliest and latest block numbers (and corresponding hashes)
+    /// for which historical trie data is retained.
+    table ProofWindow {
+      type Key = ProofWindowKey;
+      type Value = BlockNumberHash;
+    }
+
+    /// A reverse mapping of block numbers to a keys of the tables.
+    /// This is used for efficiently locating data by block number.
+    table BlockChangeSet {
+        type Key = u64; // Block number
+        type Value = ChangeSet;
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/db/models/storage.rs b/rust/op-reth/crates/trie/src/db/models/storage.rs
new file mode 100644
index 0000000000000..922d252627a82
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/models/storage.rs
@@ -0,0 +1,256 @@
+use alloy_primitives::{B256, U256};
+use derive_more::{Constructor, From, Into};
+use reth_db::{
+    DatabaseError,
+    table::{Compress, Decode, Decompress, Encode},
+};
+use reth_trie_common::StoredNibbles;
+use serde::{Deserialize, Serialize};
+
+/// Composite key: `(hashed-address, path)` for storage trie branches
+///
+/// Used to efficiently index storage branches by both account address and trie path.
+/// The encoding ensures lexicographic ordering: first by address, then by path.
+#[derive(Default, Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+pub struct StorageTrieKey {
+    /// Hashed account address
+    pub hashed_address: B256,
+    /// Trie path as nibbles
+    pub path: StoredNibbles,
+}
+
+impl StorageTrieKey {
+    /// Create a new storage branch key
+    pub const fn new(hashed_address: B256, path: StoredNibbles) -> Self {
+        Self { hashed_address, path }
+    }
+}
+
+impl Encode for StorageTrieKey {
+    type Encoded = Vec<u8>;
+
+    fn encode(self) -> Self::Encoded {
+        let mut buf = Vec::with_capacity(32 + self.path.0.len());
+        // First encode the address (32 bytes)
+        buf.extend_from_slice(self.hashed_address.as_slice());
+        // Then encode the path
+        buf.extend_from_slice(&self.path.encode());
+        buf
+    }
+}
+
+impl Decode for StorageTrieKey {
+    fn decode(value: &[u8]) -> Result<Self, DatabaseError> {
+        if value.len() < 32 {
+            return Err(DatabaseError::Decode);
+        }
+
+        // First 32 bytes are the address
+        let hashed_address = B256::from_slice(&value[..32]);
+
+        // Remaining bytes are the path
+        let path = StoredNibbles::decode(&value[32..])?;
+
+        Ok(Self { hashed_address, path })
+    }
+}
+
+/// Composite key: (`hashed_address`, `hashed_storage_key`) for hashed storage values
+///
+/// Used to efficiently index storage values by both account address and storage key.
+/// The encoding ensures lexicographic ordering: first by address, then by storage key.
+#[derive(Debug, Default, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+pub struct HashedStorageKey {
+    /// Hashed account address
+    pub hashed_address: B256,
+    /// Hashed storage key
+    pub hashed_storage_key: B256,
+}
+
+impl HashedStorageKey {
+    /// Create a new hashed storage key
+    pub const fn new(hashed_address: B256, hashed_storage_key: B256) -> Self {
+        Self { hashed_address, hashed_storage_key }
+    }
+}
+
+impl Encode for HashedStorageKey {
+    type Encoded = [u8; 64];
+
+    fn encode(self) -> Self::Encoded {
+        let mut buf = [0u8; 64];
+        // First 32 bytes: address
+        buf[..32].copy_from_slice(self.hashed_address.as_slice());
+        // Next 32 bytes: storage key
+        buf[32..].copy_from_slice(self.hashed_storage_key.as_slice());
+        buf
+    }
+}
+
+impl Decode for HashedStorageKey {
+    fn decode(value: &[u8]) -> Result<Self, DatabaseError> {
+        if value.len() != 64 {
+            return Err(DatabaseError::Decode);
+        }
+
+        let hashed_address = B256::from_slice(&value[..32]);
+        let hashed_storage_key = B256::from_slice(&value[32..64]);
+
+        Ok(Self { hashed_address, hashed_storage_key })
+    }
+}
+
+/// Storage value wrapper for U256 values
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize, From, Into, Constructor)]
+pub struct StorageValue(pub U256);
+
+impl Compress for StorageValue {
+    type Compressed = Vec<u8>;
+
+    fn compress_to_buf<B: bytes::BufMut + AsMut<[u8]>>(&self, buf: &mut B) {
+        let be: [u8; 32] = self.0.to_be_bytes::<32>();
+        buf.put_slice(&be);
+    }
+}
+
+impl Decompress for StorageValue {
+    fn decompress(value: &[u8]) -> Result<Self, DatabaseError> {
+        if value.len() != 32 {
+            return Err(DatabaseError::Decode);
+        }
+        let bytes: [u8; 32] = value.try_into().map_err(|_| DatabaseError::Decode)?;
+        Ok(Self(U256::from_be_bytes(bytes)))
+    }
+}
+
+/// Proof Window key for tracking active proof window bounds
+///
+/// Used to store earliest and latest block numbers in the external storage.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)]
+#[repr(u8)]
+pub enum ProofWindowKey {
+    /// Earliest block number stored in external storage
+    EarliestBlock = 0,
+    /// Latest block number stored in external storage
+    LatestBlock = 1,
+    /// Anchor block from where the  initial state initialization started
+    InitialStateAnchor = 2,
+}
+
+impl Encode for ProofWindowKey {
+    type Encoded = [u8; 1];
+
+    fn encode(self) -> Self::Encoded {
+        [self as u8]
+    }
+}
+
+impl Decode for ProofWindowKey {
+    fn decode(value: &[u8]) -> Result<Self, DatabaseError> {
+        match value.first() {
+            Some(&0) => Ok(Self::EarliestBlock),
+            Some(&1) => Ok(Self::LatestBlock),
+            Some(&2) => Ok(Self::InitialStateAnchor),
+            _ => Err(DatabaseError::Decode),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use reth_trie::Nibbles;
+
+    #[test]
+    fn test_storage_branch_subkey_encode_decode() {
+        let addr = B256::from([1u8; 32]);
+        let path = StoredNibbles(Nibbles::from_nibbles_unchecked([1, 2, 3, 4]));
+        let key = StorageTrieKey::new(addr, path.clone());
+
+        let encoded = key.clone().encode();
+        let decoded = StorageTrieKey::decode(&encoded).unwrap();
+
+        assert_eq!(key, decoded);
+        assert_eq!(decoded.hashed_address, addr);
+        assert_eq!(decoded.path, path);
+    }
+
+    #[test]
+    fn test_storage_branch_subkey_ordering() {
+        let addr1 = B256::from([1u8; 32]);
+        let addr2 = B256::from([2u8; 32]);
+        let path1 = StoredNibbles(Nibbles::from_nibbles_unchecked([1, 2]));
+        let path2 = StoredNibbles(Nibbles::from_nibbles_unchecked([1, 3]));
+
+        let key1 = StorageTrieKey::new(addr1, path1.clone());
+        let key2 = StorageTrieKey::new(addr1, path2);
+        let key3 = StorageTrieKey::new(addr2, path1);
+
+        // Encoded bytes should be sortable: first by address, then by path
+        let enc1 = key1.encode();
+        let enc2 = key2.encode();
+        let enc3 = key3.encode();
+
+        assert!(enc1 < enc2, "Same address, path1 < path2");
+        assert!(enc1 < enc3, "addr1 < addr2");
+        assert!(enc2 < enc3, "addr1 < addr2 (even with larger path)");
+    }
+
+    #[test]
+    fn test_hashed_storage_subkey_encode_decode() {
+        let addr = B256::from([1u8; 32]);
+        let storage_key = B256::from([2u8; 32]);
+        let key = HashedStorageKey::new(addr, storage_key);
+
+        let encoded = key.clone().encode();
+        let decoded = HashedStorageKey::decode(&encoded).unwrap();
+
+        assert_eq!(key, decoded);
+        assert_eq!(decoded.hashed_address, addr);
+        assert_eq!(decoded.hashed_storage_key, storage_key);
+    }
+
+    #[test]
+    fn test_hashed_storage_subkey_ordering() {
+        let addr1 = B256::from([1u8; 32]);
+        let addr2 = B256::from([2u8; 32]);
+        let storage1 = B256::from([10u8; 32]);
+        let storage2 = B256::from([20u8; 32]);
+
+        let key1 = HashedStorageKey::new(addr1, storage1);
+        let key2 = HashedStorageKey::new(addr1, storage2);
+        let key3 = HashedStorageKey::new(addr2, storage1);
+
+        // Encoded bytes should be sortable: first by address, then by storage key
+        let enc1 = key1.encode();
+        let enc2 = key2.encode();
+        let enc3 = key3.encode();
+
+        assert!(enc1 < enc2, "Same address, storage1 < storage2");
+        assert!(enc1 < enc3, "addr1 < addr2");
+        assert!(enc2 < enc3, "addr1 < addr2 (even with larger storage key)");
+    }
+
+    #[test]
+    fn test_hashed_storage_subkey_size() {
+        let addr = B256::from([1u8; 32]);
+        let storage_key = B256::from([2u8; 32]);
+        let key = HashedStorageKey::new(addr, storage_key);
+
+        let encoded = key.encode();
+        assert_eq!(encoded.len(), 64, "Encoded size should be exactly 64 bytes");
+    }
+
+    #[test]
+    fn test_metadata_key_encode_decode() {
+        let key = ProofWindowKey::EarliestBlock;
+        let encoded = key.encode();
+        let decoded = ProofWindowKey::decode(&encoded).unwrap();
+        assert_eq!(key, decoded);
+
+        let key = ProofWindowKey::LatestBlock;
+        let encoded = key.encode();
+        let decoded = ProofWindowKey::decode(&encoded).unwrap();
+        assert_eq!(key, decoded);
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/db/models/version.rs b/rust/op-reth/crates/trie/src/db/models/version.rs
new file mode 100644
index 0000000000000..26f985c9674f6
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/models/version.rs
@@ -0,0 +1,191 @@
+use bytes::{Buf, BufMut};
+use reth_db::{
+    DatabaseError,
+    table::{Compress, Decompress},
+};
+use reth_primitives_traits::ValueWithSubKey;
+use serde::{Deserialize, Serialize};
+
+/// Wrapper type for `Option<T>` that implements [`Compress`] and [`Decompress`]
+///
+/// Encoding:
+/// - `None` => empty byte array (length 0)
+/// - `Some(value)` => compressed bytes of value (length > 0)
+///
+/// This assumes the inner type `T` always compresses to non-empty bytes when it exists.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct MaybeDeleted<T>(pub Option<T>);
+
+impl<T> From<Option<T>> for MaybeDeleted<T> {
+    fn from(opt: Option<T>) -> Self {
+        Self(opt)
+    }
+}
+
+impl<T> From<MaybeDeleted<T>> for Option<T> {
+    fn from(maybe: MaybeDeleted<T>) -> Self {
+        maybe.0
+    }
+}
+
+impl<T: Compress> Compress for MaybeDeleted<T> {
+    type Compressed = Vec<u8>;
+
+    fn compress_to_buf<B: BufMut + AsMut<[u8]>>(&self, buf: &mut B) {
+        match &self.0 {
+            None => {
+                // Empty = deleted, write nothing
+            }
+            Some(value) => {
+                // Compress the inner value to the buffer
+                value.compress_to_buf(buf);
+            }
+        }
+    }
+}
+
+impl<T: Decompress> Decompress for MaybeDeleted<T> {
+    fn decompress(value: &[u8]) -> Result<Self, DatabaseError> {
+        if value.is_empty() {
+            // Empty = deleted
+            Ok(Self(None))
+        } else {
+            // Non-empty = present
+            let inner = T::decompress(value)?;
+            Ok(Self(Some(inner)))
+        }
+    }
+}
+
+/// Versioned value wrapper for [`DupSort`] tables
+///
+/// For [`DupSort`] tables in MDBX, the Value type must contain the [`DupSort::SubKey`] as a field.
+/// This wrapper combines a [`block_number`] (the [`DupSort::SubKey`]) with
+/// the actual value.
+///
+/// [`DupSort`]: reth_db::table::DupSort
+/// [`DupSort::SubKey`]: reth_db::table::DupSort::SubKey
+/// [`block_number`]: Self::block_number
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+pub struct VersionedValue<T> {
+    /// Block number ([`DupSort::SubKey`] for [`DupSort`])
+    ///
+    /// [`DupSort`]: reth_db::table::DupSort
+    /// [`DupSort::SubKey`]: reth_db::table::DupSort::SubKey
+    pub block_number: u64,
+    /// The actual value (may be deleted)
+    pub value: MaybeDeleted<T>,
+}
+
+impl<T> VersionedValue<T> {
+    /// Create a new versioned value
+    pub const fn new(block_number: u64, value: MaybeDeleted<T>) -> Self {
+        Self { block_number, value }
+    }
+}
+
+impl<T: Compress> Compress for VersionedValue<T> {
+    type Compressed = Vec<u8>;
+
+    fn compress_to_buf<B: BufMut + AsMut<[u8]>>(&self, buf: &mut B) {
+        // Encode block number first (8 bytes, big-endian)
+        buf.put_u64(self.block_number);
+        // Then encode the value
+        self.value.compress_to_buf(buf);
+    }
+}
+
+impl<T: Decompress> Decompress for VersionedValue<T> {
+    fn decompress(value: &[u8]) -> Result<Self, DatabaseError> {
+        if value.len() < 8 {
+            return Err(DatabaseError::Decode);
+        }
+
+        let mut buf: &[u8] = value;
+        let block_number = buf.get_u64();
+        let value = MaybeDeleted::<T>::decompress(&value[8..])?;
+
+        Ok(Self { block_number, value })
+    }
+}
+
+impl<T> ValueWithSubKey for VersionedValue<T> {
+    type SubKey = u64;
+
+    fn get_subkey(&self) -> Self::SubKey {
+        self.block_number
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use reth_primitives_traits::Account;
+    use reth_trie::BranchNodeCompact;
+
+    #[test]
+    fn test_maybe_deleted_none() {
+        let none: MaybeDeleted<Account> = MaybeDeleted(None);
+        let compressed = none.compress();
+        assert!(compressed.is_empty(), "None should compress to empty bytes");
+
+        let decompressed = MaybeDeleted::<Account>::decompress(&compressed).unwrap();
+        assert_eq!(decompressed.0, None);
+    }
+
+    #[test]
+    fn test_maybe_deleted_some_account() {
+        let account = Account {
+            nonce: 42,
+            balance: alloy_primitives::U256::from(1000u64),
+            bytecode_hash: None,
+        };
+        let some = MaybeDeleted(Some(account));
+        let compressed = some.compress();
+        assert!(!compressed.is_empty(), "Some should compress to non-empty bytes");
+
+        let decompressed = MaybeDeleted::<Account>::decompress(&compressed).unwrap();
+        assert_eq!(decompressed.0, Some(account));
+    }
+
+    #[test]
+    fn test_maybe_deleted_some_branch() {
+        // Create a simple valid BranchNodeCompact (empty is valid)
+        let branch = BranchNodeCompact::new(
+            0,      // state_mask
+            0,      // tree_mask
+            0,      // hash_mask
+            vec![], // hashes
+            None,   // root_hash
+        );
+        let some = MaybeDeleted(Some(branch.clone()));
+        let compressed = some.compress();
+        assert!(!compressed.is_empty(), "Some should compress to non-empty bytes");
+
+        let decompressed = MaybeDeleted::<BranchNodeCompact>::decompress(&compressed).unwrap();
+        assert_eq!(decompressed.0, Some(branch));
+    }
+
+    #[test]
+    fn test_maybe_deleted_roundtrip() {
+        let test_cases = vec![
+            MaybeDeleted(None),
+            MaybeDeleted(Some(Account {
+                nonce: 0,
+                balance: alloy_primitives::U256::ZERO,
+                bytecode_hash: None,
+            })),
+            MaybeDeleted(Some(Account {
+                nonce: 999,
+                balance: alloy_primitives::U256::MAX,
+                bytecode_hash: Some([0xff; 32].into()),
+            })),
+        ];
+
+        for original in test_cases {
+            let compressed = original.clone().compress();
+            let decompressed = MaybeDeleted::<Account>::decompress(&compressed).unwrap();
+            assert_eq!(original, decompressed);
+        }
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/db/schema.md b/rust/op-reth/crates/trie/src/db/schema.md
new file mode 100644
index 0000000000000..4c2b04fd6965b
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/schema.md
@@ -0,0 +1,366 @@
+# Proof History Database Schema
+
+> Location: `crates/optimism/trie/src/db`
+> Backend: **MDBX** (via `reth-db`)
+> Purpose: Serve **historical `eth_getProof`** by storing versioned trie data in a bounded window.
+
+---
+
+## Design Overview
+
+This database is a **versioned, append-only history store** for Ethereum state tries.
+
+Each logical key is stored with **multiple historical versions**, each tagged by a **block number**. Reads select the latest version whose block number is **≤ the requested block**.
+
+### Core principles
+
+* History tables are **DupSort** tables
+* Each entry is versioned by `block_number`
+* Deletions are encoded as **tombstones**
+* A reverse index (`BlockChangeSet`) enables **range pruning**
+* Proof window bounds are tracked explicitly
+
+---
+
+## Version Encoding
+
+All historical values are wrapped in `VersionedValue<T>`.
+
+### `VersionedValue<T>`
+
+| Field          | Type              | Encoding             |
+| -------------- | ----------------- | -------------------- |
+| `block_number` | `u64`             | big-endian (8 bytes) |
+| `value`        | `MaybeDeleted<T>` | see below            |
+
+```
+VersionedValue := block_number || maybe_deleted_value
+```
+
+---
+
+### `MaybeDeleted<T>`
+
+Encodes value presence or deletion:
+
+| Logical value | Encoding                     |
+| ------------- | ---------------------------- |
+| `Some(T)`     | `T::compress()`              |
+| `None`        | empty byte slice (`len = 0`) |
+
+An empty value represents **deletion at that block**.
+
+---
+
+## Tables
+
+---
+
+## 1. `AccountTrieHistory` (DupSort)
+
+Historical **branch nodes** of the **account trie**.
+
+### Purpose
+
+Reconstruct account trie structure at any historical block.
+
+### Schema
+
+| Component | Type                                |
+| --------- | ----------------------------------- |
+| Key       | `StoredNibbles`                     |
+| SubKey    | `u64` (block number)                |
+| Value     | `VersionedValue<BranchNodeCompact>` |
+
+### Key encoding
+
+* `StoredNibbles` = compact-encoded trie path
+
+### Semantics
+
+For a given trie path:
+
+* Multiple versions may exist
+* Reader selects highest `block_number ≤ target_block`
+
+---
+
+## 2. `StorageTrieHistory` (DupSort)
+
+Historical **branch nodes** of **per-account storage tries**.
+
+### Schema
+
+| Component | Type                                |
+| --------- | ----------------------------------- |
+| Key       | `StorageTrieKey`                    |
+| SubKey    | `u64`                               |
+| Value     | `VersionedValue<BranchNodeCompact>` |
+
+### `StorageTrieKey` encoding
+
+```
+StorageTrieKey :=
+  hashed_address (32 bytes)
+  || StoredNibbles::encode(path)
+```
+
+Ordering:
+
+1. `hashed_address`
+2. trie path bytes
+
+---
+
+## 3. `HashedAccountHistory` (DupSort)
+
+Historical **account leaf values**.
+
+### Schema
+
+| Component | Type                      |
+| --------- | ------------------------- |
+| Key       | `B256` (hashed address)   |
+| SubKey    | `u64`                     |
+| Value     | `VersionedValue<Account>` |
+
+### Semantics
+
+Stores nonce, balance, code hash, and storage root per account per block.
+
+---
+
+## 4. `HashedStorageHistory` (DupSort)
+
+Historical **storage slot values**.
+
+### Schema
+
+| Component | Type                           |
+| --------- | ------------------------------ |
+| Key       | `HashedStorageKey`             |
+| SubKey    | `u64`                          |
+| Value     | `VersionedValue<StorageValue>` |
+
+### `HashedStorageKey` encoding
+
+Fixed 64 bytes:
+
+```
+hashed_address (32 bytes) || hashed_storage_key (32 bytes)
+```
+
+### `StorageValue` encoding
+
+* Wraps `U256`
+* Encoded as **32-byte big-endian**
+
+---
+
+## 5. `BlockChangeSet`
+
+Reverse index of **which keys were modified in a block**.
+
+### Purpose
+
+Efficient pruning by block range.
+
+### Schema
+
+| Component | Type                 |
+| --------- | -------------------- |
+| Key       | `u64` (block number) |
+| Value     | `ChangeSet`          |
+
+### `ChangeSet` structure
+
+```rust
+pub struct ChangeSet {
+  pub account_trie_keys: Vec<StoredNibbles>,
+  pub storage_trie_keys: Vec<StorageTrieKey>,
+  pub hashed_account_keys: Vec<B256>,
+  pub hashed_storage_keys: Vec<HashedStorageKey>,
+}
+```
+
+### Encoding
+
+* Serialized using **bincode**
+
+---
+
+## 6. `ProofWindow`
+
+Tracks active proof window bounds.
+
+### Schema
+
+| Component | Type              |
+| --------- | ----------------- |
+| Key       | `ProofWindowKey`  |
+| Value     | `BlockNumberHash` |
+
+### `ProofWindowKey`
+
+| Variant         | Encoding |
+| --------------- | -------- |
+| `EarliestBlock` | `0u8`    |
+| `LatestBlock`   | `1u8`    |
+
+### `BlockNumberHash` encoding
+
+```
+block_number (u64 BE, 8 bytes)
+|| block_hash (B256, 32 bytes)
+```
+
+Total size: **40 bytes**
+
+---
+Here is a **short, clean, professional** version suitable for `SCHEMA.md`:
+
+---
+
+## Reads: Hashed & Trie Cursors
+
+Historical reads are performed using **hashed cursors** and **trie cursors**, both operating on versioned history tables.
+
+All reads follow the same rule:
+
+> Select the newest entry whose block number is **≤ the requested block**.
+
+---
+
+### Hashed Cursors
+
+Hashed cursors read **leaf values** from:
+
+* `HashedAccountHistory`
+* `HashedStorageHistory`
+
+They answer:
+
+> *What was the value of this account or storage slot at block B?*
+
+For a given key, the cursor scans historical versions and returns the latest valid value. Tombstones indicate deletion and are treated as non-existence.
+
+---
+
+### Trie Cursors
+
+Trie cursors read **trie branch nodes** from:
+
+* `AccountTrieHistory`
+* `StorageTrieHistory`
+
+They answer:
+
+> *Which trie nodes existed at this path at block B?*
+
+These cursors enable reconstruction of Merkle paths required for proof generation.
+
+---
+
+### Combined Usage
+
+When serving `eth_getProof`:
+
+* Trie cursors reconstruct the Merkle path
+* Hashed cursors supply the leaf values
+
+Both are evaluated at the same target explained block to produce deterministic historical proofs.
+
+
+---
+## Writes: `store_trie_updates` (Append-Only)
+
+`store_trie_updates` persists all state changes introduced by a block using a strictly **append-only** write model.
+
+
+### Purpose
+
+The function records **historical trie updates** so that state and proofs can be reconstructed at any later block.
+
+---
+
+### What is written
+
+For a processed block `B`, the following data is appended:
+
+* Account trie branch nodes → `AccountTrieHistory`
+* Storage trie branch nodes → `StorageTrieHistory`
+* Account leaf updates → `HashedAccountHistory`
+* Storage slot updates → `HashedStorageHistory`
+* Modified keys → `BlockChangeSet[B]`
+
+All entries are tagged with the same `block_number`.
+
+---
+
+### How writes work
+
+For each updated item:
+
+1. A `VersionedValue` is created with:
+
+    * `block_number = B`
+    * the encoded node or value
+
+2. The entry is appended to the corresponding history table.
+
+No existing entries are modified or replaced.
+
+
+---
+Here is a **concise, professional, SCHEMA.md-style** explanation aligned exactly with your clarification:
+
+---
+
+## Initial State Backfill
+
+### Source database (Reth)
+
+The initial state is sourced from **Reth’s main execution database**, which only contains data for the **current canonical state**.
+
+The backfill reads from the following Reth tables:
+
+* `HashedAccounts` – current account leaf values
+* `HashedStorages` – current storage slot values
+* `AccountsTrie` – current account trie branch nodes
+* `StoragesTrie` – current storage trie branch nodes
+
+These tables do **not** contain historical versions; they represent a single finalized state snapshot.
+
+---
+
+### Destination database (Proofs storage)
+
+The data is copied into the **proofs history database** (`OpProofsStore`), which is a **versioned, append-only** store designed for historical proof generation.
+
+---
+
+### How the initial state is created
+
+During backfill:
+
+1. The current state is fully scanned from Reth tables using read-only cursors.
+2. All entries are written into the proofs storage as versioned records.
+3. This creates a complete **baseline state** inside the proofs DB.
+
+The backfill runs only once and is skipped if the proofs DB already has an `earliest_block` set.
+
+---
+
+### Why block `0` is used
+
+Since Reth tables only represent the **current state**, the copied data must be assigned a synthetic version.
+
+Block **`0`** is used as the baseline version because:
+
+* It is ≤ any real block number
+* It establishes a stable initial version for all keys
+* Later block updates naturally override it using higher block numbers
+
+This makes block `0` the canonical **initial state anchor** for versioned reads.
+
+---
diff --git a/rust/op-reth/crates/trie/src/db/store.rs b/rust/op-reth/crates/trie/src/db/store.rs
new file mode 100644
index 0000000000000..62d801ffc7c2c
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/db/store.rs
@@ -0,0 +1,3675 @@
+use super::{BlockNumberHash, ProofWindow, ProofWindowKey, Tables};
+use crate::{
+    BlockStateDiff, OpProofsStorageError,
+    OpProofsStorageError::NoBlocksFound,
+    OpProofsStorageResult, OpProofsStore,
+    api::{InitialStateAnchor, InitialStateStatus, OpProofsInitialStateStore, WriteCounts},
+    db::{
+        MdbxAccountCursor, MdbxStorageCursor, MdbxTrieCursor,
+        cursor::Dup,
+        models::{
+            AccountTrieHistory, BlockChangeSet, ChangeSet, HashedAccountHistory,
+            HashedStorageHistory, HashedStorageKey, MaybeDeleted, StorageTrieHistory,
+            StorageTrieKey, StorageValue, VersionedValue, kv::IntoKV,
+        },
+    },
+};
+use alloy_eips::{BlockNumHash, NumHash, eip1898::BlockWithParent};
+use alloy_primitives::{B256, U256, map::HashMap};
+#[cfg(feature = "metrics")]
+use metrics::{Label, gauge};
+use reth_db::{
+    Database, DatabaseEnv, DatabaseError,
+    cursor::{DbCursorRO, DbCursorRW, DbDupCursorRO, DbDupCursorRW},
+    mdbx::{DatabaseArguments, init_db_for},
+    table::{DupSort, Table},
+    transaction::{DbTx, DbTxMut},
+};
+use reth_primitives_traits::Account;
+use reth_trie::{hashed_cursor::HashedCursor, trie_cursor::TrieCursor};
+use reth_trie_common::{
+    BranchNodeCompact, HashedPostState, Nibbles, StoredNibbles,
+    updates::{StorageTrieUpdates, TrieUpdates},
+};
+use std::{ops::RangeBounds, path::Path};
+
+/// MDBX implementation of [`OpProofsStore`].
+#[derive(Debug)]
+pub struct MdbxProofsStorage {
+    env: DatabaseEnv,
+}
+
+struct ProofWindowValue {
+    earliest: NumHash,
+    latest: NumHash,
+}
+
+/// Preprocessed prune plan for a target block number
+#[derive(Debug, Clone)]
+struct PrunePlan {
+    earliest_block: u64,
+    acc_survivors: Vec<(StoredNibbles, u64)>,
+    storage_survivors: Vec<(StorageTrieKey, u64)>,
+    hashed_acc_survivors: Vec<(B256, u64)>,
+    hashed_storage_survivors: Vec<(HashedStorageKey, u64)>,
+}
+
+/// Preprocessed delete work for a prune range
+#[derive(Debug, Default, Clone)]
+struct HistoryDeleteBatch {
+    account_trie: Vec<(<AccountTrieHistory as Table>::Key, u64)>,
+    storage_trie: Vec<(<StorageTrieHistory as Table>::Key, u64)>,
+    hashed_account: Vec<(<HashedAccountHistory as Table>::Key, u64)>,
+    hashed_storage: Vec<(<HashedStorageHistory as Table>::Key, u64)>,
+}
+
+impl MdbxProofsStorage {
+    /// Creates a new [`MdbxProofsStorage`] instance with the given path.
+    pub fn new(path: &Path) -> Result<Self, OpProofsStorageError> {
+        let env = init_db_for::<_, Tables>(path, DatabaseArguments::default())
+            .map_err(|e| DatabaseError::Other(format!("Failed to open database: {e}")))?;
+        Ok(Self { env })
+    }
+
+    fn inner_get_latest_block_number_hash(
+        &self,
+        tx: &impl DbTx,
+    ) -> OpProofsStorageResult<Option<(u64, B256)>> {
+        let block = self.inner_get_block_number_hash(tx, ProofWindowKey::LatestBlock)?;
+        if block.is_some() {
+            return Ok(block);
+        }
+
+        self.inner_get_block_number_hash(tx, ProofWindowKey::EarliestBlock)
+    }
+
+    fn inner_get_block_number_hash(
+        &self,
+        tx: &impl DbTx,
+        key: ProofWindowKey,
+    ) -> OpProofsStorageResult<Option<(u64, B256)>> {
+        let mut cursor = tx.cursor_read::<ProofWindow>()?;
+        let value = cursor.seek_exact(key)?;
+        Ok(value.map(|(_, val)| (val.number(), *val.hash())))
+    }
+
+    fn inner_get_proof_window(
+        &self,
+        tx: &impl DbTx,
+    ) -> OpProofsStorageResult<Option<ProofWindowValue>> {
+        let mut cursor = tx.cursor_read::<ProofWindow>()?;
+
+        let earliest = match cursor.seek_exact(ProofWindowKey::EarliestBlock)? {
+            Some((_, val)) => NumHash::new(val.number(), *val.hash()),
+            None => return Ok(None),
+        };
+
+        let latest = match cursor.seek_exact(ProofWindowKey::LatestBlock)? {
+            Some((_, val)) => NumHash::new(val.number(), *val.hash()),
+            None => earliest,
+        };
+
+        Ok(Some(ProofWindowValue { earliest, latest }))
+    }
+
+    fn set_earliest_block_number_hash(
+        &self,
+        block_number: u64,
+        hash: B256,
+    ) -> OpProofsStorageResult<()> {
+        let _ = self.env.update(|tx| {
+            Self::inner_set_earliest_block_number(tx, block_number, hash)?;
+            Ok::<(), DatabaseError>(())
+        })?;
+        Ok(())
+    }
+
+    /// Internal helper to set earliest block number hash within an existing transaction
+    fn inner_set_earliest_block_number(
+        tx: &(impl DbTxMut + DbTx),
+        block_number: u64,
+        hash: B256,
+    ) -> OpProofsStorageResult<()> {
+        let mut cursor = tx.cursor_write::<ProofWindow>()?;
+        cursor.upsert(ProofWindowKey::EarliestBlock, &BlockNumberHash::new(block_number, hash))?;
+        Ok(())
+    }
+
+    /// Internal helper to set latest block number hash within an existing transaction
+    fn inner_set_latest_block_number(
+        tx: &(impl DbTxMut + DbTx),
+        block_number: u64,
+        hash: B256,
+    ) -> OpProofsStorageResult<()> {
+        let mut cursor = tx.cursor_write::<ProofWindow>()?;
+        cursor.upsert(ProofWindowKey::LatestBlock, &BlockNumberHash::new(block_number, hash))?;
+        Ok(())
+    }
+
+    /// Persist a batch of versioned history entries to a dup-sorted table.
+    ///
+    /// # Parameters
+    /// - `block_number`: Target block number for versioning entries
+    /// - `items`: **Must be sorted** - iterator of entries to persist
+    /// - `append_mode`: Mode selector for write strategy:
+    ///   - `true` (Append): Appends all entries including tombstones for forward progress
+    ///   - `false` (Prune): Removes tombstones, writes non-tombstones to block 0
+    ///
+    /// The cost of pruning is the cost of (append + deleting tombstones + deleting old block 0).
+    /// The tombstones deletion is expensive as it requires a seek for each (key + subkey).
+    ///
+    /// Uses [`reth_db::mdbx::cursor::Cursor::upsert`] for upsert operation.
+    fn persist_history_batch<T, I, V>(
+        &self,
+        tx: &(impl DbTxMut + DbTx),
+        block_number: T::SubKey,
+        items: I,
+        append_mode: bool,
+    ) -> OpProofsStorageResult<Vec<T::Key>>
+    where
+        T: Table<Value = VersionedValue<V>> + DupSort<SubKey = u64>,
+        T::Key: Clone,
+        I: IntoIterator,
+        I::Item: IntoKV<T>,
+    {
+        let mut cur = tx.cursor_dup_write::<T>()?;
+        let mut keys = Vec::<T::Key>::new();
+
+        // Materialize iterator to enable partitioning and collect keys
+        let mut pairs: Vec<(T::Key, T::Value)> = Vec::new();
+        for it in items {
+            let (k, vv) = it.into_kv(block_number);
+            pairs.push((k.clone(), vv));
+            keys.push(k)
+        }
+
+        if append_mode {
+            // Append all entries (including tombstones) to preserve full history
+            for (k, vv) in pairs {
+                cur.append_dup(k.clone(), vv)?;
+            }
+            return Ok(keys);
+        }
+
+        // Drop current cursor to start clean for Phase 1
+        drop(cur);
+
+        // Phase 1: Batch Delete (Sequential)
+        // Remove all existing state at Block 0 for these keys.
+        {
+            let mut del_cur = tx.cursor_dup_write::<T>()?;
+            for (k, _) in &pairs {
+                // Seek to (Key, Block 0)
+                if let Some(vv) = del_cur.seek_by_key_subkey(k.clone(), 0)? &&
+                    vv.block_number == 0
+                {
+                    del_cur.delete_current()?;
+                }
+            }
+        }
+
+        // Phase 2: Batch Write (Sequential)
+        // Write new values (skipping tombstones).
+        {
+            let mut write_cur = tx.cursor_dup_write::<T>()?;
+            for (k, vv) in pairs {
+                if vv.value.0.is_some() {
+                    write_cur.upsert(k, &vv)?;
+                }
+            }
+        }
+
+        Ok(keys)
+    }
+
+    /// Delete entries for `items` at exactly `block_number` in a dup-sorted table.
+    /// Seeks (key, block) and deletes current if the subkey matches.
+    fn delete_dup_sorted<T, I, V>(
+        &self,
+        tx: &(impl DbTxMut + DbTx),
+        items: I,
+    ) -> OpProofsStorageResult<()>
+    where
+        T: Table<Value = VersionedValue<V>> + DupSort<SubKey = u64>,
+        T::Key: Clone,
+        T::SubKey: PartialEq + Clone,
+        I: IntoIterator<Item = (T::Key, T::SubKey)>,
+    {
+        let mut cur = tx.cursor_dup_write::<T>()?;
+        for (key, subkey) in items {
+            if let Some(vv) = cur.seek_by_key_subkey(key, subkey)? {
+                // ensure we didn't land on a >subkey
+                if vv.block_number == subkey {
+                    cur.delete_current()?;
+                }
+            }
+        }
+        Ok(())
+    }
+
+    /// Phase 1 of pruning: Calculate survivors.
+    /// Scans change sets to find the LATEST update for every key in the range.
+    fn calculate_prune_plan(&self, target_block: u64) -> OpProofsStorageResult<Option<PrunePlan>> {
+        self.env.view(|tx| {
+            let Some((earliest, _)) =
+                self.inner_get_block_number_hash(tx, ProofWindowKey::EarliestBlock)?
+            else {
+                return Ok(None);
+            };
+
+            if earliest >= target_block {
+                return Ok(None);
+            }
+
+            // 1. Accumulate latest block per key using HashMap for O(1) deduplication
+            // This is memory-efficient for high-churn scenarios (many updates to same keys).
+            let mut acc_candidates: HashMap<StoredNibbles, u64> = HashMap::default();
+            let mut storage_candidates: HashMap<StorageTrieKey, u64> = HashMap::default();
+            let mut hashed_acc_candidates: HashMap<B256, u64> = HashMap::default();
+            let mut hashed_storage_candidates: HashMap<HashedStorageKey, u64> = HashMap::default();
+
+            let range = (earliest + 1)..=target_block;
+            let mut cs_cursor = tx.cursor_read::<BlockChangeSet>()?;
+            let mut walker = cs_cursor.walk_range(range)?;
+
+            while let Some(Ok((block_number, cs))) = walker.next() {
+                for k in cs.account_trie_keys {
+                    acc_candidates
+                        .entry(k)
+                        .and_modify(|curr| *curr = (*curr).max(block_number))
+                        .or_insert(block_number);
+                }
+                for k in cs.storage_trie_keys {
+                    storage_candidates
+                        .entry(k)
+                        .and_modify(|curr| *curr = (*curr).max(block_number))
+                        .or_insert(block_number);
+                }
+                for k in cs.hashed_account_keys {
+                    hashed_acc_candidates
+                        .entry(k)
+                        .and_modify(|curr| *curr = (*curr).max(block_number))
+                        .or_insert(block_number);
+                }
+                for k in cs.hashed_storage_keys {
+                    hashed_storage_candidates
+                        .entry(k)
+                        .and_modify(|curr| *curr = (*curr).max(block_number))
+                        .or_insert(block_number);
+                }
+            }
+
+            // 2. Convert map to sorted survivors list for efficient sequential db write
+            Ok(Some(PrunePlan {
+                earliest_block: earliest,
+                acc_survivors: Self::flatten_and_sort(acc_candidates),
+                storage_survivors: Self::flatten_and_sort(storage_candidates),
+                hashed_acc_survivors: Self::flatten_and_sort(hashed_acc_candidates),
+                hashed_storage_survivors: Self::flatten_and_sort(hashed_storage_candidates),
+            }))
+        })?
+    }
+
+    /// Helper to flatten `HashMap` into a sorted Vector of survivors.
+    /// Sorting is required to ensure optimal sequential seek performance in MDBX.
+    fn flatten_and_sort<K: Ord>(map: HashMap<K, u64>) -> Vec<(K, u64)> {
+        let mut v: Vec<_> = map.into_iter().collect();
+        v.sort_unstable_by(|a, b| a.0.cmp(&b.0));
+        v
+    }
+
+    /// Delete history versions for `items` that are strictly older than the provided block number.
+    /// `items` is a list of (Key, `SurvivorBlock`). Everything strictly older than `SurvivorBlock`
+    /// is deleted. Returns the number of entries deleted.
+    fn prune_history_preceding<T, V>(
+        &self,
+        tx: &(impl DbTxMut + DbTx),
+        cutoff_items: Vec<(T::Key, u64)>,
+    ) -> OpProofsStorageResult<u64>
+    where
+        T: Table<Value = VersionedValue<V>> + DupSort<SubKey = u64>,
+        T::Key: Clone + Ord,
+    {
+        if cutoff_items.is_empty() {
+            return Ok(0);
+        }
+
+        let mut deleted_count = 0;
+        let mut cur = tx.cursor_dup_write::<T>()?;
+        for (key, survivor_block) in cutoff_items {
+            // Seek to the start of history for this key (Block 0)
+            if let Some(mut entry) = cur.seek_by_key_subkey(key.clone(), 0)? {
+                loop {
+                    if entry.block_number >= survivor_block {
+                        // Reached the survivor version (or newer). Stop deleting for this key.
+
+                        // If the survivor is a tombstone (None), delete it too.
+                        // Since we just deleted all older history, a tombstone at the start of
+                        // history is redundant (it implies "does not
+                        // exist").
+                        if entry.block_number == survivor_block && entry.value.0.is_none() {
+                            cur.delete_current()?;
+                            deleted_count += 1;
+                        }
+
+                        break;
+                    }
+
+                    // Entry is strictly older than survivor. Delete it.
+                    cur.delete_current()?;
+                    deleted_count += 1;
+
+                    // MDBX delete_current() automatically advances the cursor to the next item.
+                    // We check if the next item is still the same key.
+                    match cur.current() {
+                        Ok(Some((k, v))) => {
+                            if k != key {
+                                break; // Moved past the key
+                            }
+                            entry = v;
+                        }
+                        _ => break, // End of table or error
+                    }
+                }
+            }
+        }
+        Ok(deleted_count)
+    }
+
+    /// Append deletion tombstones for all existing storage items of `hashed_address` at
+    /// `block_number`. Iterates via `next()` from a RO cursor and writes MaybeDeleted(None)
+    /// rows.
+    fn wipe_storage<T, Next, K, VV, V>(
+        &self,
+        tx: &(impl DbTxMut + DbTx),
+        block_number: u64,
+        hashed_address: B256,
+        mut next: Next,
+    ) -> OpProofsStorageResult<Vec<T::Key>>
+    where
+        T: Table<Value = VersionedValue<V>> + DupSort,
+        Next: FnMut() -> OpProofsStorageResult<Option<(K, VV)>>,
+        (B256, K, Option<V>): IntoKV<T>,
+        T::Key: Clone,
+    {
+        let mut cur = tx.cursor_dup_write::<T>()?;
+        let mut keys: Vec<T::Key> = Vec::new();
+
+        while let Some((k, _vv)) = next()? {
+            let key: T::Key = (hashed_address, k, Option::<V>::None).into_key();
+            let del: T::Value = VersionedValue { block_number, value: MaybeDeleted(None) };
+            cur.append_dup(key.clone(), del)?;
+            keys.push(key);
+        }
+
+        Ok(keys)
+    }
+
+    /// Collect versioned history over `block_range` using `BlockChangeSet`.
+    fn collect_history_ranged(
+        &self,
+        tx: &impl DbTx,
+        block_range: impl RangeBounds<u64>,
+    ) -> OpProofsStorageResult<HistoryDeleteBatch> {
+        let mut history = HistoryDeleteBatch::default();
+        let mut change_set_cursor = tx.cursor_read::<BlockChangeSet>()?;
+        let mut walker = change_set_cursor.walk_range(block_range)?;
+
+        while let Some(Ok((block_number, change_set))) = walker.next() {
+            // Push (key, subkey=block_number) pairs
+            history
+                .account_trie
+                .extend(change_set.account_trie_keys.into_iter().map(|k| (k, block_number)));
+            history
+                .storage_trie
+                .extend(change_set.storage_trie_keys.into_iter().map(|k| (k, block_number)));
+            history
+                .hashed_account
+                .extend(change_set.hashed_account_keys.into_iter().map(|k| (k, block_number)));
+            history
+                .hashed_storage
+                .extend(change_set.hashed_storage_keys.into_iter().map(|k| (k, block_number)));
+        }
+
+        // Sorting by tuple sorts by key first, then by block_number.
+        history.account_trie.sort_by(|(k1, b1), (k2, b2)| k1.cmp(k2).then_with(|| b1.cmp(b2)));
+        history.storage_trie.sort_by(|(k1, b1), (k2, b2)| k1.cmp(k2).then_with(|| b1.cmp(b2)));
+        history.hashed_account.sort_by(|(k1, b1), (k2, b2)| k1.cmp(k2).then_with(|| b1.cmp(b2)));
+        history.hashed_storage.sort_by(|(k1, b1), (k2, b2)| k1.cmp(k2).then_with(|| b1.cmp(b2)));
+
+        Ok(history)
+    }
+
+    /// Delete versioned history over `block_range` using history batch.
+    fn delete_history_ranged(
+        &self,
+        tx: &(impl DbTxMut + DbTx),
+        block_range: impl RangeBounds<u64>,
+        history: HistoryDeleteBatch,
+    ) -> OpProofsStorageResult<WriteCounts> {
+        let mut change_set_cursor = tx.cursor_write::<BlockChangeSet>()?;
+        let mut walker = change_set_cursor.walk_range(block_range)?;
+
+        while let Some(Ok((_, _))) = walker.next() {
+            walker.delete_current()?;
+        }
+
+        // Delete using the simplified API: iterator of (key, subkey)
+        self.delete_dup_sorted::<AccountTrieHistory, _, _>(tx, history.clone().account_trie)?;
+        self.delete_dup_sorted::<StorageTrieHistory, _, _>(tx, history.clone().storage_trie)?;
+        self.delete_dup_sorted::<HashedAccountHistory, _, _>(tx, history.clone().hashed_account)?;
+        self.delete_dup_sorted::<HashedStorageHistory, _, _>(tx, history.clone().hashed_storage)?;
+
+        Ok(WriteCounts {
+            account_trie_updates_written_total: history.account_trie.len() as u64,
+            storage_trie_updates_written_total: history.storage_trie.len() as u64,
+            hashed_accounts_written_total: history.hashed_account.len() as u64,
+            hashed_storages_written_total: history.hashed_storage.len() as u64,
+        })
+    }
+
+    /// Write trie/state history for `block_number` from `block_state_diff`.
+    fn store_trie_updates_for_block(
+        &self,
+        tx: &<DatabaseEnv as Database>::TXMut,
+        block_number: u64,
+        block_state_diff: BlockStateDiff,
+        append_mode: bool,
+    ) -> OpProofsStorageResult<ChangeSet> {
+        let BlockStateDiff { sorted_trie_updates, sorted_post_state } = block_state_diff;
+
+        let storage_trie_len = sorted_trie_updates.storage_tries_ref().len();
+        let hashed_storage_len = sorted_post_state.storages.len();
+
+        let account_trie_keys = self.persist_history_batch(
+            tx,
+            block_number,
+            sorted_trie_updates.account_nodes_ref().iter().cloned(),
+            append_mode,
+        )?;
+        let hashed_account_keys = self.persist_history_batch(
+            tx,
+            block_number,
+            sorted_post_state.accounts.iter().copied(),
+            append_mode,
+        )?;
+
+        let mut storage_trie_keys = Vec::<StorageTrieKey>::with_capacity(storage_trie_len);
+        for (hashed_address, nodes) in sorted_trie_updates.storage_tries_ref() {
+            // Handle wiped - mark all storage trie as deleted at the current block number
+            if nodes.is_deleted && append_mode {
+                // Yet to have any update for the current block number - So just using up to
+                // previous block number
+                let mut ro = self.storage_trie_cursor(*hashed_address, block_number - 1)?;
+                let keys =
+                    self.wipe_storage(tx, block_number, *hashed_address, || Ok(ro.next()?))?;
+
+                storage_trie_keys.extend(keys);
+
+                // Skip any further processing for this hashed_address
+                continue;
+            }
+
+            let keys = self.persist_history_batch(
+                tx,
+                block_number,
+                nodes
+                    .storage_nodes_ref()
+                    .iter()
+                    .cloned()
+                    .map(|(path, node)| (*hashed_address, path, node)),
+                append_mode,
+            )?;
+            storage_trie_keys.extend(keys);
+        }
+
+        let mut hashed_storage_keys = Vec::<HashedStorageKey>::with_capacity(hashed_storage_len);
+        for (hashed_address, storage) in sorted_post_state.storages {
+            // Handle wiped - mark all storage slots as deleted at the current block number
+            if append_mode && storage.is_wiped() {
+                // Yet to have any update for the current block number - So just using up to
+                // previous block number
+                let mut ro = self.storage_hashed_cursor(hashed_address, block_number - 1)?;
+                let keys =
+                    self.wipe_storage(tx, block_number, hashed_address, || Ok(ro.next()?))?;
+                hashed_storage_keys.extend(keys);
+                // Skip any further processing for this hashed_address
+                continue;
+            }
+            let keys = self.persist_history_batch(
+                tx,
+                block_number,
+                storage
+                    .storage_slots_ref()
+                    .iter()
+                    .map(|(key, val)| (hashed_address, *key, Some(StorageValue(*val)))),
+                append_mode,
+            )?;
+            hashed_storage_keys.extend(keys);
+        }
+
+        Ok(ChangeSet {
+            account_trie_keys,
+            storage_trie_keys,
+            hashed_account_keys,
+            hashed_storage_keys,
+        })
+    }
+
+    /// Append-only writer for a block: validates parent, persists diff (soft-delete=true),
+    /// records a `BlockChangeSet`, and advances `ProofWindow::LatestBlock`.
+    fn store_trie_updates_append_only(
+        &self,
+        tx: &<DatabaseEnv as Database>::TXMut,
+        block_ref: BlockWithParent,
+        block_state_diff: BlockStateDiff,
+    ) -> OpProofsStorageResult<WriteCounts> {
+        let block_number = block_ref.block.number;
+
+        // Check the latest stored block is the parent of the incoming block
+        let latest_block_hash =
+            self.inner_get_latest_block_number_hash(tx)?.map_or(B256::ZERO, |(_num, hash)| hash);
+
+        if latest_block_hash != block_ref.parent {
+            return Err(OpProofsStorageError::OutOfOrder {
+                block_number,
+                parent_block_hash: block_ref.parent,
+                latest_block_hash,
+            });
+        }
+
+        let change_set =
+            &self.store_trie_updates_for_block(tx, block_number, block_state_diff, true)?;
+
+        // Cursor for recording all changes made in this block for all history tables
+        let mut change_set_cursor = tx.new_cursor::<BlockChangeSet>()?;
+        change_set_cursor.append(block_number, change_set)?;
+
+        // Update proof window's latest block
+        Self::inner_set_latest_block_number(tx, block_number, block_ref.block.hash)?;
+
+        Ok(WriteCounts {
+            account_trie_updates_written_total: change_set.account_trie_keys.len() as u64,
+            storage_trie_updates_written_total: change_set.storage_trie_keys.len() as u64,
+            hashed_accounts_written_total: change_set.hashed_account_keys.len() as u64,
+            hashed_storages_written_total: change_set.hashed_storage_keys.len() as u64,
+        })
+    }
+
+    /// Return `BlockNumHash` for the initial state anchor.
+    fn get_initial_state_anchor(&self) -> OpProofsStorageResult<Option<BlockNumHash>> {
+        self.env.view(|tx| {
+            let mut cur = tx.cursor_read::<ProofWindow>()?;
+            Ok(cur.seek_exact(ProofWindowKey::InitialStateAnchor)?.map(|(_k, v)| v.into()))
+        })?
+    }
+
+    /// Return latest key for a table
+    fn get_latest_key<T>(&self) -> OpProofsStorageResult<Option<T::Key>>
+    where
+        T: Table,
+    {
+        self.env.view(|tx| {
+            let mut cursor = tx.cursor_read::<T>()?;
+            Ok(cursor.last()?.map(|(k, _)| k))
+        })?
+    }
+}
+
+impl OpProofsStore for MdbxProofsStorage {
+    type StorageTrieCursor<'tx>
+        = MdbxTrieCursor<StorageTrieHistory, Dup<'tx, StorageTrieHistory>>
+    where
+        Self: 'tx;
+    type AccountTrieCursor<'tx>
+        = MdbxTrieCursor<AccountTrieHistory, Dup<'tx, AccountTrieHistory>>
+    where
+        Self: 'tx;
+    type StorageCursor<'tx>
+        = MdbxStorageCursor<Dup<'tx, HashedStorageHistory>>
+    where
+        Self: 'tx;
+    type AccountHashedCursor<'tx>
+        = MdbxAccountCursor<Dup<'tx, HashedAccountHistory>>
+    where
+        Self: 'tx;
+
+    fn get_earliest_block_number(&self) -> OpProofsStorageResult<Option<(u64, B256)>> {
+        self.env.view(|tx| self.inner_get_block_number_hash(tx, ProofWindowKey::EarliestBlock))?
+    }
+
+    fn get_latest_block_number(&self) -> OpProofsStorageResult<Option<(u64, B256)>> {
+        self.env.view(|tx| self.inner_get_latest_block_number_hash(tx))?
+    }
+
+    fn storage_trie_cursor<'tx>(
+        &self,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::StorageTrieCursor<'tx>> {
+        let tx = self.env.tx()?;
+        let cursor = tx.cursor_dup_read::<StorageTrieHistory>()?;
+
+        Ok(MdbxTrieCursor::new(cursor, max_block_number, Some(hashed_address)))
+    }
+
+    fn account_trie_cursor<'tx>(
+        &self,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::AccountTrieCursor<'tx>> {
+        let tx = self.env.tx()?;
+        let cursor = tx.cursor_dup_read::<AccountTrieHistory>()?;
+
+        Ok(MdbxTrieCursor::new(cursor, max_block_number, None))
+    }
+
+    fn storage_hashed_cursor<'tx>(
+        &self,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::StorageCursor<'tx>> {
+        let tx = self.env.tx()?;
+        let cursor = tx.cursor_dup_read::<HashedStorageHistory>()?;
+
+        Ok(MdbxStorageCursor::new(cursor, max_block_number, hashed_address))
+    }
+
+    fn account_hashed_cursor<'tx>(
+        &self,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::AccountHashedCursor<'tx>> {
+        let tx = self.env.tx()?;
+        let cursor = tx.cursor_dup_read::<HashedAccountHistory>()?;
+
+        Ok(MdbxAccountCursor::new(cursor, max_block_number))
+    }
+
+    fn store_trie_updates(
+        &self,
+        block_ref: BlockWithParent,
+        block_state_diff: BlockStateDiff,
+    ) -> OpProofsStorageResult<WriteCounts> {
+        self.env
+            .update(|tx| self.store_trie_updates_append_only(tx, block_ref, block_state_diff))?
+    }
+
+    fn fetch_trie_updates(&self, block_number: u64) -> OpProofsStorageResult<BlockStateDiff> {
+        self.env.view(|tx| {
+            let mut change_set_cursor = tx.cursor_read::<BlockChangeSet>()?;
+            let (_, change_set) = change_set_cursor
+                .seek_exact(block_number)?
+                .ok_or(OpProofsStorageError::NoChangeSetForBlock(block_number))?;
+
+            let mut account_trie_cursor = tx.new_cursor::<AccountTrieHistory>()?;
+            let mut storage_trie_cursor = tx.new_cursor::<StorageTrieHistory>()?;
+            let mut hashed_account_cursor = tx.new_cursor::<HashedAccountHistory>()?;
+            let mut hashed_storage_cursor = tx.new_cursor::<HashedStorageHistory>()?;
+
+            let mut trie_updates = TrieUpdates::default();
+            for key in change_set.account_trie_keys {
+                let entry =
+                    match account_trie_cursor.seek_by_key_subkey(key.clone(), block_number)? {
+                        Some(v) if v.block_number == block_number => v.value.0,
+                        _ => {
+                            return Err(OpProofsStorageError::MissingAccountTrieHistory(
+                                key.0,
+                                block_number,
+                            ));
+                        }
+                    };
+
+                if let Some(value) = entry {
+                    trie_updates.account_nodes.insert(key.0, value);
+                } else {
+                    trie_updates.removed_nodes.insert(key.0);
+                }
+            }
+
+            for key in change_set.storage_trie_keys {
+                let entry =
+                    match storage_trie_cursor.seek_by_key_subkey(key.clone(), block_number)? {
+                        Some(v) if v.block_number == block_number => v.value.0,
+                        _ => {
+                            return Err(OpProofsStorageError::MissingStorageTrieHistory(
+                                key.hashed_address,
+                                key.path.0,
+                                block_number,
+                            ));
+                        }
+                    };
+
+                let stu = trie_updates
+                    .storage_tries
+                    .entry(key.hashed_address)
+                    .or_insert_with(StorageTrieUpdates::default);
+
+                // handle is_deleted scenario
+                // Issue: https://github.com/op-rs/op-reth/issues/323
+                if let Some(value) = entry {
+                    stu.storage_nodes.insert(key.path.0, value);
+                } else {
+                    stu.removed_nodes.insert(key.path.0);
+                }
+            }
+
+            let mut post_state =
+                HashedPostState::with_capacity(change_set.hashed_account_keys.len());
+            for key in change_set.hashed_account_keys {
+                let entry = match hashed_account_cursor.seek_by_key_subkey(key, block_number)? {
+                    Some(v) if v.block_number == block_number => v.value.0,
+                    _ => {
+                        return Err(OpProofsStorageError::MissingHashedAccountHistory(
+                            key,
+                            block_number,
+                        ));
+                    }
+                };
+
+                post_state.accounts.insert(key, entry);
+            }
+
+            for key in change_set.hashed_storage_keys {
+                let entry =
+                    match hashed_storage_cursor.seek_by_key_subkey(key.clone(), block_number)? {
+                        Some(v) if v.block_number == block_number => v.value.0,
+                        _ => {
+                            return Err(OpProofsStorageError::MissingHashedStorageHistory {
+                                hashed_address: key.hashed_address,
+                                hashed_storage_key: key.hashed_storage_key,
+                                block_number,
+                            });
+                        }
+                    };
+
+                let hs = post_state.storages.entry(key.hashed_address).or_default();
+
+                // handle wiped storage scenario
+                // Issue: https://github.com/op-rs/op-reth/issues/323
+                if let Some(value) = entry {
+                    hs.storage.insert(key.hashed_storage_key, value.0);
+                } else {
+                    hs.storage.insert(key.hashed_storage_key, U256::ZERO);
+                }
+            }
+
+            Ok(BlockStateDiff {
+                sorted_trie_updates: trie_updates.into_sorted(),
+                sorted_post_state: post_state.into_sorted(),
+            })
+        })?
+    }
+
+    /// Update the initial state with the provided diff.
+    /// Prune all historical trie data till `new_earliest_block_number` (inclusive) using
+    /// the [`BlockChangeSet`] index.
+    ///
+    /// Arguments:
+    /// - `new_earliest_block_ref`: The new earliest block reference (with parent hash).
+    /// - `diff`: The state diff to apply to the initial state (block 0). This diff represents all
+    ///   the changes from the old earliest block to the new earliest block (inclusive).
+    fn prune_earliest_state(
+        &self,
+        new_earliest_block_ref: BlockWithParent,
+    ) -> OpProofsStorageResult<WriteCounts> {
+        let target_block = new_earliest_block_ref.block.number;
+
+        // --- PHASE 1: READ (Calculate Deletions) ---
+        let plan = self.calculate_prune_plan(target_block)?;
+        let Some(plan) = plan else {
+            return Ok(WriteCounts::default());
+        };
+
+        // --- PHASE 2: WRITE (Execute Deletions) ---
+        self.env.update(|tx| {
+            // 1. Execute Sparse Deletions and track actual deleted rows
+            let acc_deleted =
+                self.prune_history_preceding::<AccountTrieHistory, _>(tx, plan.acc_survivors)?;
+
+            let st_deleted =
+                self.prune_history_preceding::<StorageTrieHistory, _>(tx, plan.storage_survivors)?;
+
+            let ha_deleted = self.prune_history_preceding::<HashedAccountHistory, _>(
+                tx,
+                plan.hashed_acc_survivors,
+            )?;
+
+            let hs_deleted = self.prune_history_preceding::<HashedStorageHistory, _>(
+                tx,
+                plan.hashed_storage_survivors,
+            )?;
+
+            let counts = WriteCounts {
+                account_trie_updates_written_total: acc_deleted,
+                storage_trie_updates_written_total: st_deleted,
+                hashed_accounts_written_total: ha_deleted,
+                hashed_storages_written_total: hs_deleted,
+            };
+
+            // 2. Delete ChangeSets
+            let range = (plan.earliest_block + 1)..=target_block;
+            let mut cs_cursor = tx.cursor_write::<BlockChangeSet>()?;
+            let mut walker = cs_cursor.walk_range(range)?;
+            while walker.next().is_some() {
+                walker.delete_current()?;
+            }
+
+            // 3. Update Earliest Pointer
+            Self::inner_set_earliest_block_number(
+                tx,
+                target_block,
+                new_earliest_block_ref.block.hash,
+            )?;
+
+            Ok(counts)
+        })?
+    }
+
+    /// Unwind the historical state to `unwind_upto_block` (inclusive), deleting all history
+    /// starting from provided block. Also updates the `ProofWindow::LatestBlock` to parent of
+    /// `unwind_upto_block`.
+    fn unwind_history(&self, to: BlockWithParent) -> OpProofsStorageResult<()> {
+        let history_to_delete =
+            self.env.view(|tx| self.collect_history_ranged(tx, to.block.number..))??;
+
+        self.env.update(|tx| {
+            let proof_window = match self.inner_get_proof_window(tx)? {
+                Some(pw) => pw,
+                None => return Ok(()), // Nothing to unwind
+            };
+
+            if to.block.number > proof_window.latest.number {
+                return Ok(()); // Nothing to unwind
+            }
+
+            if to.block.number <= proof_window.earliest.number {
+                return Err(OpProofsStorageError::UnwindBeyondEarliest {
+                    unwind_block_number: to.block.number,
+                    earliest_block_number: proof_window.earliest.number,
+                });
+            }
+
+            self.delete_history_ranged(tx, to.block.number.., history_to_delete)?;
+
+            let new_latest_block =
+                BlockNumberHash::new(to.block.number.saturating_sub(1), to.parent);
+
+            // Update proof window's Latest block
+            Self::inner_set_latest_block_number(
+                tx,
+                new_latest_block.number(),
+                *new_latest_block.hash(),
+            )?;
+
+            Ok(())
+        })?
+    }
+
+    fn replace_updates(
+        &self,
+        latest_common_block: BlockNumHash,
+        mut blocks_to_add: Vec<(BlockWithParent, BlockStateDiff)>,
+    ) -> OpProofsStorageResult<()> {
+        // Sort the vec list by block number
+        blocks_to_add.sort_unstable_by_key(|(bwp, _)| bwp.block.number);
+
+        let history_to_delete = self
+            .env
+            .view(|tx| self.collect_history_ranged(tx, latest_common_block.number + 1..))??;
+
+        self.env.update(|tx| {
+            // Remove the old history
+            self.delete_history_ranged(tx, latest_common_block.number + 1.., history_to_delete)?;
+
+            // Update the ProofWindow Latest Block to latest_common_block so we can perform
+            // `store_trie_updates_append_only`.
+            Self::inner_set_latest_block_number(
+                tx,
+                latest_common_block.number,
+                latest_common_block.hash,
+            )?;
+
+            // Apply the new history
+            for (block_with_parent, diff) in blocks_to_add {
+                self.store_trie_updates_append_only(tx, block_with_parent, diff)?;
+            }
+            Ok(())
+        })?
+    }
+
+    fn set_earliest_block_number(
+        &self,
+        block_number: u64,
+        hash: B256,
+    ) -> OpProofsStorageResult<()> {
+        self.set_earliest_block_number_hash(block_number, hash)
+    }
+}
+
+impl OpProofsInitialStateStore for MdbxProofsStorage {
+    fn initial_state_anchor(&self) -> OpProofsStorageResult<InitialStateAnchor> {
+        // 1) NotStarted: no anchor row
+        let Some(block) = self.get_initial_state_anchor()? else {
+            return Ok(InitialStateAnchor::default());
+        };
+
+        // 2) Completed: anchor exists + earliest is set
+        let completed = self.get_earliest_block_number()?.is_some();
+
+        // 3) InProgress / Completed: populate details
+        Ok(InitialStateAnchor {
+            block: Some(block),
+            status: if completed {
+                InitialStateStatus::Completed
+            } else {
+                InitialStateStatus::InProgress
+            },
+            latest_account_trie_key: self.get_latest_key::<AccountTrieHistory>()?,
+            latest_storage_trie_key: self.get_latest_key::<StorageTrieHistory>()?,
+            latest_hashed_account_key: self.get_latest_key::<HashedAccountHistory>()?,
+            latest_hashed_storage_key: self.get_latest_key::<HashedStorageHistory>()?,
+        })
+    }
+
+    fn set_initial_state_anchor(&self, anchor: BlockNumHash) -> OpProofsStorageResult<()> {
+        self.env.update(|tx| {
+            let mut cur = tx.cursor_write::<ProofWindow>()?;
+            cur.insert(ProofWindowKey::InitialStateAnchor, &anchor.into())?;
+            Ok(())
+        })?
+    }
+
+    fn store_account_branches(
+        &self,
+        account_nodes: Vec<(Nibbles, Option<BranchNodeCompact>)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut account_nodes = account_nodes;
+        if account_nodes.is_empty() {
+            return Ok(());
+        }
+
+        account_nodes.sort_by_key(|(key, _)| *key);
+
+        self.env.update(|tx| {
+            self.persist_history_batch(tx, 0, account_nodes.into_iter(), true)?;
+            Ok(())
+        })?
+    }
+
+    fn store_storage_branches(
+        &self,
+        hashed_address: B256,
+        storage_nodes: Vec<(Nibbles, Option<BranchNodeCompact>)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut storage_nodes = storage_nodes;
+        if storage_nodes.is_empty() {
+            return Ok(());
+        }
+
+        storage_nodes.sort_by_key(|(key, _)| *key);
+
+        self.env.update(|tx| {
+            self.persist_history_batch(
+                tx,
+                0,
+                storage_nodes.into_iter().map(|(path, node)| (hashed_address, path, node)),
+                true,
+            )?;
+            Ok(())
+        })?
+    }
+
+    fn store_hashed_accounts(
+        &self,
+        accounts: Vec<(B256, Option<Account>)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut accounts = accounts;
+        if accounts.is_empty() {
+            return Ok(());
+        }
+
+        // sort the accounts by key to ensure insertion is efficient
+        accounts.sort_by_key(|(key, _)| *key);
+
+        self.env.update(|tx| {
+            self.persist_history_batch(tx, 0, accounts.into_iter(), true)?;
+            Ok(())
+        })?
+    }
+
+    fn store_hashed_storages(
+        &self,
+        hashed_address: B256,
+        storages: Vec<(B256, U256)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut storages = storages;
+        if storages.is_empty() {
+            return Ok(());
+        }
+
+        // sort the storages by key to ensure insertion is efficient
+        storages.sort_by_key(|(key, _)| *key);
+
+        self.env.update(|tx| {
+            self.persist_history_batch(
+                tx,
+                0,
+                storages
+                    .into_iter()
+                    .map(|(key, val)| (hashed_address, key, Some(StorageValue(val)))),
+                true,
+            )?;
+            Ok(())
+        })?
+    }
+
+    fn commit_initial_state(&self) -> OpProofsStorageResult<BlockNumHash> {
+        let anchor = self.get_initial_state_anchor()?.ok_or(NoBlocksFound)?;
+        self.set_earliest_block_number(anchor.number, anchor.hash)?;
+        Ok(anchor)
+    }
+}
+
+/// This implementation is copied from the
+/// [`DatabaseMetrics`](reth_db::database_metrics::DatabaseMetrics) implementation for
+/// [`DatabaseEnv`]. As the implementation hard-coded the table name, we need to reimplement it.
+#[cfg(feature = "metrics")]
+impl reth_db::database_metrics::DatabaseMetrics for MdbxProofsStorage {
+    fn report_metrics(&self) {
+        for (name, value, labels) in self.gauge_metrics() {
+            gauge!(name, labels).set(value);
+        }
+    }
+
+    fn gauge_metrics(&self) -> Vec<(&'static str, f64, Vec<Label>)> {
+        use eyre::WrapErr;
+        use tracing::error;
+
+        let mut metrics = Vec::new();
+
+        let _ = self
+            .env
+            .view(|tx| {
+                for table in Tables::ALL.iter().map(Tables::name) {
+                    let table_db =
+                        tx.inner().open_db(Some(table)).wrap_err("Could not open db.")?;
+
+                    let stats = tx
+                        .inner()
+                        .db_stat(table_db.dbi())
+                        .wrap_err(format!("Could not find table: {table}"))?;
+
+                    let page_size = stats.page_size() as usize;
+                    let leaf_pages = stats.leaf_pages();
+                    let branch_pages = stats.branch_pages();
+                    let overflow_pages = stats.overflow_pages();
+                    let num_pages = leaf_pages + branch_pages + overflow_pages;
+                    let table_size = page_size * num_pages;
+                    let entries = stats.entries();
+
+                    metrics.push((
+                        "optimism_proof_storage.table_size",
+                        table_size as f64,
+                        vec![Label::new("table", table)],
+                    ));
+                    metrics.push((
+                        "optimism_proof_storage.table_pages",
+                        leaf_pages as f64,
+                        vec![Label::new("table", table), Label::new("type", "leaf")],
+                    ));
+                    metrics.push((
+                        "optimism_proof_storage.table_pages",
+                        branch_pages as f64,
+                        vec![Label::new("table", table), Label::new("type", "branch")],
+                    ));
+                    metrics.push((
+                        "optimism_proof_storage.table_pages",
+                        overflow_pages as f64,
+                        vec![Label::new("table", table), Label::new("type", "overflow")],
+                    ));
+                    metrics.push((
+                        "optimism_proof_storage.table_entries",
+                        entries as f64,
+                        vec![Label::new("table", table)],
+                    ));
+                }
+
+                Ok::<(), eyre::Report>(())
+            })
+            .map_err(|error| error!(%error, "Failed to read db table stats"));
+
+        if let Ok(freelist) =
+            self.env.freelist().map_err(|error| error!(%error, "Failed to read db.freelist"))
+        {
+            metrics.push(("optimism_proof_storage.freelist", freelist as f64, vec![]));
+        }
+
+        if let Ok(stat) = self.env.stat().map_err(|error| error!(%error, "Failed to read db.stat"))
+        {
+            metrics.push(("optimism_proof_storage.page_size", stat.page_size() as f64, vec![]));
+        }
+
+        metrics.push((
+            "optimism_proof_storage.timed_out_not_aborted_transactions",
+            self.env.timed_out_not_aborted_transactions() as f64,
+            vec![],
+        ));
+
+        metrics
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::db::{
+        StorageTrieKey,
+        models::{AccountTrieHistory, StorageTrieHistory},
+    };
+    use alloy_eips::NumHash;
+    use alloy_primitives::B256;
+    use reth_db::{
+        DatabaseError,
+        cursor::DbDupCursorRO,
+        transaction::{DbTx, DbTxMut},
+    };
+    use reth_trie::{
+        BranchNodeCompact, HashedPostStateSorted, HashedStorage, Nibbles, StoredNibbles,
+        updates::{StorageTrieUpdates, TrieUpdatesSorted},
+    };
+    use tempfile::TempDir;
+
+    const B0: u64 = 0;
+
+    #[test]
+    fn store_hashed_accounts_writes_versioned_values() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::from([0xAA; 32]);
+        let account = Account::default();
+        store.store_hashed_accounts(vec![(addr, Some(account))]).expect("write accounts");
+
+        let tx = store.env.tx().expect("ro tx");
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+        let vv = cur.seek_by_key_subkey(addr, B0).expect("seek");
+        let vv = vv.expect("entry exists");
+
+        assert_eq!(vv.block_number, B0);
+        assert_eq!(vv.value.0, Some(account));
+    }
+
+    #[test]
+    fn store_hashed_accounts_multiple_items_unsorted() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Unsorted input, mixed Some/None (deletion)
+        let a1 = B256::from([0x01; 32]);
+        let a2 = B256::from([0x02; 32]);
+        let a3 = B256::from([0x03; 32]);
+        let acc1 = Account { nonce: 2, balance: U256::from(1000u64), ..Default::default() };
+        let acc3 = Account { nonce: 1, balance: U256::from(10000u64), ..Default::default() };
+
+        store
+            .store_hashed_accounts(vec![(a2, None), (a1, Some(acc1)), (a3, Some(acc3))])
+            .expect("write");
+
+        let tx = store.env.tx().expect("ro tx");
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+
+        let v1 = cur.seek_by_key_subkey(a1, B0).expect("seek a1").expect("exists a1");
+        assert_eq!(v1.block_number, B0);
+        assert_eq!(v1.value.0, Some(acc1));
+
+        let v2 = cur.seek_by_key_subkey(a2, B0).expect("seek a2").expect("exists a2");
+        assert_eq!(v2.block_number, B0);
+        assert!(v2.value.0.is_none(), "a2 is none");
+
+        let v3 = cur.seek_by_key_subkey(a3, B0).expect("seek a3").expect("exists a3");
+        assert_eq!(v3.block_number, B0);
+        assert_eq!(v3.value.0, Some(acc3));
+    }
+
+    #[test]
+    fn store_hashed_accounts_multiple_calls() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Unsorted input, mixed Some/None (deletion)
+        let a1 = B256::from([0x01; 32]);
+        let a2 = B256::from([0x02; 32]);
+        let a3 = B256::from([0x03; 32]);
+        let a4 = B256::from([0x04; 32]);
+        let a5 = B256::from([0x05; 32]);
+        let acc1 = Account { nonce: 2, balance: U256::from(1000u64), ..Default::default() };
+        let acc3 = Account { nonce: 1, balance: U256::from(10000u64), ..Default::default() };
+        let acc4 = Account { nonce: 5, balance: U256::from(5000u64), ..Default::default() };
+        let acc5 = Account { nonce: 10, balance: U256::from(20000u64), ..Default::default() };
+
+        {
+            store
+                .store_hashed_accounts(vec![(a2, None), (a1, Some(acc1)), (a4, Some(acc4))])
+                .expect("write");
+
+            let tx = store.env.tx().expect("ro tx");
+            let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+
+            let v1 = cur.seek_by_key_subkey(a1, B0).expect("seek a1").expect("exists a1");
+            assert_eq!(v1.block_number, B0);
+            assert_eq!(v1.value.0, Some(acc1));
+
+            let v2 = cur.seek_by_key_subkey(a2, B0).expect("seek a2").expect("exists a2");
+            assert_eq!(v2.block_number, B0);
+            assert!(v2.value.0.is_none(), "a2 is none");
+
+            let v4 = cur.seek_by_key_subkey(a4, B0).expect("seek a4").expect("exists a4");
+            assert_eq!(v4.block_number, B0);
+            assert_eq!(v4.value.0, Some(acc4));
+        }
+
+        {
+            // Second call
+            store.store_hashed_accounts(vec![(a5, Some(acc5)), (a3, Some(acc3))]).expect("write");
+
+            let tx = store.env.tx().expect("ro tx");
+            let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+
+            let v3 = cur.seek_by_key_subkey(a3, B0).expect("seek a3").expect("exists a3");
+            assert_eq!(v3.block_number, B0);
+            assert_eq!(v3.value.0, Some(acc3));
+
+            let v5 = cur.seek_by_key_subkey(a5, B0).expect("seek a5").expect("exists a5");
+            assert_eq!(v5.block_number, B0);
+            assert_eq!(v5.value.0, Some(acc5));
+        }
+    }
+
+    #[test]
+    fn store_hashed_storages_writes_versioned_values() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::from([0x11; 32]);
+        let slot = B256::from([0x22; 32]);
+        let val = U256::from(0x1234u64);
+
+        store.store_hashed_storages(addr, vec![(slot, val)]).expect("write storage");
+
+        let tx = store.env.tx().expect("ro tx");
+        let mut cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+        let key = HashedStorageKey::new(addr, slot);
+        let vv = cur.seek_by_key_subkey(key, B0).expect("seek");
+        let vv = vv.expect("entry exists");
+
+        assert_eq!(vv.block_number, B0);
+        let inner = vv.value.0.as_ref().expect("Some(StorageValue)");
+        assert_eq!(inner.0, val);
+    }
+
+    #[test]
+    fn store_hashed_storages_multiple_slots_unsorted() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::from([0x11; 32]);
+        let s1 = B256::from([0x01; 32]);
+        let v1 = U256::from(1u64);
+        let s2 = B256::from([0x02; 32]);
+        let v2 = U256::from(2u64);
+        let s3 = B256::from([0x03; 32]);
+        let v3 = U256::from(3u64);
+
+        store.store_hashed_storages(addr, vec![(s2, v2), (s1, v1), (s3, v3)]).expect("write");
+
+        let tx = store.env.tx().expect("ro tx");
+        let mut cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+
+        for (slot, expected) in [(s1, v1), (s2, v2), (s3, v3)] {
+            let key = HashedStorageKey::new(addr, slot);
+            let vv = cur.seek_by_key_subkey(key, B0).expect("seek").expect("exists");
+            assert_eq!(vv.block_number, B0);
+            let inner = vv.value.0.as_ref().expect("Some(StorageValue)");
+            assert_eq!(inner.0, expected);
+        }
+    }
+
+    #[test]
+    fn store_hashed_storages_multiple_calls() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::from([0x11; 32]);
+        let s1 = B256::from([0x01; 32]);
+        let v1 = U256::from(1u64);
+        let s2 = B256::from([0x02; 32]);
+        let v2 = U256::from(2u64);
+        let s3 = B256::from([0x03; 32]);
+        let v3 = U256::from(3u64);
+        let s4 = B256::from([0x04; 32]);
+        let v4 = U256::from(4u64);
+        let s5 = B256::from([0x05; 32]);
+        let v5 = U256::from(5u64);
+
+        {
+            store.store_hashed_storages(addr, vec![(s2, v2), (s1, v1), (s5, v5)]).expect("write");
+
+            let tx = store.env.tx().expect("ro tx");
+            let mut cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+
+            for (slot, expected) in [(s1, v1), (s2, v2), (s5, v5)] {
+                let key = HashedStorageKey::new(addr, slot);
+                let vv = cur.seek_by_key_subkey(key, B0).expect("seek").expect("exists");
+                assert_eq!(vv.block_number, B0);
+                let inner = vv.value.0.as_ref().expect("Some(StorageValue)");
+                assert_eq!(inner.0, expected);
+            }
+        }
+
+        {
+            // Second call
+            store.store_hashed_storages(addr, vec![(s4, v4), (s3, v3)]).expect("write");
+
+            let tx = store.env.tx().expect("ro tx");
+            let mut cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+
+            for (slot, expected) in [(s4, v4), (s3, v3)] {
+                let key = HashedStorageKey::new(addr, slot);
+                let vv = cur.seek_by_key_subkey(key, B0).expect("seek").expect("exists");
+                assert_eq!(vv.block_number, B0);
+                let inner = vv.value.0.as_ref().expect("Some(StorageValue)");
+                assert_eq!(inner.0, expected);
+            }
+        }
+    }
+
+    #[test]
+    fn test_store_account_branches_writes_versioned_values() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let nibble = Nibbles::from_nibbles_unchecked([0x12, 0x34]);
+        let branch_node = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let updates = vec![(nibble, Some(branch_node.clone()))];
+
+        store.store_account_branches(updates).expect("write");
+
+        let tx = store.env.tx().expect("ro tx");
+        let mut cur = tx.cursor_dup_read::<AccountTrieHistory>().expect("cursor");
+
+        let vv = cur
+            .seek_by_key_subkey(StoredNibbles::from(nibble), B0)
+            .expect("seek")
+            .expect("entry exists");
+
+        assert_eq!(vv.block_number, B0);
+        assert_eq!(vv.value.0, Some(branch_node));
+    }
+
+    #[test]
+    fn test_store_account_branches_multiple_items_unsorted() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let n1 = Nibbles::from_nibbles_unchecked([0x01]);
+        let b1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let n2 = Nibbles::from_nibbles_unchecked([0x02]);
+        let n3 = Nibbles::from_nibbles_unchecked([0x03]);
+        let b3 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+
+        let updates = vec![(n2, None), (n1, Some(b1)), (n3, Some(b3))];
+        store.store_account_branches(updates.clone()).expect("write");
+
+        let tx = store.env.tx().expect("ro tx");
+        let mut cur = tx.cursor_dup_read::<AccountTrieHistory>().expect("cursor");
+
+        for (nibble, branch) in updates {
+            let v = cur
+                .seek_by_key_subkey(StoredNibbles::from(nibble), B0)
+                .expect("seek")
+                .expect("exists");
+            assert_eq!(v.block_number, B0);
+            assert_eq!(v.value.0, branch);
+        }
+    }
+
+    #[test]
+    fn store_account_branches_multiple_calls() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let n1 = Nibbles::from_nibbles_unchecked([0x01]);
+        let b1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let n2 = Nibbles::from_nibbles_unchecked([0x02]);
+        let n3 = Nibbles::from_nibbles_unchecked([0x03]);
+        let b3 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let n4 = Nibbles::from_nibbles_unchecked([0x04]);
+        let b4 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let n5 = Nibbles::from_nibbles_unchecked([0x05]);
+        let b5 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+
+        {
+            let updates1 = vec![(n2, None), (n1, Some(b1)), (n4, Some(b4))];
+            store.store_account_branches(updates1.clone()).expect("write");
+
+            let tx = store.env.tx().expect("ro tx");
+            let mut cur = tx.cursor_dup_read::<AccountTrieHistory>().expect("cursor");
+
+            for (nibble, branch) in updates1 {
+                let v = cur
+                    .seek_by_key_subkey(StoredNibbles::from(nibble), B0)
+                    .expect("seek")
+                    .expect("exists");
+                assert_eq!(v.block_number, B0);
+                assert_eq!(v.value.0, branch);
+            }
+        }
+
+        {
+            // Second call
+            let updates2 = vec![(n5, Some(b5)), (n3, Some(b3))];
+            store.store_account_branches(updates2.clone()).expect("write");
+
+            let tx = store.env.tx().expect("ro tx");
+            let mut cur = tx.cursor_dup_read::<AccountTrieHistory>().expect("cursor");
+
+            for (nibble, branch) in updates2 {
+                let v = cur
+                    .seek_by_key_subkey(StoredNibbles::from(nibble), B0)
+                    .expect("seek")
+                    .expect("exists");
+                assert_eq!(v.block_number, B0);
+                assert_eq!(v.value.0, branch);
+            }
+        }
+    }
+
+    #[test]
+    fn test_store_storage_branches_writes_versioned_values() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let hashed_address = B256::random();
+        let nibble = Nibbles::from_nibbles_unchecked([0x12, 0x34]);
+        let branch_node = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let items = vec![(nibble, Some(branch_node.clone()))];
+
+        store.store_storage_branches(hashed_address, items).expect("write");
+
+        let tx = store.env.tx().expect("ro tx");
+        let mut cur = tx.cursor_dup_read::<StorageTrieHistory>().expect("cursor");
+
+        let key = StorageTrieKey::new(hashed_address, StoredNibbles::from(nibble));
+        let vv = cur.seek_by_key_subkey(key, B0).expect("seek").expect("entry exists");
+
+        assert_eq!(vv.block_number, B0);
+        assert_eq!(vv.value.0, Some(branch_node));
+    }
+
+    #[test]
+    fn store_storage_branches_multiple_items_unsorted() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let hashed_address = B256::random();
+        let n1 = Nibbles::from_nibbles_unchecked([0x01]);
+        let b1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let n2 = Nibbles::from_nibbles_unchecked([0x02]);
+        let n3 = Nibbles::from_nibbles_unchecked([0x03]);
+        let b3 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+
+        let items = vec![(n2, None), (n1, Some(b1)), (n3, Some(b3))];
+        store.store_storage_branches(hashed_address, items.clone()).expect("write");
+
+        let tx = store.env.tx().expect("ro tx");
+        let mut cur = tx.cursor_dup_read::<StorageTrieHistory>().expect("cursor");
+
+        for (nibble, branch) in items {
+            let key = StorageTrieKey::new(hashed_address, StoredNibbles::from(nibble));
+            let v = cur.seek_by_key_subkey(key, B0).expect("seek").expect("exists");
+            assert_eq!(v.block_number, B0);
+            assert_eq!(v.value.0, branch);
+        }
+    }
+
+    #[test]
+    fn store_storage_branches_multiple_calls() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let hashed_address = B256::random();
+        let n1 = Nibbles::from_nibbles_unchecked([0x01]);
+        let b1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let n2 = Nibbles::from_nibbles_unchecked([0x02]);
+        let n3 = Nibbles::from_nibbles_unchecked([0x03]);
+        let b3 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let n4 = Nibbles::from_nibbles_unchecked([0x04]);
+        let b4 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let n5 = Nibbles::from_nibbles_unchecked([0x05]);
+        let b5 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+
+        {
+            let items1 = vec![(n2, None), (n1, Some(b1)), (n5, Some(b5))];
+            store.store_storage_branches(hashed_address, items1.clone()).expect("write");
+
+            let tx = store.env.tx().expect("ro tx");
+            let mut cur = tx.cursor_dup_read::<StorageTrieHistory>().expect("cursor");
+
+            for (nibble, branch) in items1 {
+                let key = StorageTrieKey::new(hashed_address, StoredNibbles::from(nibble));
+                let v = cur.seek_by_key_subkey(key, B0).expect("seek").expect("exists");
+                assert_eq!(v.block_number, B0);
+                assert_eq!(v.value.0, branch);
+            }
+        }
+
+        {
+            // Second call
+            let items2 = vec![(n4, Some(b4)), (n3, Some(b3))];
+            store.store_storage_branches(hashed_address, items2.clone()).expect("write");
+
+            let tx = store.env.tx().expect("ro tx");
+            let mut cur = tx.cursor_dup_read::<StorageTrieHistory>().expect("cursor");
+
+            for (nibble, branch) in items2 {
+                let key = StorageTrieKey::new(hashed_address, StoredNibbles::from(nibble));
+                let v = cur.seek_by_key_subkey(key, B0).expect("seek").expect("exists");
+                assert_eq!(v.block_number, B0);
+                assert_eq!(v.value.0, branch);
+            }
+        }
+    }
+
+    #[test]
+    fn test_store_trie_updates_comprehensive() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Sample block number
+        const BLOCK: BlockWithParent =
+            BlockWithParent::new(B256::ZERO, NumHash::new(42, B256::ZERO));
+
+        // Sample addresses and keys
+        let addr1 = B256::from([0x11; 32]);
+        let addr2 = B256::from([0x22; 32]);
+        let slot1 = B256::from([0xA1; 32]);
+        let slot2 = B256::from([0xA2; 32]);
+
+        // Sample accounts
+        let acc1 = Account { nonce: 1, balance: U256::from(100), ..Default::default() };
+
+        // Sample storage values
+        let val1 = U256::from(1234u64);
+        let val2 = U256::from(5678u64);
+
+        // Sample trie paths
+        let account_path1 = Nibbles::from_nibbles_unchecked(vec![0, 1, 2, 3]);
+        let account_path2 = Nibbles::from_nibbles_unchecked(vec![4, 5, 6, 7]);
+        let removed_account_path = Nibbles::from_nibbles_unchecked(vec![7, 8, 9]);
+
+        let account_node1 = BranchNodeCompact::default();
+        let account_node2 = BranchNodeCompact::default();
+
+        let storage_path1 = Nibbles::from_nibbles_unchecked(vec![1, 2, 3, 4]);
+        let storage_path2 = Nibbles::from_nibbles_unchecked(vec![8, 9, 0, 1]);
+
+        let storage_node1 = BranchNodeCompact::default();
+        let storage_node2 = BranchNodeCompact::default();
+
+        // Construct test BlockStateDiff
+        let mut block_state_diff_trie_updates = TrieUpdates::default();
+        let mut block_state_diff_post_state = HashedPostState::default();
+
+        // Add account trie nodes
+        block_state_diff_trie_updates.account_nodes.insert(account_path1, account_node1);
+        block_state_diff_trie_updates.account_nodes.insert(account_path2, account_node2);
+        block_state_diff_trie_updates.removed_nodes.insert(removed_account_path);
+
+        // Add storage trie nodes for two addresses
+        let mut storage_nodes1 = StorageTrieUpdates::default();
+        storage_nodes1.storage_nodes.insert(storage_path1, storage_node1);
+        block_state_diff_trie_updates.storage_tries.insert(addr1, storage_nodes1);
+
+        let mut storage_nodes2 = StorageTrieUpdates::default();
+        storage_nodes2.storage_nodes.insert(storage_path2, storage_node2);
+        block_state_diff_trie_updates.storage_tries.insert(addr2, storage_nodes2);
+
+        // Add hashed accounts (one Some, one None)
+        block_state_diff_post_state.accounts.insert(addr1, Some(acc1));
+        block_state_diff_post_state.accounts.insert(addr2, None); // Deletion
+
+        // Add storage slots for both addresses
+        let mut storage1 = HashedStorage::default();
+        storage1.storage.insert(slot1, val1);
+        block_state_diff_post_state.storages.insert(addr1, storage1);
+
+        let mut storage2 = HashedStorage::default();
+        storage2.storage.insert(slot2, val2);
+        block_state_diff_post_state.storages.insert(addr2, storage2);
+
+        // Store everything
+        let block_state_diff = BlockStateDiff {
+            sorted_trie_updates: block_state_diff_trie_updates.into_sorted(),
+            sorted_post_state: block_state_diff_post_state.into_sorted(),
+        };
+        store.store_trie_updates(BLOCK, block_state_diff).expect("store");
+
+        // Verify account trie nodes
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<AccountTrieHistory>().expect("cursor");
+
+            // Check first node
+            let vv1 = cur
+                .seek_by_key_subkey(account_path1.into(), BLOCK.block.number)
+                .expect("seek")
+                .expect("exists");
+            assert_eq!(vv1.block_number, BLOCK.block.number);
+            assert!(vv1.value.0.is_some());
+
+            // Check second node
+            let vv2 = cur
+                .seek_by_key_subkey(account_path2.into(), BLOCK.block.number)
+                .expect("seek")
+                .expect("exists");
+            assert_eq!(vv2.block_number, BLOCK.block.number);
+            assert!(vv2.value.0.is_some());
+
+            // Check removed node
+            let vv3 = cur
+                .seek_by_key_subkey(removed_account_path.into(), BLOCK.block.number)
+                .expect("seek")
+                .expect("exists");
+            assert_eq!(vv3.block_number, BLOCK.block.number);
+            assert!(vv3.value.0.is_none(), "Expected node deletion");
+        }
+
+        // Verify storage trie nodes
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<StorageTrieHistory>().expect("cursor");
+
+            // Check node for addr1
+            let key1 = StorageTrieKey::new(addr1, storage_path1.into());
+            let vv1 =
+                cur.seek_by_key_subkey(key1, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv1.block_number, BLOCK.block.number);
+            assert!(vv1.value.0.is_some());
+
+            // Check node for addr2
+            let key2 = StorageTrieKey::new(addr2, storage_path2.into());
+            let vv2 =
+                cur.seek_by_key_subkey(key2, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv2.block_number, BLOCK.block.number);
+            assert!(vv2.value.0.is_some());
+        }
+
+        // Verify hashed accounts
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+
+            // Check account1 (exists)
+            let vv1 =
+                cur.seek_by_key_subkey(addr1, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv1.block_number, BLOCK.block.number);
+            assert_eq!(vv1.value.0, Some(acc1));
+
+            // Check account2 (deletion)
+            let vv2 =
+                cur.seek_by_key_subkey(addr2, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv2.block_number, BLOCK.block.number);
+            assert!(vv2.value.0.is_none(), "Expected account deletion");
+        }
+
+        // Verify hashed storages
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+
+            // Check storage for addr1
+            let key1 = HashedStorageKey::new(addr1, slot1);
+            let vv1 =
+                cur.seek_by_key_subkey(key1, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv1.block_number, BLOCK.block.number);
+            let inner1 = vv1.value.0.as_ref().expect("Some(StorageValue)");
+            assert_eq!(inner1.0, val1);
+
+            // Check storage for addr2
+            let key2 = HashedStorageKey::new(addr2, slot2);
+            let vv2 =
+                cur.seek_by_key_subkey(key2, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv2.block_number, BLOCK.block.number);
+            let inner2 = vv2.value.0.as_ref().expect("Some(StorageValue)");
+            assert_eq!(inner2.0, val2);
+        }
+
+        // Verify BlockChangeSet entries
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<BlockChangeSet>().expect("cursor");
+            let entries: Vec<_> = cur.walk(Some(BLOCK.block.number)).expect("walk").collect();
+            assert_eq!(entries.len(), 1, "Expected 1 BlockChangeSet entry");
+        }
+
+        // check the latest block number in proof window
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut proof_window_cursor = tx.new_cursor::<ProofWindow>().expect("cursor");
+            let latest_block = proof_window_cursor
+                .seek(ProofWindowKey::LatestBlock)
+                .expect("seek")
+                .expect("exists");
+            assert_eq!(latest_block.1.number(), BLOCK.block.number);
+            assert_eq!(*latest_block.1.hash(), BLOCK.block.hash);
+        }
+    }
+
+    #[test]
+    fn store_trie_updates_out_of_order_rejects() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // set latest to some hash H1
+        let existing_block = BlockWithParent::new(B256::random(), NumHash::new(1, B256::random()));
+        store
+            .set_earliest_block_number(existing_block.block.number, existing_block.block.hash)
+            .expect("set");
+
+        // incoming block whose parent != existing latest
+        let bad_parent = B256::from([0xFF; 32]);
+        let bad_block = BlockWithParent::new(bad_parent, NumHash::new(2, B256::ZERO));
+        let diff = BlockStateDiff::default();
+
+        let res = store.store_trie_updates(bad_block, diff);
+        assert!(matches!(res, Err(OpProofsStorageError::OutOfOrder { .. })));
+        // verify nothing written: proof window still unchanged
+        let latest = store.get_latest_block_number().expect("get latest");
+        assert_eq!(latest.unwrap().1, existing_block.block.hash);
+    }
+
+    #[test]
+    fn store_trie_updates_multiple_blocks_append_versions() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::from([0x21; 32]);
+        // block A (parent = ZERO)
+        let block_a = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let mut diff_a_post_state = HashedPostState::default();
+        diff_a_post_state.accounts.insert(addr, Some(Account::default()));
+
+        let diff_a = BlockStateDiff {
+            sorted_trie_updates: TrieUpdatesSorted::default(),
+            sorted_post_state: diff_a_post_state.into_sorted(),
+        };
+        store.store_trie_updates(block_a, diff_a).expect("store A");
+
+        // block B (parent = hash of A)
+        let block_b = BlockWithParent::new(block_a.block.hash, NumHash::new(2, B256::random()));
+        let mut diff_b_post_state = HashedPostState::default();
+        diff_b_post_state.accounts.insert(addr, Some(Account { nonce: 5, ..Default::default() }));
+
+        let diff_b = BlockStateDiff {
+            sorted_trie_updates: TrieUpdatesSorted::default(),
+            sorted_post_state: diff_b_post_state.into_sorted(),
+        };
+        store.store_trie_updates(block_b, diff_b).expect("store B");
+
+        // verify we can retrieve entries for both block numbers
+        let tx = store.env.tx().expect("tx");
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+        let v_a =
+            cur.seek_by_key_subkey(addr, block_a.block.number).expect("seek").expect("exists");
+        let v_b =
+            cur.seek_by_key_subkey(addr, block_b.block.number).expect("seek").expect("exists");
+        assert_eq!(v_a.block_number, block_a.block.number);
+        assert_eq!(v_b.block_number, block_b.block.number);
+    }
+
+    #[test]
+    fn test_store_trie_updates_empty_collections() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        const BLOCK: BlockWithParent =
+            BlockWithParent::new(B256::ZERO, NumHash::new(42, B256::ZERO));
+
+        // Create BlockStateDiff with empty collections
+        let block_state_diff = BlockStateDiff::default();
+
+        // This should work without errors
+        store.store_trie_updates(BLOCK, block_state_diff).expect("store");
+
+        // Verify nothing was written (should be empty)
+        let tx = store.env.tx().expect("tx");
+
+        let mut cur1 = tx.new_cursor::<AccountTrieHistory>().expect("cursor");
+        assert!(cur1.next_dup_val().expect("first").is_none(), "Account trie should be empty");
+
+        let mut cur2 = tx.new_cursor::<StorageTrieHistory>().expect("cursor");
+        assert!(cur2.next_dup_val().expect("first").is_none(), "Storage trie should be empty");
+
+        let mut cur3 = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+        assert!(cur3.next_dup_val().expect("first").is_none(), "Hashed accounts should be empty");
+
+        let mut cur4 = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+        assert!(cur4.next_dup_val().expect("first").is_none(), "Hashed storage should be empty");
+
+        let mut cur5 = tx.new_cursor::<BlockChangeSet>().expect("cursor");
+        assert!(
+            cur5.next().expect("first").is_some(),
+            "Pruning index SHOULD populate the change set even for empty diffs"
+        );
+    }
+
+    #[test]
+    fn fetch_trie_updates_missing_changeset_returns_error() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let res = store.fetch_trie_updates(99);
+        assert!(matches!(res, Err(OpProofsStorageError::NoChangeSetForBlock(99))));
+    }
+
+    #[test]
+    fn fetch_trie_updates_empty_changeset() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let block = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let diff = BlockStateDiff::default();
+
+        store.store_trie_updates(block, diff).expect("store");
+        let got = store.fetch_trie_updates(1).expect("fetch");
+        assert!(got.sorted_trie_updates.account_nodes_ref().is_empty());
+        assert!(got.sorted_trie_updates.storage_tries_ref().is_empty());
+        assert!(got.sorted_post_state.accounts.is_empty());
+        assert!(got.sorted_post_state.storages.is_empty());
+    }
+
+    #[test]
+    fn fetch_trie_updates_missing_account_history_entry_returns_error() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // prepare ChangeSet that references StoredNibbles for account key
+        // (insert ChangeSet into BlockChangeSet directly using tx)
+        {
+            let tx = store.env.tx_mut().unwrap();
+            let mut cur = tx.cursor_write::<BlockChangeSet>().unwrap();
+            cur.insert(
+                1,
+                &ChangeSet {
+                    account_trie_keys: vec![StoredNibbles::default()],
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        let res = store.fetch_trie_updates(1);
+        assert!(matches!(res, Err(OpProofsStorageError::MissingAccountTrieHistory(..))));
+    }
+
+    #[test]
+    fn fetch_trie_updates_account_history_seek_returns_later_block_treated_as_missing() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // manually insert account history and ChangeSet for block 1 referencing same key
+        {
+            let tx = store.env.tx_mut().unwrap();
+            let mut acc_cur = tx.cursor_write::<AccountTrieHistory>().unwrap();
+            acc_cur
+                .insert(
+                    StoredNibbles::from(Nibbles::from_nibbles_unchecked([0x1])),
+                    &VersionedValue::new(2, MaybeDeleted(Some(BranchNodeCompact::default()))),
+                )
+                .unwrap();
+
+            let mut cur = tx.cursor_write::<BlockChangeSet>().unwrap();
+            cur.insert(
+                1,
+                &ChangeSet {
+                    account_trie_keys: vec![StoredNibbles::from(Nibbles::from_nibbles_unchecked(
+                        [0x1],
+                    ))],
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        // fetch block 1 -> seek will find block 2 but block_number != 1 so expect
+        // MissingAccountTrieHistory
+        let res = store.fetch_trie_updates(1);
+        assert!(matches!(res, Err(OpProofsStorageError::MissingAccountTrieHistory(..))));
+    }
+
+    #[test]
+    fn fetch_trie_updates_missing_storage_history_entry_returns_error() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // prepare ChangeSet that references StorageTrieKey for storage trie
+        // (insert ChangeSet into BlockChangeSet directly using tx)
+        {
+            let tx = store.env.tx_mut().unwrap();
+            let mut cur = tx.cursor_write::<BlockChangeSet>().unwrap();
+            cur.insert(
+                1,
+                &ChangeSet {
+                    storage_trie_keys: vec![StorageTrieKey::new(
+                        B256::from([0u8; 32]),
+                        StoredNibbles::default(),
+                    )],
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        let res = store.fetch_trie_updates(1);
+        assert!(matches!(res, Err(OpProofsStorageError::MissingStorageTrieHistory(..))));
+    }
+
+    #[test]
+    fn fetch_trie_updates_storage_history_seek_returns_later_block_treated_as_missing() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // manually insert storage history and ChangeSet for block 1 referencing same key
+        {
+            let tx = store.env.tx_mut().unwrap();
+            let mut stor_cur = tx.cursor_write::<StorageTrieHistory>().unwrap();
+            stor_cur
+                .insert(
+                    StorageTrieKey::new(
+                        B256::from([0u8; 32]),
+                        StoredNibbles::from(Nibbles::from_nibbles_unchecked([0x1])),
+                    ),
+                    &VersionedValue::new(2, MaybeDeleted(Some(BranchNodeCompact::default()))),
+                )
+                .unwrap();
+
+            let mut cur = tx.cursor_write::<BlockChangeSet>().unwrap();
+            cur.insert(
+                1,
+                &ChangeSet {
+                    storage_trie_keys: vec![StorageTrieKey::new(
+                        B256::from([0u8; 32]),
+                        StoredNibbles::from(Nibbles::from_nibbles_unchecked([0x1])),
+                    )],
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        // fetch block 1 -> seek will find block 2 but block_number != 1 so expect
+        // MissingStorageTrieHistory
+        let res = store.fetch_trie_updates(1);
+        assert!(matches!(res, Err(OpProofsStorageError::MissingStorageTrieHistory(..))));
+    }
+
+    #[test]
+    fn fetch_trie_updates_missing_hashed_account_entry_returns_error() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // prepare ChangeSet that references hashed account address
+        // (insert ChangeSet into BlockChangeSet directly using tx)
+        {
+            let tx = store.env.tx_mut().unwrap();
+            let mut cur = tx.cursor_write::<BlockChangeSet>().unwrap();
+            cur.insert(
+                1,
+                &ChangeSet {
+                    hashed_account_keys: vec![B256::from([0u8; 32])],
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        let res = store.fetch_trie_updates(1);
+        assert!(matches!(res, Err(OpProofsStorageError::MissingHashedAccountHistory(..))));
+    }
+
+    #[test]
+    fn fetch_trie_updates_hashed_account_seek_returns_later_block_treated_as_missing() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // manually insert hashed account history and ChangeSet for block 1 referencing same key
+        {
+            let tx = store.env.tx_mut().unwrap();
+            let mut acc_cur = tx.cursor_write::<HashedAccountHistory>().unwrap();
+            acc_cur
+                .insert(
+                    B256::from([0u8; 32]),
+                    &VersionedValue::new(2, MaybeDeleted(Some(Account::default()))),
+                )
+                .unwrap();
+
+            let mut cur = tx.cursor_write::<BlockChangeSet>().unwrap();
+            cur.insert(
+                1,
+                &ChangeSet {
+                    hashed_account_keys: vec![B256::from([0u8; 32])],
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        // fetch block 1 -> seek will find block 2 but block_number != 1 so expect
+        // MissingHashedAccountHistory
+        let res = store.fetch_trie_updates(1);
+        assert!(matches!(res, Err(OpProofsStorageError::MissingHashedAccountHistory(..))));
+    }
+
+    #[test]
+    fn fetch_trie_updates_missing_hashed_storage_entry_returns_error() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // prepare ChangeSet that references hashed storage key
+        // (insert ChangeSet into BlockChangeSet directly using tx)
+        {
+            let tx = store.env.tx_mut().unwrap();
+            let mut cur = tx.cursor_write::<BlockChangeSet>().unwrap();
+            cur.insert(
+                1,
+                &ChangeSet {
+                    hashed_storage_keys: vec![HashedStorageKey::new(
+                        B256::from([0u8; 32]),
+                        B256::from([0u8; 32]),
+                    )],
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        let res = store.fetch_trie_updates(1);
+        assert!(matches!(res, Err(OpProofsStorageError::MissingHashedStorageHistory { .. })));
+    }
+
+    #[test]
+    fn fetch_trie_updates_hashed_storage_seek_returns_later_block_treated_as_missing() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // manually insert hashed storage history and ChangeSet for block 1 referencing same key
+        {
+            let tx = store.env.tx_mut().unwrap();
+            let mut stor_cur = tx.cursor_write::<HashedStorageHistory>().unwrap();
+            stor_cur
+                .insert(
+                    HashedStorageKey::new(B256::from([0u8; 32]), B256::from([0u8; 32])),
+                    &VersionedValue::new(2, MaybeDeleted(Some(StorageValue::new(U256::ZERO)))),
+                )
+                .unwrap();
+
+            let mut cur = tx.cursor_write::<BlockChangeSet>().unwrap();
+            cur.insert(
+                1,
+                &ChangeSet {
+                    hashed_storage_keys: vec![HashedStorageKey::new(
+                        B256::from([0u8; 32]),
+                        B256::from([0u8; 32]),
+                    )],
+                    ..Default::default()
+                },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        // fetch block 1 -> seek will find block 2 but block_number != 1 so expect
+        // MissingHashedStorageHistory
+        let res = store.fetch_trie_updates(1);
+        assert!(matches!(res, Err(OpProofsStorageError::MissingHashedStorageHistory { .. })));
+    }
+
+    #[test]
+    fn fetch_trie_updates_basic() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Build a block with mixed changes (accounts, trie nodes, hashed storages)
+        let block = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+
+        // prepare data
+        let addr1 = B256::from([0x11; 32]);
+        let addr2 = B256::from([0x22; 32]);
+        let slot1 = B256::from([0xA1; 32]);
+        let slot2 = B256::from([0xA2; 32]);
+
+        let acc1 = Account { nonce: 1, balance: U256::from(100), ..Default::default() };
+
+        let val1 = U256::from(1234u64);
+        let val2 = U256::from(5678u64);
+
+        let account_path1 = Nibbles::from_nibbles_unchecked(vec![0, 1, 2, 3]);
+        let account_path2 = Nibbles::from_nibbles_unchecked(vec![4, 5, 6, 7]);
+        let account_node1 =
+            BranchNodeCompact { root_hash: Some(B256::random()), ..Default::default() };
+        let account_node2 =
+            BranchNodeCompact { root_hash: Some(B256::random()), ..Default::default() };
+
+        let storage_path1 = Nibbles::from_nibbles_unchecked(vec![1, 2, 3, 4]);
+        let storage_node1 =
+            BranchNodeCompact { root_hash: Some(B256::random()), ..Default::default() };
+
+        // Construct BlockStateDiff
+        let mut block_state_diff_trie_updates = TrieUpdates::default();
+        block_state_diff_trie_updates.account_nodes.insert(account_path1, account_node1);
+        block_state_diff_trie_updates.account_nodes.insert(account_path2, account_node2);
+        // storage trie for addr1
+        let mut storage_nodes1 = StorageTrieUpdates::default();
+        storage_nodes1.storage_nodes.insert(storage_path1, storage_node1);
+        block_state_diff_trie_updates.storage_tries.insert(addr1, storage_nodes1);
+
+        // hashed accounts: addr1 -> Some, addr2 -> None
+        let mut block_state_diff_post_state = HashedPostState::default();
+        block_state_diff_post_state.accounts.insert(addr1, Some(acc1));
+        block_state_diff_post_state.accounts.insert(addr2, None);
+
+        // hashed storages
+        let mut storage1 = HashedStorage::default();
+        storage1.storage.insert(slot1, val1);
+        block_state_diff_post_state.storages.insert(addr1, storage1);
+
+        let mut storage2 = HashedStorage::default();
+        storage2.storage.insert(slot2, val2);
+        block_state_diff_post_state.storages.insert(addr2, storage2);
+
+        // store then fetch
+        let block_state_diff = BlockStateDiff {
+            sorted_trie_updates: block_state_diff_trie_updates.into_sorted(),
+            sorted_post_state: block_state_diff_post_state.into_sorted(),
+        };
+        store.store_trie_updates(block, block_state_diff.clone()).expect("store");
+        let got = store.fetch_trie_updates(1).expect("fetch");
+
+        // verify trie updates
+        assert_eq!(
+            got.sorted_trie_updates.account_nodes_ref(),
+            block_state_diff.sorted_trie_updates.account_nodes_ref(),
+        );
+        assert_eq!(
+            got.sorted_trie_updates.storage_tries_ref(),
+            block_state_diff.sorted_trie_updates.storage_tries_ref(),
+        );
+
+        // verify post state
+        assert_eq!(got.sorted_post_state.accounts, block_state_diff.sorted_post_state.accounts);
+        assert_eq!(got.sorted_post_state.storages, block_state_diff.sorted_post_state.storages);
+    }
+
+    #[test]
+    fn test_prune_earliest_state_single_entry() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        let block = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        // Insert a single entry to be pruned
+        let addr = B256::random();
+        let mut state_diff_post_state = HashedPostState::default();
+        state_diff_post_state.accounts.insert(addr, Some(Account::default()));
+        let state_diff = BlockStateDiff {
+            sorted_post_state: state_diff_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block, state_diff).unwrap();
+
+        // Prune the entry - pass empty diff since we're just removing data
+        let next_block = BlockWithParent::new(block.block.hash, NumHash::new(2, B256::random()));
+        store.prune_earliest_state(next_block).unwrap();
+
+        // Verify the entry was pruned
+        let tx = store.env.tx().unwrap();
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().unwrap();
+
+        // The survivor at block 1 should remain
+        let val = cur
+            .seek_by_key_subkey(addr, block.block.number)
+            .unwrap()
+            .expect("Survivor should exist");
+        assert_eq!(val.block_number, 1);
+
+        let mut pruning_cur = tx.new_cursor::<BlockChangeSet>().unwrap();
+        assert!(pruning_cur.seek_exact(block.block.number).unwrap().is_none());
+
+        // Verify earliest block was updated
+        let earliest = store.get_earliest_block_number().unwrap();
+        assert_eq!(earliest, Some((2, next_block.block.hash)));
+    }
+
+    #[test]
+    fn test_prune_earliest_state_multiple_entries_same_block() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        let block = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        // Insert multiple entries for the same block
+        let addr1 = B256::random();
+        let addr2 = B256::random();
+        let mut state_diff_post_state = HashedPostState::default();
+        state_diff_post_state.accounts.insert(addr1, Some(Account::default()));
+        state_diff_post_state.accounts.insert(addr2, Some(Account::default()));
+        let state_diff = BlockStateDiff {
+            sorted_post_state: state_diff_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block, state_diff).unwrap();
+
+        // Prune the entries
+        let next_block = BlockWithParent::new(block.block.hash, NumHash::new(2, B256::random()));
+        store.prune_earliest_state(next_block).unwrap();
+
+        // Verify the entries were pruned
+        let tx = store.env.tx().unwrap();
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().unwrap();
+
+        // All entries should survive at block 1
+        let v1 =
+            cur.seek_by_key_subkey(addr1, block.block.number).unwrap().expect("addr1 survivor");
+        assert_eq!(v1.block_number, 1);
+        let v2 =
+            cur.seek_by_key_subkey(addr2, block.block.number).unwrap().expect("addr2 survivor");
+        assert_eq!(v2.block_number, 1);
+
+        let mut pruning_cur = tx.new_cursor::<BlockChangeSet>().unwrap();
+        assert!(pruning_cur.seek_exact(block.block.number).unwrap().is_none());
+    }
+
+    #[test]
+    fn test_prune_earliest_state_multiple_blocks() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        let block_1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let block_2 = BlockWithParent::new(block_1.block.hash, NumHash::new(2, B256::random()));
+        let block_3 = BlockWithParent::new(block_2.block.hash, NumHash::new(3, B256::random()));
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        // Insert entries for multiple blocks
+        let addr1 = B256::random();
+        let addr2 = B256::random();
+        let mut state_diff1_post_state = HashedPostState::default();
+        state_diff1_post_state.accounts.insert(addr1, Some(Account::default()));
+        let state_diff1 = BlockStateDiff {
+            sorted_post_state: state_diff1_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_1, state_diff1).unwrap();
+
+        let mut state_diff2_post_state = HashedPostState::default();
+        state_diff2_post_state.accounts.insert(addr2, Some(Account::default()));
+        let state_diff2 = BlockStateDiff {
+            sorted_post_state: state_diff2_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_2, state_diff2).unwrap();
+
+        // Prune up to block 3 (should remove blocks 1 and 2)
+        store.prune_earliest_state(block_3).unwrap();
+
+        // Verify the entries were pruned
+        let tx = store.env.tx().unwrap();
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().unwrap();
+
+        // addr1 survivor at block 1 must exist
+        let v1 = cur.seek_by_key_subkey(addr1, 1).unwrap().expect("addr1 survivor");
+        assert_eq!(v1.block_number, 1);
+
+        // addr2 survivor at block 2 must exist
+        let v2 = cur.seek_by_key_subkey(addr2, 2).unwrap().expect("addr2 survivor");
+        assert_eq!(v2.block_number, 2);
+
+        let mut pruning_cur = tx.new_cursor::<BlockChangeSet>().unwrap();
+        assert!(pruning_cur.seek_exact(1).unwrap().is_none());
+        assert!(pruning_cur.seek_exact(2).unwrap().is_none());
+    }
+
+    #[test]
+    fn test_prune_earliest_state_no_op() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(1, B256::random()).unwrap();
+
+        // Attempt to prune with a new earliest block that is not newer
+        let block_1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let block_0 = BlockWithParent::new(B256::ZERO, NumHash::new(0, B256::random()));
+        store.prune_earliest_state(block_1).unwrap();
+        store.prune_earliest_state(block_0).unwrap();
+
+        // Nothing should have been pruned, this call should not panic or error
+    }
+
+    #[test]
+    fn test_prune_earliest_state_no_entries_to_prune() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(1, B256::random()).unwrap();
+
+        // Prune a range where no entries exist
+        let block_10 = BlockWithParent::new(B256::ZERO, NumHash::new(10, B256::random()));
+        store.prune_earliest_state(block_10).unwrap();
+
+        // Nothing should have been pruned, this call should not panic or error
+    }
+
+    #[test]
+    fn test_prune_earliest_state_with_diff_insertion() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        // Insert entries for blocks 1 and 2
+        let addr1 = B256::random();
+        let addr2 = B256::random();
+        let acc1 = Account { nonce: 1, balance: U256::from(100), ..Default::default() };
+        let acc2 = Account { nonce: 2, balance: U256::from(200), ..Default::default() };
+
+        let block_1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let mut state_diff1_post_state = HashedPostState::default();
+        state_diff1_post_state.accounts.insert(addr1, Some(acc1));
+        let state_diff1 = BlockStateDiff {
+            sorted_post_state: state_diff1_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_1, state_diff1).unwrap();
+
+        let block_2 = BlockWithParent::new(block_1.block.hash, NumHash::new(2, B256::random()));
+        let mut state_diff2_post_state = HashedPostState::default();
+        state_diff2_post_state.accounts.insert(addr2, Some(acc2));
+        let state_diff2 = BlockStateDiff {
+            sorted_post_state: state_diff2_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_2, state_diff2).unwrap();
+
+        // Now prune to block 3
+        let block_3 = BlockWithParent::new(block_2.block.hash, NumHash::new(3, B256::random()));
+        store.prune_earliest_state(block_3).unwrap();
+
+        let tx = store.env.tx().unwrap();
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().unwrap();
+
+        // Verify that blocks 1 and 2 entries were NOT pruned (they are survivors for their
+        // respective keys)
+        let vv1 = cur.seek_by_key_subkey(addr1, 0).unwrap().expect("addr1 should survive");
+        assert_eq!(vv1.block_number, 1);
+        assert_eq!(vv1.value.0, Some(acc1));
+
+        let vv2 = cur.seek_by_key_subkey(addr2, 0).unwrap().expect("addr2 should survive");
+        assert_eq!(vv2.block_number, 2);
+        assert_eq!(vv2.value.0, Some(acc2));
+
+        // Verify change sets for blocks 1 and 2 were removed
+        let mut pruning_cur = tx.new_cursor::<BlockChangeSet>().unwrap();
+        assert!(pruning_cur.seek_exact(1).unwrap().is_none());
+        assert!(pruning_cur.seek_exact(2).unwrap().is_none());
+
+        // Verify earliest block was updated
+        let earliest = store.get_earliest_block_number().unwrap();
+        assert_eq!(earliest, Some((3, block_3.block.hash)));
+    }
+
+    #[test]
+    fn test_prune_earliest_state_with_removed_nodes() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        // Create some trie nodes in blocks 1, 2, 3
+        let path1 = Nibbles::from_nibbles_unchecked([0x01, 0x02]);
+        let path2 = Nibbles::from_nibbles_unchecked([0x03, 0x04]);
+        let node1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let node2 = BranchNodeCompact::new(0b10, 0, 0, vec![], Some(B256::random()));
+
+        let block_1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let mut diff1_trie_updates = TrieUpdates::default();
+        diff1_trie_updates.account_nodes.insert(path1, node1);
+        let diff1 = BlockStateDiff {
+            sorted_trie_updates: diff1_trie_updates.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_1, diff1).unwrap();
+
+        let block_2 = BlockWithParent::new(block_1.block.hash, NumHash::new(2, B256::random()));
+        let mut diff2_trie_updates = TrieUpdates::default();
+        diff2_trie_updates.account_nodes.insert(path2, node2.clone());
+        let diff2 = BlockStateDiff {
+            sorted_trie_updates: diff2_trie_updates.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_2, diff2).unwrap();
+
+        // In block 3, path1 is deleted (stored as None in the database)
+        // This happens when we store trie updates with path1 mapped to None
+        let block_3 = BlockWithParent::new(block_2.block.hash, NumHash::new(3, B256::random()));
+        // Simulate storing a deletion by directly writing to DB
+        store
+            .env
+            .update(|tx| {
+                let mut cursor = tx.new_cursor::<AccountTrieHistory>()?;
+                let vv = VersionedValue { block_number: 3, value: MaybeDeleted(None) };
+                cursor.upsert(StoredNibbles::from(path1), &vv)?;
+
+                // Record in change set
+                let mut change_set_cursor = tx.new_cursor::<BlockChangeSet>()?;
+                change_set_cursor.upsert(
+                    3,
+                    &ChangeSet {
+                        account_trie_keys: vec![StoredNibbles::from(path1)],
+                        storage_trie_keys: vec![],
+                        hashed_account_keys: vec![],
+                        hashed_storage_keys: vec![],
+                    },
+                )?;
+
+                // Update proof window
+                let mut proof_window_cursor = tx.new_cursor::<ProofWindow>()?;
+                proof_window_cursor.upsert(
+                    ProofWindowKey::LatestBlock,
+                    &BlockNumberHash::new(3, block_3.block.hash),
+                )?;
+                Ok::<(), DatabaseError>(())
+            })
+            .unwrap()
+            .unwrap();
+
+        // Now prune to block 5, with the new initial state:
+        // - path1 should be in removed_nodes (it was deleted in block 3)
+        // - path2 should be included with its value (it still exists from block 2)
+        let block_5 = BlockWithParent::new(B256::random(), NumHash::new(5, B256::random()));
+        store.prune_earliest_state(block_5).unwrap();
+
+        // Verify that all entries for path1 before block 5 were removed
+        let tx = store.env.tx().unwrap();
+        let mut cur = tx.cursor_dup_read::<AccountTrieHistory>().unwrap();
+
+        // path1 at block 1 should be gone; seeking 1 finds survivor (tombstone at 3)
+        if let Some(v) = cur.seek_by_key_subkey(StoredNibbles::from(path1), 1).unwrap() {
+            assert!(v.block_number >= 3, "path1 at block 1 should be pruned");
+        }
+
+        // path1 at block 1 should be gone.
+        // path1 survivor at block 3 (tombstone) should ALSO be gone now (optimization).
+        // So seeking for path1 should return None.
+        assert!(
+            cur.seek_by_key_subkey(StoredNibbles::from(path1), 0).unwrap().is_none(),
+            "path1 should be completely removed including tombstone"
+        );
+
+        // path2 entries should be pruned (blocks < 5)
+        // Survivor for path2 is at block 2.
+        let v2 =
+            cur.seek_by_key_subkey(StoredNibbles::from(path2), 0).unwrap().expect("path2 survivor");
+        assert_eq!(v2.block_number, 2);
+        assert_eq!(v2.value.0, Some(node2));
+    }
+
+    #[test]
+    fn test_prune_earliest_state_overlapping_keys() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        // Use overlapping key (addr1 updated in blocks 1 and 2)
+        let addr1 = B256::random();
+        let acc1 = Account { nonce: 1, balance: U256::from(100), ..Default::default() };
+        let acc2 = Account { nonce: 2, balance: U256::from(200), ..Default::default() };
+
+        let block_1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let mut diff1_post_state = HashedPostState::default();
+        diff1_post_state.accounts.insert(addr1, Some(acc1));
+        let diff1 = BlockStateDiff {
+            sorted_post_state: diff1_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_1, diff1).unwrap();
+
+        let block_2 = BlockWithParent::new(block_1.block.hash, NumHash::new(2, B256::random()));
+        let mut diff2_post_state = HashedPostState::default();
+        diff2_post_state.accounts.insert(addr1, Some(acc2));
+        let diff2 = BlockStateDiff {
+            sorted_post_state: diff2_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_2, diff2).unwrap();
+
+        // Prune to block 3
+        let block_3 = BlockWithParent::new(block_2.block.hash, NumHash::new(3, B256::random()));
+        store.prune_earliest_state(block_3).unwrap();
+
+        let tx = store.env.tx().unwrap();
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().unwrap();
+
+        // Verify survivor (acc2 at block 2) remains
+        let vv1 =
+            cur.seek_by_key_subkey(addr1, 0).unwrap().expect("addr1 should having surviving state");
+        assert_eq!(vv1.block_number, 2);
+        assert_eq!(vv1.value.0, Some(acc2));
+    }
+
+    #[test]
+    fn test_prune_earliest_state_comprehensive() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        // Setup complex scenario with accounts, storage, and trie nodes
+        let addr1 = B256::random();
+        let slot1 = B256::random();
+        let path1 = Nibbles::from_nibbles_unchecked([0x01]);
+        let storage_path1 = Nibbles::from_nibbles_unchecked([0x03]);
+
+        let acc1 = Account { nonce: 1, balance: U256::from(100), ..Default::default() };
+        let node1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let storage_node1 = BranchNodeCompact::new(0b10, 0, 0, vec![], Some(B256::random()));
+
+        // Block 1: Insert account, trie node, and storage for addr1
+        let block_1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+
+        let mut diff1_trie_updates = TrieUpdates::default();
+        let mut diff1_post_state = HashedPostState::default();
+
+        diff1_post_state.accounts.insert(addr1, Some(acc1));
+        diff1_trie_updates.account_nodes.insert(path1, node1.clone());
+        let mut storage1 = HashedStorage::default();
+        storage1.storage.insert(slot1, U256::from(1234));
+        diff1_post_state.storages.insert(addr1, storage1.clone());
+        let mut storage_updates1 = StorageTrieUpdates::default();
+        storage_updates1.storage_nodes.insert(storage_path1, storage_node1.clone());
+        diff1_trie_updates.storage_tries.insert(addr1, storage_updates1.clone());
+
+        let diff_1 = BlockStateDiff {
+            sorted_post_state: diff1_post_state.into_sorted(),
+            sorted_trie_updates: diff1_trie_updates.into_sorted(),
+        };
+        store.store_trie_updates(block_1, diff_1).unwrap();
+
+        // Block 2: Update account (overwriting addr1)
+        let acc2 = Account { nonce: 2, balance: U256::from(200), ..Default::default() };
+        let block_2 = BlockWithParent::new(block_1.block.hash, NumHash::new(2, B256::random()));
+
+        let mut diff2_post_state = HashedPostState::default();
+        diff2_post_state.accounts.insert(addr1, Some(acc2));
+        let diff2 = BlockStateDiff {
+            sorted_post_state: diff2_post_state.into_sorted(),
+            ..Default::default()
+        };
+        store.store_trie_updates(block_2, diff2).unwrap();
+
+        // Prune to block 3
+        let block_3 = BlockWithParent::new(block_2.block.hash, NumHash::new(3, B256::random()));
+        store.prune_earliest_state(block_3).unwrap();
+
+        let tx = store.env.tx().unwrap();
+
+        // Verify account history - acc1 at block 1 pruned
+        let mut acc_cur = tx.new_cursor::<HashedAccountHistory>().unwrap();
+        // Survivor acc2 at block 2 remains
+        let acc_vv = acc_cur.seek_by_key_subkey(addr1, 0).unwrap().expect("Survivor at block 2");
+        assert_eq!(acc_vv.value.0, Some(acc2));
+        assert_eq!(acc_vv.block_number, 2);
+
+        // Verify account trie history - path1 at block 1 remains because it's the latest for that
+        // key
+        let mut trie_cur = tx.cursor_dup_read::<AccountTrieHistory>().unwrap();
+        let trie_vv = trie_cur
+            .seek_by_key_subkey(StoredNibbles::from(path1), 0)
+            .unwrap()
+            .expect("Survivor at block 1");
+        assert_eq!(trie_vv.value.0, Some(node1));
+        assert_eq!(trie_vv.block_number, 1);
+
+        // Verify storage history - slot1 at block 1 remains
+        let mut storage_cur = tx.new_cursor::<HashedStorageHistory>().unwrap();
+        let storage_key = HashedStorageKey::new(addr1, slot1);
+        let storage_vv =
+            storage_cur.seek_by_key_subkey(storage_key, 0).unwrap().expect("Survivor at block 1");
+        assert_eq!(storage_vv.value.0.as_ref().unwrap().0, U256::from(1234));
+        assert_eq!(storage_vv.block_number, 1);
+
+        // Verify storage trie history
+        let mut storage_trie_cur = tx.cursor_dup_read::<StorageTrieHistory>().unwrap();
+        let storage_trie_key = StorageTrieKey::new(addr1, StoredNibbles::from(storage_path1));
+        let storage_trie_vv = storage_trie_cur
+            .seek_by_key_subkey(storage_trie_key, 0)
+            .unwrap()
+            .expect("Survivor at block 1");
+        assert_eq!(storage_trie_vv.value.0, Some(storage_node1));
+        assert_eq!(storage_trie_vv.block_number, 1);
+
+        // Verify change sets pruned
+        let mut change_cur = tx.new_cursor::<BlockChangeSet>().unwrap();
+        assert!(change_cur.seek_exact(1).unwrap().is_none());
+        assert!(change_cur.seek_exact(2).unwrap().is_none());
+    }
+
+    #[test]
+    fn test_prune_earliest_state_churn_create_delete_recreate() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        let addr = B256::random();
+
+        // Block 1: Create
+        let b1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let acc1 = Account { nonce: 1, ..Default::default() };
+        let mut diff1 = HashedPostState::default();
+        diff1.accounts.insert(addr, Some(acc1));
+        store
+            .store_trie_updates(
+                b1,
+                BlockStateDiff { sorted_post_state: diff1.into_sorted(), ..Default::default() },
+            )
+            .unwrap();
+
+        // Block 2: Delete
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let mut diff2 = HashedPostState::default();
+        diff2.accounts.insert(addr, None);
+        store
+            .store_trie_updates(
+                b2,
+                BlockStateDiff { sorted_post_state: diff2.into_sorted(), ..Default::default() },
+            )
+            .unwrap();
+
+        // Block 3: Recreate
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+        let acc3 = Account { nonce: 3, ..Default::default() };
+        let mut diff3 = HashedPostState::default();
+        diff3.accounts.insert(addr, Some(acc3));
+        store
+            .store_trie_updates(
+                b3,
+                BlockStateDiff { sorted_post_state: diff3.into_sorted(), ..Default::default() },
+            )
+            .unwrap();
+
+        // Prune to Block 3
+        store.prune_earliest_state(b3).unwrap();
+
+        let tx = store.env.tx().unwrap();
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().unwrap();
+
+        // Block 1 (Older than 3) should be deleted.
+        // Since Block 3 exists, seek(1) will land on Block 3.
+        if let Some(val) = cur.seek_by_key_subkey(addr, 1).unwrap() {
+            assert!(
+                val.block_number >= 3,
+                "Block 1 should use be pruned, found {}",
+                val.block_number
+            );
+        }
+
+        // Block 2 (Older than 3) should be deleted
+        if let Some(val) = cur.seek_by_key_subkey(addr, 2).unwrap() {
+            assert!(
+                val.block_number >= 3,
+                "Block 2 should use be pruned, found {}",
+                val.block_number
+            );
+        }
+
+        // Block 3 (Survivor) should exist
+        let val = cur.seek_by_key_subkey(addr, 3).unwrap().expect("Block 3 should survive");
+        assert_eq!(val.block_number, 3);
+        assert_eq!(val.value.0, Some(acc3));
+    }
+
+    #[test]
+    fn test_prune_earliest_state_returns_correct_counts() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        let addr = B256::random();
+
+        // Block 1: Insert
+        let b1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let acc1 = Account { nonce: 1, ..Default::default() };
+        let mut diff1 = HashedPostState::default();
+        diff1.accounts.insert(addr, Some(acc1));
+        store
+            .store_trie_updates(
+                b1,
+                BlockStateDiff { sorted_post_state: diff1.into_sorted(), ..Default::default() },
+            )
+            .unwrap();
+
+        // Block 2: Update
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let acc2 = Account { nonce: 2, ..Default::default() };
+        let mut diff2 = HashedPostState::default();
+        diff2.accounts.insert(addr, Some(acc2));
+        store
+            .store_trie_updates(
+                b2,
+                BlockStateDiff { sorted_post_state: diff2.into_sorted(), ..Default::default() },
+            )
+            .unwrap();
+
+        // Prune to Block 2.
+        // Survivor is at Block 2.
+        // Block 1 should be deleted.
+        // Count should be 1.
+        let counts = store.prune_earliest_state(b2).unwrap();
+
+        assert_eq!(counts.hashed_accounts_written_total, 1);
+        assert_eq!(counts.account_trie_updates_written_total, 0);
+    }
+
+    #[test]
+    fn test_prune_earliest_state_empty_window_updates_pointer() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        store.set_earliest_block_number(0, B256::ZERO).unwrap();
+
+        let target = BlockWithParent::new(B256::random(), NumHash::new(5, B256::random()));
+
+        // Prune empty
+        store.prune_earliest_state(target).unwrap();
+
+        let earliest = store.get_earliest_block_number().unwrap();
+        assert_eq!(earliest, Some((5, target.block.hash)));
+    }
+
+    #[test]
+    fn test_prune_earliest_state_uninitialized_guard() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Earliest not set
+        let target = BlockWithParent::new(B256::random(), NumHash::new(5, B256::random()));
+
+        let counts = store.prune_earliest_state(target).unwrap();
+        assert_eq!(counts, WriteCounts::default());
+
+        // Check earliest is still None
+        assert_eq!(store.get_earliest_block_number().unwrap(), None);
+    }
+
+    #[test]
+    fn test_block_change_set_crud_operations() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+        let tx = store.env.tx_mut().expect("rw tx");
+        let mut cursor = tx.cursor_write::<BlockChangeSet>().expect("cursor");
+
+        let block_1 = 42u64;
+        let block_2 = 43u64;
+
+        let entry1 = ChangeSet {
+            account_trie_keys: vec![StoredNibbles::default()],
+            storage_trie_keys: vec![],
+            hashed_account_keys: vec![B256::ZERO],
+            hashed_storage_keys: vec![],
+        };
+        let entry2 = ChangeSet {
+            account_trie_keys: vec![],
+            storage_trie_keys: vec![StorageTrieKey::new(B256::ZERO, StoredNibbles::default())],
+            hashed_account_keys: vec![],
+            hashed_storage_keys: vec![HashedStorageKey::new(B256::ZERO, B256::ZERO)],
+        };
+
+        // Insert entries
+        cursor.insert(block_1, &entry1).unwrap();
+        cursor.insert(block_2, &entry2).unwrap();
+
+        // Read entries
+        let mut walker = cursor.walk(Some(block_1)).unwrap();
+        let mut entries = vec![walker.next().unwrap().unwrap().1];
+        if let Some(Ok((_, val))) = walker.next() {
+            entries.push(val);
+        }
+        entries.sort();
+        let mut expected = vec![entry1.clone(), entry2.clone()];
+        expected.sort();
+        assert_eq!(entries, expected);
+
+        // Delete entry1
+        let mut walker = cursor.walk(Some(block_1)).unwrap();
+        while let Some(Ok((_, val))) = walker.next() {
+            if val == entry1 {
+                walker.delete_current().unwrap();
+                break;
+            }
+        }
+
+        // Verify delete
+        let mut walker = cursor.walk(Some(block_1)).unwrap();
+        assert_eq!(walker.next().unwrap().unwrap().1, entry2);
+        assert!(walker.next().is_none());
+    }
+
+    #[test]
+    fn store_trie_updates_deleted_account_trie() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        const BLOCK: BlockWithParent =
+            BlockWithParent::new(B256::ZERO, NumHash::new(7, B256::ZERO));
+
+        // Prepare a BlockStateDiff that removes an account trie node at `acc_path`
+        let acc_path = Nibbles::from_nibbles_unchecked([0x0A, 0x0B, 0x0C]);
+        let mut diff_trie_updates = TrieUpdates::default();
+        diff_trie_updates.removed_nodes.insert(acc_path);
+        let diff = BlockStateDiff {
+            sorted_trie_updates: diff_trie_updates.into_sorted(),
+            sorted_post_state: HashedPostStateSorted::default(),
+        };
+        store.store_trie_updates(BLOCK, diff).expect("store");
+
+        // Verify deletion was written at BLOCK
+        let tx = store.env.tx().expect("tx");
+        let mut cur = tx.new_cursor::<AccountTrieHistory>().expect("cursor");
+        let vv = cur
+            .seek_by_key_subkey(StoredNibbles::from(acc_path), BLOCK.block.number)
+            .expect("seek")
+            .expect("exists");
+        assert_eq!(vv.block_number, BLOCK.block.number);
+        assert!(vv.value.0.is_none(), "expected account trie deletion");
+    }
+
+    #[test]
+    fn store_trie_updates_deleted_storage_trie() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        const BLOCK: BlockWithParent =
+            BlockWithParent::new(B256::ZERO, NumHash::new(8, B256::ZERO));
+
+        // Prepare a BlockStateDiff that removes a storage trie node for `addr` at `st_path`
+        let addr = B256::from([0xAB; 32]);
+        let st_path = Nibbles::from_nibbles_unchecked([0x01, 0x02, 0x03]);
+
+        let mut diff_trie_updates = TrieUpdates::default();
+        let mut st_updates = reth_trie::updates::StorageTrieUpdates::default();
+        // mark this storage trie node as removed
+        st_updates.removed_nodes.insert(st_path);
+        diff_trie_updates.storage_tries.insert(addr, st_updates);
+        let diff = BlockStateDiff {
+            sorted_trie_updates: diff_trie_updates.into_sorted(),
+            sorted_post_state: HashedPostStateSorted::default(),
+        };
+        store.store_trie_updates(BLOCK, diff).expect("store");
+
+        // Verify deletion was written at BLOCK
+        let tx = store.env.tx().expect("tx");
+        let mut cur = tx.new_cursor::<StorageTrieHistory>().expect("cursor");
+        let key = StorageTrieKey::new(addr, StoredNibbles::from(st_path));
+        let vv = cur.seek_by_key_subkey(key, BLOCK.block.number).expect("seek").expect("exists");
+        assert_eq!(vv.block_number, BLOCK.block.number);
+        assert!(vv.value.0.is_none(), "expected storage trie deletion");
+    }
+
+    #[test]
+    fn store_trie_updates_wiped_storage_trie_nodes() {
+        use reth_trie::updates::StorageTrieUpdates;
+
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr_wiped = B256::from([0x10; 32]);
+        let addr_live = B256::from([0xF0; 32]);
+
+        // Seed some storage-trie nodes at block 0 for the address that will be wiped.
+        let p1 = Nibbles::from_nibbles_unchecked([0x01, 0x02]);
+        let p2 = Nibbles::from_nibbles_unchecked([0x0A, 0x0B, 0x0C]);
+        let n1 = BranchNodeCompact::default();
+        let n2 = BranchNodeCompact::default();
+
+        store
+            .store_storage_branches(addr_wiped, vec![(p1, Some(n1)), (p2, Some(n2))])
+            .expect("seed wiped addr trie nodes");
+
+        // Build a BlockStateDiff that wipes addr_wiped's storage trie, and
+        // also adds a normal storage-trie node for addr_live.
+        const BLOCK: BlockWithParent =
+            BlockWithParent::new(B256::ZERO, NumHash::new(123, B256::ZERO));
+        let mut diff_trie_updates = TrieUpdates::default();
+
+        // Wipe for addr_wiped
+        let mut wiped_updates = StorageTrieUpdates::default();
+        wiped_updates.set_deleted(true);
+        diff_trie_updates.storage_tries.insert(addr_wiped, wiped_updates);
+
+        // Normal update for addr_live
+        let live_path = Nibbles::from_nibbles_unchecked([0xEE, 0xFF]);
+        let live_node = BranchNodeCompact::default();
+        let mut live_updates = StorageTrieUpdates::default();
+        live_updates.storage_nodes.insert(live_path, live_node);
+        diff_trie_updates.storage_tries.insert(addr_live, live_updates);
+
+        // Execute the store
+        let diff = BlockStateDiff {
+            sorted_trie_updates: diff_trie_updates.into_sorted(),
+            sorted_post_state: HashedPostStateSorted::default(),
+        };
+        store.store_trie_updates(BLOCK, diff).expect("store");
+
+        // Verify: for addr_wiped, each previously existing path now has a deletion tombstone at
+        // BLOCK.
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<StorageTrieHistory>().expect("cursor");
+
+            for path in [p1, p2] {
+                let key = StorageTrieKey::new(addr_wiped, StoredNibbles::from(path));
+                let vv =
+                    cur.seek_by_key_subkey(key, BLOCK.block.number).expect("seek").expect("exists");
+                assert_eq!(vv.block_number, BLOCK.block.number);
+                assert!(vv.value.0.is_none(), "expected tombstone at wipe block for path {path:?}");
+            }
+        }
+
+        // Verify: addr_live got its normal node written at BLOCK (not a deletion).
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<StorageTrieHistory>().expect("cursor");
+
+            let key = StorageTrieKey::new(addr_live, StoredNibbles::from(live_path));
+            let vv =
+                cur.seek_by_key_subkey(key, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv.block_number, BLOCK.block.number);
+            assert!(vv.value.0.is_some(), "expected normal node for non-wiped address at BLOCK");
+        }
+    }
+
+    #[test]
+    fn store_trie_updates_wiped_storage() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // We'll pre-seed storage at block 0, then issue a wipe at BLOCK.
+        const BLOCK: BlockWithParent =
+            BlockWithParent::new(B256::ZERO, NumHash::new(42, B256::ZERO));
+
+        let addr = B256::from([0x55; 32]);
+        let s1 = B256::from([0x01; 32]);
+        let s2 = B256::from([0x02; 32]);
+        let v1 = U256::from(111u64);
+        let v2 = U256::from(222u64);
+
+        // Seed prior storage (block_number = 0 in store_hashed_storages)
+        store.store_hashed_storages(addr, vec![(s1, v1), (s2, v2)]).expect("seed");
+
+        // Build BlockStateDiff that marks this address as wiped at BLOCK
+        let mut diff_post_state = HashedPostState::default();
+
+        let wiped = reth_trie::HashedStorage::new(true);
+
+        diff_post_state.storages.insert(addr, wiped);
+
+        // Execute
+        let diff = BlockStateDiff {
+            sorted_trie_updates: TrieUpdatesSorted::default(),
+            sorted_post_state: diff_post_state.into_sorted(),
+        };
+        store.store_trie_updates(BLOCK, diff).expect("store");
+
+        // Verify: for each pre-existing slot, there should be a tombstone (MaybeDeleted(None)) at
+        // BLOCK.
+        let tx = store.env.tx().expect("tx");
+        let mut cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+
+        for slot in [s1, s2] {
+            let key = HashedStorageKey::new(addr, slot);
+            let vv =
+                cur.seek_by_key_subkey(key, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv.block_number, BLOCK.block.number);
+            assert!(
+                vv.value.0.is_none(),
+                "expected deletion tombstone for slot {:?} at block {}",
+                slot,
+                BLOCK.block.number,
+            );
+        }
+    }
+
+    #[test]
+    fn store_trie_updates_wiped_and_non_wiped_mixed_order() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Choose addresses so that wiped < non_wiped in sort order (your impl sorts by address)
+        let addr_wiped = B256::from([0x01; 32]); // will sort first
+        let addr_live = B256::from([0xF0; 32]); // will sort later
+
+        // Slots & values
+        let ws1 = B256::from([0xA1; 32]);
+        let ws2 = B256::from([0xA2; 32]);
+        let wv1 = U256::from(111u64);
+        let wv2 = U256::from(222u64);
+
+        let ls1 = B256::from([0xB1; 32]);
+        let lv1_old = U256::from(333u64);
+        let lv1_new = U256::from(999u64); // will be written at BLOCK
+
+        // Seed prior storage at block 0 for BOTH addresses
+        store
+            .store_hashed_storages(addr_wiped, vec![(ws1, wv1), (ws2, wv2)])
+            .expect("seed wiped addr");
+        store.store_hashed_storages(addr_live, vec![(ls1, lv1_old)]).expect("seed live addr");
+
+        // Build diff: wiped first (by address sort), then non-wiped with a write
+        const BLOCK: BlockWithParent =
+            BlockWithParent::new(B256::ZERO, NumHash::new(77, B256::ZERO));
+        let mut diff_post_state = HashedPostState::default();
+
+        // Wiped storage for addr_wiped
+        let wiped = reth_trie::HashedStorage::new(true);
+        diff_post_state.storages.insert(addr_wiped, wiped);
+
+        // Non-wiped storage for addr_live (append new value)
+        let mut live = reth_trie::HashedStorage::default();
+        live.storage.insert(ls1, lv1_new);
+        diff_post_state.storages.insert(addr_live, live);
+
+        // Execute
+        let diff = BlockStateDiff {
+            sorted_trie_updates: TrieUpdatesSorted::default(),
+            sorted_post_state: diff_post_state.into_sorted(),
+        };
+        store.store_trie_updates(BLOCK, diff).expect("store");
+
+        // Verify: wiped address got tombstones at BLOCK for each pre-existing slot
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+            for slot in [ws1, ws2] {
+                let key = HashedStorageKey::new(addr_wiped, slot);
+                let vv =
+                    cur.seek_by_key_subkey(key, BLOCK.block.number).expect("seek").expect("exists");
+                assert_eq!(vv.block_number, BLOCK.block.number);
+                assert!(
+                    vv.value.0.is_none(),
+                    "expected deletion tombstone for wiped slot {:?} at block {}",
+                    slot,
+                    BLOCK.block.number,
+                );
+            }
+        }
+
+        // Verify: non-wiped address got the new value at BLOCK (not a deletion)
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+            let key = HashedStorageKey::new(addr_live, ls1);
+            let vv =
+                cur.seek_by_key_subkey(key, BLOCK.block.number).expect("seek").expect("exists");
+            assert_eq!(vv.block_number, BLOCK.block.number);
+            let inner = vv.value.0.as_ref().expect("Some(StorageValue)");
+            assert_eq!(inner.0, lv1_new, "expected updated value for non-wiped address");
+        }
+    }
+
+    #[test]
+    fn test_proof_window() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Test initial state (no values set)
+        let initial_value = store.get_earliest_block_number().expect("get earliest");
+        assert_eq!(initial_value, None);
+
+        // Test setting the value
+        let block_number = 42u64;
+        let hash = B256::random();
+        store.set_earliest_block_number(block_number, hash).expect("set earliest");
+
+        // Verify value was stored correctly
+        let retrieved = store.get_earliest_block_number().expect("get earliest");
+        assert_eq!(retrieved, Some((block_number, hash)));
+
+        // Test updating with new values
+        let new_block_number = 100u64;
+        let new_hash = B256::random();
+        store.set_earliest_block_number(new_block_number, new_hash).expect("update earliest");
+
+        // Verify update worked
+        let updated = store.get_earliest_block_number().expect("get updated earliest");
+        assert_eq!(updated, Some((new_block_number, new_hash)));
+
+        // Verify that latest_block falls back to earliest when not set
+        let latest = store.get_latest_block_number().expect("get latest");
+        assert_eq!(
+            latest,
+            Some((new_block_number, new_hash)),
+            "Latest block should fall back to earliest when not explicitly set"
+        );
+    }
+
+    #[test]
+    fn replace_updates_prunes_and_adds_new_chain() {
+        let dir = tempfile::TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Test address and helper to make diffs with distinct nonces.
+        let addr = B256::from([0xAB; 32]);
+        let make_diff = |nonce: u64| {
+            let mut d_post_state = HashedPostState::default();
+            d_post_state.accounts.insert(addr, Some(Account { nonce, ..Default::default() }));
+            BlockStateDiff {
+                sorted_trie_updates: TrieUpdatesSorted::default(),
+                sorted_post_state: d_post_state.into_sorted(),
+            }
+        };
+
+        // --- Build initial canonical chain: 1 -> 2 -> 3 ---
+        let b1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+
+        store.store_trie_updates(b1, make_diff(10)).expect("store b1");
+        store.store_trie_updates(b2, make_diff(20)).expect("store b2");
+        store.store_trie_updates(b3, make_diff(30)).expect("store b3");
+
+        // Sanity: entries for 1,2,3 exist with expected nonces.
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+            let v1 = cur.seek_by_key_subkey(addr, 1).expect("seek").expect("exists");
+            let v2 = cur.seek_by_key_subkey(addr, 2).expect("seek").expect("exists");
+            let v3 = cur.seek_by_key_subkey(addr, 3).expect("seek").expect("exists");
+            assert_eq!(v1.value.0.unwrap().nonce, 10);
+            assert_eq!(v2.value.0.unwrap().nonce, 20);
+            assert_eq!(v3.value.0.unwrap().nonce, 30);
+        }
+
+        // --- Reorg at LCA = 2: prune >2, then add 3' and 4' ---
+        let b3p = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random())); // 3'
+        let b4p = BlockWithParent::new(b3p.block.hash, NumHash::new(4, B256::random())); // 4'
+
+        // Build blocks_to_add vec.
+        let blocks_to_add = vec![(b3p, make_diff(300)), (b4p, make_diff(400))];
+
+        store
+            .replace_updates(BlockNumHash::new(2, b2.block.hash), blocks_to_add)
+            .expect("replace_updates succeeds");
+
+        // --- Verify post-conditions ---
+
+        // 1) HashedAccountHistory: blocks 1,2 remain; block 3 was replaced (nonce=300); block 4
+        //    exists (nonce=400).
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+
+            let v1 = cur.seek_by_key_subkey(addr, 1).expect("seek").expect("exists");
+            assert_eq!(v1.value.0.unwrap().nonce, 10);
+
+            let v2 = cur.seek_by_key_subkey(addr, 2).expect("seek").expect("exists");
+            assert_eq!(v2.value.0.unwrap().nonce, 20);
+
+            // Old block 3 (nonce=30) should have been pruned; we should now have a fresh entry at 3
+            // with nonce=300.
+            let v3_new = cur.seek_by_key_subkey(addr, 3).expect("seek").expect("replaced exists");
+            assert_eq!(
+                v3_new.value.0.unwrap().nonce,
+                300,
+                "block 3 should be replaced by new chain"
+            );
+
+            // New block 4 should exist.
+            let v4 = cur.seek_by_key_subkey(addr, 4).expect("seek").expect("exists");
+            assert_eq!(v4.value.0.unwrap().nonce, 400);
+        }
+
+        // 2) BlockChangeSet contains exactly entries for block numbers {1,2,3,4}.
+        {
+            let tx = store.env.tx().expect("tx");
+            let mut cur = tx.new_cursor::<BlockChangeSet>().expect("cursor");
+            let mut seen = std::collections::BTreeSet::new();
+            let mut it = cur.walk(Some(1)).expect("walk");
+            while let Some(Ok((bn, _))) = it.next() {
+                seen.insert(bn);
+            }
+            let expected: std::collections::BTreeSet<u64> = [1u64, 2, 3, 4].into_iter().collect();
+            assert_eq!(seen, expected, "BlockChangeSet should reflect pruned+new chain");
+        }
+    }
+
+    #[test]
+    fn test_unwind_history_basic() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::random();
+        let make_diff = |nonce: u64| {
+            let mut d_post_state = HashedPostState::default();
+            d_post_state.accounts.insert(addr, Some(Account { nonce, ..Default::default() }));
+            BlockStateDiff {
+                sorted_trie_updates: TrieUpdatesSorted::default(),
+                sorted_post_state: d_post_state.into_sorted(),
+            }
+        };
+
+        // Build chain: blocks 1 -> 2 -> 3 -> 4
+        let b0 = NumHash::new(0, B256::random());
+        let b1 = BlockWithParent::new(b0.hash, NumHash::new(1, B256::random()));
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+        let b4 = BlockWithParent::new(b3.block.hash, NumHash::new(4, B256::random()));
+
+        store.set_earliest_block_number_hash(b0.number, b0.hash).expect("set earliest");
+        store.store_trie_updates(b1, make_diff(10)).expect("store b1");
+        store.store_trie_updates(b2, make_diff(20)).expect("store b2");
+        store.store_trie_updates(b3, make_diff(30)).expect("store b3");
+        store.store_trie_updates(b4, make_diff(40)).expect("store b4");
+
+        // Unwind to block 2
+        store.unwind_history(b2).expect("unwind");
+
+        // Verify: blocks 1 and 2 remain, blocks 3 and 4 are removed
+        let tx = store.env.tx().expect("tx");
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+
+        assert!(cur.seek_by_key_subkey(addr, 1).unwrap().is_some(), "Block 1 should remain");
+        assert!(cur.seek_by_key_subkey(addr, 2).unwrap().is_none(), "Block 2 should be removed");
+        assert!(cur.seek_by_key_subkey(addr, 3).unwrap().is_none(), "Block 3 should be removed");
+        assert!(cur.seek_by_key_subkey(addr, 4).unwrap().is_none(), "Block 4 should be removed");
+
+        // Verify ProofWindow LatestBlock is updated
+        let mut proof_window_cur = tx.cursor_read::<ProofWindow>().expect("cursor");
+        let latest = proof_window_cur
+            .seek_exact(ProofWindowKey::LatestBlock)
+            .expect("seek")
+            .expect("latest exists");
+        assert_eq!(latest.1.number(), 1);
+        assert_eq!(*latest.1.hash(), b2.parent);
+    }
+
+    #[test]
+    fn test_unwind_history_to_earliest() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::random();
+        let make_diff = |nonce: u64| {
+            let mut d_post_state = HashedPostState::default();
+            d_post_state.accounts.insert(addr, Some(Account { nonce, ..Default::default() }));
+            BlockStateDiff {
+                sorted_trie_updates: TrieUpdatesSorted::default(),
+                sorted_post_state: d_post_state.into_sorted(),
+            }
+        };
+
+        // Build chain: blocks 1 -> 2 -> 3
+        let b1 = BlockWithParent::new(B256::ZERO, NumHash::new(1, B256::random()));
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+
+        store.set_earliest_block_number_hash(b1.block.number, b1.block.hash).expect("set earliest");
+        store.store_trie_updates(b2, make_diff(20)).expect("store b2");
+        store.store_trie_updates(b3, make_diff(30)).expect("store b3");
+
+        // Unwind to block b1
+        let res = store.unwind_history(b1);
+        // should fail as we cannot unwind past earliest block
+        assert!(res.is_err(), "unwind to earliest block should error");
+        assert!(matches!(res.unwrap_err(), OpProofsStorageError::UnwindBeyondEarliest { .. }));
+    }
+
+    #[test]
+    fn test_unwind_history_with_storage() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::random();
+        let slot = B256::random();
+
+        let make_diff = |nonce: u64, slot_value: u64| {
+            let mut d_post_state = HashedPostState::default();
+            d_post_state.accounts.insert(addr, Some(Account { nonce, ..Default::default() }));
+            let mut storage = HashedStorage::default();
+            storage.storage.insert(slot, U256::from(slot_value));
+            d_post_state.storages.insert(addr, storage);
+            BlockStateDiff {
+                sorted_trie_updates: TrieUpdatesSorted::default(),
+                sorted_post_state: d_post_state.into_sorted(),
+            }
+        };
+
+        // Build chain with storage changes
+        let b0 = BlockWithParent::new(B256::ZERO, NumHash::new(0, B256::random()));
+        let b1 = BlockWithParent::new(b0.block.hash, NumHash::new(1, B256::random()));
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+
+        store.set_earliest_block_number_hash(b0.block.number, b0.block.hash).expect("set earliest");
+        store.store_trie_updates(b1, make_diff(10, 100)).expect("store b1");
+        store.store_trie_updates(b2, make_diff(20, 200)).expect("store b2");
+        store.store_trie_updates(b3, make_diff(30, 300)).expect("store b3");
+
+        // Unwind to block 1
+        store.unwind_history(b2).expect("unwind");
+
+        // Verify account history
+        let tx = store.env.tx().expect("tx");
+        let mut acc_cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+        assert!(acc_cur.seek_by_key_subkey(addr, 1).unwrap().is_some(), "Block 1 should remain");
+        assert!(
+            acc_cur.seek_by_key_subkey(addr, 2).unwrap().is_none(),
+            "Block 2 should be removed"
+        );
+        assert!(
+            acc_cur.seek_by_key_subkey(addr, 3).unwrap().is_none(),
+            "Block 3 should be removed"
+        );
+
+        // Verify storage history
+        let mut storage_cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+        let storage_key = HashedStorageKey::new(addr, slot);
+        assert!(
+            storage_cur.seek_by_key_subkey(storage_key.clone(), 1).unwrap().is_some(),
+            "Storage at block 1 should remain"
+        );
+        assert!(
+            storage_cur.seek_by_key_subkey(storage_key.clone(), 2).unwrap().is_none(),
+            "Storage at block 2 should be removed"
+        );
+        assert!(
+            storage_cur.seek_by_key_subkey(storage_key, 3).unwrap().is_none(),
+            "Storage at block 3 should be removed"
+        );
+    }
+
+    #[test]
+    fn test_unwind_history_with_trie_nodes() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let path1 = Nibbles::from_nibbles_unchecked([0x01]);
+        let path2 = Nibbles::from_nibbles_unchecked([0x02]);
+        let node1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let node2 = BranchNodeCompact::new(0b10, 0, 0, vec![], Some(B256::random()));
+
+        let make_diff = |path: Nibbles, node: BranchNodeCompact| {
+            let mut d_trie_updates = TrieUpdates::default();
+            d_trie_updates.account_nodes.insert(path, node);
+            BlockStateDiff {
+                sorted_trie_updates: d_trie_updates.into_sorted(),
+                sorted_post_state: HashedPostStateSorted::default(),
+            }
+        };
+
+        // Build chain with trie updates
+        let b0 = NumHash::new(0, B256::random());
+        let b1 = BlockWithParent::new(b0.hash, NumHash::new(1, B256::random()));
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+
+        store.set_earliest_block_number_hash(b0.number, b0.hash).expect("set earliest");
+        store.store_trie_updates(b1, make_diff(path1, node1)).expect("store b1");
+        store.store_trie_updates(b2, make_diff(path2, node2.clone())).expect("store b2");
+        store.store_trie_updates(b3, make_diff(path1, node2)).expect("store b3");
+
+        // Unwind to block 1
+        store.unwind_history(b2).expect("unwind");
+
+        // Verify trie node history
+        let tx = store.env.tx().expect("tx");
+        let mut trie_cur = tx.cursor_dup_read::<AccountTrieHistory>().expect("cursor");
+
+        assert!(
+            trie_cur.seek_by_key_subkey(StoredNibbles::from(path1), 1).unwrap().is_some(),
+            "Trie node at block 1 should remain"
+        );
+        assert!(
+            trie_cur.seek_by_key_subkey(StoredNibbles::from(path2), 2).unwrap().is_none(),
+            "Trie node at block 2 should be removed"
+        );
+        assert!(
+            trie_cur.seek_by_key_subkey(StoredNibbles::from(path1), 3).unwrap().is_none(),
+            "Trie node at block 3 should be removed"
+        );
+    }
+
+    #[test]
+    fn test_unwind_history_comprehensive() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Setup comprehensive scenario with accounts, storage, and trie nodes
+        let addr1 = B256::random();
+        let addr2 = B256::random();
+        let slot1 = B256::random();
+        let slot2 = B256::random();
+        let path1 = Nibbles::from_nibbles_unchecked([0x01]);
+        let path2 = Nibbles::from_nibbles_unchecked([0x02]);
+        let storage_path1 = Nibbles::from_nibbles_unchecked([0x03]);
+
+        let acc1 = Account { nonce: 1, balance: U256::from(100), ..Default::default() };
+        let acc2 = Account { nonce: 2, balance: U256::from(200), ..Default::default() };
+        let node1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::random()));
+        let node2 = BranchNodeCompact::new(0b10, 0, 0, vec![], Some(B256::random()));
+        let storage_node1 = BranchNodeCompact::new(0b100, 0, 0, vec![], Some(B256::random()));
+
+        // Block 0: Set earliest block
+        let b0 = NumHash::new(0, B256::random());
+        store.set_earliest_block_number_hash(b0.number, b0.hash).expect("set earliest");
+
+        // Block 1: Insert multiple types of data
+        let b1 = BlockWithParent::new(b0.hash, NumHash::new(1, B256::random()));
+        let mut diff1_trie_updates = TrieUpdates::default();
+        let mut diff1_post_state = HashedPostState::default();
+        diff1_post_state.accounts.insert(addr1, Some(acc1));
+        diff1_trie_updates.account_nodes.insert(path1, node1);
+        let mut storage1 = HashedStorage::default();
+        storage1.storage.insert(slot1, U256::from(1111));
+        diff1_post_state.storages.insert(addr1, storage1);
+        let mut storage_updates1 = StorageTrieUpdates::default();
+        storage_updates1.storage_nodes.insert(storage_path1, storage_node1);
+        diff1_trie_updates.storage_tries.insert(addr1, storage_updates1);
+        let diff1 = BlockStateDiff {
+            sorted_trie_updates: diff1_trie_updates.into_sorted(),
+            sorted_post_state: diff1_post_state.into_sorted(),
+        };
+        store.store_trie_updates(b1, diff1).expect("store b1");
+
+        // Block 2: More updates
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let mut diff2_trie_updates = TrieUpdates::default();
+        let mut diff2_post_state = HashedPostState::default();
+        diff2_post_state.accounts.insert(addr2, Some(acc2));
+        diff2_trie_updates.account_nodes.insert(path2, node2);
+        let mut storage2 = HashedStorage::default();
+        storage2.storage.insert(slot2, U256::from(2222));
+        diff2_post_state.storages.insert(addr2, storage2);
+        let diff2 = BlockStateDiff {
+            sorted_trie_updates: diff2_trie_updates.into_sorted(),
+            sorted_post_state: diff2_post_state.into_sorted(),
+        };
+        store.store_trie_updates(b2, diff2).expect("store b2");
+
+        // Block 3: Additional updates
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+        let mut diff3_post_state = HashedPostState::default();
+        diff3_post_state.accounts.insert(addr1, Some(acc2)); // update addr1
+        let diff3 = BlockStateDiff {
+            sorted_trie_updates: TrieUpdatesSorted::default(),
+            sorted_post_state: diff3_post_state.into_sorted(),
+        };
+        store.store_trie_updates(b3, diff3).expect("store b3");
+
+        // Unwind to block 1
+        store.unwind_history(b2).expect("unwind");
+
+        let tx = store.env.tx().expect("tx");
+
+        // Verify account history: block 1 remains, blocks 2 and 3 removed
+        let mut acc_cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+        assert!(acc_cur.seek_by_key_subkey(addr1, 1).unwrap().is_some());
+        assert!(acc_cur.seek_by_key_subkey(addr2, 2).unwrap().is_none());
+        assert!(acc_cur.seek_by_key_subkey(addr1, 3).unwrap().is_none());
+
+        // Verify trie history
+        let mut trie_cur = tx.cursor_dup_read::<AccountTrieHistory>().expect("cursor");
+        assert!(trie_cur.seek_by_key_subkey(StoredNibbles::from(path1), 1).unwrap().is_some());
+        assert!(trie_cur.seek_by_key_subkey(StoredNibbles::from(path2), 2).unwrap().is_none());
+
+        // Verify storage history
+        let mut storage_cur = tx.new_cursor::<HashedStorageHistory>().expect("cursor");
+        assert!(
+            storage_cur
+                .seek_by_key_subkey(HashedStorageKey::new(addr1, slot1), 1)
+                .unwrap()
+                .is_some()
+        );
+        assert!(
+            storage_cur
+                .seek_by_key_subkey(HashedStorageKey::new(addr2, slot2), 2)
+                .unwrap()
+                .is_none()
+        );
+
+        // Verify storage trie history
+        let mut storage_trie_cur = tx.cursor_dup_read::<StorageTrieHistory>().expect("cursor");
+        assert!(
+            storage_trie_cur
+                .seek_by_key_subkey(
+                    StorageTrieKey::new(addr1, StoredNibbles::from(storage_path1)),
+                    1
+                )
+                .unwrap()
+                .is_some()
+        );
+
+        // Verify ProofWindow LatestBlock is updated
+        let mut proof_window_cur = tx.cursor_read::<ProofWindow>().expect("cursor");
+        let latest = proof_window_cur
+            .seek_exact(ProofWindowKey::LatestBlock)
+            .expect("seek")
+            .expect("latest exists");
+        assert_eq!(latest.1.number(), 1);
+        assert_eq!(*latest.1.hash(), b1.block.hash);
+
+        // Verify change sets are removed for blocks > 1
+        let mut change_cur = tx.new_cursor::<BlockChangeSet>().expect("cursor");
+        assert!(change_cur.seek_exact(1).unwrap().is_some(), "Block 1 changeset should remain");
+        assert!(change_cur.seek_exact(2).unwrap().is_none(), "Block 2 changeset should be removed");
+        assert!(change_cur.seek_exact(3).unwrap().is_none(), "Block 3 changeset should be removed");
+    }
+
+    #[test]
+    fn test_unwind_history_empty_chain() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        // Try to unwind when there's nothing stored yet
+        let unwind_to = BlockWithParent::new(B256::ZERO, NumHash::new(0, B256::ZERO));
+        let result = store.unwind_history(unwind_to);
+
+        // Should succeed (no-op)
+        assert!(result.is_ok(), "Unwinding empty chain should succeed");
+    }
+
+    #[test]
+    fn test_unwind_history_idempotent() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::random();
+        let make_diff = |nonce: u64| {
+            let mut d_post_state = HashedPostState::default();
+            d_post_state.accounts.insert(addr, Some(Account { nonce, ..Default::default() }));
+            BlockStateDiff {
+                sorted_trie_updates: TrieUpdatesSorted::default(),
+                sorted_post_state: d_post_state.into_sorted(),
+            }
+        };
+
+        // Build chain: blocks 1 -> 2 -> 3
+        let b0 = NumHash::new(0, B256::random());
+        let b1 = BlockWithParent::new(b0.hash, NumHash::new(1, B256::random()));
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+
+        store.set_earliest_block_number_hash(b0.number, b0.hash).expect("set earliest");
+        store.store_trie_updates(b1, make_diff(10)).expect("store b1");
+        store.store_trie_updates(b2, make_diff(20)).expect("store b2");
+        store.store_trie_updates(b3, make_diff(30)).expect("store b3");
+
+        // Unwind to block 1
+        store.unwind_history(b2).expect("first unwind");
+
+        // Unwind again to the same block (should be idempotent)
+        store.unwind_history(b2).expect("second unwind");
+
+        // Verify state is still correct
+        let tx = store.env.tx().expect("tx");
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+
+        assert!(cur.seek_by_key_subkey(addr, 1).unwrap().is_some(), "Block 1 should remain");
+        assert!(cur.seek_by_key_subkey(addr, 2).unwrap().is_none(), "Block 2 should be removed");
+        assert!(cur.seek_by_key_subkey(addr, 3).unwrap().is_none(), "Block 3 should be removed");
+    }
+
+    #[test]
+    fn test_unwind_history_beyond_latest() {
+        let dir = TempDir::new().unwrap();
+        let store = MdbxProofsStorage::new(dir.path()).expect("env");
+
+        let addr = B256::random();
+        let make_diff = |nonce: u64| {
+            let mut d_post_state = HashedPostState::default();
+            d_post_state.accounts.insert(addr, Some(Account { nonce, ..Default::default() }));
+            BlockStateDiff {
+                sorted_trie_updates: TrieUpdatesSorted::default(),
+                sorted_post_state: d_post_state.into_sorted(),
+            }
+        };
+
+        // Build chain: blocks 1 -> 2 -> 3
+        let b0 = NumHash::new(0, B256::random());
+        let b1 = BlockWithParent::new(b0.hash, NumHash::new(1, B256::random()));
+        let b2 = BlockWithParent::new(b1.block.hash, NumHash::new(2, B256::random()));
+        let b3 = BlockWithParent::new(b2.block.hash, NumHash::new(3, B256::random()));
+        let b4 = BlockWithParent::new(b3.block.hash, NumHash::new(4, B256::random()));
+        let b5 = BlockWithParent::new(b4.block.hash, NumHash::new(5, B256::random()));
+
+        store.set_earliest_block_number_hash(b0.number, b0.hash).expect("set earliest");
+        store.store_trie_updates(b1, make_diff(10)).expect("store b1");
+        store.store_trie_updates(b2, make_diff(20)).expect("store b2");
+        store.store_trie_updates(b3, make_diff(30)).expect("store b3");
+
+        // Unwind to block 1
+        store.unwind_history(b5).expect("first unwind");
+
+        // Verify state is still correct
+        let tx = store.env.tx().expect("tx");
+        let mut cur = tx.new_cursor::<HashedAccountHistory>().expect("cursor");
+
+        assert!(cur.seek_by_key_subkey(addr, 1).unwrap().is_some(), "Block 1 should remain");
+        assert!(cur.seek_by_key_subkey(addr, 2).unwrap().is_some(), "Block 2 should remain");
+        assert!(cur.seek_by_key_subkey(addr, 3).unwrap().is_some(), "Block 3 should remain");
+
+        let mut proof_window_cur = tx.cursor_read::<ProofWindow>().expect("cursor");
+        let latest = proof_window_cur
+            .seek_exact(ProofWindowKey::LatestBlock)
+            .expect("seek")
+            .expect("latest exists");
+        assert_eq!(latest.1.number(), b3.block.number);
+        assert_eq!(*latest.1.hash(), b3.block.hash);
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/error.rs b/rust/op-reth/crates/trie/src/error.rs
new file mode 100644
index 0000000000000..1bf07a73b8b63
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/error.rs
@@ -0,0 +1,194 @@
+//! Errors interfacing with [`OpProofsStore`](crate::OpProofsStore) type.
+
+use alloy_primitives::B256;
+use reth_db::DatabaseError;
+use reth_execution_errors::BlockExecutionError;
+use reth_provider::ProviderError;
+use reth_trie_common::Nibbles;
+use std::sync::Arc;
+use thiserror::Error;
+
+/// Error type for storage operations
+#[derive(Debug, Clone, Error)]
+pub enum OpProofsStorageError {
+    /// No blocks found
+    #[error("No blocks found")]
+    NoBlocksFound,
+    /// Parent block number is less than earliest stored block number
+    #[error("Parent block number is less than earliest stored block number")]
+    UnknownParent,
+    /// Block is out of order
+    #[error(
+        "Block {block_number} is out of order (parent: {parent_block_hash}, latest stored block hash: {latest_block_hash})"
+    )]
+    OutOfOrder {
+        /// The block number being inserted
+        block_number: u64,
+        /// The parent hash of the block being inserted
+        parent_block_hash: B256,
+        /// block hash of the latest stored block
+        latest_block_hash: B256,
+    },
+    /// Block update failed since parent state
+    #[error(
+        "Cannot execute block updates for block {block_number} without parent state {parent_block_number} (latest stored block number: {latest_block_number})"
+    )]
+    MissingParentBlock {
+        /// The block number being executed
+        block_number: u64,
+        /// The parent state of the block being executed
+        parent_block_number: u64,
+        /// Latest stored block number
+        latest_block_number: u64,
+    },
+    /// State root mismatch
+    #[error(
+        "State root mismatch for block {block_number} (have: {current_state_hash}, expected: {expected_state_hash})"
+    )]
+    StateRootMismatch {
+        /// Block number
+        block_number: u64,
+        /// Have state root
+        current_state_hash: B256,
+        /// Expected state root
+        expected_state_hash: B256,
+    },
+    /// No change set for block
+    #[error("No change set found for block {0}")]
+    NoChangeSetForBlock(u64),
+    /// Missing account trie history for a specific path at a specific block number
+    #[error("Missing account trie history for path {0:?} at block {1}")]
+    MissingAccountTrieHistory(Nibbles, u64),
+    /// Missing storage trie history for a specific address and path at a specific block number
+    #[error("Missing storage trie history for address {0:?}, path {1:?} at block {2}")]
+    MissingStorageTrieHistory(B256, Nibbles, u64),
+    /// Missing hashed account history for a specific key at a specific block number
+    #[error("Missing hashed account history for key {0:?} at block {1}")]
+    MissingHashedAccountHistory(B256, u64),
+    /// Missing hashed storage history for a specific address and key at a specific block number
+    #[error(
+        "Missing hashed storage history for address {hashed_address:?}, key {hashed_storage_key:?} at block {block_number}"
+    )]
+    MissingHashedStorageHistory {
+        /// The hashed address
+        hashed_address: B256,
+        /// The hashed storage key
+        hashed_storage_key: B256,
+        /// The block number
+        block_number: u64,
+    },
+    /// Attempted to unwind to a block beyond the earliest stored block
+    #[error(
+        "Attempted to unwind to block {unwind_block_number} beyond earliest stored block {earliest_block_number}"
+    )]
+    UnwindBeyondEarliest {
+        /// The block number being unwound to
+        unwind_block_number: u64,
+        /// The earliest stored block number
+        earliest_block_number: u64,
+    },
+    /// Error occurred while interacting with the database.
+    #[error(transparent)]
+    DatabaseError(DatabaseError),
+    /// Error occurred while trying to acquire a lock.
+    #[error("failed lock attempt")]
+    TryLockError,
+    /// Error occurred during block execution.
+    #[error(transparent)]
+    ExecutionError(Arc<BlockExecutionError>),
+    /// Error occurred while interacting with the provider.
+    #[error(transparent)]
+    ProviderError(Arc<ProviderError>),
+    /// Initialization detected inconsistent state between proofs storage and source DB.
+    #[error(
+        "Initialization Proofs storage detected inconsistent state. Storage does not match source DB. \
+         Please clear proofs data and retry initialization."
+    )]
+    InitializeStorageInconsistentState,
+}
+
+impl From<BlockExecutionError> for OpProofsStorageError {
+    fn from(error: BlockExecutionError) -> Self {
+        Self::ExecutionError(Arc::new(error))
+    }
+}
+
+impl From<ProviderError> for OpProofsStorageError {
+    fn from(error: ProviderError) -> Self {
+        Self::ProviderError(Arc::new(error))
+    }
+}
+
+impl From<OpProofsStorageError> for DatabaseError {
+    fn from(error: OpProofsStorageError) -> Self {
+        match error {
+            OpProofsStorageError::DatabaseError(err) => err,
+            _ => Self::Custom(Arc::new(error)),
+        }
+    }
+}
+
+impl From<DatabaseError> for OpProofsStorageError {
+    fn from(error: DatabaseError) -> Self {
+        if let DatabaseError::Custom(ref err) = error &&
+            let Some(err) = err.downcast_ref::<Self>()
+        {
+            return err.clone();
+        }
+        Self::DatabaseError(error)
+    }
+}
+
+/// Result type for storage operations
+pub type OpProofsStorageResult<T> = Result<T, OpProofsStorageError>;
+
+#[cfg(test)]
+mod test {
+    use super::*;
+    use reth_execution_errors::BlockValidationError;
+
+    #[test]
+    fn test_op_proofs_store_error_to_db_error() {
+        let original_error = OpProofsStorageError::NoBlocksFound;
+
+        let db_error = DatabaseError::from(original_error);
+        assert!(matches!(db_error, DatabaseError::Custom(_)));
+
+        let converted_error = OpProofsStorageError::from(db_error);
+        assert!(matches!(converted_error, OpProofsStorageError::NoBlocksFound))
+    }
+
+    #[test]
+    fn test_db_error_to_op_proofs_store_error() {
+        let original_error = DatabaseError::Decode;
+
+        let op_proofs_store_error = OpProofsStorageError::from(original_error);
+        assert!(matches!(
+            op_proofs_store_error,
+            OpProofsStorageError::DatabaseError(DatabaseError::Decode)
+        ));
+
+        let converted_error = DatabaseError::from(op_proofs_store_error);
+        assert!(matches!(converted_error, DatabaseError::Decode))
+    }
+
+    #[test]
+    fn test_conversion_from_block_execution_error() {
+        let block_execution_error =
+            BlockExecutionError::Validation(BlockValidationError::IncrementBalanceFailed);
+
+        let op_proofs_store_error = OpProofsStorageError::from(block_execution_error);
+        assert!(
+            matches!(op_proofs_store_error, OpProofsStorageError::ExecutionError(err) if matches!(*err, BlockExecutionError::Validation(BlockValidationError::IncrementBalanceFailed)))
+        )
+    }
+
+    #[test]
+    fn test_conversion_from_provider_error() {
+        let provider_error = ProviderError::SenderRecoveryError;
+        let op_proofs_store_error = OpProofsStorageError::from(provider_error);
+        assert!(
+            matches!(op_proofs_store_error, OpProofsStorageError::ProviderError(err) if matches!(*err, ProviderError::SenderRecoveryError))
+        )
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/in_memory.rs b/rust/op-reth/crates/trie/src/in_memory.rs
new file mode 100644
index 0000000000000..75c816f40df8f
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/in_memory.rs
@@ -0,0 +1,883 @@
+//! In-memory implementation of [`OpProofsStore`] for testing purposes
+
+use crate::{
+    BlockStateDiff, OpProofsStorageError, OpProofsStorageResult, OpProofsStore,
+    api::{InitialStateAnchor, InitialStateStatus, OpProofsInitialStateStore, WriteCounts},
+    db::{HashedStorageKey, StorageTrieKey},
+};
+use alloy_eips::{BlockNumHash, NumHash, eip1898::BlockWithParent};
+use alloy_primitives::{B256, U256};
+use parking_lot::RwLock;
+use reth_db::DatabaseError;
+use reth_primitives_traits::Account;
+use reth_trie::{
+    hashed_cursor::{HashedCursor, HashedStorageCursor},
+    trie_cursor::{TrieCursor, TrieStorageCursor},
+};
+use reth_trie_common::{
+    BranchNodeCompact, HashedPostStateSorted, Nibbles, StoredNibbles, updates::TrieUpdatesSorted,
+};
+use std::{collections::BTreeMap, sync::Arc};
+
+/// In-memory implementation of [`OpProofsStore`] for testing purposes
+#[derive(Debug, Clone)]
+pub struct InMemoryProofsStorage {
+    /// Shared state across all instances
+    inner: Arc<RwLock<InMemoryStorageInner>>,
+}
+
+#[derive(Debug, Default)]
+struct InMemoryStorageInner {
+    /// Account trie branches: (`block_number`, path) -> `branch_node`
+    account_branches: BTreeMap<(u64, Nibbles), Option<BranchNodeCompact>>,
+
+    /// Storage trie branches: (`block_number`, `hashed_address`, path) -> `branch_node`
+    storage_branches: BTreeMap<(u64, B256, Nibbles), Option<BranchNodeCompact>>,
+
+    /// Hashed accounts: (`block_number`, `hashed_address`) -> account
+    hashed_accounts: BTreeMap<(u64, B256), Option<Account>>,
+
+    /// Hashed storages: (`block_number`, `hashed_address`, `hashed_slot`) -> value
+    hashed_storages: BTreeMap<(u64, B256, B256), U256>,
+
+    /// Trie updates by block number
+    trie_updates: BTreeMap<u64, TrieUpdatesSorted>,
+
+    /// Post state by block number
+    post_states: BTreeMap<u64, HashedPostStateSorted>,
+
+    /// Earliest block number and hash
+    earliest_block: Option<(u64, B256)>,
+
+    /// The anchor block (initial state) of the store.
+    anchor_block: Option<(u64, B256)>,
+}
+
+impl InMemoryStorageInner {
+    fn store_trie_updates(
+        &mut self,
+        block_number: u64,
+        block_state_diff: BlockStateDiff,
+    ) -> WriteCounts {
+        let mut result = WriteCounts::default();
+
+        // Store account branch nodes
+        for (path, branch) in block_state_diff.sorted_trie_updates.account_nodes_ref() {
+            self.account_branches.insert((block_number, *path), branch.clone());
+            result.account_trie_updates_written_total += 1;
+        }
+
+        // Store storage branch nodes and removals
+        for (address, storage_trie_updates) in
+            block_state_diff.sorted_trie_updates.storage_tries_ref()
+        {
+            // Store storage branch nodes
+            for (path, branch) in storage_trie_updates.storage_nodes_ref() {
+                self.storage_branches.insert((block_number, *address, *path), branch.clone());
+                result.storage_trie_updates_written_total += 1;
+            }
+        }
+
+        for (address, account) in &block_state_diff.sorted_post_state.accounts {
+            self.hashed_accounts.insert((block_number, *address), *account);
+            result.hashed_accounts_written_total += 1;
+        }
+
+        for (hashed_address, storage) in &block_state_diff.sorted_post_state.storages {
+            // Handle wiped storage: iterate all existing values and mark them as deleted
+            // This is an expensive operation and should never happen for blocks going forward.
+            if storage.wiped {
+                // Collect latest values for each slot up to the current block
+                let mut slot_to_latest: std::collections::BTreeMap<B256, (u64, U256)> =
+                    std::collections::BTreeMap::new();
+
+                for ((block, address, slot), value) in &self.hashed_storages {
+                    if *block < block_number && *address == *hashed_address {
+                        if let Some((existing_block, _)) = slot_to_latest.get(slot) {
+                            if *block > *existing_block {
+                                slot_to_latest.insert(*slot, (*block, *value));
+                            }
+                        } else {
+                            slot_to_latest.insert(*slot, (*block, *value));
+                        }
+                    }
+                }
+
+                // Store zero values for all non-zero slots to mark them as deleted
+                for (slot, (_, value)) in slot_to_latest {
+                    if !value.is_zero() {
+                        self.hashed_storages
+                            .insert((block_number, *hashed_address, slot), U256::ZERO);
+                        result.hashed_storages_written_total += 1;
+                    }
+                }
+            } else {
+                for (slot, value) in storage.storage_slots_ref() {
+                    self.hashed_storages.insert((block_number, *hashed_address, *slot), *value);
+                    result.hashed_storages_written_total += 1;
+                }
+            }
+        }
+
+        self.trie_updates.insert(block_number, block_state_diff.sorted_trie_updates.clone());
+        self.post_states.insert(block_number, block_state_diff.sorted_post_state);
+
+        result
+    }
+}
+
+impl Default for InMemoryProofsStorage {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl InMemoryProofsStorage {
+    /// Create a new in-memory op proofs storage instance
+    pub fn new() -> Self {
+        Self { inner: Arc::new(RwLock::new(InMemoryStorageInner::default())) }
+    }
+
+    fn get_latest_account_trie_key(&self) -> OpProofsStorageResult<Option<StoredNibbles>> {
+        let inner = self.inner.read();
+        Ok(inner
+            .account_branches
+            .range((
+                std::ops::Bound::Included((0, Nibbles::default())),
+                std::ops::Bound::Excluded((1, Nibbles::default())),
+            ))
+            .next_back()
+            .map(|((_, nibbles), _)| StoredNibbles::from(*nibbles)))
+    }
+
+    fn get_latest_storage_trie_key(&self) -> OpProofsStorageResult<Option<StorageTrieKey>> {
+        let inner = self.inner.read();
+        Ok(inner
+            .storage_branches
+            .range((
+                std::ops::Bound::Included((0, B256::ZERO, Nibbles::default())),
+                std::ops::Bound::Excluded((1, B256::ZERO, Nibbles::default())),
+            ))
+            .next_back()
+            .map(|((_, address, nibbles), _)| {
+                StorageTrieKey::new(*address, StoredNibbles::from(*nibbles))
+            }))
+    }
+
+    fn get_latest_hashed_account_key(&self) -> OpProofsStorageResult<Option<B256>> {
+        let inner = self.inner.read();
+        Ok(inner
+            .hashed_accounts
+            .range((
+                std::ops::Bound::Included((0, B256::ZERO)),
+                std::ops::Bound::Excluded((1, B256::ZERO)),
+            ))
+            .next_back()
+            .map(|((_, address), _)| *address))
+    }
+
+    fn get_latest_hashed_storage_key(&self) -> OpProofsStorageResult<Option<HashedStorageKey>> {
+        let inner = self.inner.read();
+        Ok(inner
+            .hashed_storages
+            .range((
+                std::ops::Bound::Included((0, B256::ZERO, B256::ZERO)),
+                std::ops::Bound::Excluded((1, B256::ZERO, B256::ZERO)),
+            ))
+            .next_back()
+            .map(|((_, address, slot), _)| HashedStorageKey::new(*address, *slot)))
+    }
+}
+
+/// In-memory implementation of [`TrieCursor`].
+#[derive(Debug)]
+pub struct InMemoryTrieCursor {
+    /// inner storage reference
+    inner: Arc<RwLock<InMemoryStorageInner>>,
+    /// Hashed address being queried
+    hashed_address: Option<B256>,
+    /// max block number for the cursor
+    max_block_number: u64,
+    /// Current position in the iteration (-1 means not positioned yet)
+    position: isize,
+
+    /// Whether the entries have been populated
+    is_populated: bool,
+    /// Sorted entries that match the query parameters
+    entries: Vec<(Nibbles, BranchNodeCompact)>,
+}
+
+impl InMemoryTrieCursor {
+    const fn new(
+        inner: Arc<RwLock<InMemoryStorageInner>>,
+        hashed_address: Option<B256>,
+        max_block_number: u64,
+    ) -> Self {
+        Self {
+            inner,
+            hashed_address,
+            max_block_number,
+            position: -1,
+
+            is_populated: false,
+            entries: Vec::new(),
+        }
+    }
+
+    fn ensure_entries_populated(&mut self) -> Result<(), DatabaseError> {
+        if self.is_populated {
+            return Ok(());
+        }
+
+        let storage = self.inner.try_read().ok_or(OpProofsStorageError::TryLockError)?;
+
+        // Common logic: collect latest values for each path
+        let mut path_to_latest: std::collections::BTreeMap<
+            Nibbles,
+            (u64, Option<BranchNodeCompact>),
+        > = std::collections::BTreeMap::new();
+
+        let mut collected_entries: Vec<(Nibbles, BranchNodeCompact)> =
+            if let Some(addr) = self.hashed_address {
+                // Storage trie cursor
+                for ((block, address, path), branch) in &storage.storage_branches {
+                    if *block <= self.max_block_number && *address == addr {
+                        if let Some((existing_block, _)) = path_to_latest.get(path) {
+                            if *block > *existing_block {
+                                path_to_latest.insert(*path, (*block, branch.clone()));
+                            }
+                        } else {
+                            path_to_latest.insert(*path, (*block, branch.clone()));
+                        }
+                    }
+                }
+
+                path_to_latest
+                    .into_iter()
+                    .filter_map(|(path, (_, branch))| branch.map(|b| (path, b)))
+                    .collect()
+            } else {
+                // Account trie cursor
+                for ((block, path), branch) in &storage.account_branches {
+                    if *block <= self.max_block_number {
+                        if let Some((existing_block, _)) = path_to_latest.get(path) {
+                            if *block > *existing_block {
+                                path_to_latest.insert(*path, (*block, branch.clone()));
+                            }
+                        } else {
+                            path_to_latest.insert(*path, (*block, branch.clone()));
+                        }
+                    }
+                }
+
+                path_to_latest
+                    .into_iter()
+                    .filter_map(|(path, (_, branch))| branch.map(|b| (path, b)))
+                    .collect()
+            };
+
+        // Sort by path for consistent ordering
+        collected_entries.sort_by_key(|(a, _)| *a);
+        self.entries = collected_entries;
+        self.is_populated = true;
+        Ok(())
+    }
+}
+
+impl TrieCursor for InMemoryTrieCursor {
+    fn seek_exact(
+        &mut self,
+        path: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.ensure_entries_populated()?;
+
+        if let Some(pos) = self.entries.iter().position(|(p, _)| *p == path) {
+            self.position = pos as isize;
+            Ok(Some(self.entries[pos].clone()))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn seek(
+        &mut self,
+        path: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.ensure_entries_populated()?;
+
+        if let Some(pos) = self.entries.iter().position(|(p, _)| *p >= path) {
+            self.position = pos as isize;
+            Ok(Some(self.entries[pos].clone()))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn next(&mut self) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.ensure_entries_populated()?;
+
+        self.position += 1;
+        if self.position >= 0 && (self.position as usize) < self.entries.len() {
+            Ok(Some(self.entries[self.position as usize].clone()))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn current(&mut self) -> Result<Option<Nibbles>, DatabaseError> {
+        self.ensure_entries_populated()?;
+
+        if self.position >= 0 && (self.position as usize) < self.entries.len() {
+            Ok(Some(self.entries[self.position as usize].0))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn reset(&mut self) {
+        self.position = -1;
+    }
+}
+
+impl TrieStorageCursor for InMemoryTrieCursor {
+    fn set_hashed_address(&mut self, hashed_address: B256) {
+        self.hashed_address = Some(hashed_address);
+        self.is_populated = false;
+        self.entries.clear();
+        self.reset();
+    }
+}
+
+/// In-memory implementation of [`HashedCursor`] for storage slots
+#[derive(Debug)]
+pub struct InMemoryStorageCursor {
+    /// inner storage reference
+    inner: Arc<RwLock<InMemoryStorageInner>>,
+    /// hashed address for which the cursor is iterating
+    hashed_address: B256,
+    /// max block number for the cursor
+    max_block_number: u64,
+    /// Current position in the iteration (-1 means not positioned yet)
+    position: isize,
+
+    /// Whether the entries have been populated
+    is_populated: bool,
+    /// Sorted entries that match the query parameters
+    entries: Vec<(B256, U256)>,
+}
+
+impl InMemoryStorageCursor {
+    const fn new(
+        storage: Arc<RwLock<InMemoryStorageInner>>,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> Self {
+        Self {
+            inner: storage,
+            hashed_address,
+            max_block_number,
+            position: -1,
+
+            is_populated: false,
+            entries: Vec::new(),
+        }
+    }
+
+    fn ensure_entries_populated(&mut self) -> Result<(), DatabaseError> {
+        if self.is_populated {
+            return Ok(());
+        }
+
+        let storage = self.inner.try_read().ok_or(OpProofsStorageError::TryLockError)?;
+
+        // Collect latest values for each slot
+        let mut slot_to_latest: std::collections::BTreeMap<B256, (u64, U256)> =
+            std::collections::BTreeMap::new();
+
+        for ((block, address, slot), value) in &storage.hashed_storages {
+            if *block <= self.max_block_number && *address == self.hashed_address {
+                if let Some((existing_block, _)) = slot_to_latest.get(slot) {
+                    if *block > *existing_block {
+                        slot_to_latest.insert(*slot, (*block, *value));
+                    }
+                } else {
+                    slot_to_latest.insert(*slot, (*block, *value));
+                }
+            }
+        }
+
+        // Filter out zero values - they represent deleted/empty storage slots
+        let mut entries: Vec<(B256, U256)> = slot_to_latest
+            .into_iter()
+            .filter_map(
+                |(slot, (_, value))| {
+                    if value.is_zero() { None } else { Some((slot, value)) }
+                },
+            )
+            .collect();
+
+        entries.sort_by_key(|(slot, _)| *slot);
+        self.entries = entries;
+        self.is_populated = true;
+        Ok(())
+    }
+}
+
+impl HashedCursor for InMemoryStorageCursor {
+    type Value = U256;
+
+    fn seek(&mut self, key: B256) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.ensure_entries_populated()?;
+
+        if let Some(pos) = self.entries.iter().position(|(k, _)| *k >= key) {
+            self.position = pos as isize;
+            Ok(Some(self.entries[pos]))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn next(&mut self) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.ensure_entries_populated()?;
+
+        self.position += 1;
+        if self.position >= 0 && (self.position as usize) < self.entries.len() {
+            Ok(Some(self.entries[self.position as usize]))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn reset(&mut self) {
+        self.position = -1;
+    }
+}
+
+impl HashedStorageCursor for InMemoryStorageCursor {
+    fn is_storage_empty(&mut self) -> Result<bool, DatabaseError> {
+        Ok(self.seek(B256::ZERO)?.is_none())
+    }
+
+    fn set_hashed_address(&mut self, hashed_address: B256) {
+        self.hashed_address = hashed_address;
+        self.is_populated = false;
+        self.entries.clear();
+        self.reset();
+    }
+}
+
+/// In-memory implementation of [`HashedCursor`] for accounts
+#[derive(Debug)]
+pub struct InMemoryAccountCursor {
+    /// Current position in the iteration (-1 means not positioned yet)
+    position: isize,
+    /// Sorted entries that match the query parameters
+    entries: Vec<(B256, Account)>,
+}
+
+impl InMemoryAccountCursor {
+    fn new(storage: &InMemoryStorageInner, max_block_number: u64) -> Self {
+        // Collect latest accounts for each address
+        let mut addr_to_latest: std::collections::BTreeMap<B256, (u64, Option<Account>)> =
+            std::collections::BTreeMap::new();
+
+        for ((block, address), account) in &storage.hashed_accounts {
+            if *block <= max_block_number {
+                if let Some((existing_block, _)) = addr_to_latest.get(address) {
+                    if *block > *existing_block {
+                        addr_to_latest.insert(*address, (*block, *account));
+                    }
+                } else {
+                    addr_to_latest.insert(*address, (*block, *account));
+                }
+            }
+        }
+
+        let mut entries: Vec<(B256, Account)> = addr_to_latest
+            .into_iter()
+            .filter_map(|(address, (_, account))| account.map(|acc| (address, acc)))
+            .collect();
+
+        entries.sort_by_key(|(address, _)| *address);
+
+        Self { position: -1, entries }
+    }
+}
+
+impl HashedCursor for InMemoryAccountCursor {
+    type Value = Account;
+
+    fn seek(&mut self, key: B256) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        if let Some(pos) = self.entries.iter().position(|(k, _)| *k >= key) {
+            self.position = pos as isize;
+            Ok(Some(self.entries[pos]))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn next(&mut self) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.position += 1;
+        if self.position >= 0 && (self.position as usize) < self.entries.len() {
+            Ok(Some(self.entries[self.position as usize]))
+        } else {
+            Ok(None)
+        }
+    }
+
+    fn reset(&mut self) {
+        // no reset needed
+    }
+}
+
+impl OpProofsStore for InMemoryProofsStorage {
+    type StorageTrieCursor<'tx> = InMemoryTrieCursor;
+    type AccountTrieCursor<'tx> = InMemoryTrieCursor;
+    type StorageCursor<'tx> = InMemoryStorageCursor;
+    type AccountHashedCursor<'tx> = InMemoryAccountCursor;
+
+    fn get_earliest_block_number(&self) -> OpProofsStorageResult<Option<(u64, B256)>> {
+        let inner = self.inner.read();
+        Ok(inner.earliest_block)
+    }
+
+    fn get_latest_block_number(&self) -> OpProofsStorageResult<Option<(u64, B256)>> {
+        let inner = self.inner.read();
+        // Find the latest block number from trie_updates
+        let latest_block = inner.trie_updates.keys().max().copied();
+        Ok(latest_block.map_or(inner.earliest_block, |block| Some((block, B256::ZERO))))
+    }
+
+    fn storage_trie_cursor<'tx>(
+        &self,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::StorageTrieCursor<'tx>> {
+        Ok(InMemoryTrieCursor::new(self.inner.clone(), Some(hashed_address), max_block_number))
+    }
+
+    fn account_trie_cursor<'tx>(
+        &self,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::AccountTrieCursor<'tx>> {
+        Ok(InMemoryTrieCursor::new(self.inner.clone(), None, max_block_number))
+    }
+
+    fn storage_hashed_cursor<'tx>(
+        &self,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::StorageCursor<'tx>> {
+        Ok(InMemoryStorageCursor::new(self.inner.clone(), hashed_address, max_block_number))
+    }
+
+    fn account_hashed_cursor<'tx>(
+        &self,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::AccountHashedCursor<'tx>> {
+        let inner = self.inner.try_read().ok_or(OpProofsStorageError::TryLockError)?;
+        Ok(InMemoryAccountCursor::new(&inner, max_block_number))
+    }
+
+    fn store_trie_updates(
+        &self,
+        block_ref: BlockWithParent,
+        block_state_diff: BlockStateDiff,
+    ) -> OpProofsStorageResult<WriteCounts> {
+        let mut inner = self.inner.write();
+
+        Ok(inner.store_trie_updates(block_ref.block.number, block_state_diff))
+    }
+
+    fn fetch_trie_updates(&self, block_number: u64) -> OpProofsStorageResult<BlockStateDiff> {
+        let inner = self.inner.read();
+
+        let trie_updates = inner.trie_updates.get(&block_number).cloned().unwrap_or_default();
+        let post_state = inner.post_states.get(&block_number).cloned().unwrap_or_default();
+
+        Ok(BlockStateDiff { sorted_trie_updates: trie_updates, sorted_post_state: post_state })
+    }
+
+    fn prune_earliest_state(
+        &self,
+        new_earliest_block_ref: BlockWithParent,
+    ) -> OpProofsStorageResult<WriteCounts> {
+        let mut write_counts = WriteCounts::default();
+        let mut inner = self.inner.write();
+        let new_earliest = new_earliest_block_ref.block.number;
+
+        // 1. Account Branches
+        // Identify keys to move (blocks <= new_earliest but > 0)
+        let account_keys: Vec<_> = inner
+            .account_branches
+            .keys()
+            .filter(|(block, _)| *block > 0 && *block <= new_earliest)
+            .copied()
+            .collect();
+
+        for key in account_keys {
+            if let Some(branch) = inner.account_branches.remove(&key) {
+                // Determine if we should update the base state (block 0)
+                // In a simpler model without diff calculation, we just overwrite block 0
+                // with the latest version found in the pruned range.
+                // Since keys are sorted by block, this logic naturally keeps the latest if we
+                // iterate in order, but here we are just grabbing all of them.
+                // For correctness in BTreeMap iteration order (which is sorted):
+                inner.account_branches.insert((0, key.1), branch);
+                write_counts.account_trie_updates_written_total += 1;
+            }
+        }
+
+        // 2. Storage Branches
+        let storage_keys: Vec<_> = inner
+            .storage_branches
+            .keys()
+            .filter(|(block, _, _)| *block > 0 && *block <= new_earliest)
+            .copied()
+            .collect();
+
+        for key in storage_keys {
+            if let Some(branch) = inner.storage_branches.remove(&key) {
+                inner.storage_branches.insert((0, key.1, key.2), branch);
+                write_counts.storage_trie_updates_written_total += 1;
+            }
+        }
+
+        // 3. Hashed Accounts
+        let acc_keys: Vec<_> = inner
+            .hashed_accounts
+            .keys()
+            .filter(|(block, _)| *block > 0 && *block <= new_earliest)
+            .copied()
+            .collect();
+
+        for key in acc_keys {
+            if let Some(acc) = inner.hashed_accounts.remove(&key) {
+                inner.hashed_accounts.insert((0, key.1), acc);
+                write_counts.hashed_accounts_written_total += 1;
+            }
+        }
+
+        // 4. Hashed Storages
+        let stor_keys: Vec<_> = inner
+            .hashed_storages
+            .keys()
+            .filter(|(block, _, _)| *block > 0 && *block <= new_earliest)
+            .copied()
+            .collect();
+
+        for key in stor_keys {
+            if let Some(val) = inner.hashed_storages.remove(&key) {
+                inner.hashed_storages.insert((0, key.1, key.2), val);
+                write_counts.hashed_storages_written_total += 1;
+            }
+        }
+
+        // Update earliest block pointer
+        if let Some((_, hash)) = inner.earliest_block {
+            inner.earliest_block = Some((new_earliest, hash));
+        }
+
+        // 5. Cleanup Metadata
+        inner.trie_updates.retain(|block, _| *block > new_earliest);
+        inner.post_states.retain(|block, _| *block > new_earliest);
+
+        Ok(write_counts)
+    }
+
+    fn unwind_history(&self, unwind_upto_block: BlockWithParent) -> OpProofsStorageResult<()> {
+        let mut inner = self.inner.write();
+        let unwind_upto_block_number = unwind_upto_block.block.number - 1;
+
+        // Remove all updates after unwind_upto_block_number
+        inner.trie_updates.retain(|block, _| *block <= unwind_upto_block_number);
+        inner.post_states.retain(|block, _| *block <= unwind_upto_block_number);
+        inner.account_branches.retain(|(block, _), _| *block <= unwind_upto_block_number);
+        inner.storage_branches.retain(|(block, _, _), _| *block <= unwind_upto_block_number);
+        inner.hashed_accounts.retain(|(block, _), _| *block <= unwind_upto_block_number);
+        inner.hashed_storages.retain(|(block, _, _), _| *block <= unwind_upto_block_number);
+
+        Ok(())
+    }
+
+    fn replace_updates(
+        &self,
+        latest_common_block: BlockNumHash,
+        blocks_to_add: Vec<(BlockWithParent, BlockStateDiff)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut inner = self.inner.write();
+        let latest_common_block_number = latest_common_block.number;
+
+        // Remove all updates after latest_common_block_number
+        inner.trie_updates.retain(|block, _| *block <= latest_common_block_number);
+        inner.post_states.retain(|block, _| *block <= latest_common_block_number);
+        inner.account_branches.retain(|(block, _), _| *block <= latest_common_block_number);
+        inner.storage_branches.retain(|(block, _, _), _| *block <= latest_common_block_number);
+        inner.hashed_accounts.retain(|(block, _), _| *block <= latest_common_block_number);
+        inner.hashed_storages.retain(|(block, _, _), _| *block <= latest_common_block_number);
+
+        for (block, block_state_diff) in blocks_to_add {
+            inner.store_trie_updates(block.block.number, block_state_diff);
+        }
+
+        Ok(())
+    }
+
+    fn set_earliest_block_number(
+        &self,
+        block_number: u64,
+        hash: B256,
+    ) -> OpProofsStorageResult<()> {
+        let mut inner = self.inner.write();
+        inner.earliest_block = Some((block_number, hash));
+        Ok(())
+    }
+}
+
+impl OpProofsInitialStateStore for InMemoryProofsStorage {
+    fn initial_state_anchor(&self) -> OpProofsStorageResult<InitialStateAnchor> {
+        let inner = self.inner.read();
+
+        let Some((block_num, block_hash)) = inner.anchor_block else {
+            return Ok(InitialStateAnchor::default());
+        };
+
+        let completed = inner.earliest_block.is_some();
+
+        Ok(InitialStateAnchor {
+            block: Some(NumHash::new(block_num, block_hash)),
+            status: if completed {
+                InitialStateStatus::Completed
+            } else {
+                InitialStateStatus::InProgress
+            },
+            latest_account_trie_key: self.get_latest_account_trie_key()?,
+            latest_storage_trie_key: self.get_latest_storage_trie_key()?,
+            latest_hashed_account_key: self.get_latest_hashed_account_key()?,
+            latest_hashed_storage_key: self.get_latest_hashed_storage_key()?,
+        })
+    }
+
+    fn set_initial_state_anchor(&self, anchor: BlockNumHash) -> OpProofsStorageResult<()> {
+        let mut inner = self.inner.write();
+        inner.anchor_block = Some((anchor.number, anchor.hash));
+        Ok(())
+    }
+
+    fn store_account_branches(
+        &self,
+        updates: Vec<(Nibbles, Option<BranchNodeCompact>)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut inner = self.inner.write();
+
+        for (path, branch) in updates {
+            inner.account_branches.insert((0, path), branch);
+        }
+
+        Ok(())
+    }
+
+    fn store_storage_branches(
+        &self,
+        hashed_address: B256,
+        items: Vec<(Nibbles, Option<BranchNodeCompact>)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut inner = self.inner.write();
+
+        for (path, branch) in items {
+            inner.storage_branches.insert((0, hashed_address, path), branch);
+        }
+
+        Ok(())
+    }
+
+    fn store_hashed_accounts(
+        &self,
+        accounts: Vec<(B256, Option<Account>)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut inner = self.inner.write();
+
+        for (address, account) in accounts {
+            inner.hashed_accounts.insert((0, address), account);
+        }
+
+        Ok(())
+    }
+
+    fn store_hashed_storages(
+        &self,
+        hashed_address: B256,
+        storages: Vec<(B256, U256)>,
+    ) -> OpProofsStorageResult<()> {
+        let mut inner = self.inner.write();
+
+        for (slot, value) in storages {
+            inner.hashed_storages.insert((0, hashed_address, slot), value);
+        }
+
+        Ok(())
+    }
+
+    fn commit_initial_state(&self) -> OpProofsStorageResult<BlockNumHash> {
+        let mut inner = self.inner.write();
+        if let Some((number, hash)) = inner.anchor_block {
+            inner.earliest_block = Some((number, hash));
+            Ok(BlockNumHash::new(number, hash))
+        } else {
+            Err(OpProofsStorageError::NoBlocksFound)
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::OpProofsStorageError;
+    use alloy_eips::NumHash;
+    use alloy_primitives::U256;
+    use reth_primitives_traits::Account;
+
+    #[test]
+    fn test_in_memory_storage_basic_operations() -> Result<(), OpProofsStorageError> {
+        let storage = InMemoryProofsStorage::new();
+
+        // Test setting earliest block
+        let block_hash = B256::random();
+        storage.set_earliest_block_number(1, block_hash)?;
+        let earliest = storage.get_earliest_block_number()?;
+        assert_eq!(earliest, Some((1, block_hash)));
+
+        // Test storing and retrieving accounts
+        let account = Account { nonce: 1, balance: U256::from(100), bytecode_hash: None };
+        let hashed_address = B256::random();
+
+        storage.store_hashed_accounts(vec![(hashed_address, Some(account))])?;
+
+        let _cursor = storage.account_hashed_cursor(10)?;
+        // Note: cursor testing would require more complex setup with proper seek/next operations
+
+        Ok(())
+    }
+
+    #[test]
+    fn test_trie_updates_storage() -> Result<(), OpProofsStorageError> {
+        let storage = InMemoryProofsStorage::new();
+
+        let sorted_trie_updates = TrieUpdatesSorted::default();
+        let sorted_post_state = HashedPostStateSorted::default();
+        let block_state_diff = BlockStateDiff {
+            sorted_trie_updates: sorted_trie_updates.clone(),
+            sorted_post_state: sorted_post_state.clone(),
+        };
+
+        const BLOCK: BlockWithParent =
+            BlockWithParent::new(B256::ZERO, NumHash::new(5, B256::ZERO));
+        storage.store_trie_updates(BLOCK, block_state_diff)?;
+
+        let retrieved_diff = storage.fetch_trie_updates(BLOCK.block.number)?;
+        assert_eq!(retrieved_diff.sorted_trie_updates, sorted_trie_updates);
+        assert_eq!(retrieved_diff.sorted_post_state, sorted_post_state);
+
+        Ok(())
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/initialize.rs b/rust/op-reth/crates/trie/src/initialize.rs
new file mode 100644
index 0000000000000..54a0ac4209c1b
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/initialize.rs
@@ -0,0 +1,1166 @@
+//! Initialization job for proofs storage. Handles storing the existing state into the proofs
+//! storage.
+
+use crate::{
+    OpProofsStorageError, OpProofsStore,
+    api::{InitialStateAnchor, InitialStateStatus, OpProofsInitialStateStore},
+    db::{HashedStorageKey, StorageTrieKey},
+};
+use alloy_eips::BlockNumHash;
+use alloy_primitives::{B256, U256};
+use derive_more::Constructor;
+use reth_db::{
+    DatabaseError,
+    cursor::{DbCursorRO, DbDupCursorRO},
+    tables,
+    transaction::DbTx,
+};
+use reth_primitives_traits::{Account, StorageEntry};
+use reth_trie_common::{
+    BranchNodeCompact, Nibbles, StorageTrieEntry, StoredNibbles, StoredNibblesSubKey,
+};
+use std::{collections::HashMap, time::Instant};
+use tracing::{debug, info};
+
+/// Batch size threshold for storing entries during initialization
+const INITIALIZE_STORAGE_THRESHOLD: usize = 100000;
+
+/// Threshold for logging progress during initialization
+const INITIALIZE_LOG_THRESHOLD: usize = 100000;
+
+/// Initialization job for external storage.
+#[derive(Debug, Constructor)]
+pub struct InitializationJob<Tx: DbTx, S: OpProofsStore + Send> {
+    storage: S,
+    tx: Tx,
+}
+
+/// Macro to generate simple cursor iterators for tables
+macro_rules! define_simple_cursor_iter {
+    ($iter_name:ident, $table:ty, $key_type:ty, $value_type:ty) => {
+        struct $iter_name<C>(C);
+
+        impl<C> $iter_name<C> {
+            const fn new(cursor: C) -> Self {
+                Self(cursor)
+            }
+        }
+
+        impl<C: DbCursorRO<$table>> Iterator for $iter_name<C> {
+            type Item = Result<($key_type, $value_type), DatabaseError>;
+
+            fn next(&mut self) -> Option<Self::Item> {
+                self.0.next().transpose()
+            }
+        }
+    };
+}
+
+/// Macro to generate duplicate cursor iterators for tables with custom logic
+macro_rules! define_dup_cursor_iter {
+    ($iter_name:ident, $table:ty, $key_type:ty, $value_type:ty) => {
+        struct $iter_name<C>(C);
+
+        impl<C> $iter_name<C> {
+            const fn new(cursor: C) -> Self {
+                Self(cursor)
+            }
+        }
+
+        impl<C: DbDupCursorRO<$table> + DbCursorRO<$table>> Iterator for $iter_name<C> {
+            type Item = Result<($key_type, $value_type), DatabaseError>;
+
+            fn next(&mut self) -> Option<Self::Item> {
+                // First try to get the next duplicate value
+                if let Some(res) = self.0.next_dup().transpose() {
+                    return Some(res);
+                }
+
+                // If no more duplicates, find the next key with values
+                let Some(Ok((next_key, _))) = self.0.next_no_dup().transpose() else {
+                    // If no more entries, return None
+                    return None;
+                };
+
+                // If found, seek to the first duplicate for this key
+                return self.0.seek(next_key).transpose();
+            }
+        }
+    };
+}
+
+// Generate iterators for all 4 table types
+define_simple_cursor_iter!(HashedAccountsInit, tables::HashedAccounts, B256, Account);
+define_dup_cursor_iter!(HashedStoragesInit, tables::HashedStorages, B256, StorageEntry);
+define_simple_cursor_iter!(
+    AccountsTrieInit,
+    tables::AccountsTrie,
+    StoredNibbles,
+    BranchNodeCompact
+);
+define_dup_cursor_iter!(StoragesTrieInit, tables::StoragesTrie, B256, StorageTrieEntry);
+
+/// Trait to estimate the progress of a initialization job based on the key.
+trait CompletionEstimatable {
+    // Returns a progress estimate as a percentage (0.0 to 1.0)
+    fn estimate_progress(&self) -> f64;
+}
+
+impl CompletionEstimatable for B256 {
+    fn estimate_progress(&self) -> f64 {
+        // use the first 3 bytes as a progress estimate
+        let progress = self.0[..3].to_vec();
+        let mut val: u64 = 0;
+        for nibble in &progress {
+            val = (val << 8) | *nibble as u64;
+        }
+        val as f64 / (256u64.pow(3)) as f64
+    }
+}
+
+impl CompletionEstimatable for StoredNibbles {
+    fn estimate_progress(&self) -> f64 {
+        // use the first 6 nibbles as a progress estimate
+        let progress_nibbles =
+            if self.0.is_empty() { Nibbles::new() } else { self.0.slice(0..(self.0.len().min(6))) };
+        let mut val: u64 = 0;
+        for nibble in progress_nibbles.iter() {
+            val = (val << 4) | nibble as u64;
+        }
+        val as f64 / (16u64.pow(progress_nibbles.len() as u32)) as f64
+    }
+}
+
+impl<Tx: DbTx + Sync, S: OpProofsStore + OpProofsInitialStateStore + Send>
+    InitializationJob<Tx, S>
+{
+    /// Initialize a table from a source iterator to a storage function. Handles batching and
+    /// logging.
+    fn initialize<
+        I: Iterator<Item = Result<(Key, Value), DatabaseError>> + InitTable<Key = Key, Value = Value>,
+        Key: CompletionEstimatable + 'static,
+        Value: 'static,
+    >(
+        &self,
+        name: &str,
+        source: I,
+        storage_threshold: usize,
+        log_threshold: usize,
+    ) -> Result<u64, OpProofsStorageError> {
+        info!("Starting {} initialization", name);
+        let start_time = Instant::now();
+
+        let mut source = source.peekable();
+        let Some(first_entry) = source.peek() else {
+            debug!(target: "reth::cli", "No entries to store for table");
+            return Ok(0);
+        };
+        let initial_progress = match first_entry {
+            Ok(i) => i.0.estimate_progress(),
+            Err(e) => Err(e.clone())?,
+        };
+
+        let storage = &self.storage;
+        let source_size_hint = source.size_hint().0;
+        let mut batch = Vec::with_capacity(source_size_hint.min(storage_threshold));
+        let mut total_entries: usize = 0;
+
+        for entry in source {
+            batch.push(entry?);
+            total_entries += 1;
+
+            if total_entries.is_multiple_of(log_threshold) {
+                let progress = batch.last().expect("non-empty batch").0.estimate_progress();
+                let elapsed = start_time.elapsed();
+                let elapsed_secs = elapsed.as_secs_f64();
+
+                let progress_per_second = if elapsed_secs.is_normal() {
+                    (progress - initial_progress) / elapsed_secs
+                } else {
+                    0.0
+                };
+                let estimated_total_time = if progress_per_second.is_normal() {
+                    (1.0 - progress) / progress_per_second
+                } else {
+                    0.0
+                };
+                let progress_pct = progress * 100.0;
+                info!(
+                    "Processed {} {}, progress: {progress_pct:.2}%, ETA: {}s",
+                    name, total_entries, estimated_total_time,
+                );
+            }
+
+            if batch.len() >= storage_threshold {
+                info!("Storing {} entries, total entries: {}", name, total_entries);
+                I::store_entries(storage, batch)?;
+                batch = Vec::with_capacity(
+                    (source_size_hint.saturating_sub(total_entries)).min(storage_threshold),
+                );
+            }
+        }
+
+        if !batch.is_empty() {
+            info!("Storing final {} entries", name);
+            I::store_entries(storage, batch)?;
+        }
+
+        info!("{} initialization complete: {} entries", name, total_entries);
+        Ok(total_entries as u64)
+    }
+
+    /// Initialize hashed accounts data
+    fn initialize_hashed_accounts(
+        &self,
+        start_key: Option<B256>,
+    ) -> Result<(), OpProofsStorageError> {
+        let mut start_cursor = self.tx.cursor_read::<tables::HashedAccounts>()?;
+
+        if let Some(latest) = start_key {
+            start_cursor
+                .seek(latest)?
+                .filter(|(k, _)| *k == latest)
+                .ok_or(OpProofsStorageError::InitializeStorageInconsistentState)?;
+        }
+
+        let source = HashedAccountsInit::new(start_cursor);
+        self.initialize(
+            "hashed accounts",
+            source,
+            INITIALIZE_STORAGE_THRESHOLD,
+            INITIALIZE_LOG_THRESHOLD,
+        )?;
+
+        Ok(())
+    }
+
+    /// Initialize hashed storage data
+    fn initialize_hashed_storages(
+        &self,
+        start_key: Option<HashedStorageKey>,
+    ) -> Result<(), OpProofsStorageError> {
+        let mut start_cursor = self.tx.cursor_dup_read::<tables::HashedStorages>()?;
+
+        if let Some(latest) = start_key {
+            start_cursor
+                .seek_by_key_subkey(latest.hashed_address, latest.hashed_storage_key)?
+                .filter(|v| v.key == latest.hashed_storage_key)
+                .ok_or(OpProofsStorageError::InitializeStorageInconsistentState)?;
+        }
+
+        let source = HashedStoragesInit::new(start_cursor);
+        self.initialize(
+            "hashed storage",
+            source,
+            INITIALIZE_STORAGE_THRESHOLD,
+            INITIALIZE_LOG_THRESHOLD,
+        )?;
+
+        Ok(())
+    }
+
+    /// Initialize accounts trie data
+    fn initialize_accounts_trie(
+        &self,
+        start_key: Option<StoredNibbles>,
+    ) -> Result<(), OpProofsStorageError> {
+        let mut start_cursor = self.tx.cursor_read::<tables::AccountsTrie>()?;
+
+        if let Some(latest_key) = start_key {
+            start_cursor
+                .seek(latest_key.clone())?
+                .filter(|(k, _)| *k == latest_key)
+                .ok_or(OpProofsStorageError::InitializeStorageInconsistentState)?;
+        }
+
+        let source = AccountsTrieInit::new(start_cursor);
+        self.initialize(
+            "accounts trie",
+            source,
+            INITIALIZE_STORAGE_THRESHOLD,
+            INITIALIZE_LOG_THRESHOLD,
+        )?;
+
+        Ok(())
+    }
+
+    /// Initialize storage trie data
+    fn initialize_storages_trie(
+        &self,
+        start_key: Option<StorageTrieKey>,
+    ) -> Result<(), OpProofsStorageError> {
+        let mut start_cursor = self.tx.cursor_dup_read::<tables::StoragesTrie>()?;
+
+        if let Some(latest_key) = start_key {
+            start_cursor
+                .seek_by_key_subkey(
+                    latest_key.hashed_address,
+                    StoredNibblesSubKey::from(latest_key.path.0),
+                )?
+                .filter(|v| v.nibbles.0 == latest_key.path.0)
+                .ok_or(OpProofsStorageError::InitializeStorageInconsistentState)?;
+        }
+
+        let source = StoragesTrieInit::new(start_cursor);
+        self.initialize(
+            "storage trie",
+            source,
+            INITIALIZE_STORAGE_THRESHOLD,
+            INITIALIZE_LOG_THRESHOLD,
+        )?;
+
+        Ok(())
+    }
+
+    /// Run complete initialization of all preimage data
+    fn initialize_trie(&self, anchor: InitialStateAnchor) -> Result<(), OpProofsStorageError> {
+        self.initialize_hashed_accounts(anchor.latest_hashed_account_key)?;
+        self.initialize_hashed_storages(anchor.latest_hashed_storage_key)?;
+        self.initialize_storages_trie(anchor.latest_storage_trie_key)?;
+        self.initialize_accounts_trie(anchor.latest_account_trie_key)?;
+        Ok(())
+    }
+
+    fn validate_anchor_block(
+        &self,
+        anchor: &InitialStateAnchor,
+        best_number: u64,
+        best_hash: B256,
+    ) -> Result<(), OpProofsStorageError> {
+        let block = anchor.block.ok_or(OpProofsStorageError::InitializeStorageInconsistentState)?;
+
+        if block.number != best_number || block.hash != best_hash {
+            return Err(OpProofsStorageError::InitializeStorageInconsistentState);
+        }
+
+        Ok(())
+    }
+
+    /// Run the initialization job.
+    pub fn run(&self, best_number: u64, best_hash: B256) -> Result<(), OpProofsStorageError> {
+        let anchor = self.storage.initial_state_anchor()?;
+
+        match anchor.status {
+            InitialStateStatus::Completed => return Ok(()),
+            InitialStateStatus::NotStarted => {
+                self.storage.set_initial_state_anchor(BlockNumHash::new(best_number, best_hash))?;
+            }
+            InitialStateStatus::InProgress => {
+                self.validate_anchor_block(&anchor, best_number, best_hash)?;
+            }
+        }
+
+        self.initialize_trie(anchor)?;
+        self.storage.commit_initial_state()?;
+
+        Ok(())
+    }
+}
+
+/// Handles storing entries for a particular KV-pair type.
+trait InitTable {
+    /// Key of target table.
+    type Key: CompletionEstimatable + 'static;
+    /// Value of target table.
+    type Value: 'static;
+
+    /// Writes given entries to given storage.
+    fn store_entries(
+        store: &impl OpProofsInitialStateStore,
+        entries: impl IntoIterator<Item = (Self::Key, Self::Value)>,
+    ) -> Result<(), OpProofsStorageError>;
+}
+
+impl<C> InitTable for HashedAccountsInit<C> {
+    type Key = B256;
+    type Value = Account;
+
+    /// Save mapping of hashed addresses to accounts to storage.
+    fn store_entries(
+        store: &impl OpProofsInitialStateStore,
+        entries: impl IntoIterator<Item = (Self::Key, Self::Value)>,
+    ) -> Result<(), OpProofsStorageError> {
+        store.store_hashed_accounts(
+            entries.into_iter().map(|(address, account)| (address, Some(account))).collect(),
+        )?;
+        Ok(())
+    }
+}
+
+impl<C> InitTable for HashedStoragesInit<C> {
+    type Key = B256;
+    type Value = StorageEntry;
+
+    /// Save mapping of hashed addresses to storage entries to storage.
+    fn store_entries(
+        store: &impl OpProofsInitialStateStore,
+        entries: impl IntoIterator<Item = (Self::Key, Self::Value)>,
+    ) -> Result<(), OpProofsStorageError> {
+        let entries_iter = entries.into_iter();
+        let mut by_address: HashMap<B256, Vec<(B256, U256)>> =
+            HashMap::with_capacity(entries_iter.size_hint().0);
+
+        // Group entries by hashed address
+        for (address, entry) in entries_iter {
+            by_address.entry(address).or_default().push((entry.key, entry.value));
+        }
+        // Store each address's storage entries
+        for (address, storages) in by_address {
+            store.store_hashed_storages(address, storages)?;
+        }
+
+        Ok(())
+    }
+}
+
+impl<C> InitTable for AccountsTrieInit<C> {
+    type Key = StoredNibbles;
+    type Value = BranchNodeCompact;
+
+    /// Save mapping of account trie paths to branch nodes to storage.
+    fn store_entries(
+        store: &impl OpProofsInitialStateStore,
+        entries: impl IntoIterator<Item = (Self::Key, Self::Value)>,
+    ) -> Result<(), OpProofsStorageError> {
+        store.store_account_branches(
+            entries.into_iter().map(|(path, branch)| (path.0, Some(branch))).collect(),
+        )?;
+
+        Ok(())
+    }
+}
+
+impl<C> InitTable for StoragesTrieInit<C> {
+    type Key = B256;
+    type Value = StorageTrieEntry;
+
+    /// Save mapping of hashed addresses to storage trie entries to storage.
+    fn store_entries(
+        store: &impl OpProofsInitialStateStore,
+        entries: impl IntoIterator<Item = (Self::Key, Self::Value)>,
+    ) -> Result<(), OpProofsStorageError> {
+        let entries_iter = entries.into_iter();
+        let mut by_address: HashMap<B256, Vec<(Nibbles, Option<BranchNodeCompact>)>> =
+            HashMap::with_capacity(entries_iter.size_hint().0);
+
+        // Group entries by hashed address
+        for (hashed_address, storage_entry) in entries_iter {
+            by_address
+                .entry(hashed_address)
+                .or_default()
+                .push((storage_entry.nibbles.0, Some(storage_entry.node)));
+        }
+        // Store each address's storage trie branches
+        for (address, branches) in by_address {
+            store.store_storage_branches(address, branches)?;
+        }
+
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::MdbxProofsStorage;
+    use alloy_primitives::{Address, U256, keccak256};
+    use reth_db::{
+        Database, cursor::DbCursorRW, test_utils::create_test_rw_db, transaction::DbTxMut,
+    };
+    use reth_primitives_traits::Account;
+    use reth_trie::{
+        BranchNodeCompact, StorageTrieEntry, StoredNibbles, StoredNibblesSubKey, TrieMask,
+        hashed_cursor::HashedCursor, trie_cursor::TrieCursor,
+    };
+    use std::sync::Arc;
+    use tempfile::TempDir;
+
+    /// Helper function to create a key
+    fn k(b: u8) -> B256 {
+        let mut bytes = [0u8; 32];
+        bytes[0] = b;
+        B256::from(bytes)
+    }
+
+    /// Helper function to create a test branch node
+    fn create_test_branch_node() -> BranchNodeCompact {
+        let mut state_mask = TrieMask::default();
+        state_mask.set_bit(0);
+        state_mask.set_bit(1);
+
+        BranchNodeCompact {
+            state_mask,
+            tree_mask: TrieMask::default(),
+            hash_mask: TrieMask::default(),
+            hashes: Arc::new(vec![]),
+            root_hash: None,
+        }
+    }
+
+    #[test]
+    fn test_initialize_hashed_accounts() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        // Insert test accounts into database
+        let tx = db.tx_mut().unwrap();
+        let mut cursor = tx.cursor_write::<tables::HashedAccounts>().unwrap();
+
+        let mut accounts = vec![
+            (
+                keccak256(Address::repeat_byte(0x01)),
+                Account { nonce: 1, balance: U256::from(100), bytecode_hash: None },
+            ),
+            (
+                keccak256(Address::repeat_byte(0x02)),
+                Account { nonce: 2, balance: U256::from(200), bytecode_hash: None },
+            ),
+            (
+                keccak256(Address::repeat_byte(0x03)),
+                Account { nonce: 3, balance: U256::from(300), bytecode_hash: None },
+            ),
+        ];
+
+        // Sort accounts by address for cursor.append (which requires sorted order)
+        accounts.sort_by_key(|(addr, _)| *addr);
+
+        for (addr, account) in &accounts {
+            cursor.append(*addr, account).unwrap();
+        }
+        drop(cursor);
+        tx.commit().unwrap();
+
+        // Run initialization
+        let tx = db.tx().unwrap();
+        let job = InitializationJob::new(storage.clone(), tx);
+        job.initialize_hashed_accounts(None).unwrap();
+
+        // Verify data was stored (will be in sorted order)
+        let mut account_cursor = storage.account_hashed_cursor(100).unwrap();
+        let mut count = 0;
+        while let Some((key, account)) = account_cursor.next().unwrap() {
+            // Find matching account in our test data
+            let expected = accounts.iter().find(|(addr, _)| *addr == key).unwrap();
+            assert_eq!((key, account), *expected);
+            count += 1;
+        }
+        assert_eq!(count, 3);
+    }
+
+    #[test]
+    fn test_initialize_hashed_storage() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        // Insert test storage into database
+        let tx = db.tx_mut().unwrap();
+        let mut cursor = tx.cursor_dup_write::<tables::HashedStorages>().unwrap();
+
+        let addr1 = keccak256(Address::repeat_byte(0x01));
+        let addr2 = keccak256(Address::repeat_byte(0x02));
+
+        let storage_entries = vec![
+            (
+                addr1,
+                StorageEntry { key: keccak256(B256::repeat_byte(0x10)), value: U256::from(100) },
+            ),
+            (
+                addr1,
+                StorageEntry { key: keccak256(B256::repeat_byte(0x20)), value: U256::from(200) },
+            ),
+            (
+                addr2,
+                StorageEntry { key: keccak256(B256::repeat_byte(0x30)), value: U256::from(300) },
+            ),
+        ];
+
+        for (addr, entry) in &storage_entries {
+            cursor.upsert(*addr, entry).unwrap();
+        }
+        drop(cursor);
+        tx.commit().unwrap();
+
+        // Run initialization
+        let tx = db.tx().unwrap();
+        let job = InitializationJob::new(storage.clone(), tx);
+        job.initialize_hashed_storages(None).unwrap();
+
+        // Verify data was stored for addr1
+        let mut storage_cursor = storage.storage_hashed_cursor(addr1, 100).unwrap();
+        let mut found = vec![];
+        while let Some((key, value)) = storage_cursor.next().unwrap() {
+            found.push((key, value));
+        }
+        assert_eq!(found.len(), 2);
+        assert_eq!(found[0], (storage_entries[0].1.key, storage_entries[0].1.value));
+        assert_eq!(found[1], (storage_entries[1].1.key, storage_entries[1].1.value));
+
+        // Verify data was stored for addr2
+        let mut storage_cursor = storage.storage_hashed_cursor(addr2, 100).unwrap();
+        let mut found = vec![];
+        while let Some((key, value)) = storage_cursor.next().unwrap() {
+            found.push((key, value));
+        }
+        assert_eq!(found.len(), 1);
+        assert_eq!(found[0], (storage_entries[2].1.key, storage_entries[2].1.value));
+    }
+
+    #[test]
+    fn test_initialize_accounts_trie() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        // Insert test trie nodes into database
+        let tx = db.tx_mut().unwrap();
+        let mut cursor = tx.cursor_write::<tables::AccountsTrie>().unwrap();
+
+        let branch = create_test_branch_node();
+        let nodes = vec![
+            (StoredNibbles(Nibbles::from_nibbles_unchecked(vec![1])), branch.clone()),
+            (StoredNibbles(Nibbles::from_nibbles_unchecked(vec![2])), branch.clone()),
+            (StoredNibbles(Nibbles::from_nibbles_unchecked(vec![3])), branch),
+        ];
+
+        for (path, node) in &nodes {
+            cursor.append(path.clone(), node).unwrap();
+        }
+        drop(cursor);
+        tx.commit().unwrap();
+
+        // Run initialization
+        let tx = db.tx().unwrap();
+        let job = InitializationJob::new(storage.clone(), tx);
+        job.initialize_accounts_trie(None).unwrap();
+
+        // Verify data was stored
+        let mut trie_cursor = storage.account_trie_cursor(100).unwrap();
+        let mut count = 0;
+        while let Some((path, _node)) = trie_cursor.next().unwrap() {
+            assert_eq!(path, nodes[count].0.0);
+            count += 1;
+        }
+        assert_eq!(count, 3);
+    }
+
+    #[test]
+    fn test_initialize_storages_trie() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        // Insert test storage trie nodes into database
+        let tx = db.tx_mut().unwrap();
+        let mut cursor = tx.cursor_dup_write::<tables::StoragesTrie>().unwrap();
+
+        let branch = create_test_branch_node();
+        let addr1 = keccak256(Address::repeat_byte(0x01));
+        let addr2 = keccak256(Address::repeat_byte(0x02));
+
+        let nodes = vec![
+            (
+                addr1,
+                StorageTrieEntry {
+                    nibbles: StoredNibblesSubKey(Nibbles::from_nibbles_unchecked(vec![1])),
+                    node: branch.clone(),
+                },
+            ),
+            (
+                addr1,
+                StorageTrieEntry {
+                    nibbles: StoredNibblesSubKey(Nibbles::from_nibbles_unchecked(vec![2])),
+                    node: branch.clone(),
+                },
+            ),
+            (
+                addr2,
+                StorageTrieEntry {
+                    nibbles: StoredNibblesSubKey(Nibbles::from_nibbles_unchecked(vec![3])),
+                    node: branch,
+                },
+            ),
+        ];
+
+        for (addr, entry) in &nodes {
+            cursor.upsert(*addr, entry).unwrap();
+        }
+        drop(cursor);
+        tx.commit().unwrap();
+
+        // Run initialization
+        let tx = db.tx().unwrap();
+        let job = InitializationJob::new(storage.clone(), tx);
+        job.initialize_storages_trie(None).unwrap();
+
+        // Verify data was stored for addr1
+        let mut trie_cursor = storage.storage_trie_cursor(addr1, 100).unwrap();
+        let mut found = vec![];
+        while let Some((path, _node)) = trie_cursor.next().unwrap() {
+            found.push(path);
+        }
+        assert_eq!(found.len(), 2);
+        assert_eq!(found[0], nodes[0].1.nibbles.0);
+        assert_eq!(found[1], nodes[1].1.nibbles.0);
+
+        // Verify data was stored for addr2
+        let mut trie_cursor = storage.storage_trie_cursor(addr2, 100).unwrap();
+        let mut found = vec![];
+        while let Some((path, _node)) = trie_cursor.next().unwrap() {
+            found.push(path);
+        }
+        assert_eq!(found.len(), 1);
+        assert_eq!(found[0], nodes[2].1.nibbles.0);
+    }
+
+    #[test]
+    fn test_full_initialize_run() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        // Insert some test data
+        let tx = db.tx_mut().unwrap();
+
+        // Add accounts
+        let mut cursor = tx.cursor_write::<tables::HashedAccounts>().unwrap();
+        let addr = keccak256(Address::repeat_byte(0x01));
+        cursor
+            .append(addr, &Account { nonce: 1, balance: U256::from(100), bytecode_hash: None })
+            .unwrap();
+        drop(cursor);
+
+        // Add storage
+        let mut cursor = tx.cursor_dup_write::<tables::HashedStorages>().unwrap();
+        cursor
+            .upsert(
+                addr,
+                &StorageEntry { key: keccak256(B256::repeat_byte(0x10)), value: U256::from(100) },
+            )
+            .unwrap();
+        drop(cursor);
+
+        // Add account trie
+        let mut cursor = tx.cursor_write::<tables::AccountsTrie>().unwrap();
+        cursor
+            .append(
+                StoredNibbles(Nibbles::from_nibbles_unchecked(vec![1])),
+                &create_test_branch_node(),
+            )
+            .unwrap();
+        drop(cursor);
+
+        // Add storage trie
+        let mut cursor = tx.cursor_dup_write::<tables::StoragesTrie>().unwrap();
+        cursor
+            .upsert(
+                addr,
+                &StorageTrieEntry {
+                    nibbles: StoredNibblesSubKey(Nibbles::from_nibbles_unchecked(vec![1])),
+                    node: create_test_branch_node(),
+                },
+            )
+            .unwrap();
+        drop(cursor);
+
+        tx.commit().unwrap();
+
+        // Run full initialization
+        let tx = db.tx().unwrap();
+        let job = InitializationJob::new(storage.clone(), tx);
+        let best_number = 100;
+        let best_hash = B256::repeat_byte(0x42);
+
+        // Should be None initially
+        assert_eq!(storage.initial_state_anchor().unwrap().block, None);
+        assert_eq!(storage.get_earliest_block_number().unwrap(), None);
+
+        job.run(best_number, best_hash).unwrap();
+
+        // Should be set after initialization
+        assert_eq!(storage.get_earliest_block_number().unwrap(), Some((best_number, best_hash)));
+
+        // Verify data was initialized
+        let mut account_cursor = storage.account_hashed_cursor(100).unwrap();
+        assert!(account_cursor.next().unwrap().is_some());
+
+        let mut storage_cursor = storage.storage_hashed_cursor(addr, 100).unwrap();
+        assert!(storage_cursor.next().unwrap().is_some());
+
+        let mut trie_cursor = storage.account_trie_cursor(100).unwrap();
+        assert!(trie_cursor.next().unwrap().is_some());
+
+        let mut storage_trie_cursor = storage.storage_trie_cursor(addr, 100).unwrap();
+        assert!(storage_trie_cursor.next().unwrap().is_some());
+    }
+
+    #[test]
+    fn test_initialize_run_skips_if_already_done() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        // set and commit initial state anchor
+        storage
+            .set_initial_state_anchor(BlockNumHash::new(50, B256::repeat_byte(0x01)))
+            .expect("set anchor");
+        storage.commit_initial_state().expect("commit anchor");
+
+        let tx = db.tx().unwrap();
+        let job = InitializationJob::new(storage.clone(), tx);
+
+        // Run initialization - should skip
+        job.run(100, B256::repeat_byte(0x42)).unwrap();
+
+        // Should still have the old anchor
+        let anchor_block =
+            storage.initial_state_anchor().expect("get anchor").block.expect("block");
+        assert_eq!(
+            Some((anchor_block.number, anchor_block.hash)),
+            Some((50, B256::repeat_byte(0x01)))
+        );
+
+        // Should still have the old earliest block
+        assert_eq!(
+            storage.get_earliest_block_number().unwrap(),
+            Some((50, B256::repeat_byte(0x01)))
+        );
+    }
+
+    #[test]
+    fn test_initialize_resumes_hashed_accounts_with_no_dups() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let store = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        store.set_initial_state_anchor(BlockNumHash::new(0, B256::default())).expect("set anchor");
+
+        // Phase 1 in source: k1, k2
+        let k1 = k(1);
+        let k2 = k(2);
+        {
+            let tx = db.tx_mut().unwrap();
+            let mut cur = tx.cursor_write::<tables::HashedAccounts>().unwrap();
+            cur.append(k1, &Account { nonce: 1, balance: U256::from(100), bytecode_hash: None })
+                .unwrap();
+            cur.append(k2, &Account { nonce: 2, balance: U256::from(200), bytecode_hash: None })
+                .unwrap();
+            tx.commit().unwrap();
+        }
+
+        // Initialization #1
+        {
+            let tx = db.tx().unwrap();
+            let job = InitializationJob::new(store.clone(), tx);
+            job.initialize_hashed_accounts(None).unwrap();
+        }
+
+        // Resume point must be k2 (max)
+        assert_eq!(
+            store.initial_state_anchor().expect("get anchor").latest_hashed_account_key,
+            Some(k2)
+        );
+
+        // Phase 2 in source: k3, k4
+        let k3 = k(3);
+        let k4 = k(4);
+        {
+            let tx = db.tx_mut().unwrap();
+            let mut cur = tx.cursor_write::<tables::HashedAccounts>().unwrap();
+            cur.append(k3, &Account { nonce: 3, balance: U256::from(300), bytecode_hash: None })
+                .unwrap();
+            cur.append(k4, &Account { nonce: 4, balance: U256::from(400), bytecode_hash: None })
+                .unwrap();
+            tx.commit().unwrap();
+        }
+
+        // Initialization #2 (restart)
+        {
+            let tx = db.tx().unwrap();
+            let job = InitializationJob::new(store.clone(), tx);
+            job.initialize_hashed_accounts(Some(k2)).unwrap();
+        }
+
+        // Now resume point must be k4
+        assert_eq!(
+            store.initial_state_anchor().expect("get anchor").latest_hashed_account_key,
+            Some(k4)
+        );
+
+        // Verify order + no dupes by iterating proofs cursor
+        let mut cur = store.account_hashed_cursor(0).unwrap();
+        let mut got = Vec::new();
+        while let Some((key, acct)) = cur.next().unwrap() {
+            got.push((key, acct));
+        }
+
+        // Expect exactly 4, in increasing key order.
+        assert_eq!(got.len(), 4);
+        assert_eq!(got[0].0, k1);
+        assert_eq!(got[1].0, k2);
+        assert_eq!(got[2].0, k3);
+        assert_eq!(got[3].0, k4);
+
+        // No dupes
+        for w in got.windows(2) {
+            assert!(w[0].0 < w[1].0);
+        }
+    }
+
+    #[test]
+    fn test_initialize_resumes_hashed_storages_with_no_dups() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let store = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        store.set_initial_state_anchor(BlockNumHash::new(0, B256::default())).expect("set anchor");
+
+        let a1 = k(0x10);
+        let a2 = k(0x20);
+
+        let s11 = k(0x01);
+        let s12 = k(0x02);
+        let s21 = k(0x03);
+        let s22 = k(0x04);
+
+        // Phase 1 source:
+        // a1: s11,s12
+        // a2: s21
+        {
+            let tx = db.tx_mut().unwrap();
+            let mut cur = tx.cursor_dup_write::<tables::HashedStorages>().unwrap();
+            cur.upsert(a1, &StorageEntry { key: s11, value: U256::from(11) }).unwrap();
+            cur.upsert(a1, &StorageEntry { key: s12, value: U256::from(12) }).unwrap();
+            cur.upsert(a2, &StorageEntry { key: s21, value: U256::from(21) }).unwrap();
+            tx.commit().unwrap();
+        }
+
+        // Initialization #1
+        {
+            let tx = db.tx().unwrap();
+            let job = InitializationJob::new(store.clone(), tx);
+            job.initialize_hashed_storages(None).unwrap();
+        }
+
+        // Latest key must be (a2, s21) because a2 > a1
+        let last1 = store
+            .initial_state_anchor()
+            .expect("get anchor")
+            .latest_hashed_storage_key
+            .expect("ok");
+        assert_eq!(last1.hashed_address, a2);
+        assert_eq!(last1.hashed_storage_key, s21);
+
+        // Phase 2 source: add s22 to a2
+        {
+            let tx = db.tx_mut().unwrap();
+            let mut cur = tx.cursor_dup_write::<tables::HashedStorages>().unwrap();
+            cur.upsert(a2, &StorageEntry { key: s22, value: U256::from(22) }).unwrap();
+            tx.commit().unwrap();
+        }
+
+        // Initialization #2
+        {
+            let tx = db.tx().unwrap();
+            let job = InitializationJob::new(store.clone(), tx);
+            job.initialize_hashed_storages(Some(HashedStorageKey::new(a2, s21))).unwrap();
+        }
+
+        // Latest key now must be (a2, s22)
+        let last2 = store
+            .initial_state_anchor()
+            .expect("get anchor")
+            .latest_hashed_storage_key
+            .expect("ok");
+        assert_eq!(last2.hashed_address, a2);
+        assert_eq!(last2.hashed_storage_key, s22);
+
+        // Verify no dupes by iterating per-address
+        {
+            let mut c = store.storage_hashed_cursor(a1, 0).unwrap();
+            let mut got = Vec::new();
+            while let Some((slot, val)) = c.next().unwrap() {
+                got.push((slot, val));
+            }
+            assert_eq!(got.len(), 2);
+            assert_eq!(got[0].0, s11);
+            assert_eq!(got[1].0, s12);
+        }
+        {
+            let mut c = store.storage_hashed_cursor(a2, 0).unwrap();
+            let mut got = Vec::new();
+            while let Some((slot, val)) = c.next().unwrap() {
+                got.push((slot, val));
+            }
+            assert_eq!(got.len(), 2);
+            assert_eq!(got[0].0, s21);
+            assert_eq!(got[1].0, s22);
+        }
+    }
+
+    #[test]
+    fn test_initialize_resumes_accounts_trie_with_no_dups() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let store = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        store.set_initial_state_anchor(BlockNumHash::new(0, B256::default())).expect("set anchor");
+
+        let p1 = StoredNibbles(Nibbles::from_nibbles_unchecked(vec![1]));
+        let p2 = StoredNibbles(Nibbles::from_nibbles_unchecked(vec![2]));
+        let p3 = StoredNibbles(Nibbles::from_nibbles_unchecked(vec![3]));
+        let p4 = StoredNibbles(Nibbles::from_nibbles_unchecked(vec![4]));
+
+        // Phase 1 source: p1,p2
+        {
+            let tx = db.tx_mut().unwrap();
+            let mut cur = tx.cursor_write::<tables::AccountsTrie>().unwrap();
+            cur.append(p1.clone(), &create_test_branch_node()).unwrap();
+            cur.append(p2.clone(), &create_test_branch_node()).unwrap();
+            tx.commit().unwrap();
+        }
+
+        // Initialization #1
+        {
+            let tx = db.tx().unwrap();
+            let job = InitializationJob::new(store.clone(), tx);
+            job.initialize_accounts_trie(None).unwrap();
+        }
+
+        assert_eq!(
+            store.initial_state_anchor().expect("get anchor").latest_account_trie_key,
+            Some(p2.clone())
+        );
+
+        // Phase 2 source: p3,p4
+        {
+            let tx = db.tx_mut().unwrap();
+            let mut cur = tx.cursor_write::<tables::AccountsTrie>().unwrap();
+            cur.append(p3.clone(), &create_test_branch_node()).unwrap();
+            cur.append(p4.clone(), &create_test_branch_node()).unwrap();
+            tx.commit().unwrap();
+        }
+
+        // Initialization #2
+        {
+            let tx = db.tx().unwrap();
+            let job = InitializationJob::new(store.clone(), tx);
+            job.initialize_accounts_trie(Some(p2.clone())).unwrap();
+        }
+
+        assert_eq!(
+            store.initial_state_anchor().expect("get anchor").latest_account_trie_key,
+            Some(p4.clone())
+        );
+
+        // Verify 4 ordered, no dupes
+        let mut c = store.account_trie_cursor(0).unwrap();
+        let mut got = Vec::new();
+        while let Some((path, _node)) = c.next().unwrap() {
+            got.push(path);
+        }
+        assert_eq!(got.len(), 4);
+        assert_eq!(got[0], p1.0);
+        assert_eq!(got[1], p2.0);
+        assert_eq!(got[2], p3.0);
+        assert_eq!(got[3], p4.0);
+    }
+
+    #[test]
+    fn test_initialize_resumes_storages_trie_with_no_dups() {
+        let db = create_test_rw_db();
+        let dir = TempDir::new().unwrap();
+        let store = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env"));
+
+        store.set_initial_state_anchor(BlockNumHash::new(0, B256::default())).expect("set anchor");
+
+        let a1 = k(0x10);
+        let a2 = k(0x20);
+
+        let n1 = StoredNibblesSubKey(Nibbles::from_nibbles_unchecked(vec![1]));
+        let n2 = StoredNibblesSubKey(Nibbles::from_nibbles_unchecked(vec![2]));
+        let n3 = StoredNibblesSubKey(Nibbles::from_nibbles_unchecked(vec![3]));
+
+        // Phase 1 source: (a1,n1), (a2,n2)
+        {
+            let tx = db.tx_mut().unwrap();
+            let mut cur = tx.cursor_dup_write::<tables::StoragesTrie>().unwrap();
+            cur.upsert(
+                a1,
+                &StorageTrieEntry { nibbles: n1.clone(), node: create_test_branch_node() },
+            )
+            .unwrap();
+            cur.upsert(
+                a2,
+                &StorageTrieEntry { nibbles: n2.clone(), node: create_test_branch_node() },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        // Initialization #1
+        {
+            let tx = db.tx().unwrap();
+            let job = InitializationJob::new(store.clone(), tx);
+            job.initialize_storages_trie(None).unwrap();
+        }
+
+        // Latest must be (a2, n2) because a2 > a1
+        let last1 =
+            store.initial_state_anchor().expect("get anchor").latest_storage_trie_key.expect("ok");
+        assert_eq!(last1.hashed_address, a2);
+        assert_eq!(last1.path.0, n2.0);
+
+        // Phase 2 source: add (a2,n3)
+        {
+            let tx = db.tx_mut().unwrap();
+            let mut cur = tx.cursor_dup_write::<tables::StoragesTrie>().unwrap();
+            cur.upsert(
+                a2,
+                &StorageTrieEntry { nibbles: n3.clone(), node: create_test_branch_node() },
+            )
+            .unwrap();
+            tx.commit().unwrap();
+        }
+
+        // Initialization #2
+        {
+            let tx = db.tx().unwrap();
+            let job = InitializationJob::new(store.clone(), tx);
+            job.initialize_storages_trie(Some(StorageTrieKey::new(a2, StoredNibbles::from(n2.0))))
+                .unwrap();
+        }
+
+        // Latest must now be (a2,n3)
+        let last2 =
+            store.initial_state_anchor().expect("get anchor").latest_storage_trie_key.expect("ok");
+        assert_eq!(last2.hashed_address, a2);
+        assert_eq!(last2.path.0, n3.0);
+
+        // Verify per-address no dupes and stable ordering
+        {
+            let mut c = store.storage_trie_cursor(a1, 0).unwrap();
+
+            let mut got = Vec::new();
+
+            // next returns the rest
+            while let Some((path, _node)) = c.next().unwrap() {
+                got.push(path);
+            }
+
+            assert_eq!(got, vec![n1.0]);
+        }
+        {
+            let mut c = store.storage_trie_cursor(a2, 0).unwrap();
+
+            let mut got = Vec::new();
+
+            // next returns the rest
+            while let Some((path, _node)) = c.next().unwrap() {
+                got.push(path);
+            }
+            assert_eq!(got, vec![n2.0, n3.0]);
+        }
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/lib.rs b/rust/op-reth/crates/trie/src/lib.rs
new file mode 100644
index 0000000000000..6d41dd8d858b4
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/lib.rs
@@ -0,0 +1,65 @@
+//! Standalone crate for Optimism Trie Node storage.
+//!
+//! External storage for intermediary trie nodes that are otherwise discarded by pipeline and
+//! live sync upon successful state root update. Storing these intermediary trie nodes enables
+//! efficient retrieval of inputs to proof computation for duration of OP fault proof window.
+
+#![doc(
+    html_logo_url = "https://raw.githubusercontent.com/paradigmxyz/reth/main/assets/reth-docs.png",
+    html_favicon_url = "https://avatars0.githubusercontent.com/u/97369466?s=256",
+    issue_tracker_base_url = "https://github.com/paradigmxyz/reth/issues/"
+)]
+#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(not(test), warn(unused_crate_dependencies))]
+
+// Used only for feature propagation (serde-bincode-compat workaround).
+#[cfg(feature = "serde-bincode-compat")]
+use reth_ethereum_primitives as _;
+
+pub mod api;
+pub use api::{BlockStateDiff, OpProofsInitialStateStore, OpProofsStore};
+
+pub mod initialize;
+pub use initialize::InitializationJob;
+
+pub mod in_memory;
+pub use in_memory::{
+    InMemoryAccountCursor, InMemoryProofsStorage, InMemoryStorageCursor, InMemoryTrieCursor,
+};
+
+pub mod db;
+pub use db::{MdbxAccountCursor, MdbxProofsStorage, MdbxStorageCursor, MdbxTrieCursor};
+
+#[cfg(feature = "metrics")]
+pub mod metrics;
+#[cfg(feature = "metrics")]
+pub use metrics::{
+    OpProofsHashedAccountCursor, OpProofsHashedStorageCursor, OpProofsStorage, OpProofsTrieCursor,
+    StorageMetrics,
+};
+
+#[cfg(not(feature = "metrics"))]
+/// Alias for [`OpProofsStore`] type without metrics (`metrics` feature is disabled).
+pub type OpProofsStorage<S> = S;
+
+pub mod proof;
+
+pub mod provider;
+
+pub mod live;
+
+pub mod cursor;
+#[cfg(not(feature = "metrics"))]
+pub use cursor::{OpProofsHashedAccountCursor, OpProofsHashedStorageCursor, OpProofsTrieCursor};
+
+pub mod cursor_factory;
+pub use cursor_factory::{OpProofsHashedAccountCursorFactory, OpProofsTrieCursorFactory};
+
+pub mod error;
+pub use error::{OpProofsStorageError, OpProofsStorageResult};
+
+mod prune;
+pub use prune::{
+    OpProofStoragePruner, OpProofStoragePrunerResult, OpProofStoragePrunerTask, PrunerError,
+    PrunerOutput,
+};
diff --git a/rust/op-reth/crates/trie/src/live.rs b/rust/op-reth/crates/trie/src/live.rs
new file mode 100644
index 0000000000000..0f2df9e92ea98
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/live.rs
@@ -0,0 +1,225 @@
+//! Live trie collector for external proofs storage.
+
+use crate::{
+    BlockStateDiff, OpProofsStorage, OpProofsStorageError, OpProofsStore, api::OperationDurations,
+    provider::OpProofsStateProviderRef,
+};
+use alloy_eips::{BlockNumHash, NumHash, eip1898::BlockWithParent};
+use derive_more::Constructor;
+use reth_evm::{ConfigureEvm, execute::Executor};
+use reth_primitives_traits::{AlloyBlockHeader, BlockTy, RecoveredBlock};
+use reth_provider::{
+    DatabaseProviderFactory, HashedPostStateProvider, StateProviderFactory, StateReader,
+    StateRootProvider,
+};
+use reth_revm::database::StateProviderDatabase;
+use reth_trie_common::{HashedPostStateSorted, updates::TrieUpdatesSorted};
+use std::{sync::Arc, time::Instant};
+use tracing::info;
+
+/// Live trie collector for external proofs storage.
+#[derive(Debug, Constructor)]
+pub struct LiveTrieCollector<'tx, Evm, Provider, PreimageStore>
+where
+    Evm: ConfigureEvm,
+    Provider: StateReader + DatabaseProviderFactory + StateProviderFactory,
+{
+    evm_config: Evm,
+    provider: Provider,
+    storage: &'tx OpProofsStorage<PreimageStore>,
+}
+
+impl<'tx, Evm, Provider, Store> LiveTrieCollector<'tx, Evm, Provider, Store>
+where
+    Evm: ConfigureEvm,
+    Provider: StateReader + DatabaseProviderFactory + StateProviderFactory,
+    Store: 'tx + OpProofsStore + Clone + 'static,
+{
+    /// Execute a block and store the updates in the storage.
+    pub fn execute_and_store_block_updates(
+        &self,
+        block: &RecoveredBlock<BlockTy<Evm::Primitives>>,
+    ) -> Result<(), OpProofsStorageError> {
+        let mut operation_durations = OperationDurations::default();
+
+        let start = Instant::now();
+        // ensure that we have the state of the parent block
+        let (Some((earliest, _)), Some((latest, _))) =
+            (self.storage.get_earliest_block_number()?, self.storage.get_latest_block_number()?)
+        else {
+            return Err(OpProofsStorageError::NoBlocksFound);
+        };
+
+        let parent_block_number = block.number() - 1;
+        if parent_block_number < earliest {
+            return Err(OpProofsStorageError::UnknownParent);
+        }
+
+        if parent_block_number > latest {
+            return Err(OpProofsStorageError::MissingParentBlock {
+                block_number: block.number(),
+                parent_block_number,
+                latest_block_number: latest,
+            });
+        }
+
+        let block_ref =
+            BlockWithParent::new(block.parent_hash(), NumHash::new(block.number(), block.hash()));
+
+        // TODO: should we check block hash here?
+
+        let state_provider = OpProofsStateProviderRef::new(
+            self.provider.state_by_block_hash(block.parent_hash())?,
+            self.storage,
+            parent_block_number,
+        );
+
+        let db = StateProviderDatabase::new(&state_provider);
+        let block_executor = self.evm_config.batch_executor(db);
+
+        let execution_result = block_executor.execute(&(*block).clone())?;
+
+        operation_durations.execution_duration_seconds = start.elapsed();
+
+        let hashed_state = state_provider.hashed_post_state(&execution_result.state);
+        let (state_root, trie_updates) =
+            state_provider.state_root_with_updates(hashed_state.clone())?;
+
+        operation_durations.state_root_duration_seconds =
+            start.elapsed() - operation_durations.execution_duration_seconds;
+
+        if state_root != block.state_root() {
+            return Err(OpProofsStorageError::StateRootMismatch {
+                block_number: block.number(),
+                current_state_hash: state_root,
+                expected_state_hash: block.state_root(),
+            });
+        }
+
+        let update_result = self.storage.store_trie_updates(
+            block_ref,
+            BlockStateDiff {
+                sorted_trie_updates: trie_updates.into_sorted(),
+                sorted_post_state: hashed_state.into_sorted(),
+            },
+        )?;
+
+        operation_durations.total_duration_seconds = start.elapsed();
+        operation_durations.write_duration_seconds = operation_durations.total_duration_seconds -
+            operation_durations.state_root_duration_seconds -
+            operation_durations.execution_duration_seconds;
+
+        #[cfg(feature = "metrics")]
+        {
+            let block_metrics = self.storage.metrics().block_metrics();
+            block_metrics.record_operation_durations(&operation_durations);
+            block_metrics.increment_write_counts(&update_result);
+        }
+
+        info!(
+            block_number = block.number(),
+            ?operation_durations,
+            ?update_result,
+            "Block executed and trie updates stored successfully",
+        );
+
+        Ok(())
+    }
+
+    /// Store trie updates for a given block.
+    pub fn store_block_updates(
+        &self,
+        block: BlockWithParent,
+        sorted_trie_updates: TrieUpdatesSorted,
+        sorted_post_state: HashedPostStateSorted,
+    ) -> Result<(), OpProofsStorageError> {
+        let start = Instant::now();
+        let mut operation_durations = OperationDurations::default();
+
+        let storage_result = self
+            .storage
+            .store_trie_updates(block, BlockStateDiff { sorted_trie_updates, sorted_post_state })?;
+
+        let write_duration = start.elapsed();
+        operation_durations.total_duration_seconds = write_duration;
+        operation_durations.write_duration_seconds = write_duration;
+
+        #[cfg(feature = "metrics")]
+        {
+            let block_metrics = self.storage.metrics().block_metrics();
+            block_metrics.record_operation_durations(&operation_durations);
+            block_metrics.increment_write_counts(&storage_result);
+        }
+
+        info!(
+            block_number = block.block.number,
+            ?operation_durations,
+            ?storage_result,
+            "Trie updates stored successfully",
+        );
+
+        Ok(())
+    }
+
+    /// Handles chain reorganizations by replacing block updates after a common ancestor.
+    ///
+    /// This method removes all block updates after the latest common ancestor (the block before
+    /// the first block in `new_blocks`) and replaces them with the updates from the provided new
+    /// chain.
+    ///
+    /// # Arguments
+    ///
+    /// * `new_blocks` - A vector of references to `RecoveredBlock` instances representing the new
+    ///   blocks to be added to the trie storage.
+    pub fn unwind_and_store_block_updates(
+        &self,
+        block_updates: Vec<(BlockWithParent, Arc<TrieUpdatesSorted>, Arc<HashedPostStateSorted>)>,
+    ) -> Result<(), OpProofsStorageError> {
+        if block_updates.is_empty() {
+            return Ok(());
+        }
+
+        let start = Instant::now();
+        let mut operation_durations = OperationDurations::default();
+        let first = &block_updates[0].0;
+        let latest_common_block =
+            BlockNumHash::new(first.block.number.saturating_sub(1), first.parent);
+        let mut block_trie_updates: Vec<(BlockWithParent, BlockStateDiff)> =
+            Vec::with_capacity(block_updates.len());
+
+        for (block, trie_updates, hashed_state) in &block_updates {
+            block_trie_updates.push((
+                *block,
+                BlockStateDiff {
+                    sorted_trie_updates: (**trie_updates).clone(),
+                    sorted_post_state: (**hashed_state).clone(),
+                },
+            ));
+        }
+
+        self.storage.replace_updates(latest_common_block, block_trie_updates)?;
+        let write_duration = start.elapsed();
+        operation_durations.total_duration_seconds = write_duration;
+        operation_durations.write_duration_seconds = write_duration;
+
+        #[cfg(feature = "metrics")]
+        {
+            let block_metrics = self.storage.metrics().block_metrics();
+            block_metrics.record_operation_durations(&operation_durations);
+        }
+
+        info!(
+            start_block_number = block_updates.first().map(|(b, _, _)| b.block.number),
+            end_block_number = block_updates.last().map(|(b, _, _)| b.block.number),
+            ?operation_durations,
+            "Trie updates rewound and stored successfully",
+        );
+        Ok(())
+    }
+
+    /// Remove account, storage and trie updates from historical storage for all blocks from
+    /// the specified block (inclusive).
+    pub fn unwind_history(&self, to: BlockWithParent) -> Result<(), OpProofsStorageError> {
+        self.storage.unwind_history(to)
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/metrics.rs b/rust/op-reth/crates/trie/src/metrics.rs
new file mode 100644
index 0000000000000..fcdcdf208ecfc
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/metrics.rs
@@ -0,0 +1,597 @@
+//! Storage wrapper that records metrics for all operations.
+
+use crate::{
+    BlockStateDiff, OpProofsStorageResult, OpProofsStore,
+    api::{InitialStateAnchor, OpProofsInitialStateStore, OperationDurations, WriteCounts},
+    cursor,
+};
+use alloy_eips::{BlockNumHash, eip1898::BlockWithParent};
+use alloy_primitives::{B256, U256, map::HashMap};
+use derive_more::Constructor;
+use metrics::{Counter, Gauge, Histogram};
+use reth_db::DatabaseError;
+use reth_metrics::Metrics;
+use reth_primitives_traits::Account;
+use reth_trie::{
+    hashed_cursor::{HashedCursor, HashedStorageCursor},
+    trie_cursor::{TrieCursor, TrieStorageCursor},
+};
+use reth_trie_common::{BranchNodeCompact, Nibbles};
+use std::{
+    fmt::Debug,
+    future::Future,
+    sync::Arc,
+    time::{Duration, Instant},
+};
+use strum::{EnumCount, EnumIter, IntoEnumIterator};
+
+/// Alias for [`OpProofsStorageWithMetrics`].
+pub type OpProofsStorage<S> = OpProofsStorageWithMetrics<S>;
+
+/// Alias for [`TrieCursor`](cursor::OpProofsTrieCursor) with metrics layer.
+pub type OpProofsTrieCursor<C> = cursor::OpProofsTrieCursor<OpProofsTrieCursorWithMetrics<C>>;
+
+/// Alias for [`OpProofsHashedAccountCursor`](cursor::OpProofsHashedAccountCursor) with metrics
+/// layer.
+pub type OpProofsHashedAccountCursor<C> =
+    cursor::OpProofsHashedAccountCursor<OpProofsHashedCursorWithMetrics<C>>;
+
+/// Alias for [`OpProofsHashedStorageCursor`](cursor::OpProofsHashedStorageCursor) with metrics
+/// layer.
+pub type OpProofsHashedStorageCursor<C> =
+    cursor::OpProofsHashedStorageCursor<OpProofsHashedCursorWithMetrics<C>>;
+
+/// Types of storage operations that can be tracked.
+#[derive(Debug, Clone, Copy, Eq, PartialEq, Hash, EnumCount, EnumIter)]
+pub enum StorageOperation {
+    /// Store account trie branch
+    StoreAccountBranch,
+    /// Store storage trie branch
+    StoreStorageBranch,
+    /// Store hashed account
+    StoreHashedAccount,
+    /// Store hashed storage
+    StoreHashedStorage,
+    /// Trie cursor seek exact operation
+    TrieCursorSeekExact,
+    /// Trie cursor seek
+    TrieCursorSeek,
+    /// Trie cursor next
+    TrieCursorNext,
+    /// Trie cursor current
+    TrieCursorCurrent,
+    /// Hashed cursor seek
+    HashedCursorSeek,
+    /// Hashed cursor next
+    HashedCursorNext,
+}
+
+impl StorageOperation {
+    /// Returns the operation as a string for metrics labels.
+    pub const fn as_str(&self) -> &'static str {
+        match self {
+            Self::StoreAccountBranch => "store_account_branch",
+            Self::StoreStorageBranch => "store_storage_branch",
+            Self::StoreHashedAccount => "store_hashed_account",
+            Self::StoreHashedStorage => "store_hashed_storage",
+            Self::TrieCursorSeekExact => "trie_cursor_seek_exact",
+            Self::TrieCursorSeek => "trie_cursor_seek",
+            Self::TrieCursorNext => "trie_cursor_next",
+            Self::TrieCursorCurrent => "trie_cursor_current",
+            Self::HashedCursorSeek => "hashed_cursor_seek",
+            Self::HashedCursorNext => "hashed_cursor_next",
+        }
+    }
+}
+
+/// Metrics for storage operations.
+#[derive(Debug)]
+pub struct StorageMetrics {
+    /// Cache of operation metrics handles, keyed by (operation, context)
+    operations: HashMap<StorageOperation, OperationMetrics>,
+    /// Block-level metrics
+    block_metrics: BlockMetrics,
+}
+
+impl StorageMetrics {
+    /// Create a new metrics instance with pre-allocated handles.
+    pub fn new() -> Self {
+        Self {
+            operations: Self::generate_operation_handles(),
+            block_metrics: BlockMetrics::new_with_labels(&[] as &[(&str, &str)]),
+        }
+    }
+
+    /// Generate metric handles for all operation and context combinations.
+    fn generate_operation_handles() -> HashMap<StorageOperation, OperationMetrics> {
+        let mut operations =
+            HashMap::with_capacity_and_hasher(StorageOperation::COUNT, Default::default());
+        for operation in StorageOperation::iter() {
+            operations.insert(
+                operation,
+                OperationMetrics::new_with_labels(&[("operation", operation.as_str())]),
+            );
+        }
+        operations
+    }
+
+    /// Record a storage operation with timing.
+    pub fn record_operation<R>(&self, operation: StorageOperation, f: impl FnOnce() -> R) -> R {
+        if let Some(metrics) = self.operations.get(&operation) { metrics.record(f) } else { f() }
+    }
+
+    /// Record a storage operation with timing (async version).
+    pub async fn record_operation_async<F, R>(&self, operation: StorageOperation, f: F) -> R
+    where
+        F: Future<Output = R>,
+    {
+        let start = Instant::now();
+        let result = f.await;
+        let duration = start.elapsed();
+
+        if let Some(metrics) = self.operations.get(&operation) {
+            metrics.record_duration(duration);
+        }
+
+        result
+    }
+
+    /// Get block metrics for recording high-level timing.
+    pub const fn block_metrics(&self) -> &BlockMetrics {
+        &self.block_metrics
+    }
+
+    /// Record a pre-measured duration for an operation.
+    pub fn record_duration(&self, operation: StorageOperation, duration: Duration) {
+        if let Some(metrics) = self.operations.get(&operation) {
+            metrics.record_duration(duration);
+        }
+    }
+
+    /// Record multiple items with the same duration.
+    pub fn record_duration_per_item(
+        &self,
+        operation: StorageOperation,
+        duration: Duration,
+        count: usize,
+    ) {
+        if let Some(metrics) = self.operations.get(&operation) {
+            metrics.record_duration_per_item(duration, count);
+        }
+    }
+}
+
+impl Default for StorageMetrics {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+/// Metrics for individual storage operations.
+#[derive(Metrics, Clone)]
+#[metrics(scope = "optimism_trie.storage.operation")]
+struct OperationMetrics {
+    /// Duration of storage operations in seconds
+    duration_seconds: Histogram,
+}
+
+impl OperationMetrics {
+    /// Record an operation with timing.
+    fn record<R>(&self, f: impl FnOnce() -> R) -> R {
+        let start = Instant::now();
+        let result = f();
+        self.duration_seconds.record(start.elapsed());
+        result
+    }
+
+    /// Record a pre-measured duration.
+    fn record_duration(&self, duration: Duration) {
+        self.duration_seconds.record(duration);
+    }
+
+    fn record_duration_per_item(&self, duration: Duration, count_usize: usize) {
+        if count_usize > 0 &&
+            let Some(count) = u32::try_from(count_usize).ok()
+        {
+            self.duration_seconds.record_many(duration / count, count as usize);
+        }
+    }
+}
+
+/// High-level block processing metrics.
+#[derive(Metrics, Clone)]
+#[metrics(scope = "optimism_trie.block")]
+pub struct BlockMetrics {
+    /// Total time to process a block (end-to-end) in seconds
+    pub total_duration_seconds: Histogram,
+    /// Time spent executing the block (EVM) in seconds
+    pub execution_duration_seconds: Histogram,
+    /// Time spent calculating state root in seconds
+    pub state_root_duration_seconds: Histogram,
+    /// Time spent writing trie updates to storage in seconds
+    pub write_duration_seconds: Histogram,
+    /// Number of trie updates written
+    pub account_trie_updates_written_total: Counter,
+    /// Number of storage trie updates written
+    pub storage_trie_updates_written_total: Counter,
+    /// Number of hashed accounts written
+    pub hashed_accounts_written_total: Counter,
+    /// Number of hashed storages written
+    pub hashed_storages_written_total: Counter,
+    /// Earliest block number that the proofs storage has stored.
+    pub earliest_number: Gauge,
+    /// Latest block number that the proofs storage has stored.
+    pub latest_number: Gauge,
+}
+
+impl BlockMetrics {
+    /// Record operation durations for the processing of a block.
+    pub fn record_operation_durations(&self, durations: &OperationDurations) {
+        self.total_duration_seconds.record(durations.total_duration_seconds);
+        self.execution_duration_seconds.record(durations.execution_duration_seconds);
+        self.state_root_duration_seconds.record(durations.state_root_duration_seconds);
+        self.write_duration_seconds.record(durations.write_duration_seconds);
+    }
+
+    /// Increment write counts of historical trie updates for a single block.
+    pub fn increment_write_counts(&self, counts: &WriteCounts) {
+        self.account_trie_updates_written_total
+            .increment(counts.account_trie_updates_written_total);
+        self.storage_trie_updates_written_total
+            .increment(counts.storage_trie_updates_written_total);
+        self.hashed_accounts_written_total.increment(counts.hashed_accounts_written_total);
+        self.hashed_storages_written_total.increment(counts.hashed_storages_written_total);
+    }
+}
+
+/// Wrapper for [`TrieCursor`] that records metrics.
+#[derive(Debug, Constructor, Clone)]
+pub struct OpProofsTrieCursorWithMetrics<C> {
+    cursor: C,
+    metrics: Arc<StorageMetrics>,
+}
+
+impl<C: TrieCursor> TrieCursor for OpProofsTrieCursorWithMetrics<C> {
+    #[inline]
+    fn seek_exact(
+        &mut self,
+        path: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.metrics.record_operation(StorageOperation::TrieCursorSeekExact, || {
+            self.cursor.seek_exact(path)
+        })
+    }
+
+    #[inline]
+    fn seek(
+        &mut self,
+        path: Nibbles,
+    ) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.metrics.record_operation(StorageOperation::TrieCursorSeek, || self.cursor.seek(path))
+    }
+
+    #[inline]
+    fn next(&mut self) -> Result<Option<(Nibbles, BranchNodeCompact)>, DatabaseError> {
+        self.metrics.record_operation(StorageOperation::TrieCursorNext, || self.cursor.next())
+    }
+
+    #[inline]
+    fn current(&mut self) -> Result<Option<Nibbles>, DatabaseError> {
+        self.metrics.record_operation(StorageOperation::TrieCursorCurrent, || self.cursor.current())
+    }
+
+    #[inline]
+    fn reset(&mut self) {
+        self.cursor.reset()
+    }
+}
+
+impl<C: TrieStorageCursor> TrieStorageCursor for OpProofsTrieCursorWithMetrics<C> {
+    #[inline]
+    fn set_hashed_address(&mut self, _hashed_address: B256) {
+        self.cursor.set_hashed_address(_hashed_address)
+    }
+}
+
+/// Wrapper for [`HashedCursor`] type that records metrics.
+#[derive(Debug, Constructor, Clone)]
+pub struct OpProofsHashedCursorWithMetrics<C> {
+    cursor: C,
+    metrics: Arc<StorageMetrics>,
+}
+
+impl<C: HashedCursor> HashedCursor for OpProofsHashedCursorWithMetrics<C> {
+    type Value = C::Value;
+
+    #[inline]
+    fn seek(&mut self, key: B256) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.metrics.record_operation(StorageOperation::HashedCursorSeek, || self.cursor.seek(key))
+    }
+
+    #[inline]
+    fn next(&mut self) -> Result<Option<(B256, Self::Value)>, DatabaseError> {
+        self.metrics.record_operation(StorageOperation::HashedCursorNext, || self.cursor.next())
+    }
+
+    #[inline]
+    fn reset(&mut self) {
+        self.cursor.reset()
+    }
+}
+
+impl<C: HashedStorageCursor> HashedStorageCursor for OpProofsHashedCursorWithMetrics<C> {
+    #[inline]
+    fn is_storage_empty(&mut self) -> Result<bool, DatabaseError> {
+        self.cursor.is_storage_empty()
+    }
+
+    #[inline]
+    fn set_hashed_address(&mut self, _hashed_address: B256) {
+        self.cursor.set_hashed_address(_hashed_address)
+    }
+}
+
+/// Wrapper around [`OpProofsStore`] type that records metrics for all operations.
+#[derive(Debug, Clone)]
+pub struct OpProofsStorageWithMetrics<S> {
+    storage: S,
+    metrics: Arc<StorageMetrics>,
+}
+
+impl<S> OpProofsStorageWithMetrics<S> {
+    /// Initializes new [`StorageMetrics`] and wraps given storage instance.
+    pub fn new(storage: S) -> Self {
+        Self { storage, metrics: Arc::new(StorageMetrics::default()) }
+    }
+
+    /// Get the underlying storage.
+    pub const fn inner(&self) -> &S {
+        &self.storage
+    }
+
+    /// Get the metrics.
+    pub const fn metrics(&self) -> &Arc<StorageMetrics> {
+        &self.metrics
+    }
+}
+
+impl<S> OpProofsStore for OpProofsStorageWithMetrics<S>
+where
+    S: OpProofsStore,
+{
+    type StorageTrieCursor<'tx>
+        = OpProofsTrieCursorWithMetrics<S::StorageTrieCursor<'tx>>
+    where
+        Self: 'tx;
+    type AccountTrieCursor<'tx>
+        = OpProofsTrieCursorWithMetrics<S::AccountTrieCursor<'tx>>
+    where
+        Self: 'tx;
+    type StorageCursor<'tx>
+        = OpProofsHashedCursorWithMetrics<S::StorageCursor<'tx>>
+    where
+        Self: 'tx;
+    type AccountHashedCursor<'tx>
+        = OpProofsHashedCursorWithMetrics<S::AccountHashedCursor<'tx>>
+    where
+        Self: 'tx;
+
+    #[inline]
+    fn get_earliest_block_number(&self) -> OpProofsStorageResult<Option<(u64, B256)>> {
+        self.storage.get_earliest_block_number()
+    }
+
+    #[inline]
+    fn get_latest_block_number(&self) -> OpProofsStorageResult<Option<(u64, B256)>> {
+        self.storage.get_latest_block_number()
+    }
+
+    #[inline]
+    fn storage_trie_cursor<'tx>(
+        &self,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::StorageTrieCursor<'tx>> {
+        let cursor = self.storage.storage_trie_cursor(hashed_address, max_block_number)?;
+        Ok(OpProofsTrieCursorWithMetrics::new(cursor, self.metrics.clone()))
+    }
+
+    #[inline]
+    fn account_trie_cursor<'tx>(
+        &self,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::AccountTrieCursor<'tx>> {
+        let cursor = self.storage.account_trie_cursor(max_block_number)?;
+        Ok(OpProofsTrieCursorWithMetrics::new(cursor, self.metrics.clone()))
+    }
+
+    #[inline]
+    fn storage_hashed_cursor<'tx>(
+        &self,
+        hashed_address: B256,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::StorageCursor<'tx>> {
+        let cursor = self.storage.storage_hashed_cursor(hashed_address, max_block_number)?;
+        Ok(OpProofsHashedCursorWithMetrics::new(cursor, self.metrics.clone()))
+    }
+
+    #[inline]
+    fn account_hashed_cursor<'tx>(
+        &self,
+        max_block_number: u64,
+    ) -> OpProofsStorageResult<Self::AccountHashedCursor<'tx>> {
+        let cursor = self.storage.account_hashed_cursor(max_block_number)?;
+        Ok(OpProofsHashedCursorWithMetrics::new(cursor, self.metrics.clone()))
+    }
+
+    // metrics are handled by the live trie collector
+    #[inline]
+    fn store_trie_updates(
+        &self,
+        block_ref: BlockWithParent,
+        block_state_diff: BlockStateDiff,
+    ) -> OpProofsStorageResult<WriteCounts> {
+        let result = self.storage.store_trie_updates(block_ref, block_state_diff)?;
+        self.metrics.block_metrics.latest_number.set(block_ref.block.number as f64);
+        Ok(result)
+    }
+
+    // no metrics for these
+    #[inline]
+    fn fetch_trie_updates(&self, block_number: u64) -> OpProofsStorageResult<BlockStateDiff> {
+        self.storage.fetch_trie_updates(block_number)
+    }
+    #[inline]
+    fn prune_earliest_state(
+        &self,
+        new_earliest_block_ref: BlockWithParent,
+    ) -> OpProofsStorageResult<WriteCounts> {
+        self.metrics.block_metrics.earliest_number.set(new_earliest_block_ref.block.number as f64);
+        self.storage.prune_earliest_state(new_earliest_block_ref)
+    }
+
+    #[inline]
+    fn unwind_history(&self, to: BlockWithParent) -> OpProofsStorageResult<()> {
+        self.storage.unwind_history(to)
+    }
+
+    #[inline]
+    fn replace_updates(
+        &self,
+        latest_common_block: BlockNumHash,
+        blocks_to_add: Vec<(BlockWithParent, BlockStateDiff)>,
+    ) -> OpProofsStorageResult<()> {
+        self.storage.replace_updates(latest_common_block, blocks_to_add)
+    }
+
+    #[inline]
+    fn set_earliest_block_number(
+        &self,
+        block_number: u64,
+        hash: B256,
+    ) -> OpProofsStorageResult<()> {
+        self.metrics.block_metrics.earliest_number.set(block_number as f64);
+        self.storage.set_earliest_block_number(block_number, hash)
+    }
+}
+
+impl<S> OpProofsInitialStateStore for OpProofsStorageWithMetrics<S>
+where
+    S: OpProofsInitialStateStore,
+{
+    #[inline]
+    fn initial_state_anchor(&self) -> OpProofsStorageResult<InitialStateAnchor> {
+        self.storage.initial_state_anchor()
+    }
+
+    #[inline]
+    fn set_initial_state_anchor(&self, anchor: BlockNumHash) -> OpProofsStorageResult<()> {
+        self.storage.set_initial_state_anchor(anchor)
+    }
+
+    #[inline]
+    fn store_account_branches(
+        &self,
+        account_nodes: Vec<(Nibbles, Option<BranchNodeCompact>)>,
+    ) -> OpProofsStorageResult<()> {
+        let count = account_nodes.len();
+        let start = Instant::now();
+        let result = self.storage.store_account_branches(account_nodes);
+        let duration = start.elapsed();
+
+        // Record per-item duration
+        if count > 0 {
+            self.metrics.record_duration_per_item(
+                StorageOperation::StoreAccountBranch,
+                duration,
+                count,
+            );
+        }
+
+        result
+    }
+
+    #[inline]
+    fn store_storage_branches(
+        &self,
+        hashed_address: B256,
+        storage_nodes: Vec<(Nibbles, Option<BranchNodeCompact>)>,
+    ) -> OpProofsStorageResult<()> {
+        let count = storage_nodes.len();
+        let start = Instant::now();
+        let result = self.storage.store_storage_branches(hashed_address, storage_nodes);
+        let duration = start.elapsed();
+
+        // Record per-item duration
+        if count > 0 {
+            self.metrics.record_duration_per_item(
+                StorageOperation::StoreStorageBranch,
+                duration,
+                count,
+            );
+        }
+
+        result
+    }
+
+    #[inline]
+    fn store_hashed_accounts(
+        &self,
+        accounts: Vec<(B256, Option<Account>)>,
+    ) -> OpProofsStorageResult<()> {
+        let count = accounts.len();
+        let start = Instant::now();
+        let result = self.storage.store_hashed_accounts(accounts);
+        let duration = start.elapsed();
+
+        // Record per-item duration
+        if count > 0 {
+            self.metrics.record_duration_per_item(
+                StorageOperation::StoreHashedAccount,
+                duration,
+                count,
+            );
+        }
+
+        result
+    }
+
+    #[inline]
+    fn store_hashed_storages(
+        &self,
+        hashed_address: B256,
+        storages: Vec<(B256, U256)>,
+    ) -> OpProofsStorageResult<()> {
+        let count = storages.len();
+        let start = Instant::now();
+        let result = self.storage.store_hashed_storages(hashed_address, storages);
+        let duration = start.elapsed();
+
+        // Record per-item duration
+        if count > 0 {
+            self.metrics.record_duration_per_item(
+                StorageOperation::StoreHashedStorage,
+                duration,
+                count,
+            );
+        }
+
+        result
+    }
+
+    #[inline]
+    fn commit_initial_state(&self) -> OpProofsStorageResult<BlockNumHash> {
+        let block = self.storage.commit_initial_state()?;
+        self.metrics.block_metrics.earliest_number.set(block.number as f64);
+        Ok(block)
+    }
+}
+
+impl<S> From<S> for OpProofsStorageWithMetrics<S>
+where
+    S: OpProofsStore + Clone + 'static,
+{
+    fn from(storage: S) -> Self {
+        Self::new(storage)
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/proof.rs b/rust/op-reth/crates/trie/src/proof.rs
new file mode 100644
index 0000000000000..7f5c692c6e1a7
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/proof.rs
@@ -0,0 +1,403 @@
+//! Provides proof operation implementations for [`OpProofsStorage`].
+
+use crate::{
+    OpProofsHashedAccountCursorFactory, OpProofsStorage, OpProofsStore, OpProofsTrieCursorFactory,
+};
+use alloy_primitives::{
+    Address, B256, Bytes, keccak256,
+    map::{B256Map, HashMap},
+};
+use reth_execution_errors::{StateProofError, StateRootError, StorageRootError, TrieWitnessError};
+use reth_trie::{
+    StateRoot, StorageRoot, TrieType,
+    hashed_cursor::HashedPostStateCursorFactory,
+    metrics::TrieRootMetrics,
+    proof::{self, Proof},
+    trie_cursor::InMemoryTrieCursorFactory,
+    witness::TrieWitness,
+};
+use reth_trie_common::{
+    AccountProof, HashedPostState, HashedPostStateSorted, HashedStorage, MultiProof,
+    MultiProofTargets, StorageMultiProof, StorageProof, TrieInput, updates::TrieUpdates,
+};
+
+/// Extends [`Proof`] with operations specific for working with [`OpProofsStorage`].
+pub trait DatabaseProof<'tx, S> {
+    /// Creates a new `DatabaseProof` instance from external storage.
+    fn from_tx(storage: &'tx OpProofsStorage<S>, block_number: u64) -> Self;
+
+    /// Generates the state proof for target account based on [`TrieInput`].
+    fn overlay_account_proof(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+        address: Address,
+        slots: &[B256],
+    ) -> Result<AccountProof, StateProofError>;
+
+    /// Generates the state [`MultiProof`] for target hashed account and storage keys.
+    fn overlay_multiproof(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+        targets: MultiProofTargets,
+    ) -> Result<MultiProof, StateProofError>;
+}
+
+impl<'tx, S> DatabaseProof<'tx, S>
+    for Proof<OpProofsTrieCursorFactory<'tx, S>, OpProofsHashedAccountCursorFactory<'tx, S>>
+where
+    S: OpProofsStore + Clone,
+{
+    /// Create a new [`Proof`] instance from [`OpProofsStorage`].
+    fn from_tx(storage: &'tx OpProofsStorage<S>, block_number: u64) -> Self {
+        Self::new(
+            OpProofsTrieCursorFactory::new(storage, block_number),
+            OpProofsHashedAccountCursorFactory::new(storage, block_number),
+        )
+    }
+
+    /// Generates the state proof for target account based on [`TrieInput`].
+    fn overlay_account_proof(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+        address: Address,
+        slots: &[B256],
+    ) -> Result<AccountProof, StateProofError> {
+        let nodes_sorted = input.nodes.into_sorted();
+        let state_sorted = input.state.into_sorted();
+        Self::from_tx(storage, block_number)
+            .with_trie_cursor_factory(InMemoryTrieCursorFactory::new(
+                OpProofsTrieCursorFactory::new(storage, block_number),
+                &nodes_sorted,
+            ))
+            .with_hashed_cursor_factory(HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ))
+            .with_prefix_sets_mut(input.prefix_sets)
+            .account_proof(address, slots)
+    }
+
+    /// Generates the state [`MultiProof`] for target hashed account and storage keys.
+    fn overlay_multiproof(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+        targets: MultiProofTargets,
+    ) -> Result<MultiProof, StateProofError> {
+        let nodes_sorted = input.nodes.into_sorted();
+        let state_sorted = input.state.into_sorted();
+        Self::from_tx(storage, block_number)
+            .with_trie_cursor_factory(InMemoryTrieCursorFactory::new(
+                OpProofsTrieCursorFactory::new(storage, block_number),
+                &nodes_sorted,
+            ))
+            .with_hashed_cursor_factory(HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ))
+            .with_prefix_sets_mut(input.prefix_sets)
+            .multiproof(targets)
+    }
+}
+
+/// Extends [`StorageProof`] with operations specific for working with [`OpProofsStorage`].
+pub trait DatabaseStorageProof<'tx, S> {
+    /// Create a new [`StorageProof`] from [`OpProofsStorage`] and account address.
+    fn from_tx(storage: &'tx OpProofsStorage<S>, block_number: u64, address: Address) -> Self;
+
+    /// Generates the storage proof for target slot based on [`TrieInput`].
+    fn overlay_storage_proof(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        address: Address,
+        slot: B256,
+        storage: HashedStorage,
+    ) -> Result<StorageProof, StateProofError>;
+
+    /// Generates the storage multiproof for target slots based on [`TrieInput`].
+    fn overlay_storage_multiproof(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        address: Address,
+        slots: &[B256],
+        storage: HashedStorage,
+    ) -> Result<StorageMultiProof, StateProofError>;
+}
+
+impl<'tx, S> DatabaseStorageProof<'tx, S>
+    for proof::StorageProof<
+        'static,
+        OpProofsTrieCursorFactory<'tx, S>,
+        OpProofsHashedAccountCursorFactory<'tx, S>,
+    >
+where
+    S: OpProofsStore + 'tx + Clone,
+{
+    /// Create a new [`StorageProof`] from [`OpProofsStorage`] and account address.
+    fn from_tx(storage: &'tx OpProofsStorage<S>, block_number: u64, address: Address) -> Self {
+        Self::new(
+            OpProofsTrieCursorFactory::new(storage, block_number),
+            OpProofsHashedAccountCursorFactory::new(storage, block_number),
+            address,
+        )
+    }
+
+    fn overlay_storage_proof(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        address: Address,
+        slot: B256,
+        hashed_storage: HashedStorage,
+    ) -> Result<StorageProof, StateProofError> {
+        let hashed_address = keccak256(address);
+        let prefix_set = hashed_storage.construct_prefix_set();
+        let state_sorted = HashedPostStateSorted::new(
+            Default::default(),
+            HashMap::from_iter([(hashed_address, hashed_storage.into_sorted())]),
+        );
+        Self::from_tx(storage, block_number, address)
+            .with_hashed_cursor_factory(HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ))
+            .with_prefix_set_mut(prefix_set)
+            .storage_proof(slot)
+    }
+
+    fn overlay_storage_multiproof(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        address: Address,
+        slots: &[B256],
+        hashed_storage: HashedStorage,
+    ) -> Result<StorageMultiProof, StateProofError> {
+        let hashed_address = keccak256(address);
+        let targets = slots.iter().map(keccak256).collect();
+        let prefix_set = hashed_storage.construct_prefix_set();
+        let state_sorted = HashedPostStateSorted::new(
+            Default::default(),
+            HashMap::from_iter([(hashed_address, hashed_storage.into_sorted())]),
+        );
+        Self::from_tx(storage, block_number, address)
+            .with_hashed_cursor_factory(HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ))
+            .with_prefix_set_mut(prefix_set)
+            .storage_multiproof(targets)
+    }
+}
+
+/// Extends [`StateRoot`] with operations specific for working with [`OpProofsStorage`].
+pub trait DatabaseStateRoot<'tx, S: OpProofsStore + 'tx + Clone>: Sized {
+    /// Calculate the state root for this [`HashedPostState`].
+    /// Internally, this method retrieves prefixsets and uses them
+    /// to calculate incremental state root.
+    ///
+    /// # Returns
+    ///
+    /// The state root for this [`HashedPostState`].
+    fn overlay_root(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        post_state: HashedPostState,
+    ) -> Result<B256, StateRootError>;
+
+    /// Calculates the state root for this [`HashedPostState`] and returns it alongside trie
+    /// updates. See [`Self::overlay_root`] for more info.
+    fn overlay_root_with_updates(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        post_state: HashedPostState,
+    ) -> Result<(B256, TrieUpdates), StateRootError>;
+
+    /// Calculates the state root for provided [`HashedPostState`] using cached intermediate nodes.
+    fn overlay_root_from_nodes(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+    ) -> Result<B256, StateRootError>;
+
+    /// Calculates the state root and trie updates for provided [`HashedPostState`] using
+    /// cached intermediate nodes.
+    fn overlay_root_from_nodes_with_updates(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+    ) -> Result<(B256, TrieUpdates), StateRootError>;
+}
+
+impl<'tx, S> DatabaseStateRoot<'tx, S>
+    for StateRoot<OpProofsTrieCursorFactory<'tx, S>, OpProofsHashedAccountCursorFactory<'tx, S>>
+where
+    S: OpProofsStore + 'tx + Clone,
+{
+    fn overlay_root(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        post_state: HashedPostState,
+    ) -> Result<B256, StateRootError> {
+        let prefix_sets = post_state.construct_prefix_sets().freeze();
+        let state_sorted = post_state.into_sorted();
+        StateRoot::new(
+            OpProofsTrieCursorFactory::new(storage, block_number),
+            HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ),
+        )
+        .with_prefix_sets(prefix_sets)
+        .root()
+    }
+
+    fn overlay_root_with_updates(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        post_state: HashedPostState,
+    ) -> Result<(B256, TrieUpdates), StateRootError> {
+        let prefix_sets = post_state.construct_prefix_sets().freeze();
+        let state_sorted = post_state.into_sorted();
+        StateRoot::new(
+            OpProofsTrieCursorFactory::new(storage, block_number),
+            HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ),
+        )
+        .with_prefix_sets(prefix_sets)
+        .root_with_updates()
+    }
+
+    fn overlay_root_from_nodes(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+    ) -> Result<B256, StateRootError> {
+        let state_sorted = input.state.into_sorted();
+        let nodes_sorted = input.nodes.into_sorted();
+        StateRoot::new(
+            InMemoryTrieCursorFactory::new(
+                OpProofsTrieCursorFactory::new(storage, block_number),
+                &nodes_sorted,
+            ),
+            HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ),
+        )
+        .with_prefix_sets(input.prefix_sets.freeze())
+        .root()
+    }
+
+    fn overlay_root_from_nodes_with_updates(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+    ) -> Result<(B256, TrieUpdates), StateRootError> {
+        let state_sorted = input.state.into_sorted();
+        let nodes_sorted = input.nodes.into_sorted();
+        StateRoot::new(
+            InMemoryTrieCursorFactory::new(
+                OpProofsTrieCursorFactory::new(storage, block_number),
+                &nodes_sorted,
+            ),
+            HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ),
+        )
+        .with_prefix_sets(input.prefix_sets.freeze())
+        .root_with_updates()
+    }
+}
+
+/// Extends [`StorageRoot`] with operations specific for working with [`OpProofsStorage`].
+pub trait DatabaseStorageRoot<'tx, S: OpProofsStore + 'tx + Clone> {
+    /// Calculates the storage root for provided [`HashedStorage`].
+    fn overlay_root(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        address: Address,
+        hashed_storage: HashedStorage,
+    ) -> Result<B256, StorageRootError>;
+}
+
+impl<'tx, S> DatabaseStorageRoot<'tx, S>
+    for StorageRoot<OpProofsTrieCursorFactory<'tx, S>, OpProofsHashedAccountCursorFactory<'tx, S>>
+where
+    S: OpProofsStore + 'tx + Clone,
+{
+    fn overlay_root(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        address: Address,
+        hashed_storage: HashedStorage,
+    ) -> Result<B256, StorageRootError> {
+        let prefix_set = hashed_storage.construct_prefix_set().freeze();
+        let state_sorted =
+            HashedPostState::from_hashed_storage(keccak256(address), hashed_storage).into_sorted();
+        StorageRoot::new(
+            OpProofsTrieCursorFactory::new(storage, block_number),
+            HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ),
+            address,
+            prefix_set,
+            TrieRootMetrics::new(TrieType::Custom("op_historical_proofs_storage")),
+        )
+        .root()
+    }
+}
+
+/// Extends [`TrieWitness`] with operations specific for working with [`OpProofsStorage`].
+pub trait DatabaseTrieWitness<'tx, S: OpProofsStore + 'tx + Clone> {
+    /// Creates a new [`TrieWitness`] instance from [`OpProofsStorage`].
+    fn from_tx(storage: &'tx OpProofsStorage<S>, block_number: u64) -> Self;
+
+    /// Generates the trie witness for the target state based on [`TrieInput`].
+    fn overlay_witness(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+        target: HashedPostState,
+    ) -> Result<B256Map<Bytes>, TrieWitnessError>;
+}
+
+impl<'tx, S> DatabaseTrieWitness<'tx, S>
+    for TrieWitness<OpProofsTrieCursorFactory<'tx, S>, OpProofsHashedAccountCursorFactory<'tx, S>>
+where
+    S: OpProofsStore + 'tx + Clone,
+{
+    fn from_tx(storage: &'tx OpProofsStorage<S>, block_number: u64) -> Self {
+        Self::new(
+            OpProofsTrieCursorFactory::new(storage, block_number),
+            OpProofsHashedAccountCursorFactory::new(storage, block_number),
+        )
+    }
+
+    fn overlay_witness(
+        storage: &'tx OpProofsStorage<S>,
+        block_number: u64,
+        input: TrieInput,
+        target: HashedPostState,
+    ) -> Result<B256Map<Bytes>, TrieWitnessError> {
+        let nodes_sorted = input.nodes.into_sorted();
+        let state_sorted = input.state.into_sorted();
+        Self::from_tx(storage, block_number)
+            .with_trie_cursor_factory(InMemoryTrieCursorFactory::new(
+                OpProofsTrieCursorFactory::new(storage, block_number),
+                &nodes_sorted,
+            ))
+            .with_hashed_cursor_factory(HashedPostStateCursorFactory::new(
+                OpProofsHashedAccountCursorFactory::new(storage, block_number),
+                &state_sorted,
+            ))
+            .with_prefix_sets_mut(input.prefix_sets)
+            .always_include_root_node()
+            .compute(target)
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/provider.rs b/rust/op-reth/crates/trie/src/provider.rs
new file mode 100644
index 0000000000000..fd52b3e71ca92
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/provider.rs
@@ -0,0 +1,235 @@
+//! Provider for external proofs storage
+
+use crate::{
+    OpProofsStorage, OpProofsStorageError, OpProofsStore,
+    proof::{
+        DatabaseProof, DatabaseStateRoot, DatabaseStorageProof, DatabaseStorageRoot,
+        DatabaseTrieWitness,
+    },
+};
+use alloy_primitives::keccak256;
+use derive_more::Constructor;
+use reth_primitives_traits::{Account, Bytecode};
+use reth_provider::{
+    AccountReader, BlockHashReader, BytecodeReader, HashedPostStateProvider, ProviderError,
+    ProviderResult, StateProofProvider, StateProvider, StateRootProvider, StorageRootProvider,
+};
+use reth_revm::{
+    db::BundleState,
+    primitives::{Address, B256, Bytes, StorageValue, alloy_primitives::BlockNumber},
+};
+use reth_trie::{
+    StateRoot, StorageRoot,
+    hashed_cursor::HashedCursor,
+    proof::{self, Proof},
+    witness::TrieWitness,
+};
+use reth_trie_common::{
+    AccountProof, HashedPostState, HashedStorage, KeccakKeyHasher, MultiProof, MultiProofTargets,
+    StorageMultiProof, StorageProof, TrieInput, updates::TrieUpdates,
+};
+use std::fmt::Debug;
+
+/// State provider for external proofs storage.
+#[derive(Constructor)]
+pub struct OpProofsStateProviderRef<'a, Storage: OpProofsStore> {
+    /// Historical state provider for non-state related tasks.
+    latest: Box<dyn StateProvider + Send + 'a>,
+
+    /// Storage provider for state lookups.
+    storage: &'a OpProofsStorage<Storage>,
+
+    /// Max block number that can be used for state lookups.
+    block_number: BlockNumber,
+}
+
+impl<'a, Storage> Debug for OpProofsStateProviderRef<'a, Storage>
+where
+    Storage: OpProofsStore + 'a + Debug,
+{
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("OpProofsStateProviderRef")
+            .field("storage", &self.storage)
+            .field("block_number", &self.block_number)
+            .finish()
+    }
+}
+
+impl From<OpProofsStorageError> for ProviderError {
+    fn from(error: OpProofsStorageError) -> Self {
+        Self::other(error)
+    }
+}
+
+impl<'a, Storage: OpProofsStore> BlockHashReader for OpProofsStateProviderRef<'a, Storage> {
+    fn block_hash(&self, number: BlockNumber) -> ProviderResult<Option<B256>> {
+        self.latest.block_hash(number)
+    }
+
+    fn canonical_hashes_range(
+        &self,
+        start: BlockNumber,
+        end: BlockNumber,
+    ) -> ProviderResult<Vec<B256>> {
+        self.latest.canonical_hashes_range(start, end)
+    }
+}
+
+impl<'a, Storage: OpProofsStore + Clone> StateRootProvider
+    for OpProofsStateProviderRef<'a, Storage>
+{
+    fn state_root(&self, state: HashedPostState) -> ProviderResult<B256> {
+        Ok(StateRoot::overlay_root(self.storage, self.block_number, state)?)
+    }
+
+    fn state_root_from_nodes(&self, input: TrieInput) -> ProviderResult<B256> {
+        Ok(StateRoot::overlay_root_from_nodes(self.storage, self.block_number, input)?)
+    }
+
+    fn state_root_with_updates(
+        &self,
+        state: HashedPostState,
+    ) -> ProviderResult<(B256, TrieUpdates)> {
+        Ok(StateRoot::overlay_root_with_updates(self.storage, self.block_number, state)?)
+    }
+
+    fn state_root_from_nodes_with_updates(
+        &self,
+        input: TrieInput,
+    ) -> ProviderResult<(B256, TrieUpdates)> {
+        Ok(StateRoot::overlay_root_from_nodes_with_updates(self.storage, self.block_number, input)?)
+    }
+}
+
+impl<'a, Storage: OpProofsStore + Clone> StorageRootProvider
+    for OpProofsStateProviderRef<'a, Storage>
+{
+    fn storage_root(&self, address: Address, storage: HashedStorage) -> ProviderResult<B256> {
+        StorageRoot::overlay_root(self.storage, self.block_number, address, storage)
+            .map_err(|err| ProviderError::Database(err.into()))
+    }
+
+    fn storage_proof(
+        &self,
+        address: Address,
+        slot: B256,
+        storage: HashedStorage,
+    ) -> ProviderResult<StorageProof> {
+        proof::StorageProof::overlay_storage_proof(
+            self.storage,
+            self.block_number,
+            address,
+            slot,
+            storage,
+        )
+        .map_err(ProviderError::from)
+    }
+
+    fn storage_multiproof(
+        &self,
+        address: Address,
+        slots: &[B256],
+        storage: HashedStorage,
+    ) -> ProviderResult<StorageMultiProof> {
+        proof::StorageProof::overlay_storage_multiproof(
+            self.storage,
+            self.block_number,
+            address,
+            slots,
+            storage,
+        )
+        .map_err(ProviderError::from)
+    }
+}
+
+impl<'a, Storage: OpProofsStore + Clone> StateProofProvider
+    for OpProofsStateProviderRef<'a, Storage>
+{
+    fn proof(
+        &self,
+        input: TrieInput,
+        address: Address,
+        slots: &[B256],
+    ) -> ProviderResult<AccountProof> {
+        Proof::overlay_account_proof(self.storage, self.block_number, input, address, slots)
+            .map_err(ProviderError::from)
+    }
+
+    fn multiproof(
+        &self,
+        input: TrieInput,
+        targets: MultiProofTargets,
+    ) -> ProviderResult<MultiProof> {
+        Proof::overlay_multiproof(self.storage, self.block_number, input, targets)
+            .map_err(ProviderError::from)
+    }
+
+    fn witness(&self, input: TrieInput, target: HashedPostState) -> ProviderResult<Vec<Bytes>> {
+        TrieWitness::overlay_witness(self.storage, self.block_number, input, target)
+            .map_err(ProviderError::from)
+            .map(|hm| hm.into_values().collect())
+    }
+}
+
+impl<'a, Storage: OpProofsStore> HashedPostStateProvider for OpProofsStateProviderRef<'a, Storage> {
+    fn hashed_post_state(&self, bundle_state: &BundleState) -> HashedPostState {
+        HashedPostState::from_bundle_state::<KeccakKeyHasher>(bundle_state.state())
+    }
+}
+
+impl<'a, Storage: OpProofsStore> AccountReader for OpProofsStateProviderRef<'a, Storage> {
+    fn basic_account(&self, address: &Address) -> ProviderResult<Option<Account>> {
+        let hashed_key = keccak256(address.0);
+        Ok(self
+            .storage
+            .account_hashed_cursor(self.block_number)
+            .map_err(Into::<ProviderError>::into)?
+            .seek(hashed_key)
+            .map_err(Into::<ProviderError>::into)?
+            .and_then(|(key, account)| (key == hashed_key).then_some(account)))
+    }
+}
+
+impl<'a, Storage> StateProvider for OpProofsStateProviderRef<'a, Storage>
+where
+    Storage: OpProofsStore + Clone,
+{
+    fn storage(&self, address: Address, storage_key: B256) -> ProviderResult<Option<StorageValue>> {
+        let hashed_key = keccak256(storage_key);
+        Ok(self
+            .storage
+            .storage_hashed_cursor(keccak256(address.0), self.block_number)
+            .map_err(Into::<ProviderError>::into)?
+            .seek(hashed_key)
+            .map_err(Into::<ProviderError>::into)?
+            .and_then(|(key, storage)| (key == hashed_key).then_some(storage)))
+    }
+}
+
+impl<'a, Storage: OpProofsStore> BytecodeReader for OpProofsStateProviderRef<'a, Storage> {
+    fn bytecode_by_hash(&self, code_hash: &B256) -> ProviderResult<Option<Bytecode>> {
+        self.latest.bytecode_by_hash(code_hash)
+    }
+}
+
+#[cfg(all(test, not(feature = "metrics")))]
+mod tests {
+    use super::*;
+    use crate::InMemoryProofsStorage;
+    use reth_provider::noop::NoopProvider;
+
+    #[test]
+    fn test_op_proofs_state_provider_ref_debug() {
+        let latest: Box<dyn StateProvider + Send> = Box::new(NoopProvider::default());
+        let storage: crate::OpProofsStorage<InMemoryProofsStorage> =
+            InMemoryProofsStorage::new().into();
+        let block_number = 42u64;
+
+        let provider = OpProofsStateProviderRef::new(latest, &storage, block_number);
+
+        assert_eq!(
+            format!("{:?}", provider),
+            "OpProofsStateProviderRef { storage: InMemoryProofsStorage { inner: RwLock { data: InMemoryStorageInner { account_branches: {}, storage_branches: {}, hashed_accounts: {}, hashed_storages: {}, trie_updates: {}, post_states: {}, earliest_block: None, anchor_block: None } } }, block_number: 42 }"
+        );
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/prune/error.rs b/rust/op-reth/crates/trie/src/prune/error.rs
new file mode 100644
index 0000000000000..965def8fc4250
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/prune/error.rs
@@ -0,0 +1,96 @@
+use crate::{OpProofsStorageError, api::WriteCounts};
+use reth_provider::ProviderError;
+use std::{
+    fmt,
+    fmt::{Display, Formatter},
+    time::Duration,
+};
+use strum::Display;
+use thiserror::Error;
+
+/// Result of [`OpProofStoragePruner::run`](crate::OpProofStoragePruner::run) execution.
+pub type OpProofStoragePrunerResult = Result<PrunerOutput, PrunerError>;
+
+/// Successful prune summary.
+#[derive(Debug, Clone, Default, Eq, PartialEq)]
+pub struct PrunerOutput {
+    /// Total elapsed wall time for this run (fetch + apply).
+    pub duration: Duration,
+    /// Earliest block at the start of the run.
+    pub start_block: u64,
+    /// New earliest block at the end of the run.
+    pub end_block: u64,
+    /// Number of entries updated/removed per table.
+    pub write_counts: WriteCounts,
+}
+
+impl Display for PrunerOutput {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        let blocks = self.end_block.saturating_sub(self.start_block);
+        let total_entries = self.write_counts.hashed_accounts_written_total +
+            self.write_counts.hashed_storages_written_total +
+            self.write_counts.account_trie_updates_written_total +
+            self.write_counts.storage_trie_updates_written_total;
+        write!(
+            f,
+            "Pruned {}→{} ({} blocks), entries={}, elapsed={:.3}s",
+            self.start_block,
+            self.end_block,
+            blocks,
+            total_entries,
+            self.duration.as_secs_f64(),
+        )
+    }
+}
+
+impl PrunerOutput {
+    /// extend the current [`PrunerOutput`] with another [`PrunerOutput`]
+    pub fn extend_ref(&mut self, other: Self) {
+        self.duration += other.duration;
+        // take the earliest start block
+        if self.start_block > other.start_block {
+            self.start_block = other.start_block;
+        }
+        // take the latest end block
+        if self.end_block < other.end_block {
+            self.end_block = other.end_block;
+        }
+        self.write_counts += other.write_counts;
+    }
+}
+
+/// Error returned by the pruner.
+#[derive(Debug, Error, Display)]
+pub enum PrunerError {
+    /// Wrapped error from the underlying `OpProofStorage` layer.
+    Storage(#[from] OpProofsStorageError),
+
+    /// Wrapped error from the reth db provider.
+    Provider(#[from] ProviderError),
+
+    /// Block not found in the underlying reth storage provider.
+    BlockNotFound(u64),
+
+    /// The pruner timed out before finishing the prune
+    TimedOut(Duration),
+}
+
+#[cfg(test)]
+mod tests {
+    use super::PrunerOutput;
+    use crate::api::WriteCounts;
+    use std::time::Duration;
+
+    #[test]
+    fn test_pruner_output_display() {
+        let pruner_output = PrunerOutput {
+            duration: Duration::from_secs(10),
+            start_block: 1,
+            end_block: 2,
+            write_counts: WriteCounts::new(1, 2, 3, 4),
+        };
+        let formatted_pruner_output = format!("{pruner_output}");
+
+        assert_eq!(formatted_pruner_output, "Pruned 1→2 (1 blocks), entries=10, elapsed=10.000s");
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/prune/metrics.rs b/rust/op-reth/crates/trie/src/prune/metrics.rs
new file mode 100644
index 0000000000000..35457c88190ab
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/prune/metrics.rs
@@ -0,0 +1,39 @@
+use crate::PrunerOutput;
+use reth_metrics::{
+    Metrics,
+    metrics::{Gauge, Histogram},
+};
+
+#[derive(Metrics)]
+#[metrics(scope = "optimism_trie.pruner")]
+pub(crate) struct Metrics {
+    /// Pruning duration
+    pub(crate) total_duration_seconds: Histogram,
+    /// Number of pruned blocks
+    pub(crate) pruned_blocks: Gauge,
+    /// Number of account trie updates written in the prune run
+    pub(crate) account_trie_updates_written: Gauge,
+    /// Number of storage trie updates written in the prune run
+    pub(crate) storage_trie_updates_written: Gauge,
+    /// Number of hashed accounts written in the prune run
+    pub(crate) hashed_accounts_written: Gauge,
+    /// Number of hashed storages written in the prune run
+    pub(crate) hashed_storages_written: Gauge,
+}
+
+impl Metrics {
+    pub(crate) fn record_prune_result(&self, result: PrunerOutput) {
+        let blocks_pruned = result.end_block - result.start_block;
+        if blocks_pruned > 0 {
+            self.total_duration_seconds.record(result.duration.as_secs_f64());
+            self.pruned_blocks.set(blocks_pruned as f64);
+
+            // Consume write counts
+            let wc = &result.write_counts;
+            self.account_trie_updates_written.set(wc.account_trie_updates_written_total as f64);
+            self.storage_trie_updates_written.set(wc.storage_trie_updates_written_total as f64);
+            self.hashed_accounts_written.set(wc.hashed_accounts_written_total as f64);
+            self.hashed_storages_written.set(wc.hashed_storages_written_total as f64);
+        }
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/prune/mod.rs b/rust/op-reth/crates/trie/src/prune/mod.rs
new file mode 100644
index 0000000000000..888065832ec40
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/prune/mod.rs
@@ -0,0 +1,11 @@
+mod error;
+pub use error::{OpProofStoragePrunerResult, PrunerError, PrunerOutput};
+
+mod pruner;
+pub use pruner::OpProofStoragePruner;
+
+#[cfg(feature = "metrics")]
+mod metrics;
+
+mod task;
+pub use task::OpProofStoragePrunerTask;
diff --git a/rust/op-reth/crates/trie/src/prune/pruner.rs b/rust/op-reth/crates/trie/src/prune/pruner.rs
new file mode 100644
index 0000000000000..6b048dee42c7e
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/prune/pruner.rs
@@ -0,0 +1,588 @@
+#[cfg(feature = "metrics")]
+use crate::prune::metrics::Metrics;
+use crate::{
+    OpProofsStorage, OpProofsStore,
+    prune::error::{OpProofStoragePrunerResult, PrunerError, PrunerOutput},
+};
+use alloy_eips::{BlockNumHash, eip1898::BlockWithParent};
+use reth_provider::BlockHashReader;
+use std::cmp;
+use tokio::time::Instant;
+use tracing::{error, info, trace};
+
+/// Prunes the proof storage by calling `prune_earliest_state` on the storage provider.
+#[derive(Debug)]
+pub struct OpProofStoragePruner<P, H> {
+    // Database provider for the prune
+    provider: OpProofsStorage<P>,
+    /// Reader to fetch block hash by block number
+    block_hash_reader: H,
+    /// Keep at least these many recent blocks
+    min_block_interval: u64,
+    /// Maximum number of blocks to prune in one database transaction
+    prune_batch_size: u64,
+    // TODO: add timeout - Maximum time for one pruner run. If `None`, no timeout.
+    #[doc(hidden)]
+    #[cfg(feature = "metrics")]
+    metrics: Metrics,
+}
+
+impl<P, H> OpProofStoragePruner<P, H> {
+    /// Create a new pruner.
+    pub fn new(
+        provider: OpProofsStorage<P>,
+        block_hash_reader: H,
+        min_block_interval: u64,
+        prune_batch_size: u64,
+    ) -> Self {
+        Self {
+            provider,
+            block_hash_reader,
+            min_block_interval,
+            prune_batch_size,
+            #[cfg(feature = "metrics")]
+            metrics: Metrics::default(),
+        }
+    }
+}
+
+impl<P, H> OpProofStoragePruner<P, H>
+where
+    P: OpProofsStore,
+    H: BlockHashReader,
+{
+    fn run_inner(&self) -> OpProofStoragePrunerResult {
+        let latest_block_opt = self.provider.get_latest_block_number()?;
+        if latest_block_opt.is_none() {
+            trace!(target: "trie::pruner", "No latest blocks in the proof storage");
+            return Ok(PrunerOutput::default());
+        }
+
+        let earliest_block_opt = self.provider.get_earliest_block_number()?;
+        if earliest_block_opt.is_none() {
+            trace!(target: "trie::pruner", "No earliest blocks in the proof storage");
+            return Ok(PrunerOutput::default());
+        }
+
+        let latest_block = latest_block_opt.unwrap().0;
+        let earliest_block = earliest_block_opt.unwrap().0;
+
+        let interval = latest_block.saturating_sub(earliest_block);
+        if interval <= self.min_block_interval {
+            trace!(target: "trie::pruner", "Nothing to prune");
+            return Ok(PrunerOutput::default());
+        }
+
+        // at this point `latest_block` is always greater than `min_block_interval`
+        let target_earliest_block = latest_block - self.min_block_interval;
+
+        info!(
+            target: "trie::pruner",
+            from_block = earliest_block,
+            to_block = target_earliest_block,
+           "Starting pruning proof storage",
+        );
+
+        let mut current_earliest_block = earliest_block;
+        let mut prune_output = PrunerOutput {
+            start_block: earliest_block,
+            end_block: target_earliest_block,
+            ..Default::default()
+        };
+
+        // Prune in batches
+        while current_earliest_block < target_earliest_block {
+            // Calculate the end of this batch
+            let batch_end_block =
+                cmp::min(current_earliest_block + self.prune_batch_size, target_earliest_block);
+
+            let batch_output = self.prune_batch(current_earliest_block, batch_end_block)?;
+
+            prune_output.extend_ref(batch_output);
+
+            // Update loop state
+            current_earliest_block = batch_end_block;
+        }
+
+        Ok(prune_output)
+    }
+
+    /// Prunes a single batch of blocks.
+    fn prune_batch(&self, start_block: u64, end_block: u64) -> Result<PrunerOutput, PrunerError> {
+        let batch_start_time = Instant::now();
+
+        // Fetch block hashes for the new earliest block of this batch
+        let new_earliest_block_hash = self
+            .block_hash_reader
+            .block_hash(end_block)
+            .inspect_err(|err| {
+                error!(
+                    target: "trie::pruner",
+                    block = end_block,
+                    ?err,
+                    "Failed to fetch block hash for new earliest block during pruning"
+                )
+            })?
+            .ok_or(PrunerError::BlockNotFound(end_block))?;
+
+        let parent_block_num = end_block - 1;
+        let parent_block_hash = self
+            .block_hash_reader
+            .block_hash(parent_block_num)
+            .inspect_err(|err| {
+                error!(
+                    target: "trie::pruner",
+                    block = parent_block_num,
+                    ?err,
+                    "Failed to fetch block hash for parent block during pruning"
+                )
+            })?
+            .ok_or(PrunerError::BlockNotFound(parent_block_num))?;
+
+        batch_start_time.elapsed();
+
+        let block_with_parent = BlockWithParent {
+            parent: parent_block_hash,
+            block: BlockNumHash { number: end_block, hash: new_earliest_block_hash },
+        };
+
+        // Commit this batch
+        let write_counts = self.provider.prune_earliest_state(block_with_parent)?;
+
+        let duration = batch_start_time.elapsed();
+        let batch_output = PrunerOutput { duration, start_block, end_block, write_counts };
+
+        // Record metrics for this batch
+        #[cfg(feature = "metrics")]
+        self.metrics.record_prune_result(batch_output.clone());
+
+        info!(
+            target: "trie::pruner",
+            ?batch_output,
+            "Finished pruning batch of proof storage",
+        );
+        Ok(batch_output)
+    }
+
+    /// Run the pruner
+    pub fn run(&self) {
+        let res = self.run_inner();
+        if let Err(e) = res {
+            error!(target: "trie::pruner", err=%e, "Pruner failed");
+            return;
+        }
+        info!(target: "trie::pruner", result = %res.unwrap(), "Finished pruning proof storage");
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::{BlockStateDiff, db::MdbxProofsStorage};
+    use alloy_eips::{BlockHashOrNumber, NumHash};
+    use alloy_primitives::{B256, BlockNumber, U256};
+    use mockall::mock;
+    use reth_primitives_traits::Account;
+    use reth_storage_errors::provider::ProviderResult;
+    use reth_trie::{
+        BranchNodeCompact, HashedPostState, HashedStorage, Nibbles,
+        hashed_cursor::HashedCursor,
+        trie_cursor::TrieCursor,
+        updates::{StorageTrieUpdates, TrieUpdates, TrieUpdatesSorted},
+    };
+    use std::sync::Arc;
+    use tempfile::TempDir;
+
+    mock! (
+        #[derive(Debug)]
+        pub BlockHashReader {}
+
+        impl BlockHashReader for BlockHashReader {
+            fn block_hash(&self, number: BlockNumber) -> ProviderResult<Option<B256>>;
+
+            fn convert_block_hash(
+                &self,
+                _hash_or_number: BlockHashOrNumber,
+            ) -> ProviderResult<Option<B256>>;
+
+            fn canonical_hashes_range(
+                &self,
+                _start: BlockNumber,
+                _end: BlockNumber,
+            ) -> ProviderResult<Vec<B256>>;
+        }
+    );
+
+    fn b256(n: u64) -> B256 {
+        use alloy_primitives::keccak256;
+        keccak256(n.to_be_bytes())
+    }
+
+    /// Build a block-with-parent for number `n` with deterministic hash.
+    fn block(n: u64, parent: B256) -> BlockWithParent {
+        BlockWithParent::new(parent, NumHash::new(n, b256(n)))
+    }
+
+    #[tokio::test]
+    async fn run_inner_and_and_verify_updated_state() {
+        // --- env/store ---
+        let dir = TempDir::new().unwrap();
+        let store: OpProofsStorage<Arc<MdbxProofsStorage>> =
+            OpProofsStorage::from(Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")));
+
+        store.set_earliest_block_number(0, B256::ZERO).expect("set earliest");
+
+        // --- entities ---
+        // accounts
+        let a1 = B256::from([0xA1; 32]);
+        let a2 = B256::from([0xA2; 32]);
+        let a3 = B256::from([0xA3; 32]); // introduced later
+
+        // one storage address with 3 slots
+        let stor_addr = B256::from([0x10; 32]);
+        let s1 = B256::from([0xB1; 32]);
+        let s2 = B256::from([0xB2; 32]);
+        let s3 = B256::from([0xB3; 32]);
+
+        // account-trie paths (p1 gets removed by block 3; p2 remains; p3 added later)
+        let p1 = Nibbles::from_nibbles_unchecked([0x01, 0x02]);
+        let p2 = Nibbles::from_nibbles_unchecked([0x03, 0x04]);
+        let p3 = Nibbles::from_nibbles_unchecked([0x05, 0x06]);
+
+        let node_p1 = BranchNodeCompact::new(0b1, 0, 0, vec![], Some(B256::from([0x11; 32])));
+        let node_p2 = BranchNodeCompact::new(0b10, 0, 0, vec![], Some(B256::from([0x22; 32])));
+        let node_p3 = BranchNodeCompact::new(0b11, 0, 0, vec![], Some(B256::from([0x33; 32])));
+
+        // storage-trie paths (st1 removed by block 3; st2 remains; st3 added later)
+        let st1 = Nibbles::from_nibbles_unchecked([0x0A]);
+        let st2 = Nibbles::from_nibbles_unchecked([0x0B]);
+        let st3 = Nibbles::from_nibbles_unchecked([0x0C]);
+
+        let node_st2 = BranchNodeCompact::new(0b101, 0, 0, vec![], Some(B256::from([0x44; 32])));
+        let node_st3 = BranchNodeCompact::new(0b110, 0, 0, vec![], Some(B256::from([0x55; 32])));
+
+        // --- write 5 blocks manually ---
+        let mut parent = B256::ZERO;
+
+        // Block 1: add a1,a2; s1=100, s2=200; add p1, st1
+        {
+            let b1 = block(1, parent);
+
+            let mut d_trie_updates = TrieUpdates::default();
+            let mut d_post_state = HashedPostState::default();
+
+            d_post_state.accounts.insert(
+                a1,
+                Some(Account { nonce: 1, balance: U256::from(1_001), ..Default::default() }),
+            );
+            d_post_state.accounts.insert(
+                a2,
+                Some(Account { nonce: 1, balance: U256::from(1_002), ..Default::default() }),
+            );
+
+            let mut hs = HashedStorage::default();
+            hs.storage.insert(s1, U256::from(100));
+            hs.storage.insert(s2, U256::from(200));
+            d_post_state.storages.insert(stor_addr, hs);
+
+            d_trie_updates.account_nodes.insert(p1, node_p1);
+            let e = d_trie_updates.storage_tries.entry(stor_addr).or_default();
+            e.storage_nodes.insert(st1, BranchNodeCompact::default());
+
+            let d = BlockStateDiff {
+                sorted_post_state: d_post_state.into_sorted(),
+                sorted_trie_updates: d_trie_updates.into_sorted(),
+            };
+            store.store_trie_updates(b1, d).expect("b1");
+            parent = b256(1);
+        }
+
+        // Block 2: update a2; add a3; s2=220, s3=300; add p2, st2
+        {
+            let b2 = block(2, parent);
+
+            let mut d_trie_updates = TrieUpdates::default();
+            let mut d_post_state = HashedPostState::default();
+
+            d_post_state.accounts.insert(
+                a2,
+                Some(Account { nonce: 2, balance: U256::from(2_002), ..Default::default() }),
+            );
+            d_post_state.accounts.insert(
+                a3,
+                Some(Account { nonce: 1, balance: U256::from(1_003), ..Default::default() }),
+            );
+
+            let mut hs = HashedStorage::default();
+            hs.storage.insert(s2, U256::from(220));
+            hs.storage.insert(s3, U256::from(300));
+            d_post_state.storages.insert(stor_addr, hs);
+
+            d_trie_updates.account_nodes.insert(p2, node_p2.clone());
+            let e = d_trie_updates.storage_tries.entry(stor_addr).or_default();
+            e.storage_nodes.insert(st2, node_st2.clone());
+
+            let d = BlockStateDiff {
+                sorted_post_state: d_post_state.into_sorted(),
+                sorted_trie_updates: d_trie_updates.into_sorted(),
+            };
+            store.store_trie_updates(b2, d).expect("b2");
+            parent = b256(2);
+        }
+
+        // Block 3: delete a1; leave a2,a3; remove p1; remove st1 (storage-trie)
+        {
+            let b3 = block(3, parent);
+
+            let mut d_trie_updates = TrieUpdates::default();
+            let mut d_post_state = HashedPostState::default();
+
+            // delete a1, keep a2 & a3 values unchanged for this block
+            d_post_state.accounts.insert(a1, None);
+
+            // remove account trie node p1
+            d_trie_updates.removed_nodes.insert(p1);
+
+            // remove storage-trie node st1
+            let mut st_upd = StorageTrieUpdates::default();
+            st_upd.removed_nodes.insert(st1);
+            d_trie_updates.storage_tries.insert(stor_addr, st_upd);
+
+            let d = BlockStateDiff {
+                sorted_post_state: d_post_state.into_sorted(),
+                sorted_trie_updates: d_trie_updates.into_sorted(),
+            };
+            store.store_trie_updates(b3, d).expect("b3");
+            parent = b256(3);
+        }
+
+        // Block 4 (kept): update a2; s1=140; add p3, st3
+        {
+            let b4 = block(4, parent);
+
+            let mut d_trie_updates = TrieUpdates::default();
+            let mut d_post_state = HashedPostState::default();
+
+            d_post_state.accounts.insert(
+                a2,
+                Some(Account { nonce: 3, balance: U256::from(3_002), ..Default::default() }),
+            );
+
+            let mut hs = HashedStorage::default();
+            hs.storage.insert(s1, U256::from(140));
+            d_post_state.storages.insert(stor_addr, hs);
+            d_trie_updates.account_nodes.insert(p3, node_p3.clone());
+            let e = d_trie_updates.storage_tries.entry(stor_addr).or_default();
+            e.storage_nodes.insert(st3, node_st3.clone());
+
+            let d = BlockStateDiff {
+                sorted_post_state: d_post_state.into_sorted(),
+                sorted_trie_updates: d_trie_updates.into_sorted(),
+            };
+            store.store_trie_updates(b4, d).expect("b4");
+            parent = b256(4);
+        }
+
+        // Block 5 (kept): update a3; s3=330
+        {
+            let b5 = block(5, parent);
+
+            let mut d_post_state = HashedPostState::default();
+
+            d_post_state.accounts.insert(
+                a3,
+                Some(Account { nonce: 2, balance: U256::from(2_003), ..Default::default() }),
+            );
+
+            let mut hs = HashedStorage::default();
+            hs.storage.insert(s3, U256::from(330));
+            d_post_state.storages.insert(stor_addr, hs);
+
+            let d = BlockStateDiff {
+                sorted_post_state: d_post_state.into_sorted(),
+                sorted_trie_updates: TrieUpdatesSorted::default(),
+            };
+            store.store_trie_updates(b5, d).expect("b5");
+        }
+
+        // sanity: earliest=0, latest=5
+        {
+            let e = store.get_earliest_block_number().expect("earliest").expect("some");
+            let l = store.get_latest_block_number().expect("latest").expect("some");
+            assert_eq!(e.0, 0);
+            assert_eq!(l.0, 5);
+        }
+
+        // --- prune: remove the first 3 blocks, keep 4 and 5
+        // new_earliest = 5-1 = 4
+        let mut block_hash_reader = MockBlockHashReader::new();
+        block_hash_reader
+            .expect_block_hash()
+            .withf(move |block_num| *block_num == 4)
+            .returning(move |_| Ok(Some(b256(4))));
+
+        block_hash_reader
+            .expect_block_hash()
+            .withf(move |block_num| *block_num == 3)
+            .returning(move |_| Ok(Some(b256(3))));
+
+        let pruner = OpProofStoragePruner::new(store.clone(), block_hash_reader, 1, 1000);
+        let out = pruner.run_inner().expect("pruner ok");
+        assert_eq!(out.start_block, 0);
+        assert_eq!(out.end_block, 4, "pruned up to 4 (inclusive); new earliest is 4");
+
+        // proof window moved: earliest=4, latest=5
+        {
+            let e = store.get_earliest_block_number().expect("earliest").expect("some");
+            let l = store.get_latest_block_number().expect("latest").expect("some");
+            assert_eq!(e.0, 4);
+            assert_eq!(e.1, b256(4));
+            assert_eq!(l.0, 5);
+            assert_eq!(l.1, b256(5));
+        }
+
+        // --- DB checks
+        let mut acc_cur = store.account_hashed_cursor(4).expect("acc cur");
+        let mut stor_cur = store.storage_hashed_cursor(stor_addr, 4).expect("stor cur");
+        let mut acc_trie_cur = store.account_trie_cursor(4).expect("acc trie cur");
+        let mut stor_trie_cur = store.storage_trie_cursor(stor_addr, 4).expect("stor trie cur");
+
+        // Check these histories have been removed
+        let pruned_hashed_account = a1;
+        let pruned_trie_accounts = p1;
+        let pruned_trie_storage = st1;
+
+        assert_ne!(
+            acc_cur.seek(pruned_hashed_account).expect("seek").unwrap().0,
+            pruned_hashed_account,
+            "deleted account must not exist in earliest snapshot"
+        );
+        assert_ne!(
+            acc_trie_cur.seek(pruned_trie_accounts).expect("seek").unwrap().0,
+            pruned_trie_accounts,
+            "deleted account trie must not exist in earliest snapshot"
+        );
+        assert_ne!(
+            stor_trie_cur.seek(pruned_trie_storage).expect("seek").unwrap().0,
+            pruned_trie_storage,
+            "deleted storage trie must not exist in earliest snapshot"
+        );
+
+        // Check these histories have been updated - till block 4
+        let updated_hashed_accounts = vec![
+            (a2, Account { nonce: 3, balance: U256::from(3_002), ..Default::default() }), /* block 4 */
+            (a3, Account { nonce: 1, balance: U256::from(1_003), ..Default::default() }), /* block 2 */
+        ];
+        let updated_hashed_storage = vec![
+            (s1, U256::from(140)), // block 4
+            (s2, U256::from(220)), // block 2
+            (s3, U256::from(300)), // block 2
+        ];
+        let updated_trie_accounts = vec![
+            (p2, node_p2), // block 2
+            (p3, node_p3), // block 4
+        ];
+        let updated_trie_storage = vec![
+            (st2, node_st2), // block 2
+            (st3, node_st3), // block 4
+        ];
+
+        for (key, val) in updated_hashed_accounts {
+            let (k, vv) = acc_cur.seek(key).expect("seek").unwrap();
+            assert_eq!(key, k, "key must exist");
+            assert_eq!(val, vv, "value must be updated");
+        }
+
+        for (key, val) in updated_hashed_storage {
+            let (k, vv) = stor_cur.seek(key).expect("seek").unwrap();
+            assert_eq!(key, k, "key must exist");
+            assert_eq!(val, vv, "value must be updated");
+        }
+
+        for (key, val) in updated_trie_accounts {
+            let (k, vv) = acc_trie_cur.seek(key).expect("seek").unwrap();
+            assert_eq!(key, k, "key must exist");
+            assert_eq!(val, vv, "value must be updated");
+        }
+        for (key, val) in updated_trie_storage {
+            let (k, vv) = stor_trie_cur.seek(key).expect("seek").unwrap();
+            assert_eq!(key, k, "key must exist");
+            assert_eq!(val, vv, "value must be updated");
+        }
+    }
+
+    // Both latest and earliest blocks are None -> early return default; DB untouched.
+    #[tokio::test]
+    async fn run_inner_where_latest_block_is_none() {
+        let dir = TempDir::new().unwrap();
+        let store: OpProofsStorage<Arc<MdbxProofsStorage>> =
+            OpProofsStorage::from(Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")));
+
+        let earliest = store.get_earliest_block_number().unwrap();
+        let latest = store.get_latest_block_number().unwrap();
+        println!("{earliest:?} {latest:?}");
+        assert!(earliest.is_none());
+        assert!(latest.is_none());
+
+        let block_hash_reader = MockBlockHashReader::new();
+        let pruner = OpProofStoragePruner::new(store, block_hash_reader, 10, 1000);
+        let out = pruner.run_inner().expect("ok");
+        assert_eq!(out, PrunerOutput::default(), "should early-return default output");
+    }
+
+    // The earliest block is None, but the latest block exists -> early return default.
+    #[tokio::test]
+    async fn run_inner_earliest_none_real_db() {
+        use crate::BlockStateDiff;
+
+        let dir = TempDir::new().unwrap();
+        let store: OpProofsStorage<Arc<MdbxProofsStorage>> =
+            OpProofsStorage::from(Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")));
+
+        // Write a single block to set *latest* only.
+        store
+            .store_trie_updates(block(3, B256::ZERO), BlockStateDiff::default())
+            .expect("store b1");
+
+        let earliest = store.get_earliest_block_number().unwrap();
+        let latest = store.get_latest_block_number().unwrap();
+        assert!(earliest.is_none(), "earliest must remain None");
+        assert_eq!(latest.unwrap().0, 3);
+
+        let block_hash_reader = MockBlockHashReader::new();
+        let pruner = OpProofStoragePruner::new(store, block_hash_reader, 1, 1000);
+        let out = pruner.run_inner().expect("ok");
+        assert_eq!(out, PrunerOutput::default(), "should early-return default output");
+    }
+
+    // interval < min_block_interval -> "Nothing to prune" path; default output.
+    #[tokio::test]
+    async fn run_inner_interval_too_small_real_db() {
+        use crate::BlockStateDiff;
+
+        let dir = TempDir::new().unwrap();
+        let store: OpProofsStorage<Arc<MdbxProofsStorage>> =
+            OpProofsStorage::from(Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")));
+
+        // Set earliest=4 explicitly
+        let earliest_num = 4u64;
+        let h4 = b256(4);
+        store.set_earliest_block_number(earliest_num, h4).expect("set earliest");
+
+        // Set latest=5 by storing block 5
+        let b5 = block(5, h4);
+        store.store_trie_updates(b5, BlockStateDiff::default()).expect("store b5");
+
+        // Sanity: earliest=4, latest=5 => interval=1
+        let e = store.get_earliest_block_number().unwrap().unwrap();
+        let l = store.get_latest_block_number().unwrap().unwrap();
+        assert_eq!(e.0, 4);
+        assert_eq!(l.0, 5);
+
+        // Require min_block_interval=2 (or greater) so interval < min
+        let block_hash_reader = MockBlockHashReader::new();
+        let pruner = OpProofStoragePruner::new(store, block_hash_reader, 2, 1000);
+        let out = pruner.run_inner().expect("ok");
+        assert_eq!(out, PrunerOutput::default(), "no pruning should occur");
+    }
+}
diff --git a/rust/op-reth/crates/trie/src/prune/task.rs b/rust/op-reth/crates/trie/src/prune/task.rs
new file mode 100644
index 0000000000000..3838343cb4082
--- /dev/null
+++ b/rust/op-reth/crates/trie/src/prune/task.rs
@@ -0,0 +1,64 @@
+use crate::{OpProofsStorage, OpProofsStore, prune::OpProofStoragePruner};
+use reth_provider::BlockHashReader;
+use reth_tasks::shutdown::GracefulShutdown;
+use tokio::{
+    time,
+    time::{Duration, MissedTickBehavior},
+};
+use tracing::info;
+
+const PRUNE_BATCH_SIZE: u64 = 200;
+
+/// Periodic pruner task: constructs the pruner and runs it every interval.
+#[derive(Debug)]
+pub struct OpProofStoragePrunerTask<P, H> {
+    pruner: OpProofStoragePruner<P, H>,
+    min_block_interval: u64,
+    task_run_interval: Duration,
+}
+
+impl<P, H> OpProofStoragePrunerTask<P, H>
+where
+    P: OpProofsStore,
+    H: BlockHashReader,
+{
+    /// Initialize a new [`OpProofStoragePrunerTask`]
+    pub fn new(
+        provider: OpProofsStorage<P>,
+        hash_reader: H,
+        min_block_interval: u64,
+        task_run_interval: Duration,
+    ) -> Self {
+        let pruner =
+            OpProofStoragePruner::new(provider, hash_reader, min_block_interval, PRUNE_BATCH_SIZE);
+        Self { pruner, min_block_interval, task_run_interval }
+    }
+
+    /// Run forever (until `cancel`), executing one prune pass per `task_run_interval`.
+    pub async fn run(self, mut signal: GracefulShutdown) {
+        info!(
+            target: "trie::pruner_task",
+            min_block_interval = self.min_block_interval,
+            interval_secs = self.task_run_interval.as_secs(),
+            "Starting pruner task"
+        );
+
+        // Drive pruning with a periodic ticker
+        let mut interval = time::interval(self.task_run_interval);
+        interval.set_missed_tick_behavior(MissedTickBehavior::Delay);
+
+        loop {
+            tokio::select! {
+                _ = &mut signal => {
+                    info!(target: "trie::pruner_task", "Pruner task cancelled; exiting");
+                    break;
+                }
+                _ = interval.tick() => {
+                    self.pruner.run()
+                }
+            }
+        }
+
+        info!(target: "trie::pruner_task", "Pruner task stopped");
+    }
+}
diff --git a/rust/op-reth/crates/trie/tests/lib.rs b/rust/op-reth/crates/trie/tests/lib.rs
new file mode 100644
index 0000000000000..ccf4a5c871374
--- /dev/null
+++ b/rust/op-reth/crates/trie/tests/lib.rs
@@ -0,0 +1,1967 @@
+//! Common test suite for [`OpProofsStore`] implementations.
+
+use alloy_eips::{BlockNumHash, NumHash, eip1898::BlockWithParent};
+use alloy_primitives::{B256, U256};
+use reth_optimism_trie::{
+    BlockStateDiff, InMemoryProofsStorage, OpProofsInitialStateStore, OpProofsStorageError,
+    OpProofsStore, db::MdbxProofsStorage,
+};
+use reth_primitives_traits::Account;
+use reth_trie::{
+    BranchNodeCompact, HashedPostState, HashedPostStateSorted, HashedStorage, Nibbles, TrieMask,
+    hashed_cursor::HashedCursor,
+    trie_cursor::TrieCursor,
+    updates::{TrieUpdates, TrieUpdatesSorted},
+};
+use serial_test::serial;
+use std::sync::Arc;
+use tempfile::TempDir;
+use test_case::test_case;
+
+/// Helper to create a simple test branch node
+fn create_test_branch() -> BranchNodeCompact {
+    let mut state_mask = TrieMask::default();
+    state_mask.set_bit(0);
+    state_mask.set_bit(1);
+
+    BranchNodeCompact {
+        state_mask,
+        tree_mask: TrieMask::default(),
+        hash_mask: TrieMask::default(),
+        hashes: Arc::new(vec![]),
+        root_hash: None,
+    }
+}
+
+/// Helper to create a variant test branch node for comparison tests
+fn create_test_branch_variant() -> BranchNodeCompact {
+    let mut state_mask = TrieMask::default();
+    state_mask.set_bit(5);
+    state_mask.set_bit(6);
+
+    BranchNodeCompact {
+        state_mask,
+        tree_mask: TrieMask::default(),
+        hash_mask: TrieMask::default(),
+        hashes: Arc::new(vec![]),
+        root_hash: None,
+    }
+}
+
+/// Helper to create nibbles from a vector of u8 values
+fn nibbles_from(vec: Vec<u8>) -> Nibbles {
+    Nibbles::from_nibbles_unchecked(vec)
+}
+
+/// Helper to create a test account
+fn create_test_account() -> Account {
+    Account {
+        nonce: 42,
+        balance: U256::from(1000000),
+        bytecode_hash: Some(B256::repeat_byte(0xBB)),
+    }
+}
+
+/// Helper to create a test account with custom values
+fn create_test_account_with_values(nonce: u64, balance: u64, code_hash_byte: u8) -> Account {
+    Account {
+        nonce,
+        balance: U256::from(balance),
+        bytecode_hash: Some(B256::repeat_byte(code_hash_byte)),
+    }
+}
+
+fn create_mdbx_proofs_storage() -> MdbxProofsStorage {
+    let path = TempDir::new().unwrap();
+    MdbxProofsStorage::new(path.path()).unwrap()
+}
+
+/// Test basic storage and retrieval of earliest block number
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_earliest_block_operations<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    // Initially should be None
+    let earliest = storage.get_earliest_block_number()?;
+    assert!(earliest.is_none());
+
+    // Set earliest block
+    let block_hash = B256::repeat_byte(0x42);
+    storage.set_earliest_block_number(100, block_hash)?;
+
+    // Should retrieve the same values
+    let earliest = storage.get_earliest_block_number()?;
+    assert_eq!(earliest, Some((100, block_hash)));
+
+    Ok(())
+}
+
+/// Test storing and retrieving trie updates
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_trie_updates_operations<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let block_ref = BlockWithParent::new(B256::ZERO, NumHash::new(50, B256::repeat_byte(0x96)));
+    let sorted_trie_updates = TrieUpdatesSorted::default();
+    let sorted_post_state = HashedPostStateSorted::default();
+    let block_state_diff = BlockStateDiff {
+        sorted_trie_updates: sorted_trie_updates.clone(),
+        sorted_post_state: sorted_post_state.clone(),
+    };
+
+    // Store trie updates
+    storage.store_trie_updates(block_ref, block_state_diff)?;
+
+    // Retrieve and verify
+    let retrieved_diff = storage.fetch_trie_updates(block_ref.block.number)?;
+    assert_eq!(retrieved_diff.sorted_trie_updates, sorted_trie_updates);
+    assert_eq!(retrieved_diff.sorted_post_state, sorted_post_state);
+
+    Ok(())
+}
+
+// =============================================================================
+// 1. Basic Cursor Operations
+// =============================================================================
+
+/// Test cursor operations on empty trie
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_cursor_empty_trie<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let mut cursor = storage.account_trie_cursor(100)?;
+
+    // All operations should return None on empty trie
+    assert!(cursor.seek_exact(Nibbles::default())?.is_none());
+    assert!(cursor.seek(Nibbles::default())?.is_none());
+    assert!(cursor.next()?.is_none());
+    assert!(cursor.current()?.is_none());
+
+    Ok(())
+}
+
+/// Test cursor operations with single entry
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_cursor_single_entry<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2, 3]);
+    let branch = create_test_branch();
+
+    // Store single entry
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+
+    // Test seek_exact
+    let result = cursor.seek_exact(path)?.unwrap();
+    assert_eq!(result.0, path);
+
+    // Test current position
+    assert_eq!(cursor.current()?.unwrap(), path);
+
+    // Test next from end should return None
+    assert!(cursor.next()?.is_none());
+
+    Ok(())
+}
+
+/// Test cursor operations with multiple entries
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_cursor_multiple_entries<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let paths = vec![
+        nibbles_from(vec![1]),
+        nibbles_from(vec![1, 2]),
+        nibbles_from(vec![2]),
+        nibbles_from(vec![2, 3]),
+    ];
+    let branch = create_test_branch();
+
+    // Store multiple entries
+    for path in &paths {
+        storage.store_account_branches(vec![(*path, Some(branch.clone()))])?;
+    }
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+
+    // Test that we can iterate through all entries
+    let mut found_paths = Vec::new();
+    while let Some((path, _)) = cursor.next()? {
+        found_paths.push(path);
+    }
+
+    assert_eq!(found_paths.len(), 4);
+    // Paths should be in lexicographic order
+    for i in 0..paths.len() {
+        assert_eq!(found_paths[i], paths[i]);
+    }
+
+    Ok(())
+}
+
+// =============================================================================
+// 2. Seek Operations
+// =============================================================================
+
+/// Test `seek_exact` with existing path
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_seek_exact_existing_path<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2, 3]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    let result = cursor.seek_exact(path)?.unwrap();
+    assert_eq!(result.0, path);
+
+    Ok(())
+}
+
+/// Test `seek_exact` with non-existing path
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_seek_exact_non_existing_path<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2, 3]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    let non_existing = nibbles_from(vec![4, 5, 6]);
+    assert!(cursor.seek_exact(non_existing)?.is_none());
+
+    Ok(())
+}
+
+/// Test `seek_exact` with empty path
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_seek_exact_empty_path<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    let result = cursor.seek_exact(Nibbles::default())?.unwrap();
+    assert_eq!(result.0, Nibbles::default());
+
+    Ok(())
+}
+
+/// Test seek to existing path
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_seek_to_existing_path<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2, 3]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    let result = cursor.seek(path)?.unwrap();
+    assert_eq!(result.0, path);
+
+    Ok(())
+}
+
+/// Test seek between existing nodes
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_seek_between_existing_nodes<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path1 = nibbles_from(vec![1]);
+    let path2 = nibbles_from(vec![3]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path1, Some(branch.clone()))])?;
+    storage.store_account_branches(vec![(path2, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    // Seek to path between 1 and 3, should return path 3
+    let seek_path = nibbles_from(vec![2]);
+    let result = cursor.seek(seek_path)?.unwrap();
+    assert_eq!(result.0, path2);
+
+    Ok(())
+}
+
+/// Test seek after all nodes
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_seek_after_all_nodes<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    // Seek to path after all nodes
+    let seek_path = nibbles_from(vec![9]);
+    assert!(cursor.seek(seek_path)?.is_none());
+
+    Ok(())
+}
+
+/// Test seek before all nodes
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_seek_before_all_nodes<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![5]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    // Seek to path before all nodes, should return first node
+    let seek_path = nibbles_from(vec![1]);
+    let result = cursor.seek(seek_path)?.unwrap();
+    assert_eq!(result.0, path);
+
+    Ok(())
+}
+
+// =============================================================================
+// 3. Navigation Tests
+// =============================================================================
+
+/// Test next without prior seek
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_next_without_prior_seek<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    // next() without prior seek should start from beginning
+    let result = cursor.next()?.unwrap();
+    assert_eq!(result.0, path);
+
+    Ok(())
+}
+
+/// Test next after seek
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_next_after_seek<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path1 = nibbles_from(vec![1]);
+    let path2 = nibbles_from(vec![2]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path1, Some(branch.clone()))])?;
+    storage.store_account_branches(vec![(path2, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    cursor.seek(path1)?;
+
+    // next() should return second node
+    let result = cursor.next()?.unwrap();
+    assert_eq!(result.0, path2);
+
+    Ok(())
+}
+
+/// Test next at end of trie
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_next_at_end_of_trie<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    cursor.seek(path)?;
+
+    // next() at end should return None
+    assert!(cursor.next()?.is_none());
+
+    Ok(())
+}
+
+/// Test multiple consecutive next calls
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_multiple_consecutive_next<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let paths = vec![nibbles_from(vec![1]), nibbles_from(vec![2]), nibbles_from(vec![3])];
+    let branch = create_test_branch();
+
+    for path in &paths {
+        storage.store_account_branches(vec![(*path, Some(branch.clone()))])?;
+    }
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+
+    // Iterate through all with consecutive next() calls
+    for expected_path in &paths {
+        let result = cursor.next()?.unwrap();
+        assert_eq!(result.0, *expected_path);
+    }
+
+    // Final next() should return None
+    assert!(cursor.next()?.is_none());
+
+    Ok(())
+}
+
+/// Test current after operations
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_current_after_operations<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path1 = nibbles_from(vec![1]);
+    let path2 = nibbles_from(vec![2]);
+    let branch = create_test_branch();
+
+    storage.store_account_branches(vec![(path1, Some(branch.clone()))])?;
+    storage.store_account_branches(vec![(path2, Some(branch))])?;
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+
+    // Current should be None initially
+    assert!(cursor.current()?.is_none());
+
+    // After seek, current should track position
+    cursor.seek(path1)?;
+    assert_eq!(cursor.current()?.unwrap(), path1);
+
+    // After next, current should update
+    cursor.next()?;
+    assert_eq!(cursor.current()?.unwrap(), path2);
+
+    Ok(())
+}
+
+/// Test current with no prior operations
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_current_no_prior_operations<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let mut cursor = storage.account_trie_cursor(100)?;
+
+    // Current should be None when no operations performed
+    assert!(cursor.current()?.is_none());
+
+    Ok(())
+}
+
+// =============================================================================
+// 4. Block Number Filtering
+// =============================================================================
+
+/// Test same path with different blocks
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_same_path_different_blocks<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2]);
+    let branch1 = create_test_branch();
+    let branch2 = create_test_branch_variant();
+
+    // Store same path at different blocks
+    storage.store_account_branches(vec![(path, Some(branch1))])?;
+    storage.store_account_branches(vec![(path, Some(branch2))])?;
+
+    // Cursor with max_block_number=75 should see only block 50 data
+    let mut cursor75 = storage.account_trie_cursor(75)?;
+    let result75 = cursor75.seek_exact(path)?.unwrap();
+    assert_eq!(result75.0, path);
+
+    // Cursor with max_block_number=150 should see block 100 data (latest)
+    let mut cursor150 = storage.account_trie_cursor(150)?;
+    let result150 = cursor150.seek_exact(path)?.unwrap();
+    assert_eq!(result150.0, path);
+
+    Ok(())
+}
+
+/// Test deleted branch nodes
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_deleted_branch_nodes<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2]);
+    let branch = create_test_branch();
+    let block_ref = BlockWithParent::new(B256::ZERO, NumHash::new(100, B256::repeat_byte(0x96)));
+
+    // Store branch node, then delete it (store None)
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    // Cursor before deletion should see the node
+    let mut cursor75 = storage.account_trie_cursor(75)?;
+    assert!(cursor75.seek_exact(path)?.is_some());
+
+    let mut block_state_diff_trie_updates = TrieUpdates::default();
+    block_state_diff_trie_updates.removed_nodes.insert(path);
+    let block_state_diff = BlockStateDiff {
+        sorted_trie_updates: block_state_diff_trie_updates.into_sorted(),
+        sorted_post_state: HashedPostStateSorted::default(),
+    };
+    storage.store_trie_updates(block_ref, block_state_diff)?;
+
+    // Cursor after deletion should not see the node
+    let mut cursor150 = storage.account_trie_cursor(150)?;
+    assert!(cursor150.seek_exact(path)?.is_none());
+
+    Ok(())
+}
+
+// =============================================================================
+// 5. Hashed Address Filtering
+// =============================================================================
+
+/// Test account-specific cursor
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_account_specific_cursor<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2]);
+    let addr1 = B256::repeat_byte(0x01);
+    let addr2 = B256::repeat_byte(0x02);
+    let branch = create_test_branch();
+
+    // Store same path for different accounts (using storage branches)
+    storage.store_storage_branches(addr1, vec![(path, Some(branch.clone()))])?;
+    storage.store_storage_branches(addr2, vec![(path, Some(branch))])?;
+
+    // Cursor for addr1 should only see addr1 data
+    let mut cursor1 = storage.storage_trie_cursor(addr1, 100)?;
+    let result1 = cursor1.seek_exact(path)?.unwrap();
+    assert_eq!(result1.0, path);
+
+    // Cursor for addr2 should only see addr2 data
+    let mut cursor2 = storage.storage_trie_cursor(addr2, 100)?;
+    let result2 = cursor2.seek_exact(path)?.unwrap();
+    assert_eq!(result2.0, path);
+
+    // Cursor for addr1 should not see addr2 data when iterating
+    let mut cursor1_iter = storage.storage_trie_cursor(addr1, 100)?;
+    let mut found_count = 0;
+    while cursor1_iter.next()?.is_some() {
+        found_count += 1;
+    }
+    assert_eq!(found_count, 1); // Should only see one entry (for addr1)
+
+    Ok(())
+}
+
+/// Test state trie cursor
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_state_trie_cursor<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path = nibbles_from(vec![1, 2]);
+    let addr = B256::repeat_byte(0x01);
+    let branch = create_test_branch();
+
+    // Store data for account trie and state trie
+    storage.store_storage_branches(addr, vec![(path, Some(branch.clone()))])?;
+    storage.store_account_branches(vec![(path, Some(branch))])?;
+
+    // State trie cursor (None address) should only see state trie data
+    let mut state_cursor = storage.account_trie_cursor(100)?;
+    let result = state_cursor.seek_exact(path)?.unwrap();
+    assert_eq!(result.0, path);
+
+    // Verify state cursor doesn't see account data when iterating
+    let mut state_cursor_iter = storage.account_trie_cursor(100)?;
+    let mut found_count = 0;
+    while state_cursor_iter.next()?.is_some() {
+        found_count += 1;
+    }
+
+    assert_eq!(found_count, 1); // Should only see state trie entry
+
+    Ok(())
+}
+
+/// Test mixed account and state data
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_mixed_account_state_data<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let path1 = nibbles_from(vec![1]);
+    let path2 = nibbles_from(vec![2]);
+    let addr = B256::repeat_byte(0x01);
+    let branch = create_test_branch();
+
+    // Store mixed account and state trie data
+    storage.store_storage_branches(addr, vec![(path1, Some(branch.clone()))])?;
+    storage.store_account_branches(vec![(path2, Some(branch))])?;
+
+    // Account cursor should only see account data
+    let mut account_cursor = storage.storage_trie_cursor(addr, 100)?;
+    let mut account_paths = Vec::new();
+    while let Some((path, _)) = account_cursor.next()? {
+        account_paths.push(path);
+    }
+    assert_eq!(account_paths.len(), 1);
+    assert_eq!(account_paths[0], path1);
+
+    // State cursor should only see state data
+    let mut state_cursor = storage.account_trie_cursor(100)?;
+    let mut state_paths = Vec::new();
+    while let Some((path, _)) = state_cursor.next()? {
+        state_paths.push(path);
+    }
+    assert_eq!(state_paths.len(), 1);
+    assert_eq!(state_paths[0], path2);
+
+    Ok(())
+}
+
+// =============================================================================
+// 6. Path Ordering Tests
+// =============================================================================
+
+/// Test lexicographic ordering
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_lexicographic_ordering<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let paths = vec![
+        nibbles_from(vec![3, 1]),
+        nibbles_from(vec![1, 2]),
+        nibbles_from(vec![2]),
+        nibbles_from(vec![1]),
+    ];
+    let branch = create_test_branch();
+
+    // Store paths in random order
+    for path in &paths {
+        storage.store_account_branches(vec![(*path, Some(branch.clone()))])?;
+    }
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    let mut found_paths = Vec::new();
+    while let Some((path, _)) = cursor.next()? {
+        found_paths.push(path);
+    }
+
+    // Should be returned in lexicographic order: [1], [1,2], [2], [3,1]
+    let expected_order = vec![
+        nibbles_from(vec![1]),
+        nibbles_from(vec![1, 2]),
+        nibbles_from(vec![2]),
+        nibbles_from(vec![3, 1]),
+    ];
+
+    assert_eq!(found_paths, expected_order);
+
+    Ok(())
+}
+
+/// Test path prefix scenarios
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_path_prefix_scenarios<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let paths = vec![
+        nibbles_from(vec![1]),       // Prefix of next
+        nibbles_from(vec![1, 2]),    // Extends first
+        nibbles_from(vec![1, 2, 3]), // Extends second
+    ];
+    let branch = create_test_branch();
+
+    for path in &paths {
+        storage.store_account_branches(vec![(*path, Some(branch.clone()))])?;
+    }
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+
+    // Seek to prefix should find exact match
+    let result = cursor.seek_exact(paths[0])?.unwrap();
+    assert_eq!(result.0, paths[0]);
+
+    // Next should go to next path, not skip prefixed paths
+    let result = cursor.next()?.unwrap();
+    assert_eq!(result.0, paths[1]);
+
+    let result = cursor.next()?.unwrap();
+    assert_eq!(result.0, paths[2]);
+
+    Ok(())
+}
+
+/// Test complex nibble combinations
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_complex_nibble_combinations<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    // Test various nibble patterns including edge values
+    let paths = vec![
+        nibbles_from(vec![0]),
+        nibbles_from(vec![0, 15]),
+        nibbles_from(vec![15]),
+        nibbles_from(vec![15, 0]),
+        nibbles_from(vec![7, 8, 9]),
+    ];
+    let branch = create_test_branch();
+
+    for path in &paths {
+        storage.store_account_branches(vec![(*path, Some(branch.clone()))])?;
+    }
+
+    let mut cursor = storage.account_trie_cursor(100)?;
+    let mut found_paths = Vec::new();
+    while let Some((path, _)) = cursor.next()? {
+        found_paths.push(path);
+    }
+
+    // All paths should be found and in correct order
+    assert_eq!(found_paths.len(), 5);
+
+    // Verify specific ordering for edge cases
+    assert_eq!(found_paths[0], nibbles_from(vec![0]));
+    assert_eq!(found_paths[1], nibbles_from(vec![0, 15]));
+    assert_eq!(found_paths[4], nibbles_from(vec![15, 0]));
+
+    Ok(())
+}
+
+// =============================================================================
+// 7. Leaf Node Tests (Hashed Accounts and Storage)
+// =============================================================================
+
+/// Test store and retrieve single account
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_store_and_retrieve_single_account<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let account_key = B256::repeat_byte(0x01);
+    let account = create_test_account();
+
+    // Store account
+    storage.store_hashed_accounts(vec![(account_key, Some(account))])?;
+
+    // Retrieve via cursor
+    let mut cursor = storage.account_hashed_cursor(100)?;
+    let result = cursor.seek(account_key)?.unwrap();
+
+    assert_eq!(result.0, account_key);
+    assert_eq!(result.1.nonce, account.nonce);
+    assert_eq!(result.1.balance, account.balance);
+    assert_eq!(result.1.bytecode_hash, account.bytecode_hash);
+
+    Ok(())
+}
+
+/// Test account cursor navigation
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_account_cursor_navigation<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let accounts = [
+        (B256::repeat_byte(0x01), create_test_account()),
+        (B256::repeat_byte(0x03), create_test_account()),
+        (B256::repeat_byte(0x05), create_test_account()),
+    ];
+
+    // Store accounts
+    let accounts_to_store: Vec<_> = accounts.iter().map(|(k, v)| (*k, Some(*v))).collect();
+    storage.store_hashed_accounts(accounts_to_store)?;
+
+    let mut cursor = storage.account_hashed_cursor(100)?;
+
+    // Test seeking to exact key
+    let result = cursor.seek(accounts[1].0)?.unwrap();
+    assert_eq!(result.0, accounts[1].0);
+
+    // Test seeking to key that doesn't exist (should return next greater)
+    let seek_key = B256::repeat_byte(0x02);
+    let result = cursor.seek(seek_key)?.unwrap();
+    assert_eq!(result.0, accounts[1].0); // Should find 0x03
+
+    // Test next() navigation
+    let result = cursor.next()?.unwrap();
+    assert_eq!(result.0, accounts[2].0); // Should find 0x05
+
+    // Test next() at end
+    assert!(cursor.next()?.is_none());
+
+    Ok(())
+}
+
+/// Test account block versioning
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_account_block_versioning<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let account_key = B256::repeat_byte(0x01);
+    let account_v1 = create_test_account_with_values(1, 100, 0xBB);
+    let account_v2 = create_test_account_with_values(2, 200, 0xDD);
+
+    // Store account at different blocks
+    storage.store_hashed_accounts(vec![(account_key, Some(account_v1))])?;
+
+    // Cursor with max_block_number=75 should see v1
+    let mut cursor75 = storage.account_hashed_cursor(75)?;
+    let result75 = cursor75.seek(account_key)?.unwrap();
+    assert_eq!(result75.1.nonce, account_v1.nonce);
+    assert_eq!(result75.1.balance, account_v1.balance);
+
+    storage.store_hashed_accounts(vec![(account_key, Some(account_v2))])?;
+
+    // After update, Cursor with max_block_number=150 should see v2
+    let mut cursor150 = storage.account_hashed_cursor(150)?;
+    let result150 = cursor150.seek(account_key)?.unwrap();
+    assert_eq!(result150.1.nonce, account_v2.nonce);
+    assert_eq!(result150.1.balance, account_v2.balance);
+
+    Ok(())
+}
+
+/// Test store and retrieve storage
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+
+fn test_store_and_retrieve_storage<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let hashed_address = B256::repeat_byte(0x01);
+    let storage_slots = vec![
+        (B256::repeat_byte(0x10), U256::from(100)),
+        (B256::repeat_byte(0x20), U256::from(200)),
+        (B256::repeat_byte(0x30), U256::from(300)),
+    ];
+
+    // Store storage slots
+    storage.store_hashed_storages(hashed_address, storage_slots.clone())?;
+
+    // Retrieve via cursor
+    let mut cursor = storage.storage_hashed_cursor(hashed_address, 100)?;
+
+    // Test seeking to each slot
+    for (key, expected_value) in &storage_slots {
+        let result = cursor.seek(*key)?.unwrap();
+        assert_eq!(result.0, *key);
+        assert_eq!(result.1, *expected_value);
+    }
+
+    Ok(())
+}
+
+/// Test storage cursor navigation
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_storage_cursor_navigation<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let hashed_address = B256::repeat_byte(0x01);
+    let storage_slots = vec![
+        (B256::repeat_byte(0x10), U256::from(100)),
+        (B256::repeat_byte(0x30), U256::from(300)),
+        (B256::repeat_byte(0x50), U256::from(500)),
+    ];
+
+    storage.store_hashed_storages(hashed_address, storage_slots.clone())?;
+
+    let mut cursor = storage.storage_hashed_cursor(hashed_address, 100)?;
+
+    // Start from beginning with next()
+    let mut found_slots = Vec::new();
+    while let Some((key, value)) = cursor.next()? {
+        found_slots.push((key, value));
+    }
+
+    assert_eq!(found_slots.len(), 3);
+    assert_eq!(found_slots[0], storage_slots[0]);
+    assert_eq!(found_slots[1], storage_slots[1]);
+    assert_eq!(found_slots[2], storage_slots[2]);
+
+    Ok(())
+}
+
+/// Test storage account isolation
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_storage_account_isolation<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let address1 = B256::repeat_byte(0x01);
+    let address2 = B256::repeat_byte(0x02);
+    let storage_key = B256::repeat_byte(0x10);
+
+    // Store same storage key for different accounts
+    storage.store_hashed_storages(address1, vec![(storage_key, U256::from(100))])?;
+    storage.store_hashed_storages(address2, vec![(storage_key, U256::from(200))])?;
+
+    // Verify each account sees only its own storage
+    let mut cursor1 = storage.storage_hashed_cursor(address1, 100)?;
+    let result1 = cursor1.seek(storage_key)?.unwrap();
+    assert_eq!(result1.1, U256::from(100));
+
+    let mut cursor2 = storage.storage_hashed_cursor(address2, 100)?;
+    let result2 = cursor2.seek(storage_key)?.unwrap();
+    assert_eq!(result2.1, U256::from(200));
+
+    // Verify cursor1 doesn't see address2's storage
+    let mut cursor1_iter = storage.storage_hashed_cursor(address1, 100)?;
+    let mut count = 0;
+    while cursor1_iter.next()?.is_some() {
+        count += 1;
+    }
+    assert_eq!(count, 1); // Should only see one entry
+
+    Ok(())
+}
+
+/// Test storage block versioning
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_storage_block_versioning<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let hashed_address = B256::repeat_byte(0x01);
+    let storage_key = B256::repeat_byte(0x10);
+
+    // Store storage at different blocks
+    storage.store_hashed_storages(hashed_address, vec![(storage_key, U256::from(100))])?;
+
+    // Cursor with max_block_number=75 should see old value
+    let mut cursor75 = storage.storage_hashed_cursor(hashed_address, 75)?;
+    let result75 = cursor75.seek(storage_key)?.unwrap();
+    assert_eq!(result75.1, U256::from(100));
+
+    storage.store_hashed_storages(hashed_address, vec![(storage_key, U256::from(200))])?;
+    // Cursor with max_block_number=150 should see new value
+    let mut cursor150 = storage.storage_hashed_cursor(hashed_address, 150)?;
+    let result150 = cursor150.seek(storage_key)?.unwrap();
+    assert_eq!(result150.1, U256::from(200));
+
+    Ok(())
+}
+
+/// Test storage zero value deletion
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_storage_zero_value_deletion<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let hashed_address = B256::repeat_byte(0x01);
+    let storage_key = B256::repeat_byte(0x10);
+
+    // Store non-zero value
+    storage.store_hashed_storages(hashed_address, vec![(storage_key, U256::from(100))])?;
+
+    // Cursor before deletion should see the value
+    let mut cursor75 = storage.storage_hashed_cursor(hashed_address, 75)?;
+    let result75 = cursor75.seek(storage_key)?.unwrap();
+    assert_eq!(result75.1, U256::from(100));
+
+    // "Delete" by storing zero value at block 100
+    let mut block_state_diff_post_state = HashedPostState::default();
+    let mut hashed_storage = HashedStorage::default();
+    hashed_storage.storage.insert(storage_key, U256::ZERO);
+    block_state_diff_post_state.storages.insert(hashed_address, hashed_storage);
+
+    let block_ref = BlockWithParent::new(B256::ZERO, NumHash::new(100, B256::repeat_byte(0x96)));
+    let block_state_diff = BlockStateDiff {
+        sorted_trie_updates: TrieUpdatesSorted::default(),
+        sorted_post_state: block_state_diff_post_state.into_sorted(),
+    };
+    storage.store_trie_updates(block_ref, block_state_diff)?;
+
+    // Cursor after deletion should NOT see the entry (zero values are skipped)
+    let mut cursor150 = storage.storage_hashed_cursor(hashed_address, 150)?;
+    let result150 = cursor150.seek(storage_key)?;
+    assert!(result150.is_none(), "Zero values should be skipped/deleted");
+
+    Ok(())
+}
+
+/// Test that zero values are skipped during iteration
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_storage_cursor_skips_zero_values<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let hashed_address = B256::repeat_byte(0x01);
+
+    // Create a mix of non-zero and zero value storage slots
+    let storage_slots = vec![
+        (B256::repeat_byte(0x10), U256::from(100)), // Non-zero
+        (B256::repeat_byte(0x20), U256::ZERO),      // Zero value - should be skipped
+        (B256::repeat_byte(0x30), U256::from(300)), // Non-zero
+        (B256::repeat_byte(0x40), U256::ZERO),      // Zero value - should be skipped
+        (B256::repeat_byte(0x50), U256::from(500)), // Non-zero
+    ];
+
+    // Store all slots
+    storage.store_hashed_storages(hashed_address, storage_slots)?;
+
+    // Create cursor and iterate through all entries
+    let mut cursor = storage.storage_hashed_cursor(hashed_address, 100)?;
+    let mut found_slots = Vec::new();
+    while let Some((key, value)) = cursor.next()? {
+        found_slots.push((key, value));
+    }
+
+    // Should only find 3 non-zero values
+    assert_eq!(found_slots.len(), 3, "Zero values should be skipped during iteration");
+
+    // Verify the non-zero values are the ones we stored
+    assert_eq!(found_slots[0], (B256::repeat_byte(0x10), U256::from(100)));
+    assert_eq!(found_slots[1], (B256::repeat_byte(0x30), U256::from(300)));
+    assert_eq!(found_slots[2], (B256::repeat_byte(0x50), U256::from(500)));
+
+    // Verify seeking to a zero-value slot returns None or skips to next non-zero
+    let mut seek_cursor = storage.storage_hashed_cursor(hashed_address, 100)?;
+    let seek_result = seek_cursor.seek(B256::repeat_byte(0x20))?;
+
+    // Should either return None or skip to the next non-zero value (0x30)
+    if let Some((key, value)) = seek_result {
+        assert_eq!(key, B256::repeat_byte(0x30), "Should skip zero value and find next non-zero");
+        assert_eq!(value, U256::from(300));
+    }
+
+    Ok(())
+}
+
+/// Test empty cursors
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_empty_cursors<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    // Test empty account cursor
+    let mut account_cursor = storage.account_hashed_cursor(100)?;
+    assert!(account_cursor.seek(B256::repeat_byte(0x01))?.is_none());
+    assert!(account_cursor.next()?.is_none());
+
+    // Test empty storage cursor
+    let mut storage_cursor = storage.storage_hashed_cursor(B256::repeat_byte(0x01), 100)?;
+    assert!(storage_cursor.seek(B256::repeat_byte(0x10))?.is_none());
+    assert!(storage_cursor.next()?.is_none());
+
+    Ok(())
+}
+
+/// Test cursor boundary conditions
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_cursor_boundary_conditions<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    let account_key = B256::repeat_byte(0x80); // Middle value
+    let account = create_test_account();
+
+    storage.store_hashed_accounts(vec![(account_key, Some(account))])?;
+
+    let mut cursor = storage.account_hashed_cursor(100)?;
+
+    // Seek to minimum key should find our account
+    let result = cursor.seek(B256::ZERO)?.unwrap();
+    assert_eq!(result.0, account_key);
+
+    // Seek to maximum key should find nothing
+    assert!(cursor.seek(B256::repeat_byte(0xFF))?.is_none());
+
+    // Seek to key just before our account should find our account
+    let just_before = B256::repeat_byte(0x7F);
+    let result = cursor.seek(just_before)?.unwrap();
+    assert_eq!(result.0, account_key);
+
+    Ok(())
+}
+
+/// Test large batch operations
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_large_batch_operations<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    // Create large batch of accounts
+    let mut accounts = Vec::new();
+    for i in 0..100 {
+        let key = B256::from([i as u8; 32]);
+        let account = create_test_account_with_values(i, i * 1000, (i + 1) as u8);
+        accounts.push((key, Some(account)));
+    }
+
+    // Store in batch
+    storage.store_hashed_accounts(accounts.clone())?;
+
+    // Verify all accounts can be retrieved
+    let mut cursor = storage.account_hashed_cursor(100)?;
+    let mut found_count = 0;
+    while cursor.next()?.is_some() {
+        found_count += 1;
+    }
+    assert_eq!(found_count, 100);
+
+    // Test specific account retrieval
+    let test_key = B256::from([42u8; 32]);
+    let result = cursor.seek(test_key)?.unwrap();
+    assert_eq!(result.0, test_key);
+    assert_eq!(result.1.nonce, 42);
+
+    Ok(())
+}
+
+/// Test wiped storage in [`HashedPostState`]
+///
+/// When `store_trie_updates` receives a [`HashedPostState`] with wiped=true for a storage entry,
+/// it should iterate all existing values for that address and create deletion entries for them.
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_store_trie_updates_with_wiped_storage<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    use reth_trie::HashedStorage;
+
+    let hashed_address = B256::repeat_byte(0x01);
+    let block_ref = BlockWithParent::new(B256::ZERO, NumHash::new(100, B256::repeat_byte(0x96)));
+
+    // First, store some storage values at block 50
+    let storage_slots = vec![
+        (B256::repeat_byte(0x10), U256::from(100)),
+        (B256::repeat_byte(0x20), U256::from(200)),
+        (B256::repeat_byte(0x30), U256::from(300)),
+        (B256::repeat_byte(0x40), U256::from(400)),
+    ];
+
+    storage.store_hashed_storages(hashed_address, storage_slots.clone())?;
+
+    // Verify all values are present at block 75
+    let mut cursor75 = storage.storage_hashed_cursor(hashed_address, 75)?;
+    let mut found_slots = Vec::new();
+    while let Some((key, value)) = cursor75.next()? {
+        found_slots.push((key, value));
+    }
+    assert_eq!(found_slots.len(), 4, "All storage slots should be present before wipe");
+    assert_eq!(found_slots[0], (B256::repeat_byte(0x10), U256::from(100)));
+    assert_eq!(found_slots[1], (B256::repeat_byte(0x20), U256::from(200)));
+    assert_eq!(found_slots[2], (B256::repeat_byte(0x30), U256::from(300)));
+    assert_eq!(found_slots[3], (B256::repeat_byte(0x40), U256::from(400)));
+
+    // Now create a HashedPostState with wiped=true for this address at block 100
+    let mut post_state = HashedPostState::default();
+    let wiped_storage = HashedStorage::new(true); // wiped=true, empty storage map
+    post_state.storages.insert(hashed_address, wiped_storage);
+
+    let block_state_diff = BlockStateDiff {
+        sorted_trie_updates: TrieUpdatesSorted::default(),
+        sorted_post_state: post_state.into_sorted(),
+    };
+
+    // Store the wiped state
+    storage.store_trie_updates(block_ref, block_state_diff)?;
+
+    // After wiping, cursor at block 150 should see NO storage values
+    let mut cursor150 = storage.storage_hashed_cursor(hashed_address, 150)?;
+    let mut found_slots_after_wipe = Vec::new();
+    while let Some((key, value)) = cursor150.next()? {
+        found_slots_after_wipe.push((key, value));
+    }
+
+    assert_eq!(
+        found_slots_after_wipe.len(),
+        0,
+        "All storage slots should be deleted after wipe. Found: {found_slots_after_wipe:?}"
+    );
+
+    // Verify individual seeks also return None
+    for (slot, _) in &storage_slots {
+        let mut seek_cursor = storage.storage_hashed_cursor(hashed_address, 150)?;
+        let result = seek_cursor.seek(*slot)?;
+        assert!(
+            result.is_none() || result.unwrap().0 != *slot,
+            "Storage slot {slot:?} should be deleted after wipe"
+        );
+    }
+
+    // Verify cursor at block 75 (before wipe) still sees all values
+    let mut cursor75_after = storage.storage_hashed_cursor(hashed_address, 75)?;
+    let mut found_slots_before_wipe = Vec::new();
+    while let Some((key, value)) = cursor75_after.next()? {
+        found_slots_before_wipe.push((key, value));
+    }
+    assert_eq!(
+        found_slots_before_wipe.len(),
+        4,
+        "All storage slots should still be present when querying before wipe block"
+    );
+
+    Ok(())
+}
+
+/// Test that `store_trie_updates` properly stores branch nodes, leaf nodes, and removals
+///
+/// This test verifies that all data stored via `store_trie_updates` can be read back
+/// through the cursor APIs.
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_store_trie_updates_comprehensive<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    use reth_trie::{HashedStorage, updates::StorageTrieUpdates};
+
+    let block_ref = BlockWithParent::new(B256::ZERO, NumHash::new(100, B256::repeat_byte(0x96)));
+
+    // Create comprehensive trie updates with branches, leaves, and removals
+    let mut trie_updates = TrieUpdates::default();
+
+    // Add account branch nodes
+    let account_path1 = nibbles_from(vec![1, 2, 3]);
+    let account_path2 = nibbles_from(vec![4, 5, 6]);
+    let account_branch1 = create_test_branch();
+    let account_branch2 = create_test_branch_variant();
+
+    trie_updates.account_nodes.insert(account_path1, account_branch1);
+    trie_updates.account_nodes.insert(account_path2, account_branch2);
+
+    // Add removed account nodes
+    let removed_account_path = nibbles_from(vec![7, 8, 9]);
+    trie_updates.removed_nodes.insert(removed_account_path);
+
+    // Add storage branch nodes for an address
+    let hashed_address = B256::repeat_byte(0x42);
+    let storage_path1 = nibbles_from(vec![1, 1]);
+    let storage_path2 = nibbles_from(vec![2, 2]);
+    let storage_branch = create_test_branch();
+
+    let mut storage_trie = StorageTrieUpdates::default();
+    storage_trie.storage_nodes.insert(storage_path1, storage_branch.clone());
+    storage_trie.storage_nodes.insert(storage_path2, storage_branch);
+
+    // Add removed storage node
+    let removed_storage_path = nibbles_from(vec![3, 3]);
+    storage_trie.removed_nodes.insert(removed_storage_path);
+
+    trie_updates.insert_storage_updates(hashed_address, storage_trie);
+
+    // Create post state with accounts and storage
+    let mut post_state = HashedPostState::default();
+
+    // Add accounts
+    let account1_addr = B256::repeat_byte(0x10);
+    let account2_addr = B256::repeat_byte(0x20);
+    let account1 = create_test_account_with_values(1, 1000, 0xAA);
+    let account2 = create_test_account_with_values(2, 2000, 0xBB);
+
+    post_state.accounts.insert(account1_addr, Some(account1));
+    post_state.accounts.insert(account2_addr, Some(account2));
+
+    // Add deleted account
+    let deleted_account_addr = B256::repeat_byte(0x30);
+    post_state.accounts.insert(deleted_account_addr, None);
+
+    // Add storage for an address
+    let storage_addr = B256::repeat_byte(0x50);
+    let mut hashed_storage = HashedStorage::new(false);
+    hashed_storage.storage.insert(B256::repeat_byte(0x01), U256::from(111));
+    hashed_storage.storage.insert(B256::repeat_byte(0x02), U256::from(222));
+    hashed_storage.storage.insert(B256::repeat_byte(0x03), U256::ZERO); // Deleted storage
+    post_state.storages.insert(storage_addr, hashed_storage);
+
+    let block_state_diff = BlockStateDiff {
+        sorted_trie_updates: trie_updates.into_sorted(),
+        sorted_post_state: post_state.into_sorted(),
+    };
+
+    // Store the updates
+    storage.store_trie_updates(block_ref, block_state_diff)?;
+
+    // ========== Verify Account Branch Nodes ==========
+    let mut account_trie_cursor = storage.account_trie_cursor(block_ref.block.number + 10)?;
+
+    // Should find the added branches
+    let result1 = account_trie_cursor.seek_exact(account_path1)?;
+    assert!(result1.is_some(), "Account branch node 1 should be found");
+    assert_eq!(result1.unwrap().0, account_path1);
+
+    let result2 = account_trie_cursor.seek_exact(account_path2)?;
+    assert!(result2.is_some(), "Account branch node 2 should be found");
+    assert_eq!(result2.unwrap().0, account_path2);
+
+    // Removed node should not be found
+    let removed_result = account_trie_cursor.seek_exact(removed_account_path)?;
+    assert!(removed_result.is_none(), "Removed account node should not be found");
+
+    // ========== Verify Storage Branch Nodes ==========
+    let mut storage_trie_cursor =
+        storage.storage_trie_cursor(hashed_address, block_ref.block.number + 10)?;
+
+    let storage_result1 = storage_trie_cursor.seek_exact(storage_path1)?;
+    assert!(storage_result1.is_some(), "Storage branch node 1 should be found");
+
+    let storage_result2 = storage_trie_cursor.seek_exact(storage_path2)?;
+    assert!(storage_result2.is_some(), "Storage branch node 2 should be found");
+
+    // Removed storage node should not be found
+    let removed_storage_result = storage_trie_cursor.seek_exact(removed_storage_path)?;
+    assert!(removed_storage_result.is_none(), "Removed storage node should not be found");
+
+    // ========== Verify Account Leaves ==========
+    let mut account_cursor = storage.account_hashed_cursor(block_ref.block.number + 10)?;
+
+    let acc1_result = account_cursor.seek(account1_addr)?;
+    assert!(acc1_result.is_some(), "Account 1 should be found");
+    assert_eq!(acc1_result.unwrap().0, account1_addr);
+    assert_eq!(acc1_result.unwrap().1.nonce, 1);
+    assert_eq!(acc1_result.unwrap().1.balance, U256::from(1000));
+
+    let acc2_result = account_cursor.seek(account2_addr)?;
+    assert!(acc2_result.is_some(), "Account 2 should be found");
+    assert_eq!(acc2_result.unwrap().1.nonce, 2);
+
+    // Deleted account should not be found
+    let deleted_acc_result = account_cursor.seek(deleted_account_addr)?;
+    assert!(
+        deleted_acc_result.is_none() || deleted_acc_result.unwrap().0 != deleted_account_addr,
+        "Deleted account should not be found"
+    );
+
+    // ========== Verify Storage Leaves ==========
+    let mut storage_cursor =
+        storage.storage_hashed_cursor(storage_addr, block_ref.block.number + 10)?;
+
+    let slot1_result = storage_cursor.seek(B256::repeat_byte(0x01))?;
+    assert!(slot1_result.is_some(), "Storage slot 1 should be found");
+    assert_eq!(slot1_result.unwrap().1, U256::from(111));
+
+    let slot2_result = storage_cursor.seek(B256::repeat_byte(0x02))?;
+    assert!(slot2_result.is_some(), "Storage slot 2 should be found");
+    assert_eq!(slot2_result.unwrap().1, U256::from(222));
+
+    // Zero-valued storage should not be found (deleted)
+    let slot3_result = storage_cursor.seek(B256::repeat_byte(0x03))?;
+    assert!(
+        slot3_result.is_none() || slot3_result.unwrap().0 != B256::repeat_byte(0x03),
+        "Zero-valued storage slot should not be found"
+    );
+
+    // ========== Verify fetch_trie_updates can retrieve the data ==========
+    let fetched_diff = storage.fetch_trie_updates(block_ref.block.number)?;
+
+    // Check that trie updates are stored
+    assert_eq!(
+        fetched_diff.sorted_trie_updates.account_nodes_ref().len(),
+        3,
+        "Should have 3 account nodes, including removed"
+    );
+    assert_eq!(
+        fetched_diff.sorted_trie_updates.storage_tries_ref().len(),
+        1,
+        "Should have 1 storage trie"
+    );
+
+    // Check that post state is stored
+    assert_eq!(
+        fetched_diff.sorted_post_state.accounts.len(),
+        3,
+        "Should have 3 accounts (including deleted)"
+    );
+    assert_eq!(fetched_diff.sorted_post_state.storages.len(), 1, "Should have 1 storage entry");
+
+    Ok(())
+}
+
+/// Test that `replace_updates` properly applies hashed/trie storage updates to the DB
+///
+/// This test verifies the bug fix where `replace_updates` was only storing `trie_updates`
+/// and `post_states` directly without populating the internal data structures
+/// (`hashed_accounts`, `hashed_storages`, `account_branches`, `storage_branches`).
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_replace_updates_applies_all_updates<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    use reth_trie::{HashedStorage, updates::StorageTrieUpdates};
+
+    let block_ref_50 = BlockWithParent::new(B256::ZERO, NumHash::new(50, B256::repeat_byte(0x96)));
+
+    // ========== Setup: Store initial state at blocks 50, 100, 101 ==========
+    let initial_account_addr = B256::repeat_byte(0x10);
+    let initial_account = create_test_account_with_values(1, 1000, 0xAA);
+
+    let initial_storage_addr = B256::repeat_byte(0x20);
+    let initial_storage_slot = B256::repeat_byte(0x01);
+    let initial_storage_value = U256::from(100);
+
+    let initial_branch_path = nibbles_from(vec![1, 2, 3]);
+    let initial_branch = create_test_branch();
+
+    // Store initial data at block 50
+    let mut initial_trie_updates_50 = TrieUpdates::default();
+    initial_trie_updates_50.account_nodes.insert(initial_branch_path, initial_branch.clone());
+
+    let mut initial_post_state_50 = HashedPostState::default();
+    initial_post_state_50.accounts.insert(initial_account_addr, Some(initial_account));
+
+    let initial_diff_50 = BlockStateDiff {
+        sorted_trie_updates: initial_trie_updates_50.into_sorted(),
+        sorted_post_state: initial_post_state_50.into_sorted(),
+    };
+    storage.store_trie_updates(block_ref_50, initial_diff_50)?;
+
+    // Store data at block 100 (common block)
+    let mut initial_trie_updates_100 = TrieUpdates::default();
+    let common_branch_path = nibbles_from(vec![4, 5, 6]);
+    initial_trie_updates_100.account_nodes.insert(common_branch_path, initial_branch.clone());
+
+    let mut initial_post_state_100 = HashedPostState::default();
+    let mut initial_storage_100 = HashedStorage::new(false);
+    initial_storage_100.storage.insert(initial_storage_slot, initial_storage_value);
+    initial_post_state_100.storages.insert(initial_storage_addr, initial_storage_100);
+
+    let initial_diff_100 = BlockStateDiff {
+        sorted_trie_updates: initial_trie_updates_100.into_sorted(),
+        sorted_post_state: initial_post_state_100.into_sorted(),
+    };
+
+    let block_ref_100 =
+        BlockWithParent::new(block_ref_50.block.hash, NumHash::new(100, B256::repeat_byte(0x97)));
+
+    storage.store_trie_updates(block_ref_100, initial_diff_100)?;
+
+    // Store data at block 101 (will be replaced)
+    let mut initial_trie_updates_101 = TrieUpdates::default();
+    let old_branch_path = nibbles_from(vec![7, 8, 9]);
+    initial_trie_updates_101.account_nodes.insert(old_branch_path, initial_branch);
+
+    let mut initial_post_state_101 = HashedPostState::default();
+    let old_account_addr = B256::repeat_byte(0x30);
+    let old_account = create_test_account_with_values(99, 9999, 0xFF);
+    initial_post_state_101.accounts.insert(old_account_addr, Some(old_account));
+
+    let initial_diff_101 = BlockStateDiff {
+        sorted_trie_updates: initial_trie_updates_101.into_sorted(),
+        sorted_post_state: initial_post_state_101.into_sorted(),
+    };
+    let block_ref_101 =
+        BlockWithParent::new(block_ref_100.block.hash, NumHash::new(101, B256::repeat_byte(0x98)));
+    storage.store_trie_updates(block_ref_101, initial_diff_101)?;
+
+    let block_ref_102 =
+        BlockWithParent::new(block_ref_101.block.hash, NumHash::new(102, B256::repeat_byte(0x99)));
+
+    // ========== Verify initial state exists ==========
+    // Verify block 50 data exists
+    let mut cursor_initial = storage.account_trie_cursor(75)?;
+    assert!(
+        cursor_initial.seek_exact(initial_branch_path)?.is_some(),
+        "Initial branch should exist before replace"
+    );
+
+    // Verify block 101 old data exists
+    let mut cursor_old = storage.account_trie_cursor(150)?;
+    assert!(
+        cursor_old.seek_exact(old_branch_path)?.is_some(),
+        "Old branch at block 101 should exist before replace"
+    );
+
+    let mut account_cursor_old = storage.account_hashed_cursor(150)?;
+    assert!(
+        account_cursor_old.seek(old_account_addr)?.is_some(),
+        "Old account at block 101 should exist before replace"
+    );
+
+    // ========== Call replace_updates to replace blocks after 100 ==========
+    let mut blocks_to_add: Vec<(BlockWithParent, BlockStateDiff)> = Vec::default();
+
+    // New data for block 101
+    let new_account_addr = B256::repeat_byte(0x40);
+    let new_account = create_test_account_with_values(5, 5000, 0xCC);
+
+    let new_storage_addr = B256::repeat_byte(0x50);
+    let new_storage_slot = B256::repeat_byte(0x02);
+    let new_storage_value = U256::from(999);
+
+    let new_branch_path = nibbles_from(vec![10, 11, 12]);
+    let new_branch = create_test_branch_variant();
+
+    let storage_branch_path = nibbles_from(vec![5, 5]);
+    let storage_hashed_addr = B256::repeat_byte(0x60);
+
+    let mut new_trie_updates = TrieUpdates::default();
+    new_trie_updates.account_nodes.insert(new_branch_path, new_branch.clone());
+
+    // Add storage trie updates
+    let mut storage_trie = StorageTrieUpdates::default();
+    storage_trie.storage_nodes.insert(storage_branch_path, new_branch.clone());
+    new_trie_updates.insert_storage_updates(storage_hashed_addr, storage_trie);
+
+    let mut new_post_state = HashedPostState::default();
+    new_post_state.accounts.insert(new_account_addr, Some(new_account));
+
+    let mut new_storage = HashedStorage::new(false);
+    new_storage.storage.insert(new_storage_slot, new_storage_value);
+    new_post_state.storages.insert(new_storage_addr, new_storage);
+
+    blocks_to_add.push((
+        block_ref_101,
+        BlockStateDiff {
+            sorted_trie_updates: new_trie_updates.into_sorted(),
+            sorted_post_state: new_post_state.into_sorted(),
+        },
+    ));
+
+    // New data for block 102
+    let block_102_account_addr = B256::repeat_byte(0x70);
+    let block_102_account = create_test_account_with_values(10, 10000, 0xDD);
+
+    let mut trie_updates_102 = TrieUpdates::default();
+    let block_102_branch_path = nibbles_from(vec![15, 14, 13]);
+    trie_updates_102.account_nodes.insert(block_102_branch_path, new_branch);
+
+    let mut post_state_102 = HashedPostState::default();
+    post_state_102.accounts.insert(block_102_account_addr, Some(block_102_account));
+
+    blocks_to_add.push((
+        block_ref_102,
+        BlockStateDiff {
+            sorted_trie_updates: trie_updates_102.into_sorted(),
+            sorted_post_state: post_state_102.into_sorted(),
+        },
+    ));
+
+    // Execute replace_updates
+    storage.replace_updates(BlockNumHash::new(100, block_ref_100.block.hash), blocks_to_add)?;
+    // ========== Verify that data up to block 100 still exists ==========
+    let mut cursor_50 = storage.account_trie_cursor(75)?;
+    assert!(
+        cursor_50.seek_exact(initial_branch_path)?.is_some(),
+        "Block 50 branch should still exist after replace"
+    );
+
+    let mut cursor_100 = storage.account_trie_cursor(100)?;
+    assert!(
+        cursor_100.seek_exact(common_branch_path)?.is_some(),
+        "Block 100 branch should still exist after replace"
+    );
+
+    let mut storage_cursor_100 = storage.storage_hashed_cursor(initial_storage_addr, 100)?;
+    let result_100 = storage_cursor_100.seek(initial_storage_slot)?;
+    assert!(result_100.is_some(), "Block 100 storage should still exist after replace");
+    assert_eq!(
+        result_100.unwrap().1,
+        initial_storage_value,
+        "Block 100 storage value should be unchanged"
+    );
+
+    // ========== Verify that old data after block 100 is gone ==========
+    let mut cursor_old_gone = storage.account_trie_cursor(150)?;
+    assert!(
+        cursor_old_gone.seek_exact(old_branch_path)?.is_none(),
+        "Old branch at block 101 should be removed after replace"
+    );
+
+    let mut account_cursor_old_gone = storage.account_hashed_cursor(150)?;
+    let old_acc_result = account_cursor_old_gone.seek(old_account_addr)?;
+    assert!(
+        old_acc_result.is_none() || old_acc_result.unwrap().0 != old_account_addr,
+        "Old account at block 101 should be removed after replace"
+    );
+
+    // ========== Verify new data is properly accessible via cursors ==========
+
+    // Verify new account branch nodes
+    let mut trie_cursor = storage.account_trie_cursor(150)?;
+    let branch_result = trie_cursor.seek_exact(new_branch_path)?;
+    assert!(branch_result.is_some(), "New account branch should be accessible via cursor");
+    assert_eq!(branch_result.unwrap().0, new_branch_path);
+
+    // Verify new storage branch nodes
+    let mut storage_trie_cursor = storage.storage_trie_cursor(storage_hashed_addr, 150)?;
+    let storage_branch_result = storage_trie_cursor.seek_exact(storage_branch_path)?;
+    assert!(storage_branch_result.is_some(), "New storage branch should be accessible via cursor");
+    assert_eq!(storage_branch_result.unwrap().0, storage_branch_path);
+
+    // Verify new hashed accounts
+    let mut account_cursor = storage.account_hashed_cursor(150)?;
+    let account_result = account_cursor.seek(new_account_addr)?;
+    assert!(account_result.is_some(), "New account should be accessible via cursor");
+    assert_eq!(account_result.as_ref().unwrap().0, new_account_addr);
+    assert_eq!(account_result.as_ref().unwrap().1.nonce, new_account.nonce);
+    assert_eq!(account_result.as_ref().unwrap().1.balance, new_account.balance);
+    assert_eq!(account_result.as_ref().unwrap().1.bytecode_hash, new_account.bytecode_hash);
+
+    // Verify new hashed storages
+    let mut storage_cursor = storage.storage_hashed_cursor(new_storage_addr, 150)?;
+    let storage_result = storage_cursor.seek(new_storage_slot)?;
+    assert!(storage_result.is_some(), "New storage should be accessible via cursor");
+    assert_eq!(storage_result.as_ref().unwrap().0, new_storage_slot);
+    assert_eq!(storage_result.as_ref().unwrap().1, new_storage_value);
+
+    // Verify block 102 data
+    let mut trie_cursor_102 = storage.account_trie_cursor(150)?;
+    let branch_result_102 = trie_cursor_102.seek_exact(block_102_branch_path)?;
+    assert!(branch_result_102.is_some(), "Block 102 branch should be accessible");
+    assert_eq!(branch_result_102.unwrap().0, block_102_branch_path);
+
+    let mut account_cursor_102 = storage.account_hashed_cursor(150)?;
+    let account_result_102 = account_cursor_102.seek(block_102_account_addr)?;
+    assert!(account_result_102.is_some(), "Block 102 account should be accessible");
+    assert_eq!(account_result_102.as_ref().unwrap().0, block_102_account_addr);
+    assert_eq!(account_result_102.as_ref().unwrap().1.nonce, block_102_account.nonce);
+
+    // Verify fetch_trie_updates returns the new data
+    let fetched_101 = storage.fetch_trie_updates(101)?;
+    assert_eq!(
+        fetched_101.sorted_trie_updates.account_nodes_ref().len(),
+        1,
+        "Should have 1 account branch node at block 101"
+    );
+    assert!(
+        fetched_101
+            .sorted_trie_updates
+            .account_nodes_ref()
+            .iter()
+            .any(|(addr, _)| *addr == new_branch_path),
+        "New branch path should be in trie_updates"
+    );
+    assert_eq!(
+        fetched_101.sorted_post_state.accounts.len(),
+        1,
+        "Should have 1 account at block 101"
+    );
+    assert!(
+        fetched_101.sorted_post_state.accounts.iter().any(|(addr, _)| *addr == new_account_addr),
+        "New account should be in post_state"
+    );
+
+    Ok(())
+}
+
+/// Test that pure deletions (nodes only in `removed_nodes`) are properly stored
+///
+/// This test verifies that when a node appears only in `removed_nodes` (not in updates),
+/// it is properly stored as a deletion and subsequent queries return None for that path.
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_pure_deletions_stored_correctly<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    use reth_trie::updates::StorageTrieUpdates;
+
+    // ========== Setup: Store initial branch nodes at block 50 ==========
+    let account_path1 = nibbles_from(vec![1, 2, 3]);
+    let account_path2 = nibbles_from(vec![4, 5, 6]);
+    let storage_path1 = nibbles_from(vec![7, 8, 9]);
+    let storage_path2 = nibbles_from(vec![10, 11, 12]);
+    let storage_address = B256::repeat_byte(0x42);
+
+    let initial_branch = create_test_branch();
+
+    let mut initial_trie_updates = TrieUpdates::default();
+    initial_trie_updates.account_nodes.insert(account_path1, initial_branch.clone());
+    initial_trie_updates.account_nodes.insert(account_path2, initial_branch.clone());
+
+    let mut storage_trie = StorageTrieUpdates::default();
+    storage_trie.storage_nodes.insert(storage_path1, initial_branch.clone());
+    storage_trie.storage_nodes.insert(storage_path2, initial_branch);
+    initial_trie_updates.insert_storage_updates(storage_address, storage_trie);
+
+    let initial_diff = BlockStateDiff {
+        sorted_trie_updates: initial_trie_updates.into_sorted(),
+        sorted_post_state: HashedPostStateSorted::default(),
+    };
+
+    let block_ref_50 = BlockWithParent::new(B256::ZERO, NumHash::new(50, B256::repeat_byte(0x96)));
+
+    storage.store_trie_updates(block_ref_50, initial_diff)?;
+
+    // Verify initial state exists at block 75
+    let mut cursor_75 = storage.account_trie_cursor(75)?;
+    assert!(
+        cursor_75.seek_exact(account_path1)?.is_some(),
+        "Initial account branch 1 should exist at block 75"
+    );
+    assert!(
+        cursor_75.seek_exact(account_path2)?.is_some(),
+        "Initial account branch 2 should exist at block 75"
+    );
+
+    let mut storage_cursor_75 = storage.storage_trie_cursor(storage_address, 75)?;
+    assert!(
+        storage_cursor_75.seek_exact(storage_path1)?.is_some(),
+        "Initial storage branch 1 should exist at block 75"
+    );
+    assert!(
+        storage_cursor_75.seek_exact(storage_path2)?.is_some(),
+        "Initial storage branch 2 should exist at block 75"
+    );
+
+    // ========== At block 100: Mark paths as deleted (ONLY in removed_nodes) ==========
+    let mut deletion_trie_updates = TrieUpdates::default();
+
+    // Add to removed_nodes ONLY (no updates)
+    deletion_trie_updates.removed_nodes.insert(account_path1);
+
+    // Do the same for storage branch
+    let mut deletion_storage_trie = StorageTrieUpdates::default();
+    deletion_storage_trie.removed_nodes.insert(storage_path1);
+    deletion_trie_updates.insert_storage_updates(storage_address, deletion_storage_trie);
+
+    let deletion_diff = BlockStateDiff {
+        sorted_trie_updates: deletion_trie_updates.into_sorted(),
+        sorted_post_state: HashedPostStateSorted::default(),
+    };
+
+    let block_ref_100 =
+        BlockWithParent::new(B256::repeat_byte(0x96), NumHash::new(100, B256::repeat_byte(0x97)));
+
+    storage.store_trie_updates(block_ref_100, deletion_diff)?;
+
+    // ========== Verify that deleted nodes return None at block 150 ==========
+
+    // Deleted account branch should not be found
+    let mut cursor_150 = storage.account_trie_cursor(150)?;
+    let account_result = cursor_150.seek_exact(account_path1)?;
+    assert!(account_result.is_none(), "Deleted account branch should return None at block 150");
+
+    // Non-deleted account branch should still exist
+    let account_result2 = cursor_150.seek_exact(account_path2)?;
+    assert!(
+        account_result2.is_some(),
+        "Non-deleted account branch should still exist at block 150"
+    );
+
+    // Deleted storage branch should not be found
+    let mut storage_cursor_150 = storage.storage_trie_cursor(storage_address, 150)?;
+    let storage_result = storage_cursor_150.seek_exact(storage_path1)?;
+    assert!(storage_result.is_none(), "Deleted storage branch should return None at block 150");
+
+    // Non-deleted storage branch should still exist
+    let storage_result2 = storage_cursor_150.seek_exact(storage_path2)?;
+    assert!(
+        storage_result2.is_some(),
+        "Non-deleted storage branch should still exist at block 150"
+    );
+
+    // ========== Verify that the nodes still exist at block 75 (before deletion) ==========
+    let mut cursor_75_after = storage.account_trie_cursor(75)?;
+    assert!(
+        cursor_75_after.seek_exact(account_path1)?.is_some(),
+        "Deleted node should still exist at block 75 (before deletion)"
+    );
+
+    let mut storage_cursor_75_after = storage.storage_trie_cursor(storage_address, 75)?;
+    assert!(
+        storage_cursor_75_after.seek_exact(storage_path1)?.is_some(),
+        "Deleted storage node should still exist at block 75 (before deletion)"
+    );
+
+    // ========== Verify iteration skips deleted nodes ==========
+    let mut cursor_iter = storage.account_trie_cursor(150)?;
+    let mut found_paths = Vec::new();
+    while let Some((path, _)) = cursor_iter.next()? {
+        found_paths.push(path);
+    }
+
+    assert!(!found_paths.contains(&account_path1), "Iteration should skip deleted node");
+    assert!(found_paths.contains(&account_path2), "Iteration should include non-deleted node");
+
+    Ok(())
+}
+
+/// Test that updates take precedence over removals when both are present
+///
+/// This test verifies that when a path appears in both `removed_nodes` and `account_nodes`,
+/// the update from `account_nodes` takes precedence. This is critical for correctness
+/// when processing trie updates that both remove and update the same node.
+#[test_case(InMemoryProofsStorage::new(); "InMemory")]
+#[test_case(create_mdbx_proofs_storage(); "Mdbx")]
+#[serial]
+fn test_updates_take_precedence_over_removals<S: OpProofsStore + OpProofsInitialStateStore>(
+    storage: S,
+) -> Result<(), OpProofsStorageError> {
+    use reth_trie::updates::StorageTrieUpdates;
+
+    // ========== Setup: Store initial branch nodes at block 50 ==========
+    let account_path = nibbles_from(vec![1, 2, 3]);
+    let storage_path = nibbles_from(vec![4, 5, 6]);
+    let storage_address = B256::repeat_byte(0x42);
+
+    let initial_branch = create_test_branch();
+
+    let mut initial_trie_updates = TrieUpdates::default();
+    initial_trie_updates.account_nodes.insert(account_path, initial_branch.clone());
+
+    let mut storage_trie = StorageTrieUpdates::default();
+    storage_trie.storage_nodes.insert(storage_path, initial_branch.clone());
+    initial_trie_updates.insert_storage_updates(storage_address, storage_trie);
+
+    let initial_diff = BlockStateDiff {
+        sorted_trie_updates: initial_trie_updates.into_sorted(),
+        sorted_post_state: HashedPostStateSorted::default(),
+    };
+
+    let block_ref_50 = BlockWithParent::new(B256::ZERO, NumHash::new(50, B256::repeat_byte(0x96)));
+
+    storage.store_trie_updates(block_ref_50, initial_diff)?;
+
+    // Verify initial state exists at block 75
+    let mut cursor_75 = storage.account_trie_cursor(75)?;
+    assert!(
+        cursor_75.seek_exact(account_path)?.is_some(),
+        "Initial account branch should exist at block 75"
+    );
+
+    let mut storage_cursor_75 = storage.storage_trie_cursor(storage_address, 75)?;
+    assert!(
+        storage_cursor_75.seek_exact(storage_path)?.is_some(),
+        "Initial storage branch should exist at block 75"
+    );
+
+    // ========== At block 100: Add paths to BOTH removed_nodes AND account_nodes ==========
+    // This simulates a scenario where a node is both removed and updated
+    // The update should take precedence
+    let updated_branch = create_test_branch_variant();
+
+    let mut conflicting_trie_updates = TrieUpdates::default();
+
+    // Add to removed_nodes
+    conflicting_trie_updates.removed_nodes.insert(account_path);
+
+    // Also add to account_nodes (this should take precedence)
+    conflicting_trie_updates.account_nodes.insert(account_path, updated_branch.clone());
+
+    // Do the same for storage branch
+    let mut conflicting_storage_trie = StorageTrieUpdates::default();
+    conflicting_storage_trie.removed_nodes.insert(storage_path);
+    conflicting_storage_trie.storage_nodes.insert(storage_path, updated_branch.clone());
+    conflicting_trie_updates.insert_storage_updates(storage_address, conflicting_storage_trie);
+
+    let conflicting_diff = BlockStateDiff {
+        sorted_trie_updates: conflicting_trie_updates.into_sorted(),
+        sorted_post_state: HashedPostStateSorted::default(),
+    };
+
+    let block_ref_100 =
+        BlockWithParent::new(B256::repeat_byte(0x96), NumHash::new(100, B256::repeat_byte(0x97)));
+
+    storage.store_trie_updates(block_ref_100, conflicting_diff)?;
+
+    // ========== Verify that updates took precedence at block 150 ==========
+
+    // Account branch should exist (not deleted) with the updated value
+    let mut cursor_150 = storage.account_trie_cursor(150)?;
+    let account_result = cursor_150.seek_exact(account_path)?;
+    assert!(
+        account_result.is_some(),
+        "Account branch should exist at block 150 (update should take precedence over removal)"
+    );
+    let (found_path, found_branch) = account_result.unwrap();
+    assert_eq!(found_path, account_path);
+    // Verify it's the updated branch, not the initial one
+    assert_eq!(
+        found_branch.state_mask, updated_branch.state_mask,
+        "Account branch should be the updated version, not the initial one"
+    );
+
+    // Storage branch should exist (not deleted) with the updated value
+    let mut storage_cursor_150 = storage.storage_trie_cursor(storage_address, 150)?;
+    let storage_result = storage_cursor_150.seek_exact(storage_path)?;
+    assert!(
+        storage_result.is_some(),
+        "Storage branch should exist at block 150 (update should take precedence over removal)"
+    );
+    let (found_storage_path, found_storage_branch) = storage_result.unwrap();
+    assert_eq!(found_storage_path, storage_path);
+    // Verify it's the updated branch
+    assert_eq!(
+        found_storage_branch.state_mask, updated_branch.state_mask,
+        "Storage branch should be the updated version, not the initial one"
+    );
+
+    // ========== Verify that the old version still exists at block 75 ==========
+    let mut cursor_75_after = storage.account_trie_cursor(75)?;
+    let result_75 = cursor_75_after.seek_exact(account_path)?;
+    assert!(result_75.is_some(), "Initial version should still exist at block 75");
+    let (_, branch_75) = result_75.unwrap();
+    assert_eq!(
+        branch_75.state_mask, initial_branch.state_mask,
+        "Block 75 should see the initial branch, not the updated one"
+    );
+
+    Ok(())
+}
diff --git a/rust/op-reth/crates/trie/tests/live.rs b/rust/op-reth/crates/trie/tests/live.rs
new file mode 100644
index 0000000000000..64f08632ff874
--- /dev/null
+++ b/rust/op-reth/crates/trie/tests/live.rs
@@ -0,0 +1,508 @@
+//! End-to-end test of the live trie collector.
+
+use alloy_consensus::{BlockHeader, Header, TxEip2930, constants::ETH_TO_WEI};
+use alloy_genesis::{Genesis, GenesisAccount};
+use alloy_primitives::{Address, B256, TxKind, U256, keccak256};
+use derive_more::Constructor;
+use reth_chainspec::{ChainSpec, ChainSpecBuilder, EthereumHardfork, MAINNET, MIN_TRANSACTION_GAS};
+use reth_db::Database;
+use reth_db_common::init::init_genesis;
+use reth_ethereum_primitives::{Block, BlockBody, Receipt, Transaction, TransactionSigned};
+use reth_evm::{ConfigureEvm, execute::Executor};
+use reth_evm_ethereum::EthEvmConfig;
+use reth_node_api::{NodePrimitives, NodeTypesWithDB};
+use reth_optimism_trie::{
+    MdbxProofsStorage, OpProofsStorage, OpProofsStorageError, initialize::InitializationJob,
+    live::LiveTrieCollector,
+};
+use reth_primitives_traits::{Block as _, RecoveredBlock};
+use reth_provider::{
+    BlockWriter as _, ExecutionOutcome, HashedPostStateProvider, LatestStateProviderRef,
+    ProviderFactory, StateRootProvider,
+    providers::{BlockchainProvider, ProviderNodeTypes},
+    test_utils::create_test_provider_factory_with_chain_spec,
+};
+use reth_revm::database::StateProviderDatabase;
+use secp256k1::{Keypair, Secp256k1, rand::rng};
+use std::sync::Arc;
+use tempfile::TempDir;
+
+/// Converts a secp256k1 public key to an Ethereum address.
+fn public_key_to_address(pubkey: secp256k1::PublicKey) -> Address {
+    let hash = keccak256(&pubkey.serialize_uncompressed()[1..]);
+    Address::from_slice(&hash[12..])
+}
+
+/// Signs a transaction with the given keypair.
+fn sign_tx_with_key_pair(key_pair: Keypair, tx: Transaction) -> TransactionSigned {
+    use alloy_consensus::SignableTransaction;
+    use reth_primitives_traits::crypto::secp256k1::sign_message;
+    let secret = B256::from_slice(&key_pair.secret_bytes());
+    let sig = sign_message(secret, tx.signature_hash()).unwrap();
+    tx.into_signed(sig).into()
+}
+
+/// Specification for a transaction within a block
+#[derive(Debug, Clone)]
+struct TxSpec {
+    /// Recipient address for the transaction
+    to: Address,
+    /// Value to transfer (in wei)
+    value: U256,
+    /// Nonce for the transaction (will be automatically assigned if None)
+    nonce: Option<u64>,
+}
+
+impl TxSpec {
+    /// Create a simple transfer transaction
+    const fn transfer(to: Address, value: U256) -> Self {
+        Self { to, value, nonce: None }
+    }
+}
+
+/// Specification for a block in the test chain
+#[derive(Debug, Clone, Constructor)]
+struct BlockSpec {
+    /// Transactions to include in this block
+    txs: Vec<TxSpec>,
+}
+
+/// Configuration for a test scenario
+#[derive(Debug, Constructor)]
+struct TestScenario {
+    /// Blocks to execute before running the initialization job
+    blocks_before_initialization: Vec<BlockSpec>,
+    /// Blocks to execute after initialization using the live collector
+    blocks_after_initialization: Vec<BlockSpec>,
+}
+
+/// Helper to create a chain spec with a genesis account funded
+fn chain_spec_with_address(address: Address) -> Arc<ChainSpec> {
+    Arc::new(
+        ChainSpecBuilder::default()
+            .chain(MAINNET.chain)
+            .genesis(Genesis {
+                alloc: [(
+                    address,
+                    GenesisAccount { balance: U256::from(10 * ETH_TO_WEI), ..Default::default() },
+                )]
+                .into(),
+                ..MAINNET.genesis.clone()
+            })
+            .paris_activated()
+            .build(),
+    )
+}
+
+/// Creates a block from a spec, executing transactions with the given keypair
+fn create_block_from_spec(
+    spec: &BlockSpec,
+    block_number: u64,
+    parent_hash: B256,
+    chain_spec: &Arc<ChainSpec>,
+    key_pair: Keypair,
+    nonce_counter: &mut u64,
+) -> RecoveredBlock<Block> {
+    let transactions: Vec<TransactionSigned> = spec
+        .txs
+        .iter()
+        .map(|tx_spec| {
+            let nonce = tx_spec.nonce.unwrap_or_else(|| {
+                let current = *nonce_counter;
+                *nonce_counter += 1;
+                current
+            });
+
+            sign_tx_with_key_pair(
+                key_pair,
+                TxEip2930 {
+                    chain_id: chain_spec.chain.id(),
+                    nonce,
+                    gas_limit: MIN_TRANSACTION_GAS,
+                    gas_price: 1_500_000_000,
+                    to: TxKind::Call(tx_spec.to),
+                    value: tx_spec.value,
+                    ..Default::default()
+                }
+                .into(),
+            )
+        })
+        .collect();
+
+    let gas_total = transactions.len() as u64 * MIN_TRANSACTION_GAS;
+
+    Block {
+        header: Header {
+            parent_hash,
+            receipts_root: alloy_primitives::b256!(
+                "0xd3a6acf9a244d78b33831df95d472c4128ea85bf079a1d41e32ed0b7d2244c9e"
+            ),
+            difficulty: chain_spec.fork(EthereumHardfork::Paris).ttd().expect("Paris TTD"),
+            number: block_number,
+            gas_limit: gas_total.max(MIN_TRANSACTION_GAS),
+            gas_used: gas_total,
+            state_root: B256::ZERO, // Will be calculated by executor
+            ..Default::default()
+        },
+        body: BlockBody { transactions, ..Default::default() },
+    }
+    .try_into_recovered()
+    .unwrap()
+}
+
+/// Executes a block and returns the updated block with correct state root
+fn execute_block<N>(
+    block: &mut RecoveredBlock<Block>,
+    provider_factory: &ProviderFactory<N>,
+    chain_spec: &Arc<ChainSpec>,
+) -> eyre::Result<reth_evm::execute::BlockExecutionOutput<Receipt>>
+where
+    N: ProviderNodeTypes<
+            Primitives: NodePrimitives<Block = Block, BlockBody = BlockBody, Receipt = Receipt>,
+        > + NodeTypesWithDB,
+{
+    let provider = provider_factory.provider()?;
+    let db = StateProviderDatabase::new(LatestStateProviderRef::new(&provider));
+    let evm_config = EthEvmConfig::ethereum(chain_spec.clone());
+    let block_executor = evm_config.batch_executor(db);
+
+    let execution_result = block_executor.execute(block)?;
+
+    let hashed_state =
+        LatestStateProviderRef::new(&provider).hashed_post_state(&execution_result.state);
+    let state_root = LatestStateProviderRef::new(&provider).state_root(hashed_state)?;
+
+    block.set_state_root(state_root);
+
+    Ok(execution_result)
+}
+
+/// Commits a block and its execution output to the database
+fn commit_block_to_database<N>(
+    block: &RecoveredBlock<Block>,
+    execution_output: &reth_evm::execute::BlockExecutionOutput<Receipt>,
+    provider_factory: &ProviderFactory<N>,
+) -> eyre::Result<()>
+where
+    N: ProviderNodeTypes<
+            Primitives: NodePrimitives<Block = Block, BlockBody = BlockBody, Receipt = Receipt>,
+        > + NodeTypesWithDB,
+{
+    let execution_outcome = ExecutionOutcome {
+        bundle: execution_output.state.clone(),
+        receipts: vec![execution_output.receipts.clone()],
+        first_block: block.number(),
+        requests: vec![execution_output.requests.clone()],
+    };
+
+    // Calculate hashed state from execution result
+    let state_provider = provider_factory.provider()?;
+    let hashed_state = HashedPostStateProvider::hashed_post_state(
+        &LatestStateProviderRef::new(&state_provider),
+        &execution_output.state,
+    );
+
+    let provider_rw = provider_factory.provider_rw()?;
+    provider_rw.append_blocks_with_state(
+        vec![block.clone()],
+        &execution_outcome,
+        hashed_state.into_sorted(),
+    )?;
+    provider_rw.commit()?;
+
+    Ok(())
+}
+
+/// Runs a test scenario with the given configuration
+fn run_test_scenario<N>(
+    scenario: TestScenario,
+    provider_factory: ProviderFactory<N>,
+    chain_spec: Arc<ChainSpec>,
+    key_pair: Keypair,
+    storage: OpProofsStorage<Arc<MdbxProofsStorage>>,
+) -> eyre::Result<()>
+where
+    N: ProviderNodeTypes<
+            Primitives: NodePrimitives<Block = Block, BlockBody = BlockBody, Receipt = Receipt>,
+        > + NodeTypesWithDB,
+{
+    let genesis_hash = chain_spec.genesis_hash();
+    let mut nonce_counter = 0u64;
+    let mut last_block_hash = genesis_hash;
+    let mut last_block_number = 0u64;
+
+    // Execute blocks before initialization
+    for (idx, block_spec) in scenario.blocks_before_initialization.iter().enumerate() {
+        let block_number = idx as u64 + 1;
+        let mut block = create_block_from_spec(
+            block_spec,
+            block_number,
+            last_block_hash,
+            &chain_spec,
+            key_pair,
+            &mut nonce_counter,
+        );
+
+        let execution_output = execute_block(&mut block, &provider_factory, &chain_spec)?;
+        commit_block_to_database(&block, &execution_output, &provider_factory)?;
+
+        last_block_hash = block.hash();
+        last_block_number = block_number;
+    }
+
+    {
+        let provider = provider_factory.db_ref();
+        let tx = provider.tx()?;
+        let initialization_job = InitializationJob::new(storage.clone(), tx);
+        initialization_job.run(last_block_number, last_block_hash)?;
+    }
+
+    // Execute blocks after initialization using live collector
+    let evm_config = EthEvmConfig::ethereum(chain_spec.clone());
+
+    for (idx, block_spec) in scenario.blocks_after_initialization.iter().enumerate() {
+        let block_number = last_block_number + idx as u64 + 1;
+        let mut block = create_block_from_spec(
+            block_spec,
+            block_number,
+            last_block_hash,
+            &chain_spec,
+            key_pair,
+            &mut nonce_counter,
+        );
+
+        // Execute the block to get the correct state root
+        let execution_output = execute_block(&mut block, &provider_factory, &chain_spec)?;
+
+        // Create a fresh blockchain provider to ensure it sees all committed blocks
+        let blockchain_db = BlockchainProvider::new(provider_factory.clone())?;
+        let live_trie_collector =
+            LiveTrieCollector::new(evm_config.clone(), blockchain_db, &storage);
+
+        // Use the live collector to execute and store trie updates
+        live_trie_collector.execute_and_store_block_updates(&block)?;
+
+        // Commit the block to the database so subsequent blocks can build on it
+        commit_block_to_database(&block, &execution_output, &provider_factory)?;
+
+        last_block_hash = block.hash();
+    }
+
+    Ok(())
+}
+
+/// End-to-end test of a single live collector iteration.
+/// (1) Creates a chain with some state
+/// (2) Stores the genesis state into storage via initialization
+/// (3) Executes a block and calculates the state root using the stored state
+#[test]
+fn test_execute_and_store_block_updates() {
+    let dir = TempDir::new().unwrap();
+    let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")).into();
+
+    // Create a keypair for signing transactions
+    let secp = Secp256k1::new();
+    let key_pair = Keypair::new(&secp, &mut rng());
+    let sender = public_key_to_address(key_pair.public_key());
+
+    // Create chain spec with the sender address funded in genesis
+    let chain_spec = chain_spec_with_address(sender);
+
+    // Create test database and provider factory
+    let provider_factory = create_test_provider_factory_with_chain_spec(chain_spec.clone());
+
+    // Insert genesis state into the database
+    init_genesis(&provider_factory).unwrap();
+
+    // Define the test scenario:
+    // - No blocks before initialization
+    // - Initialization to genesis (block 0)
+    // - Execute one block with a single transaction after initialization
+    let recipient = Address::repeat_byte(0x42);
+    let scenario = TestScenario::new(
+        vec![],
+        vec![BlockSpec::new(vec![TxSpec::transfer(recipient, U256::from(1))])],
+    );
+
+    run_test_scenario(scenario, provider_factory, chain_spec, key_pair, storage).unwrap();
+}
+
+#[test]
+fn test_execute_and_store_block_updates_missing_parent_block() {
+    let dir = TempDir::new().unwrap();
+    let storage: OpProofsStorage<Arc<MdbxProofsStorage>> =
+        Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")).into();
+
+    let secp = Secp256k1::new();
+    let key_pair = Keypair::new(&secp, &mut rng());
+    let sender = public_key_to_address(key_pair.public_key());
+
+    let chain_spec = chain_spec_with_address(sender);
+    let provider_factory = create_test_provider_factory_with_chain_spec(chain_spec.clone());
+    init_genesis(&provider_factory).unwrap();
+
+    // No blocks before initialization; initialization only inserts genesis.
+    let scenario = TestScenario::new(vec![], vec![]);
+
+    // Run initialization (block 0 only)
+    run_test_scenario(
+        scenario,
+        provider_factory.clone(),
+        chain_spec.clone(),
+        key_pair,
+        storage.clone(),
+    )
+    .unwrap();
+
+    // Create a block whose parent block number is missing.
+    let incorrect_block_number = 2;
+    let incorrect_parent_hash = B256::repeat_byte(0x11);
+
+    let mut nonce_counter = 0;
+    let incorrect_block = create_block_from_spec(
+        &BlockSpec::new(vec![]),
+        incorrect_block_number,
+        incorrect_parent_hash,
+        &chain_spec,
+        key_pair,
+        &mut nonce_counter,
+    );
+
+    let blockchain_db = BlockchainProvider::new(provider_factory).unwrap();
+    let collector =
+        LiveTrieCollector::new(EthEvmConfig::ethereum(chain_spec.clone()), blockchain_db, &storage);
+
+    // EXPECT: MissingParentBlock
+    let err = collector.execute_and_store_block_updates(&incorrect_block).unwrap_err();
+
+    assert!(matches!(err, OpProofsStorageError::MissingParentBlock { .. }));
+}
+
+#[test]
+fn test_execute_and_store_block_updates_state_root_mismatch() {
+    let dir = TempDir::new().unwrap();
+    let storage: OpProofsStorage<Arc<MdbxProofsStorage>> =
+        Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")).into();
+
+    let secp = Secp256k1::new();
+    let key_pair = Keypair::new(&secp, &mut rng());
+    let sender = public_key_to_address(key_pair.public_key());
+
+    let chain_spec = chain_spec_with_address(sender);
+    let provider_factory = create_test_provider_factory_with_chain_spec(chain_spec.clone());
+    init_genesis(&provider_factory).unwrap();
+
+    // Run normal scenario: no blocks before initialization, one block after.
+    let recipient = Address::repeat_byte(0x42);
+    let scenario = TestScenario::new(
+        vec![],
+        vec![BlockSpec::new(vec![TxSpec::transfer(recipient, U256::from(1))])],
+    );
+
+    run_test_scenario(
+        scenario,
+        provider_factory.clone(),
+        chain_spec.clone(),
+        key_pair,
+        storage.clone(),
+    )
+    .unwrap();
+
+    // Generate a second block normally
+    let blockchain_db = BlockchainProvider::new(provider_factory.clone()).unwrap();
+    let collector =
+        LiveTrieCollector::new(EthEvmConfig::ethereum(chain_spec.clone()), blockchain_db, &storage);
+
+    // Create the next block
+    let mut nonce_counter = 0;
+    let last_block_hash = chain_spec.genesis_hash(); // because scenario executes 1 block
+    let next_number = 2;
+
+    let mut block = create_block_from_spec(
+        &BlockSpec::new(vec![]),
+        next_number,
+        last_block_hash,
+        &chain_spec,
+        key_pair,
+        &mut nonce_counter,
+    );
+
+    // Execute it to compute a correct state root
+    let _ = execute_block(&mut block, &provider_factory, &chain_spec).unwrap();
+
+    // Change the state root to induce the error
+    block.header_mut().state_root = B256::repeat_byte(0xAA);
+
+    // EXPECT: StateRootMismatch
+    let err = collector.execute_and_store_block_updates(&block).unwrap_err();
+
+    assert!(matches!(err, OpProofsStorageError::StateRootMismatch { .. }));
+}
+
+/// Test with multiple blocks before and after initialization
+#[test]
+fn test_multiple_blocks_before_and_after_initialization() {
+    let dir = TempDir::new().unwrap();
+    let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")).into();
+
+    let secp = Secp256k1::new();
+    let key_pair = Keypair::new(&secp, &mut rng());
+    let sender = public_key_to_address(key_pair.public_key());
+
+    let chain_spec = chain_spec_with_address(sender);
+    let provider_factory = create_test_provider_factory_with_chain_spec(chain_spec.clone());
+    init_genesis(&provider_factory).unwrap();
+
+    // Define the test scenario:
+    // - Execute 3 blocks before initialization (will be committed to db)
+    // - Initialization to block 3
+    // - Execute 2 more blocks using the live collector
+    let recipient1 = Address::repeat_byte(0x42);
+    let recipient2 = Address::repeat_byte(0x43);
+    let recipient3 = Address::repeat_byte(0x44);
+
+    let scenario = TestScenario::new(
+        vec![
+            BlockSpec::new(vec![TxSpec::transfer(recipient1, U256::from(1))]),
+            BlockSpec::new(vec![TxSpec::transfer(recipient2, U256::from(2))]),
+            BlockSpec::new(vec![TxSpec::transfer(recipient3, U256::from(3))]),
+        ],
+        vec![
+            BlockSpec::new(vec![TxSpec::transfer(recipient1, U256::from(4))]),
+            BlockSpec::new(vec![TxSpec::transfer(recipient2, U256::from(5))]),
+        ],
+    );
+
+    run_test_scenario(scenario, provider_factory, chain_spec, key_pair, storage).unwrap();
+}
+
+/// Test with blocks containing multiple transactions
+#[test]
+fn test_blocks_with_multiple_transactions() {
+    let dir = TempDir::new().unwrap();
+    let storage = Arc::new(MdbxProofsStorage::new(dir.path()).expect("env")).into();
+
+    let secp = Secp256k1::new();
+    let key_pair = Keypair::new(&secp, &mut rng());
+    let sender = public_key_to_address(key_pair.public_key());
+
+    let chain_spec = chain_spec_with_address(sender);
+    let provider_factory = create_test_provider_factory_with_chain_spec(chain_spec.clone());
+    init_genesis(&provider_factory).unwrap();
+
+    let recipient1 = Address::repeat_byte(0x42);
+    let recipient2 = Address::repeat_byte(0x43);
+    let recipient3 = Address::repeat_byte(0x44);
+
+    // Block with 3 transactions
+    let scenario = TestScenario::new(
+        vec![],
+        vec![BlockSpec::new(vec![
+            TxSpec::transfer(recipient1, U256::from(1)),
+            TxSpec::transfer(recipient2, U256::from(2)),
+            TxSpec::transfer(recipient3, U256::from(3)),
+        ])],
+    );
+
+    run_test_scenario(scenario, provider_factory, chain_spec, key_pair, storage).unwrap();
+}
diff --git a/rust/op-reth/crates/txpool/src/validator.rs b/rust/op-reth/crates/txpool/src/validator.rs
index cb48ae71d16c7..c972cd95d6fd7 100644
--- a/rust/op-reth/crates/txpool/src/validator.rs
+++ b/rust/op-reth/crates/txpool/src/validator.rs
@@ -309,27 +309,6 @@ where
         self.validate_one(origin, transaction).await
     }
 
-    async fn validate_transactions(
-        &self,
-        transactions: Vec<(TransactionOrigin, Self::Transaction)>,
-    ) -> Vec<TransactionValidationOutcome<Self::Transaction>> {
-        futures_util::future::join_all(
-            transactions.into_iter().map(|(origin, tx)| self.validate_one(origin, tx)),
-        )
-        .await
-    }
-
-    async fn validate_transactions_with_origin(
-        &self,
-        origin: TransactionOrigin,
-        transactions: impl IntoIterator<Item = Self::Transaction> + Send,
-    ) -> Vec<TransactionValidationOutcome<Self::Transaction>> {
-        futures_util::future::join_all(
-            transactions.into_iter().map(|tx| self.validate_one(origin, tx)),
-        )
-        .await
-    }
-
     fn on_new_head_block(&self, new_tip_block: &SealedBlock<Self::Block>) {
         self.inner.on_new_head_block(new_tip_block);
         self.update_l1_block_info(
diff --git a/rust/op-reth/examples/op-db-access/Cargo.toml b/rust/op-reth/examples/op-db-access/Cargo.toml
index ae06e600b9cd5..18e5710c64071 100644
--- a/rust/op-reth/examples/op-db-access/Cargo.toml
+++ b/rust/op-reth/examples/op-db-access/Cargo.toml
@@ -6,6 +6,6 @@ edition.workspace = true
 license.workspace = true
 
 [dependencies]
-reth-op = { workspace = true, features = ["node"] }
+reth-op = { workspace = true, features = ["node", "tasks"] }
 
 eyre.workspace = true
diff --git a/rust/op-reth/examples/op-db-access/src/main.rs b/rust/op-reth/examples/op-db-access/src/main.rs
index 6afe8d25b3563..b0aa332170571 100644
--- a/rust/op-reth/examples/op-db-access/src/main.rs
+++ b/rust/op-reth/examples/op-db-access/src/main.rs
@@ -1,6 +1,8 @@
 //! Shows how to manually access the database
 
-use reth_op::{chainspec::BASE_MAINNET, node::OpNode, provider::providers::ReadOnlyConfig};
+use reth_op::{
+    chainspec::BASE_MAINNET, node::OpNode, provider::providers::ReadOnlyConfig, tasks::Runtime,
+};
 
 // Providers are zero-cost abstractions on top of an opened MDBX Transaction
 // exposing a familiar API to query the chain's information without requiring knowledge
@@ -12,9 +14,14 @@ fn main() -> eyre::Result<()> {
     // The path to data directory, e.g. "~/.local/reth/share/base"
     let datadir = std::env::var("RETH_DATADIR")?;
 
+    let runtime = Runtime::test();
+
     // Instantiate a provider factory for Ethereum mainnet using the provided datadir path.
-    let factory = OpNode::provider_factory_builder()
-        .open_read_only(BASE_MAINNET.clone(), ReadOnlyConfig::from_datadir(datadir))?;
+    let factory = OpNode::provider_factory_builder().open_read_only(
+        BASE_MAINNET.clone(),
+        ReadOnlyConfig::from_datadir(datadir),
+        runtime,
+    )?;
 
     // obtain a provider access that has direct access to the database.
     let _provider = factory.provider();