diff --git a/Cargo.lock b/Cargo.lock
index d1e8d4f..ea80e10 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "addr2line"
@@ -114,7 +114,7 @@ version = "0.1.1"
 source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939"
 dependencies = [
  "alloy-consensus 0.1.1",
- "alloy-core",
+ "alloy-core 0.7.7",
  "alloy-json-rpc 0.1.1",
  "alloy-provider 0.1.1",
  "alloy-rpc-client 0.1.1",
@@ -124,6 +124,26 @@ dependencies = [
  "reqwest",
 ]
 
+[[package]]
+name = "alloy"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8367891bf380210abb0d6aa30c5f85a9080cb4a066c4d5c5acadad630823751b"
+dependencies = [
+ "alloy-consensus 0.3.6",
+ "alloy-core 0.8.3",
+ "alloy-eips 0.3.6",
+ "alloy-genesis 0.3.6",
+ "alloy-json-rpc 0.3.6",
+ "alloy-network 0.3.6",
+ "alloy-provider 0.3.6",
+ "alloy-rpc-client 0.3.6",
+ "alloy-rpc-types 0.3.6",
+ "alloy-serde 0.3.6",
+ "alloy-transport 0.3.6",
+ "alloy-transport-http 0.3.6",
+]
+
 [[package]]
 name = "alloy-chains"
 version = "0.1.27"
@@ -136,13 +156,23 @@ dependencies = [
  "strum",
 ]
 
+[[package]]
+name = "alloy-compat"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bdc9136288101eb70d3b6baf9781ad810589fde773e356c5efa92cce3b9c6da"
+dependencies = [
+ "alloy-primitives 0.8.3",
+ "ethereum-types",
+]
+
 [[package]]
 name = "alloy-consensus"
 version = "0.1.1"
 source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939"
 dependencies = [
  "alloy-eips 0.1.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-serde 0.1.1",
  "c-kzg",
@@ -156,21 +186,48 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "04c309895995eaa4bfcc345f5515a39c7df9447798645cc8bf462b6c5bf1dc96"
 dependencies = [
  "alloy-eips 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-serde 0.2.1",
  "c-kzg",
  "serde",
 ]
 
+[[package]]
+name = "alloy-consensus"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1"
+dependencies = [
+ "alloy-eips 0.3.6",
+ "alloy-primitives 0.8.3",
+ "alloy-rlp",
+ "alloy-serde 0.3.6",
+ "c-kzg",
+ "serde",
+]
+
 [[package]]
 name = "alloy-core"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
+ "alloy-rlp",
+]
+
+[[package]]
+name = "alloy-core"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b095eb0533144b4497e84a9cc3e44a5c2e3754a3983c0376a55a2f9183a53e"
+dependencies = [
+ "alloy-dyn-abi 0.8.3",
+ "alloy-json-abi 0.8.3",
+ "alloy-primitives 0.8.3",
  "alloy-rlp",
+ "alloy-sol-types 0.8.3",
 ]
 
 [[package]]
@@ -179,24 +236,63 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df"
 dependencies = [
- "alloy-json-abi",
- "alloy-primitives",
- "alloy-sol-type-parser",
- "alloy-sol-types",
+ "alloy-json-abi 0.7.7",
+ "alloy-primitives 0.7.7",
+ "alloy-sol-type-parser 0.7.7",
+ "alloy-sol-types 0.7.7",
+ "const-hex",
+ "derive_more 0.99.18",
+ "itoa",
+ "serde",
+ "serde_json",
+ "winnow 0.6.18",
+]
+
+[[package]]
+name = "alloy-dyn-abi"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4004925bff5ba0a11739ae84dbb6601a981ea692f3bd45b626935ee90a6b8471"
+dependencies = [
+ "alloy-json-abi 0.8.3",
+ "alloy-primitives 0.8.3",
+ "alloy-sol-type-parser 0.8.12",
+ "alloy-sol-types 0.8.3",
  "const-hex",
- "derive_more",
  "itoa",
  "serde",
  "serde_json",
  "winnow 0.6.18",
 ]
 
+[[package]]
+name = "alloy-eip2930"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41"
+dependencies = [
+ "alloy-primitives 0.8.3",
+ "alloy-rlp",
+ "serde",
+]
+
+[[package]]
+name = "alloy-eip7702"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea59dc42102bc9a1905dc57901edc6dd48b9f38115df86c7d252acba70d71d04"
+dependencies = [
+ "alloy-primitives 0.8.3",
+ "alloy-rlp",
+ "serde",
+]
+
 [[package]]
 name = "alloy-eips"
 version = "0.1.1"
 source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-serde 0.1.1",
  "c-kzg",
@@ -211,36 +307,77 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9431c99a3b3fe606ede4b3d4043bdfbcb780c45b8d8d226c3804e2b75cfbe68"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-serde 0.2.1",
  "c-kzg",
- "derive_more",
+ "derive_more 0.99.18",
  "k256",
  "once_cell",
  "serde",
  "sha2 0.10.8",
 ]
 
+[[package]]
+name = "alloy-eips"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f"
+dependencies = [
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "alloy-primitives 0.8.3",
+ "alloy-rlp",
+ "alloy-serde 0.3.6",
+ "c-kzg",
+ "derive_more 1.0.0",
+ "once_cell",
+ "serde",
+ "sha2 0.10.8",
+]
+
 [[package]]
 name = "alloy-genesis"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "79614dfe86144328da11098edcc7bc1a3f25ad8d3134a9eb9e857e06f0d9840d"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-serde 0.2.1",
  "serde",
 ]
 
+[[package]]
+name = "alloy-genesis"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a7a18afb0b318616b6b2b0e2e7ac5529d32a966c673b48091c9919e284e6aca"
+dependencies = [
+ "alloy-primitives 0.8.3",
+ "alloy-serde 0.3.6",
+ "serde",
+]
+
 [[package]]
 name = "alloy-json-abi"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372"
 dependencies = [
- "alloy-primitives",
- "alloy-sol-type-parser",
+ "alloy-primitives 0.7.7",
+ "alloy-sol-type-parser 0.7.7",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "alloy-json-abi"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9996daf962fd0a90d3c93b388033228865953b92de7bb1959b891d78750a4091"
+dependencies = [
+ "alloy-primitives 0.8.3",
+ "alloy-sol-type-parser 0.8.12",
  "serde",
  "serde_json",
 ]
@@ -250,7 +387,7 @@ name = "alloy-json-rpc"
 version = "0.1.1"
 source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "serde",
  "serde_json",
  "thiserror",
@@ -263,8 +400,22 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57e2865c4c3bb4cdad3f0d9ec1ab5c0c657ba69a375651bd35e32fb6c180ccc2"
 dependencies = [
- "alloy-primitives",
- "alloy-sol-types",
+ "alloy-primitives 0.7.7",
+ "alloy-sol-types 0.7.7",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+]
+
+[[package]]
+name = "alloy-json-rpc"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab"
+dependencies = [
+ "alloy-primitives 0.8.3",
+ "alloy-sol-types 0.8.3",
  "serde",
  "serde_json",
  "thiserror",
@@ -279,11 +430,11 @@ dependencies = [
  "alloy-consensus 0.1.1",
  "alloy-eips 0.1.1",
  "alloy-json-rpc 0.1.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types-eth 0.1.1",
  "alloy-serde 0.1.1",
  "alloy-signer 0.1.1",
- "alloy-sol-types",
+ "alloy-sol-types 0.7.7",
  "async-trait",
  "auto_impl",
  "futures-utils-wasm",
@@ -299,12 +450,33 @@ dependencies = [
  "alloy-consensus 0.2.1",
  "alloy-eips 0.2.1",
  "alloy-json-rpc 0.2.1",
- "alloy-network-primitives",
- "alloy-primitives",
+ "alloy-network-primitives 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types-eth 0.2.1",
  "alloy-serde 0.2.1",
  "alloy-signer 0.2.1",
- "alloy-sol-types",
+ "alloy-sol-types 0.7.7",
+ "async-trait",
+ "auto_impl",
+ "futures-utils-wasm",
+ "thiserror",
+]
+
+[[package]]
+name = "alloy-network"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb3705ce7d8602132bcf5ac7a1dd293a42adc2f183abf5907c30ac535ceca049"
+dependencies = [
+ "alloy-consensus 0.3.6",
+ "alloy-eips 0.3.6",
+ "alloy-json-rpc 0.3.6",
+ "alloy-network-primitives 0.3.6",
+ "alloy-primitives 0.8.3",
+ "alloy-rpc-types-eth 0.3.6",
+ "alloy-serde 0.3.6",
+ "alloy-signer 0.3.6",
+ "alloy-sol-types 0.8.3",
  "async-trait",
  "auto_impl",
  "futures-utils-wasm",
@@ -317,11 +489,23 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec9d5a0f9170b10988b6774498a022845e13eda94318440d17709d50687f67f9"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-serde 0.2.1",
  "serde",
 ]
 
+[[package]]
+name = "alloy-network-primitives"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3"
+dependencies = [
+ "alloy-eips 0.3.6",
+ "alloy-primitives 0.8.3",
+ "alloy-serde 0.3.6",
+ "serde",
+]
+
 [[package]]
 name = "alloy-primitives"
 version = "0.7.7"
@@ -332,7 +516,7 @@ dependencies = [
  "bytes",
  "cfg-if",
  "const-hex",
- "derive_more",
+ "derive_more 0.99.18",
  "getrandom 0.2.15",
  "hex-literal",
  "itoa",
@@ -345,6 +529,28 @@ dependencies = [
  "tiny-keccak",
 ]
 
+[[package]]
+name = "alloy-primitives"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "411aff151f2a73124ee473708e82ed51b2535f68928b6a1caa8bc1246ae6f7cd"
+dependencies = [
+ "alloy-rlp",
+ "bytes",
+ "cfg-if",
+ "const-hex",
+ "derive_more 1.0.0",
+ "hex-literal",
+ "itoa",
+ "k256",
+ "keccak-asm",
+ "proptest",
+ "rand 0.8.5",
+ "ruint",
+ "serde",
+ "tiny-keccak",
+]
+
 [[package]]
 name = "alloy-provider"
 version = "0.1.1"
@@ -355,7 +561,7 @@ dependencies = [
  "alloy-eips 0.1.1",
  "alloy-json-rpc 0.1.1",
  "alloy-network 0.1.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-client 0.1.1",
  "alloy-rpc-types-eth 0.1.1",
  "alloy-rpc-types-trace 0.1.1",
@@ -388,8 +594,8 @@ dependencies = [
  "alloy-eips 0.2.1",
  "alloy-json-rpc 0.2.1",
  "alloy-network 0.2.1",
- "alloy-network-primitives",
- "alloy-primitives",
+ "alloy-network-primitives 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-pubsub",
  "alloy-rpc-client 0.2.1",
  "alloy-rpc-types-eth 0.2.1",
@@ -412,6 +618,41 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "alloy-provider"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "927f708dd457ed63420400ee5f06945df9632d5d101851952056840426a10dc5"
+dependencies = [
+ "alloy-chains",
+ "alloy-consensus 0.3.6",
+ "alloy-eips 0.3.6",
+ "alloy-json-rpc 0.3.6",
+ "alloy-network 0.3.6",
+ "alloy-network-primitives 0.3.6",
+ "alloy-primitives 0.8.3",
+ "alloy-rpc-client 0.3.6",
+ "alloy-rpc-types-eth 0.3.6",
+ "alloy-rpc-types-trace 0.3.6",
+ "alloy-transport 0.3.6",
+ "alloy-transport-http 0.3.6",
+ "async-stream",
+ "async-trait",
+ "auto_impl",
+ "dashmap 6.0.1",
+ "futures",
+ "futures-utils-wasm",
+ "lru",
+ "pin-project",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "alloy-pubsub"
 version = "0.2.1"
@@ -419,7 +660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f5da2c55cbaf229bad3c5f8b00b5ab66c74ef093e5f3a753d874cfecf7d2281"
 dependencies = [
  "alloy-json-rpc 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-transport 0.2.1",
  "bimap",
  "futures",
@@ -427,7 +668,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -468,7 +709,7 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "url",
 ]
@@ -480,7 +721,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b38e3ffdb285df5d9f60cb988d336d9b8e3505acb78750c3bc60336a7af41d3"
 dependencies = [
  "alloy-json-rpc 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-pubsub",
  "alloy-transport 0.2.1",
  "alloy-transport-http 0.2.1",
@@ -492,7 +733,28 @@ dependencies = [
  "serde_json",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "alloy-rpc-client"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5"
+dependencies = [
+ "alloy-json-rpc 0.3.6",
+ "alloy-transport 0.3.6",
+ "alloy-transport-http 0.3.6",
+ "futures",
+ "pin-project",
+ "reqwest",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-stream",
+ "tower 0.5.1",
  "tracing",
  "url",
 ]
@@ -520,14 +782,26 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "alloy-rpc-types"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64333d639f2a0cf73491813c629a405744e16343a4bc5640931be707c345ecc5"
+dependencies = [
+ "alloy-rpc-types-eth 0.3.6",
+ "alloy-rpc-types-trace 0.3.6",
+ "alloy-serde 0.3.6",
+ "serde",
+]
+
 [[package]]
 name = "alloy-rpc-types-admin"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbfb8b2c2eea8acd5580c9804a1ee58038938b16efb24eec09c3005f65b0e4ad"
 dependencies = [
- "alloy-genesis",
- "alloy-primitives",
+ "alloy-genesis 0.2.1",
+ "alloy-primitives 0.7.7",
  "serde",
  "serde_json",
 ]
@@ -538,7 +812,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52ab6509cd38b2e8c8da726e0f61c1e314a81df06a38d37ddec8bced3f8d25ed"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-serde 0.2.1",
  "serde",
 ]
@@ -550,7 +824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c8a24bcff4f9691d7a4971b43e5da46aa7b4ce22ed7789796612dc1eed220983"
 dependencies = [
  "alloy-eips 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types-engine",
  "serde",
  "serde_with",
@@ -565,7 +839,7 @@ checksum = "ff63f51b2fb2f547df5218527fd0653afb1947bf7fead5b3ce58c75d170b30f7"
 dependencies = [
  "alloy-consensus 0.2.1",
  "alloy-eips 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-rpc-types-eth 0.2.1",
  "alloy-serde 0.2.1",
@@ -583,10 +857,10 @@ source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1
 dependencies = [
  "alloy-consensus 0.1.1",
  "alloy-eips 0.1.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-serde 0.1.1",
- "alloy-sol-types",
+ "alloy-sol-types 0.7.7",
  "itertools 0.13.0",
  "serde",
  "serde_json",
@@ -601,11 +875,11 @@ checksum = "81e18424d962d7700a882fe423714bd5b9dde74c7a7589d4255ea64068773aef"
 dependencies = [
  "alloy-consensus 0.2.1",
  "alloy-eips 0.2.1",
- "alloy-network-primitives",
- "alloy-primitives",
+ "alloy-network-primitives 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-serde 0.2.1",
- "alloy-sol-types",
+ "alloy-sol-types 0.7.7",
  "itertools 0.13.0",
  "jsonrpsee-types",
  "serde",
@@ -613,6 +887,27 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "alloy-rpc-types-eth"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83aa984386deda02482660aa31cb8ca1e63d533f1c31a52d7d181ac5ec68e9b8"
+dependencies = [
+ "alloy-consensus 0.3.6",
+ "alloy-eips 0.3.6",
+ "alloy-network-primitives 0.3.6",
+ "alloy-primitives 0.8.3",
+ "alloy-rlp",
+ "alloy-serde 0.3.6",
+ "alloy-sol-types 0.8.3",
+ "cfg-if",
+ "derive_more 1.0.0",
+ "hashbrown 0.14.5",
+ "itertools 0.13.0",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "alloy-rpc-types-mev"
 version = "0.2.1"
@@ -620,7 +915,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a0593a17b4b009598eb3e8380e298c53bd5581f3f37d85a38e6a34881c90ea1"
 dependencies = [
  "alloy-eips 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-serde 0.2.1",
  "serde",
  "serde_json",
@@ -631,7 +926,7 @@ name = "alloy-rpc-types-trace"
 version = "0.1.1"
 source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types-eth 0.1.1",
  "alloy-serde 0.1.1",
  "serde",
@@ -644,7 +939,7 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a86eeb49ea0cc79f249faa1d35c20541bb1c317a59b5962cb07b1890355b0064"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types-eth 0.2.1",
  "alloy-serde 0.2.1",
  "serde",
@@ -652,13 +947,27 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "alloy-rpc-types-trace"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98db35cd42c90b484377e6bc44d95377a7a38a5ebee996e67754ac0446d542ab"
+dependencies = [
+ "alloy-primitives 0.8.3",
+ "alloy-rpc-types-eth 0.3.6",
+ "alloy-serde 0.3.6",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
 [[package]]
 name = "alloy-rpc-types-txpool"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2342fed8175642b15a37a51f8729b05b2469281fbeb816f0ccbb0087e2dd74a"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types-eth 0.2.1",
  "alloy-serde 0.2.1",
  "serde",
@@ -669,7 +978,7 @@ name = "alloy-serde"
 version = "0.1.1"
 source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "serde",
  "serde_json",
 ]
@@ -680,7 +989,18 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e33feda6a53e6079895aed1d08dcb98a1377b000d80d16370fbbdb8155d547ef"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "alloy-serde"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa"
+dependencies = [
+ "alloy-primitives 0.8.3",
  "serde",
  "serde_json",
 ]
@@ -690,7 +1010,7 @@ name = "alloy-signer"
 version = "0.1.1"
 source = "git+https://github.com/alloy-rs/alloy?tag=v0.1.1#f04a704ac5be9cb21b4b1f6c35f925607f1aa939"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "async-trait",
  "auto_impl",
  "elliptic-curve",
@@ -704,7 +1024,21 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "740a25b92e849ed7b0fa013951fe2f64be9af1ad5abe805037b44fb7770c5c47"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
+ "async-trait",
+ "auto_impl",
+ "elliptic-curve",
+ "k256",
+ "thiserror",
+]
+
+[[package]]
+name = "alloy-signer"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0"
+dependencies = [
+ "alloy-primitives 0.8.3",
  "async-trait",
  "auto_impl",
  "elliptic-curve",
@@ -718,21 +1052,35 @@ version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09"
 dependencies = [
- "alloy-sol-macro-expander",
- "alloy-sol-macro-input",
+ "alloy-sol-macro-expander 0.7.7",
+ "alloy-sol-macro-input 0.7.7",
  "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn 2.0.74",
 ]
 
+[[package]]
+name = "alloy-sol-macro"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9343289b4a7461ed8bab8618504c995c049c082b70c7332efd7b32125633dc05"
+dependencies = [
+ "alloy-sol-macro-expander 0.8.12",
+ "alloy-sol-macro-input 0.8.12",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+]
+
 [[package]]
 name = "alloy-sol-macro-expander"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525"
 dependencies = [
- "alloy-sol-macro-input",
+ "alloy-sol-macro-input 0.7.7",
  "const-hex",
  "heck 0.5.0",
  "indexmap 2.4.0",
@@ -740,7 +1088,25 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.74",
- "syn-solidity",
+ "syn-solidity 0.7.7",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "alloy-sol-macro-expander"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4222d70bec485ceccc5d8fd4f2909edd65b5d5e43d4aca0b5dcee65d519ae98f"
+dependencies = [
+ "alloy-sol-macro-input 0.8.12",
+ "const-hex",
+ "heck 0.5.0",
+ "indexmap 2.4.0",
+ "proc-macro-error2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+ "syn-solidity 0.8.12",
  "tiny-keccak",
 ]
 
@@ -756,7 +1122,22 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.74",
- "syn-solidity",
+ "syn-solidity 0.7.7",
+]
+
+[[package]]
+name = "alloy-sol-macro-input"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e17f2677369571b976e51ea1430eb41c3690d344fef567b840bfc0b01b6f83a"
+dependencies = [
+ "const-hex",
+ "dunce",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+ "syn-solidity 0.8.12",
 ]
 
 [[package]]
@@ -769,14 +1150,37 @@ dependencies = [
  "winnow 0.6.18",
 ]
 
+[[package]]
+name = "alloy-sol-type-parser"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa64d80ae58ffaafdff9d5d84f58d03775f66c84433916dc9a64ed16af5755da"
+dependencies = [
+ "serde",
+ "winnow 0.6.18",
+]
+
 [[package]]
 name = "alloy-sol-types"
 version = "0.7.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7"
 dependencies = [
- "alloy-primitives",
- "alloy-sol-macro",
+ "alloy-primitives 0.7.7",
+ "alloy-sol-macro 0.7.7",
+ "const-hex",
+ "serde",
+]
+
+[[package]]
+name = "alloy-sol-types"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1eb88e4da0a1b697ed6a9f811fdba223cf4d5c21410804fd1707836af73a462b"
+dependencies = [
+ "alloy-json-abi 0.8.3",
+ "alloy-primitives 0.8.3",
+ "alloy-sol-macro 0.8.12",
  "const-hex",
  "serde",
 ]
@@ -794,7 +1198,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "url",
 ]
 
@@ -812,7 +1216,26 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "tower",
+ "tower 0.4.13",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "alloy-transport"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33616b2edf7454302a1d48084db185e52c309f73f6c10be99b0fe39354b3f1e9"
+dependencies = [
+ "alloy-json-rpc 0.3.6",
+ "base64 0.22.1",
+ "futures-util",
+ "futures-utils-wasm",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tokio",
+ "tower 0.5.1",
  "tracing",
  "url",
 ]
@@ -826,7 +1249,7 @@ dependencies = [
  "alloy-transport 0.1.1",
  "reqwest",
  "serde_json",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "url",
 ]
@@ -841,7 +1264,22 @@ dependencies = [
  "alloy-transport 0.2.1",
  "reqwest",
  "serde_json",
- "tower",
+ "tower 0.4.13",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "alloy-transport-http"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49"
+dependencies = [
+ "alloy-json-rpc 0.3.6",
+ "alloy-transport 0.3.6",
+ "reqwest",
+ "serde_json",
+ "tower 0.5.1",
  "tracing",
  "url",
 ]
@@ -870,9 +1308,9 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03704f265cbbb943b117ecb5055fd46e8f41e7dc8a58b1aed20bcd40ace38c15"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
- "derive_more",
+ "derive_more 0.99.18",
  "hashbrown 0.14.5",
  "nybbles",
  "serde",
@@ -1900,9 +2338,9 @@ dependencies = [
 [[package]]
 name = "compat"
 version = "0.1.0"
-source = "git+https://github.com/fractal-zkp/zk_evm.git?branch=zeth#0e552933304d801b69262601118a901b6fe14aac"
+source = "git+https://github.com/fractal-zkp/zk_evm.git?branch=zeth#585cfce31ee389e50567e8df2fcd05a3c52beeff"
 dependencies = [
- "alloy",
+ "alloy 0.1.1",
  "primitive-types 0.12.2",
 ]
 
@@ -2407,6 +2845,27 @@ dependencies = [
  "syn 2.0.74",
 ]
 
+[[package]]
+name = "derive_more"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
+dependencies = [
+ "derive_more-impl",
+]
+
+[[package]]
+name = "derive_more-impl"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+ "unicode-xid",
+]
+
 [[package]]
 name = "digest"
 version = "0.9.0"
@@ -2759,16 +3218,22 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 [[package]]
 name = "evm_arithmetization"
 version = "0.4.0"
-source = "git+https://github.com/fractal-zkp/zk_evm.git?branch=zeth#0e552933304d801b69262601118a901b6fe14aac"
+source = "git+https://github.com/0xPolygonZero/zk_evm.git#dd17ff3d61f03c8eef73c41b2931575fb1de8082"
 dependencies = [
+ "alloy 0.3.6",
+ "alloy-compat",
  "anyhow",
+ "bitvec",
  "bytes",
+ "copyvec",
+ "either",
  "env_logger",
  "ethereum-types",
  "hashbrown 0.14.5",
  "hex-literal",
  "itertools 0.13.0",
  "keccak-hash 0.10.0",
+ "line-index",
  "log",
  "mpt_trie",
  "num",
@@ -2777,18 +3242,27 @@ dependencies = [
  "pest",
  "pest_derive",
  "plonky2",
- "plonky2_maybe_rayon",
+ "plonky2_maybe_rayon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "plonky2_util",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rlp",
  "rlp-derive",
  "serde",
+ "serde-big-array",
  "serde_json",
  "sha2 0.10.8",
+ "smt_trie",
  "starky",
  "static_assertions",
+ "thiserror",
  "tiny-keccak",
+ "tokio",
+ "tower-lsp",
+ "tracing",
+ "u4",
+ "url",
+ "zk_evm_common",
  "zk_evm_proc_macro",
 ]
 
@@ -3473,7 +3947,7 @@ dependencies = [
  "pin-project-lite",
  "socket2 0.5.7",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tower-service",
  "tracing",
 ]
@@ -3997,7 +4471,7 @@ dependencies = [
  "serde_json",
  "thiserror",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "url",
 ]
@@ -4038,7 +4512,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -4410,6 +4884,16 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "line-index"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e27e0ed5a392a7f5ba0b3808a2afccff16c64933312c84b57618b49d1209bd2"
+dependencies = [
+ "nohash-hasher",
+ "text-size",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.6"
@@ -4472,6 +4956,19 @@ dependencies = [
  "linked-hash-map",
 ]
 
+[[package]]
+name = "lsp-types"
+version = "0.94.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66bfd44a06ae10647fe3f8214762e9369fd4248df1350924b4ef9e770a85ea1"
+dependencies = [
+ "bitflags 1.3.2",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "url",
+]
+
 [[package]]
 name = "lz4_flex"
 version = "0.11.3"
@@ -4679,7 +5176,7 @@ checksum = "1fafa6961cabd9c63bcd77a45d7e3b7f3b552b70417831fb0f56db717e72407e"
 [[package]]
 name = "mpt_trie"
 version = "0.4.1"
-source = "git+https://github.com/fractal-zkp/zk_evm.git?branch=zeth#0e552933304d801b69262601118a901b6fe14aac"
+source = "git+https://github.com/0xPolygonZero/zk_evm.git#dd17ff3d61f03c8eef73c41b2931575fb1de8082"
 dependencies = [
  "bytes",
  "enum-as-inner",
@@ -4780,6 +5277,12 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "nohash-hasher"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451"
+
 [[package]]
 name = "nom"
 version = "7.1.3"
@@ -5354,8 +5857,7 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 [[package]]
 name = "plonky2"
 version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85f26b090b989aebdeaf6a4eed748c1fbcabf67e7273a22e4e0c877b63846d0f"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=2488cdacd49ede15737bc1172546d82e9521b79b#2488cdacd49ede15737bc1172546d82e9521b79b"
 dependencies = [
  "ahash",
  "anyhow",
@@ -5366,7 +5868,7 @@ dependencies = [
  "log",
  "num",
  "plonky2_field",
- "plonky2_maybe_rayon",
+ "plonky2_maybe_rayon 0.2.0 (git+https://github.com/0xPolygonZero/plonky2.git?rev=2488cdacd49ede15737bc1172546d82e9521b79b)",
  "plonky2_util",
  "rand 0.8.5",
  "rand_chacha 0.3.1",
@@ -5379,8 +5881,7 @@ dependencies = [
 [[package]]
 name = "plonky2_field"
 version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a1dca60ad900d81b1fe2df3d0b88d43345988e2935e6709176e96573f4bcf5d"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=2488cdacd49ede15737bc1172546d82e9521b79b#2488cdacd49ede15737bc1172546d82e9521b79b"
 dependencies = [
  "anyhow",
  "itertools 0.11.0",
@@ -5401,11 +5902,18 @@ dependencies = [
  "rayon",
 ]
 
+[[package]]
+name = "plonky2_maybe_rayon"
+version = "0.2.0"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=2488cdacd49ede15737bc1172546d82e9521b79b#2488cdacd49ede15737bc1172546d82e9521b79b"
+dependencies = [
+ "rayon",
+]
+
 [[package]]
 name = "plonky2_util"
 version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16136f5f3019c1e83035af76cccddd56d789a5e2933306270185c3f99f12259"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=2488cdacd49ede15737bc1172546d82e9521b79b#2488cdacd49ede15737bc1172546d82e9521b79b"
 
 [[package]]
 name = "pollster"
@@ -5502,6 +6010,28 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.86"
@@ -5920,7 +6450,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.1",
  "tokio",
  "tokio-native-tls",
  "tokio-rustls",
@@ -6157,7 +6687,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "auto_impl",
- "derive_more",
+ "derive_more 0.99.18",
  "metrics",
  "parking_lot 0.12.3",
  "pin-project",
@@ -6180,11 +6710,11 @@ source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f633060
 dependencies = [
  "alloy-chains",
  "alloy-eips 0.2.1",
- "alloy-genesis",
- "alloy-primitives",
+ "alloy-genesis 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-trie",
  "auto_impl",
- "derive_more",
+ "derive_more 0.99.18",
  "once_cell",
  "reth-ethereum-forks",
  "reth-network-peers",
@@ -6264,7 +6794,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "alloy-eips 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "eyre",
  "libc",
  "rand 0.8.5",
@@ -6280,8 +6810,8 @@ source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f633060
 dependencies = [
  "alloy-consensus 0.2.1",
  "alloy-eips 0.2.1",
- "alloy-genesis",
- "alloy-primitives",
+ "alloy-genesis 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-trie",
  "bytes",
  "modular-bitfield",
@@ -6362,7 +6892,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "bytes",
- "derive_more",
+ "derive_more 0.99.18",
  "eyre",
  "metrics",
  "page_size",
@@ -6392,7 +6922,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "bytes",
- "derive_more",
+ "derive_more 0.99.18",
  "metrics",
  "modular-bitfield",
  "parity-scale-codec",
@@ -6411,7 +6941,7 @@ name = "reth-db-common"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-genesis",
+ "alloy-genesis 0.2.1",
  "boyer-moore-magiclen",
  "eyre",
  "reth-chainspec",
@@ -6437,7 +6967,7 @@ name = "reth-discv4"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "discv5",
  "enr",
@@ -6461,9 +6991,9 @@ name = "reth-discv5"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
- "derive_more",
+ "derive_more 0.99.18",
  "discv5",
  "enr",
  "futures",
@@ -6487,7 +7017,7 @@ name = "reth-dns-discovery"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "data-encoding",
  "enr",
  "linked_hash_set",
@@ -6537,7 +7067,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "aes 0.8.4",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "block-padding",
  "byteorder",
@@ -6681,7 +7211,7 @@ source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f633060
 dependencies = [
  "alloy-rlp",
  "bytes",
- "derive_more",
+ "derive_more 0.99.18",
  "futures",
  "pin-project",
  "reth-chainspec",
@@ -6705,10 +7235,10 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "alloy-chains",
- "alloy-genesis",
+ "alloy-genesis 0.2.1",
  "alloy-rlp",
  "bytes",
- "derive_more",
+ "derive_more 0.99.18",
  "reth-chainspec",
  "reth-codecs-derive",
  "reth-primitives",
@@ -6751,7 +7281,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "alloy-chains",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "auto_impl",
  "crc",
@@ -6815,7 +7345,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "alloy-eips 0.2.1",
- "alloy-sol-types",
+ "alloy-sol-types 0.7.7",
  "reth-chainspec",
  "reth-ethereum-consensus",
  "reth-ethereum-forks",
@@ -6833,7 +7363,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "alloy-eips 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "nybbles",
  "reth-consensus",
@@ -6886,7 +7416,7 @@ name = "reth-exex-types"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "reth-provider",
 ]
 
@@ -6917,7 +7447,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -6929,7 +7459,7 @@ dependencies = [
  "bitflags 2.6.0",
  "byteorder",
  "dashmap 6.0.1",
- "derive_more",
+ "derive_more 0.99.18",
  "indexmap 2.4.0",
  "parking_lot 0.12.3",
  "reth-mdbx-sys",
@@ -6974,7 +7504,7 @@ name = "reth-net-banlist"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
 ]
 
 [[package]]
@@ -6997,7 +7527,7 @@ dependencies = [
  "alloy-rlp",
  "aquamarine",
  "auto_impl",
- "derive_more",
+ "derive_more 0.99.18",
  "discv5",
  "enr",
  "futures",
@@ -7043,10 +7573,10 @@ name = "reth-network-api"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types-admin",
  "auto_impl",
- "derive_more",
+ "derive_more 0.99.18",
  "enr",
  "futures",
  "reth-eth-wire-types",
@@ -7084,7 +7614,7 @@ name = "reth-network-peers"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "enr",
  "secp256k1",
@@ -7117,7 +7647,7 @@ dependencies = [
  "anyhow",
  "bincode",
  "cuckoofilter",
- "derive_more",
+ "derive_more 0.99.18",
  "lz4_flex",
  "memmap2",
  "ph",
@@ -7207,11 +7737,11 @@ name = "reth-node-core"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-genesis",
+ "alloy-genesis 0.2.1",
  "alloy-rpc-types-engine",
  "clap",
  "const_format",
- "derive_more",
+ "derive_more 0.99.18",
  "dirs-next",
  "eyre",
  "futures",
@@ -7315,7 +7845,7 @@ dependencies = [
  "reth-tasks",
  "tikv-jemalloc-ctl",
  "tokio",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "vergen",
 ]
@@ -7380,13 +7910,13 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "alloy-eips 0.2.1",
- "alloy-genesis",
- "alloy-primitives",
+ "alloy-genesis 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-rpc-types 0.2.1",
  "bytes",
  "c-kzg",
- "derive_more",
+ "derive_more 0.99.18",
  "k256",
  "modular-bitfield",
  "once_cell",
@@ -7411,13 +7941,13 @@ source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f633060
 dependencies = [
  "alloy-consensus 0.2.1",
  "alloy-eips 0.2.1",
- "alloy-genesis",
- "alloy-primitives",
+ "alloy-genesis 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-rpc-types-eth 0.2.1",
  "byteorder",
  "bytes",
- "derive_more",
+ "derive_more 0.99.18",
  "modular-bitfield",
  "reth-codecs",
  "revm-primitives",
@@ -7468,7 +7998,7 @@ name = "reth-prune"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "itertools 0.13.0",
  "metrics",
  "rayon",
@@ -7494,9 +8024,9 @@ name = "reth-prune-types"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "bytes",
- "derive_more",
+ "derive_more 0.99.18",
  "modular-bitfield",
  "reth-codecs",
  "serde",
@@ -7524,12 +8054,12 @@ name = "reth-rpc"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-dyn-abi",
- "alloy-genesis",
- "alloy-primitives",
+ "alloy-dyn-abi 0.7.7",
+ "alloy-genesis 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "async-trait",
- "derive_more",
+ "derive_more 0.99.18",
  "futures",
  "http",
  "http-body",
@@ -7569,7 +8099,7 @@ dependencies = [
  "thiserror",
  "tokio",
  "tokio-stream",
- "tower",
+ "tower 0.4.13",
  "tracing",
  "tracing-futures",
 ]
@@ -7613,7 +8143,7 @@ dependencies = [
  "reth-transaction-pool",
  "serde",
  "thiserror",
- "tower",
+ "tower 0.4.13",
  "tower-http",
  "tracing",
 ]
@@ -7651,7 +8181,7 @@ name = "reth-rpc-eth-api"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-dyn-abi",
+ "alloy-dyn-abi 0.7.7",
  "async-trait",
  "auto_impl",
  "dyn-clone",
@@ -7685,8 +8215,8 @@ name = "reth-rpc-eth-types"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-sol-types",
- "derive_more",
+ "alloy-sol-types 0.7.7",
+ "derive_more 0.99.18",
  "futures",
  "jsonrpsee-core",
  "jsonrpsee-types",
@@ -7727,7 +8257,7 @@ dependencies = [
  "http",
  "jsonrpsee-http-client",
  "pin-project",
- "tower",
+ "tower 0.4.13",
  "tracing",
 ]
 
@@ -7736,7 +8266,7 @@ name = "reth-rpc-server-types"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "jsonrpsee-core",
  "jsonrpsee-types",
  "reth-errors",
@@ -7752,7 +8282,7 @@ name = "reth-rpc-types"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types 0.2.1",
  "alloy-rpc-types-admin",
  "alloy-rpc-types-anvil",
@@ -7816,7 +8346,7 @@ name = "reth-stages-api"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "aquamarine",
  "auto_impl",
  "futures-util",
@@ -7843,7 +8373,7 @@ name = "reth-stages-types"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "bytes",
  "modular-bitfield",
  "reth-codecs",
@@ -7856,7 +8386,7 @@ name = "reth-static-file"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "parking_lot 0.12.3",
  "rayon",
  "reth-db",
@@ -7876,9 +8406,9 @@ name = "reth-static-file-types"
 version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "clap",
- "derive_more",
+ "derive_more 0.99.18",
  "serde",
  "strum",
 ]
@@ -7993,7 +8523,7 @@ source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f633060
 dependencies = [
  "alloy-rlp",
  "auto_impl",
- "derive_more",
+ "derive_more 0.99.18",
  "itertools 0.13.0",
  "metrics",
  "rayon",
@@ -8013,12 +8543,12 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "alloy-consensus 0.2.1",
- "alloy-genesis",
- "alloy-primitives",
+ "alloy-genesis 0.2.1",
+ "alloy-primitives 0.7.7",
  "alloy-rlp",
  "alloy-trie",
  "bytes",
- "derive_more",
+ "derive_more 0.99.18",
  "itertools 0.13.0",
  "nybbles",
  "reth-codecs",
@@ -8034,7 +8564,7 @@ source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f633060
 dependencies = [
  "alloy-rlp",
  "auto_impl",
- "derive_more",
+ "derive_more 0.99.18",
  "itertools 0.13.0",
  "metrics",
  "rayon",
@@ -8057,7 +8587,7 @@ version = "1.0.5"
 source = "git+https://github.com/fractal-zkp/reth.git?branch=zeth#5eacfa7f6330604fb5b4cd62ccbea35455abf878"
 dependencies = [
  "alloy-rlp",
- "derive_more",
+ "derive_more 0.99.18",
  "itertools 0.13.0",
  "metrics",
  "rayon",
@@ -8094,9 +8624,9 @@ name = "revm-inspectors"
 version = "0.5.6"
 source = "git+https://github.com/fractal-zkp/revm-inspectors.git?branch=zeth#e5fd7d9b570d79766f90f837fc6fec0dada64ecf"
 dependencies = [
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "alloy-rpc-types 0.2.1",
- "alloy-sol-types",
+ "alloy-sol-types 0.7.7",
  "anstyle",
  "boa_engine",
  "boa_gc",
@@ -8139,13 +8669,13 @@ version = "8.0.0"
 source = "git+https://github.com/fractal-zkp/revm.git?branch=zeth#8109dc49bfa6c21113eee07557e6e8cabde4d615"
 dependencies = [
  "alloy-eips 0.2.1",
- "alloy-primitives",
+ "alloy-primitives 0.7.7",
  "auto_impl",
  "bitflags 2.6.0",
  "bitvec",
  "c-kzg",
  "cfg-if",
- "derive_more",
+ "derive_more 0.99.18",
  "dyn-clone",
  "enumn",
  "hashbrown 0.14.5",
@@ -8619,6 +9149,15 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde-big-array"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_bytes"
 version = "0.11.15"
@@ -8652,6 +9191,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_repr"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+]
+
 [[package]]
 name = "serde_spanned"
 version = "0.6.7"
@@ -8900,10 +9450,9 @@ dependencies = [
 [[package]]
 name = "smt_trie"
 version = "0.1.1"
-source = "git+https://github.com/fractal-zkp/zk_evm.git?branch=zeth#0e552933304d801b69262601118a901b6fe14aac"
+source = "git+https://github.com/0xPolygonZero/zk_evm.git#dd17ff3d61f03c8eef73c41b2931575fb1de8082"
 dependencies = [
- "ethereum-types",
- "hex-literal",
+ "alloy 0.3.6",
  "plonky2",
  "rand 0.8.5",
  "serde",
@@ -9205,8 +9754,7 @@ checksum = "8acdd7dbfcfb5dd6e46c63512508bf71c2043f70b8f143813ad75cb5e8a589f2"
 [[package]]
 name = "starky"
 version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a8480ca5b8eedf83ad070a780783b4e21a56c6ef66b4c0d1b7520b72bdfda1b"
+source = "git+https://github.com/0xPolygonZero/plonky2.git?rev=2488cdacd49ede15737bc1172546d82e9521b79b#2488cdacd49ede15737bc1172546d82e9521b79b"
 dependencies = [
  "ahash",
  "anyhow",
@@ -9215,8 +9763,9 @@ dependencies = [
  "log",
  "num-bigint",
  "plonky2",
- "plonky2_maybe_rayon",
+ "plonky2_maybe_rayon 0.2.0 (git+https://github.com/0xPolygonZero/plonky2.git?rev=2488cdacd49ede15737bc1172546d82e9521b79b)",
  "plonky2_util",
+ "serde",
 ]
 
 [[package]]
@@ -9327,6 +9876,24 @@ dependencies = [
  "syn 2.0.74",
 ]
 
+[[package]]
+name = "syn-solidity"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f76fe0a3e1476bdaa0775b9aec5b869ed9520c2b2fedfe9c6df3618f8ea6290b"
+dependencies = [
+ "paste",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.1"
@@ -9377,6 +9944,12 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
+[[package]]
+name = "text-size"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f18aa187839b2bdb1ad2fa35ead8c4c2976b64e4363c386d45ac0f7ee85c9233"
+
 [[package]]
 name = "thin-vec"
 version = "0.2.13"
@@ -9700,6 +10273,20 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "tower"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 0.1.2",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "tower-http"
 version = "0.5.2"
@@ -9724,7 +10311,7 @@ dependencies = [
  "pin-project-lite",
  "tokio",
  "tokio-util",
- "tower",
+ "tower 0.4.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -9737,6 +10324,40 @@ version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
+[[package]]
+name = "tower-lsp"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4ba052b54a6627628d9b3c34c176e7eda8359b7da9acd497b9f20998d118508"
+dependencies = [
+ "async-trait",
+ "auto_impl",
+ "bytes",
+ "dashmap 5.5.3",
+ "futures",
+ "httparse",
+ "lsp-types",
+ "memchr",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-util",
+ "tower 0.4.13",
+ "tower-lsp-macros",
+ "tracing",
+]
+
+[[package]]
+name = "tower-lsp-macros"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84fd902d4e0b9a4b27f2f440108dc034e1758628a9b702f8ec61ad66355422fa"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.74",
+]
+
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@@ -9746,8 +10367,10 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 [[package]]
 name = "trace_decoder"
 version = "0.6.0"
-source = "git+https://github.com/fractal-zkp/zk_evm.git?branch=zeth#0e552933304d801b69262601118a901b6fe14aac"
+source = "git+https://github.com/0xPolygonZero/zk_evm.git#dd17ff3d61f03c8eef73c41b2931575fb1de8082"
 dependencies = [
+ "alloy 0.3.6",
+ "alloy-compat",
  "anyhow",
  "bitflags 2.6.0",
  "bitvec",
@@ -10134,6 +10757,7 @@ dependencies = [
  "form_urlencoded",
  "idna 0.5.0",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -10821,6 +11445,8 @@ dependencies = [
 name = "zeth"
 version = "0.1.0"
 dependencies = [
+ "alloy 0.3.6",
+ "alloy-compat",
  "alloy-rlp",
  "async-trait",
  "clap",
@@ -10854,16 +11480,15 @@ dependencies = [
 [[package]]
 name = "zk_evm_common"
 version = "0.1.0"
-source = "git+https://github.com/fractal-zkp/zk_evm.git?branch=zeth#0e552933304d801b69262601118a901b6fe14aac"
+source = "git+https://github.com/0xPolygonZero/zk_evm.git#dd17ff3d61f03c8eef73c41b2931575fb1de8082"
 dependencies = [
  "ethereum-types",
- "keccak-hash 0.10.0",
 ]
 
 [[package]]
 name = "zk_evm_proc_macro"
 version = "0.1.0"
-source = "git+https://github.com/fractal-zkp/zk_evm.git?branch=zeth#0e552933304d801b69262601118a901b6fe14aac"
+source = "git+https://github.com/0xPolygonZero/zk_evm.git#dd17ff3d61f03c8eef73c41b2931575fb1de8082"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/Cargo.toml b/Cargo.toml
index b4946dd..d087d6b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,12 +7,13 @@ edition = "2021"
 name = "zeth"
 path = "src/main.rs"
 
-
 [dependencies]
 async-trait = "0.1.81"
 alloy-rlp = "0.3.4"
+alloy-compat = "0.1.1"
 clap = "4"
 jsonrpsee = "0.24"
+compat = { git = "https://github.com/fractal-zkp/zk_evm.git", branch = "zeth" }
 reth = { git = "https://github.com/fractal-zkp/reth.git", branch = "zeth" }
 reth-evm = { git = "https://github.com/fractal-zkp/reth.git", branch = "zeth"  }
 reth-revm = { git = "https://github.com/fractal-zkp/reth.git", branch = "zeth"  }
@@ -25,7 +26,6 @@ reth-provider = { git = "https://github.com/fractal-zkp/reth.git", branch = "zet
 reth-rpc = { git = "https://github.com/fractal-zkp/reth.git", branch = "zeth"  }
 reth-tracing = { git = "https://github.com/fractal-zkp/reth.git", branch = "zeth"  }
 reth-trie = { git = "https://github.com/fractal-zkp/reth.git", branch = "zeth"  }
-
 revm = { git = "https://github.com/fractal-zkp/revm.git", branch = "zeth", features = [
     "std",
     "secp256k1",
@@ -36,14 +36,15 @@ eyre = "0.6"
 tokio = { version = "1.21", default-features = false }
 futures = "0.3"
 
-compat = { git = "https://github.com/fractal-zkp/zk_evm.git", branch = "zeth" }
-trace_decoder = { git = "https://github.com/fractal-zkp/zk_evm.git", branch = "zeth" }
-mpt_trie = { git = "https://github.com/fractal-zkp/zk_evm.git", branch = "zeth" }
-
+trace_decoder = { git = "https://github.com/0xPolygonZero/zk_evm.git" }
+mpt_trie = { git = "https://github.com/0xPolygonZero/zk_evm.git" }
 primitive-types = { version = "0.12.2", package = "primitive-types" }
+
 serde_json = "1.0.94"
 thiserror = "1.0"
 
 tracing = "0.1.0"
 
 sqlx = { version = "0.7", features = [ "runtime-tokio", "sqlite", "postgres" ] }
+
+alloy = { version = '0.3.0' }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
new file mode 100644
index 0000000..e524eda
--- /dev/null
+++ b/rust-toolchain.toml
@@ -0,0 +1,2 @@
+[toolchain]
+channel = "nightly-2024-09-24"
diff --git a/src/tracer.rs b/src/tracer.rs
index acb498c..bdec989 100644
--- a/src/tracer.rs
+++ b/src/tracer.rs
@@ -1,25 +1,28 @@
+use primitive_types::H256;
+use alloy::primitives::{keccak256, B256, U256};
+use alloy_compat::Compat;
 use alloy_rlp::{BufMut, Encodable};
-use compat::Compat;
 use eyre::Result;
 use mpt_trie::builder::PartialTrieBuilder;
 use reth_exex::ExExContext;
 use reth_node_api::FullNodeComponents;
 use reth_primitives::{
-    keccak256, Receipt, SealedBlockWithSenders, StorageKey, TransactionSigned, B256,
+    Receipt, SealedBlockWithSenders, StorageKey, TransactionSigned,
 };
 use reth_provider::{StateProvider, StateProviderFactory};
 use reth_revm::primitives::state::EvmState;
 use reth_trie::StorageMultiProof;
 use revm::{
     db::ExecutionTrace,
-    primitives::{Account, Address, U256},
+    primitives::{Account, Address},
 };
-use std::collections::{HashMap, HashSet};
+use std::collections::{HashMap, HashSet, BTreeSet, BTreeMap};
 use trace_decoder::{
     BlockTrace, BlockTraceTriePreImages, ContractCodeUsage, SeparateStorageTriesPreImage,
     SeparateTriePreImage, SeparateTriePreImages, TxnInfo, TxnMeta, TxnTrace,
 };
 
+
 pub(crate) fn trace_block<Node: FullNodeComponents>(
     ctx: &mut ExExContext<Node>,
     block: SealedBlockWithSenders,
@@ -28,7 +31,7 @@ pub(crate) fn trace_block<Node: FullNodeComponents>(
     tx_traces: Vec<HashMap<Address, Account>>,
 ) -> Result<BlockTrace> {
     let db = configure_db(ctx, &block);
-    let mut code_db = HashMap::new();
+    let mut code_db = BTreeSet::new();
     let mut txn_infos = vec![];
     let mut cum_gas = 0;
 
@@ -51,7 +54,7 @@ pub(crate) fn trace_block<Node: FullNodeComponents>(
 
     Ok(BlockTrace {
         trie_pre_images,
-        code_db: Some(code_db),
+        code_db,
         txn_info: txn_infos,
     })
 }
@@ -68,7 +71,7 @@ fn trace_transaction(
     tx: &TransactionSigned,
     receipt: Receipt,
     state: &EvmState,
-    code_db: &mut HashMap<primitive_types::H256, Vec<u8>>,
+    code_db: &mut BTreeSet<Vec<u8>>,
     cum_gas: &mut u64,
 ) -> TxnInfo {
     let meta = TxnMeta {
@@ -87,34 +90,33 @@ fn trace_transaction(
     let traces = state
         .iter()
         .map(|(address, state)| {
-            let mut storage_read = vec![];
-            let mut storage_written: HashMap<primitive_types::H256, _> = HashMap::new();
+            let mut storage_read: BTreeSet<B256> = BTreeSet::new();
+            let mut storage_written: BTreeMap<B256, _> = BTreeMap::new();
 
             for (key, value) in state.storage.clone().into_iter() {
                 match value.is_changed() {
                     true => {
                         storage_written.insert(
-                            Into::<B256>::into(key).compat(),
+                            key.into(),
                             value.present_value.compat(),
                         );
                     }
                     false => {
-                        storage_read.push(Into::<B256>::into(key).compat());
+                        storage_read.insert(key.into());
                     }
                 }
             }
 
             let code_usage =
-                match state.info.is_empty_code_hash() || state.info.code_hash() == B256::ZERO {
+                match state.info.is_empty_code_hash() || state.info.code_hash().eq(&reth_primitives::B256::ZERO) {
                     true => None,
                     false => state.info.code.clone().map(|code| {
                         code_db.insert(
-                            state.info.code_hash.compat(),
                             code.original_bytes().to_vec(),
                         );
                         match state.is_created() {
                             true => ContractCodeUsage::Write(code.original_bytes().to_vec()),
-                            false => ContractCodeUsage::Read(state.info.code_hash.compat()),
+                            false => ContractCodeUsage::Read(keccak256(state.info.code_hash).compat()),
                         }
                     }),
                 };
@@ -122,13 +124,13 @@ fn trace_transaction(
             let trace = TxnTrace {
                 balance: Some(state.info.balance.compat()).filter(|_| state.is_touched()),
                 nonce: Some(state.info.nonce.into()).filter(|_| state.is_touched()),
-                storage_read: Some(storage_read).filter(|x| !x.is_empty()),
-                storage_written: Some(storage_written).filter(|x| !x.is_empty()),
+                storage_read: storage_read.into_iter().map(Compat::compat).collect(),
+                storage_written: storage_written.into_iter().map(|(k, v)| (k.compat(), v)).collect(),
                 code_usage,
-                self_destructed: Some(state.is_selfdestructed()).filter(|x| *x),
+                self_destructed: state.is_selfdestructed(),
             };
 
-            ((*address).compat(), trace)
+            (compat::Compat::compat(*address), trace)
         })
         .collect();
 
@@ -149,7 +151,7 @@ fn state_witness(
 
     // build the account trie witness
     let mut state_trie_builder =
-        PartialTrieBuilder::new(state_witness.root.compat(), Default::default());
+        PartialTrieBuilder::new(compat::Compat::compat(state_witness.root), Default::default());
     state_trie_builder.insert_proof(
         state_witness
             .account_subtree
@@ -159,15 +161,15 @@ fn state_witness(
     );
 
     // build the storage trie witnesses
-    let mut storage_witnesses: HashMap<primitive_types::H256, SeparateTriePreImage> = state_witness
+    let mut storage_witnesses: HashMap<H256, SeparateTriePreImage> = state_witness
         .storages
         .into_iter()
         .map(|(hashed_addr, StorageMultiProof { root, subtree })| {
             let mut storage_trie_builder =
-                PartialTrieBuilder::new(root.compat(), Default::default());
+                PartialTrieBuilder::new(keccak256(root).compat(), Default::default());
             storage_trie_builder.insert_proof(subtree.into_values().map(Into::into).collect());
             (
-                hashed_addr.compat(),
+                keccak256(hashed_addr).compat(),
                 SeparateTriePreImage::Direct(storage_trie_builder.build()),
             )
         })