From 09b74a349176f740d571f44bbedbbbff1edbda91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Mon, 27 Oct 2025 14:28:03 +0000
Subject: [PATCH 01/36] Implement build.rs bindings generation

---
 Cargo.lock                                    | 2032 +++++++++++++++--
 Cargo.toml                                    |   17 +-
 .../src/infra/blockchain/contracts.rs         |    9 +-
 crates/contracts-generate/Cargo.toml          |   22 +
 crates/contracts-generate/src/lib.rs          |  235 ++
 crates/contracts/.gitignore                   |    1 +
 crates/contracts/Cargo.toml                   |    2 +
 crates/contracts/build.rs                     |   60 +
 crates/contracts/src/alloy.rs                 |   13 -
 crates/contracts/src/lib.rs                   |    2 +
 crates/order-validation/src/banned.rs         |    2 +-
 crates/orderbook/src/run.rs                   |    2 +-
 12 files changed, 2229 insertions(+), 168 deletions(-)
 create mode 100644 crates/contracts-generate/Cargo.toml
 create mode 100644 crates/contracts-generate/src/lib.rs
 create mode 100644 crates/contracts/.gitignore

diff --git a/Cargo.lock b/Cargo.lock
index e16ebed404..9a66f61da3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,6 +27,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -48,7 +54,7 @@ dependencies = [
  "getrandom 0.2.15",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.34",
 ]
 
 [[package]]
@@ -121,6 +127,7 @@ checksum = "5674914c2cfdb866c21cb0c09d82374ee39a1395cf512e7515f4c014083b3fff"
 dependencies = [
  "alloy-primitives",
  "num_enum",
+ "serde",
  "strum",
 ]
 
@@ -200,15 +207,18 @@ dependencies = [
 
 [[package]]
 name = "alloy-dyn-abi"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6c2905bafc2df7ccd32ca3af13f0b0d82f2e2ff9dfbeb12196c0d978d5c0deb"
+checksum = "3fdff496dd4e98a81f4861e66f7eaf5f2488971848bb42d9c892f871730245c8"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
  "alloy-sol-type-parser",
  "alloy-sol-types",
+ "arbitrary",
+ "derive_more 2.0.1",
  "itoa",
+ "proptest",
  "serde",
  "serde_json",
  "winnow 0.7.11",
@@ -246,6 +256,7 @@ checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
+ "k256",
  "serde",
  "thiserror 2.0.12",
 ]
@@ -274,9 +285,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-abi"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2acb6637a9c0e1cdf8971e0ced8f3fa34c04c5e9dccf6bb184f6a64fe0e37d8"
+checksum = "5513d5e6bd1cba6bdcf5373470f559f320c05c8c59493b6e98912fbe6733943f"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-type-parser",
@@ -340,16 +351,18 @@ dependencies = [
 
 [[package]]
 name = "alloy-primitives"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b77f7d5e60ad8ae6bd2200b8097919712a07a6db622a4b201e7ead6166f02e5"
+checksum = "355bf68a433e0fd7f7d33d5a9fc2583fde70bf5c530f63b80845f8da5505cf28"
 dependencies = [
  "alloy-rlp",
+ "arbitrary",
  "bytes",
  "cfg-if",
  "const-hex",
  "derive_more 2.0.1",
  "foldhash 0.2.0",
+ "getrandom 0.3.3",
  "hashbrown 0.16.0",
  "indexmap 2.10.0",
  "itoa",
@@ -357,6 +370,7 @@ dependencies = [
  "keccak-asm",
  "paste",
  "proptest",
+ "proptest-derive",
  "rand 0.9.1",
  "ruint",
  "rustc-hash",
@@ -404,6 +418,28 @@ dependencies = [
  "wasmtimer",
 ]
 
+[[package]]
+name = "alloy-pubsub"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06e45a68423e732900a0c824b8e22237db461b79d2e472dd68b7547c16104427"
+dependencies = [
+ "alloy-json-rpc",
+ "alloy-primitives",
+ "alloy-transport",
+ "auto_impl",
+ "bimap",
+ "futures",
+ "parking_lot",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-stream",
+ "tower 0.5.2",
+ "tracing",
+ "wasmtimer",
+]
+
 [[package]]
 name = "alloy-rlp"
 version = "0.3.12"
@@ -423,7 +459,7 @@ checksum = "64b728d511962dda67c1bc7ea7c03736ec275ed2cf4c35d9585298ac9ccf3b73"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -456,6 +492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "339af7336571dd39ae3a15bde08ae6a647e62f75350bd415832640268af92c06"
 dependencies = [
  "alloy-primitives",
+ "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
  "alloy-serde",
  "serde",
@@ -472,6 +509,24 @@ dependencies = [
  "alloy-serde",
 ]
 
+[[package]]
+name = "alloy-rpc-types-engine"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "605ec375d91073851f566a3082548af69a28dca831b27a8be7c1b4c49f5c6ca2"
+dependencies = [
+ "alloy-consensus",
+ "alloy-eips",
+ "alloy-primitives",
+ "alloy-rlp",
+ "alloy-serde",
+ "derive_more 2.0.1",
+ "jsonwebtoken",
+ "rand 0.8.5",
+ "serde",
+ "strum",
+]
+
 [[package]]
 name = "alloy-rpc-types-eth"
 version = "1.0.41"
@@ -559,23 +614,23 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-macro"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78c84c3637bee9b5c4a4d2b93360ee16553d299c3b932712353caf1cea76d0e6"
+checksum = "f3ce480400051b5217f19d6e9a82d9010cdde20f1ae9c00d53591e4a1afbb312"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
 name = "alloy-sol-macro-expander"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a882aa4e1790063362434b9b40d358942b188477ac1c44cfb8a52816ffc0cc17"
+checksum = "6d792e205ed3b72f795a8044c52877d2e6b6e9b1d13f431478121d8d4eaa9028"
 dependencies = [
  "alloy-json-abi",
  "alloy-sol-macro-input",
@@ -585,16 +640,16 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "syn-solidity",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "alloy-sol-macro-input"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18e5772107f9bb265d8d8c86e0733937bb20d0857ea5425b1b6ddf51a9804042"
+checksum = "0bd1247a8f90b465ef3f1207627547ec16940c35597875cdc09c49d58b19693c"
 dependencies = [
  "alloy-json-abi",
  "const-hex",
@@ -604,15 +659,15 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_json",
- "syn 2.0.104",
+ "syn 2.0.108",
  "syn-solidity",
 ]
 
 [[package]]
 name = "alloy-sol-type-parser"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e188b939aa4793edfaaa099cb1be4e620036a775b4bdf24fdc56f1cd6fd45890"
+checksum = "954d1b2533b9b2c7959652df3076954ecb1122a28cc740aa84e7b0a49f6ac0a9"
 dependencies = [
  "serde",
  "winnow 0.7.11",
@@ -620,9 +675,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-sol-types"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3c8a9a909872097caffc05df134e5ef2253a1cdb56d3a9cf0052a042ac763f9"
+checksum = "70319350969a3af119da6fb3e9bddb1bce66c9ea933600cb297c8b1850ad2a3c"
 dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
@@ -669,6 +724,44 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "alloy-transport-ipc"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d47962f3f1d9276646485458dc842b4e35675f42111c9d814ae4711c664c8300"
+dependencies = [
+ "alloy-json-rpc",
+ "alloy-pubsub",
+ "alloy-transport",
+ "bytes",
+ "futures",
+ "interprocess",
+ "pin-project",
+ "serde",
+ "serde_json",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "alloy-transport-ws"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9476a36a34e2fb51b6746d009c53d309a186a825aa95435407f0e07149f4ad2d"
+dependencies = [
+ "alloy-pubsub",
+ "alloy-transport",
+ "futures",
+ "http 1.1.0",
+ "rustls 0.23.34",
+ "serde_json",
+ "tokio",
+ "tokio-tungstenite",
+ "tracing",
+ "ws_stream_wasm",
+]
+
 [[package]]
 name = "alloy-trie"
 version = "0.9.0"
@@ -695,7 +788,7 @@ dependencies = [
  "darling 0.21.3",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -713,11 +806,22 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "annotate-snippets"
+version = "0.12.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47224528f74de27d1d06aad6a5dda4f865b6ebe2e56c538943d746a7270cb67e"
+dependencies = [
+ "anstyle",
+ "memchr",
+ "unicode-width 0.2.2",
+]
+
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -754,12 +858,13 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
 dependencies = [
  "anstyle",
- "windows-sys 0.52.0",
+ "once_cell_polyfill",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -785,12 +890,65 @@ dependencies = [
  "tiny-keccak",
 ]
 
+[[package]]
+name = "arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
+dependencies = [
+ "derive_arbitrary",
+]
+
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
+[[package]]
+name = "ark-bls12-381"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df4dcc01ff89867cd86b0da835f23c3f02738353aaee7dde7495af71363b8d5"
+dependencies = [
+ "ark-ec",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+]
+
+[[package]]
+name = "ark-bn254"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc"
+dependencies = [
+ "ark-ec",
+ "ark-ff 0.5.0",
+ "ark-std 0.5.0",
+]
+
+[[package]]
+name = "ark-ec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
+dependencies = [
+ "ahash 0.8.11",
+ "ark-ff 0.5.0",
+ "ark-poly",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "educe",
+ "fnv",
+ "hashbrown 0.15.4",
+ "itertools 0.13.0",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "zeroize",
+]
+
 [[package]]
 name = "ark-ff"
 version = "0.3.0"
@@ -876,7 +1034,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60"
 dependencies = [
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -914,7 +1072,22 @@ dependencies = [
  "num-traits",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "ark-poly"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
+dependencies = [
+ "ahash 0.8.11",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "educe",
+ "fnv",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -944,12 +1117,24 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
 dependencies = [
+ "ark-serialize-derive",
  "ark-std 0.5.0",
  "arrayvec",
  "digest 0.10.7",
  "num-bigint",
 ]
 
+[[package]]
+name = "ark-serialize-derive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
 [[package]]
 name = "ark-std"
 version = "0.3.0"
@@ -980,6 +1165,12 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "arrayref"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
+
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -1032,7 +1223,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1043,7 +1234,18 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "async_io_stream"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
+dependencies = [
+ "futures",
+ "pharos",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
@@ -1072,6 +1274,16 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "aurora-engine-modexp"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "518bc5745a6264b5fd7b09dffb9667e400ee9e2bbe18555fac75e1fe9afa0df9"
+dependencies = [
+ "hex",
+ "num",
+]
+
 [[package]]
 name = "auto_impl"
 version = "1.3.0"
@@ -1080,7 +1292,7 @@ checksum = "ffdcb70bdbc4d478427380519163274ac86e52916e10f0a8889adf0f96d3fee7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -1459,11 +1671,11 @@ dependencies = [
  "http-body 0.4.6",
  "http-body 1.0.0",
  "hyper 0.14.29",
- "hyper-rustls",
+ "hyper-rustls 0.24.2",
  "once_cell",
  "pin-project-lite",
  "pin-utils",
- "rustls",
+ "rustls 0.21.12",
  "tokio",
  "tracing",
 ]
@@ -1594,7 +1806,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.3",
  "object",
  "rustc-demangle",
 ]
@@ -1657,6 +1869,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bimap"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
+
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -1696,11 +1914,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 dependencies = [
- "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1756,10 +1974,16 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "syn_derive",
 ]
 
+[[package]]
+name = "boxcar"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e"
+
 [[package]]
 name = "bs58"
 version = "0.5.1"
@@ -1907,7 +2131,34 @@ dependencies = [
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-link",
+ "windows-link 0.1.3",
+]
+
+[[package]]
+name = "ciborium"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
+dependencies = [
+ "ciborium-io",
+ "half",
 ]
 
 [[package]]
@@ -1930,6 +2181,9 @@ dependencies = [
  "anstyle",
  "clap_lex",
  "strsim",
+ "terminal_size",
+ "unicase",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -1941,7 +2195,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2007,6 +2261,17 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
+[[package]]
+name = "comfy-table"
+version = "7.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b03b7db8e0b4b2fdad6c551e634134e99ec000e5c8c3b6856c65e8bbaded7a3b"
+dependencies = [
+ "crossterm",
+ "unicode-segmentation",
+ "unicode-width 0.2.2",
+]
+
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -2098,12 +2363,31 @@ version = "0.1.0"
 dependencies = [
  "alloy",
  "anyhow",
+ "contracts-generate",
  "ethcontract",
  "ethcontract-generate",
  "paste",
  "serde_json",
  "tracing",
  "tracing-subscriber",
+ "walkdir",
+]
+
+[[package]]
+name = "contracts-generate"
+version = "0.1.0"
+dependencies = [
+ "alloy-dyn-abi",
+ "alloy-json-abi",
+ "alloy-sol-macro-expander",
+ "alloy-sol-macro-input",
+ "eyre",
+ "forge-sol-macro-gen",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "walkdir",
 ]
 
 [[package]]
@@ -2121,6 +2405,15 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "convert_case"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
+dependencies = [
+ "unicode-segmentation",
+]
+
 [[package]]
 name = "cookie"
 version = "0.17.0"
@@ -2240,6 +2533,16 @@ dependencies = [
  "crossbeam-utils",
 ]
 
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "crossbeam-epoch"
 version = "0.9.18"
@@ -2264,6 +2567,29 @@ version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
+[[package]]
+name = "crossterm"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
+dependencies = [
+ "bitflags 2.10.0",
+ "crossterm_winapi",
+ "document-features",
+ "parking_lot",
+ "rustix 1.1.2",
+ "winapi",
+]
+
+[[package]]
+name = "crossterm_winapi"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -2353,7 +2679,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2368,7 +2694,7 @@ dependencies = [
  "quote",
  "serde",
  "strsim",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2379,7 +2705,7 @@ checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
 dependencies = [
  "darling_core 0.20.9",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2390,7 +2716,7 @@ checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
 dependencies = [
  "darling_core 0.21.3",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2483,21 +2809,43 @@ dependencies = [
 ]
 
 [[package]]
-name = "derive_more"
-version = "0.99.17"
+name = "derive-where"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f"
 dependencies = [
- "convert_case 0.4.0",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.0",
- "syn 1.0.109",
+ "syn 2.0.108",
 ]
 
 [[package]]
-name = "derive_more"
-version = "1.0.0"
+name = "derive_arbitrary"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+dependencies = [
+ "convert_case 0.4.0",
+ "proc-macro2",
+ "quote",
+ "rustc_version 0.4.0",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_more"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05"
 dependencies = [
@@ -2522,7 +2870,7 @@ dependencies = [
  "convert_case 0.6.0",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "unicode-xid",
 ]
 
@@ -2532,9 +2880,10 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
+ "convert_case 0.7.1",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "unicode-xid",
 ]
 
@@ -2565,6 +2914,42 @@ dependencies = [
  "subtle",
 ]
 
+[[package]]
+name = "dirs"
+version = "6.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
+dependencies = [
+ "dirs-sys",
+]
+
+[[package]]
+name = "dirs-sys"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+dependencies = [
+ "libc",
+ "option-ext",
+ "redox_users",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "doctest-file"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
+
+[[package]]
+name = "document-features"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
+dependencies = [
+ "litrs",
+]
+
 [[package]]
 name = "dotenvy"
 version = "0.15.7"
@@ -2644,6 +3029,12 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
+[[package]]
+name = "dyn-clone"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+
 [[package]]
 name = "e2e"
 version = "1.0.0"
@@ -2709,7 +3100,7 @@ dependencies = [
  "enum-ordinalize",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2767,7 +3158,7 @@ checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2778,12 +3169,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.9"
+version = "0.3.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
@@ -2878,7 +3269,7 @@ dependencies = [
  "ethcontract-generate",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -2892,7 +3283,7 @@ dependencies = [
  "ethcontract-common",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "url",
 ]
 
@@ -2981,6 +3372,16 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "eyre"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
+dependencies = [
+ "indenter",
+ "once_cell",
+]
+
 [[package]]
 name = "fastrand"
 version = "2.1.0"
@@ -3033,12 +3434,13 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
- "miniz_oxide",
+ "libz-rs-sys",
+ "miniz_oxide 0.8.9",
 ]
 
 [[package]]
@@ -3094,6 +3496,22 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
+[[package]]
+name = "forge-sol-macro-gen"
+version = "1.4.4"
+source = "git+https://github.com/foundry-rs/foundry#a446ab30700b5c9384a42b5e53b1c72c43013799"
+dependencies = [
+ "alloy-sol-macro-expander",
+ "alloy-sol-macro-input",
+ "eyre",
+ "foundry-common",
+ "heck 0.5.0",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -3103,6 +3521,195 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "foundry-block-explorers"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff814624bb21bfe43b70fb736ab39527b405d04cdc94d90b7e182fba28b25ec7"
+dependencies = [
+ "alloy-chains",
+ "alloy-json-abi",
+ "alloy-primitives",
+ "foundry-compilers",
+ "reqwest 0.12.12",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
+ "tracing",
+]
+
+[[package]]
+name = "foundry-common"
+version = "1.4.4"
+source = "git+https://github.com/foundry-rs/foundry#a446ab30700b5c9384a42b5e53b1c72c43013799"
+dependencies = [
+ "alloy-chains",
+ "alloy-consensus",
+ "alloy-dyn-abi",
+ "alloy-eips",
+ "alloy-json-abi",
+ "alloy-json-rpc",
+ "alloy-network",
+ "alloy-primitives",
+ "alloy-provider",
+ "alloy-pubsub",
+ "alloy-rpc-client",
+ "alloy-rpc-types",
+ "alloy-serde",
+ "alloy-sol-types",
+ "alloy-transport",
+ "alloy-transport-http",
+ "alloy-transport-ipc",
+ "alloy-transport-ws",
+ "anstream",
+ "anstyle",
+ "chrono",
+ "ciborium",
+ "clap",
+ "comfy-table",
+ "dunce",
+ "eyre",
+ "flate2",
+ "foundry-block-explorers",
+ "foundry-common-fmt",
+ "foundry-compilers",
+ "itertools 0.14.0",
+ "jiff",
+ "num-format",
+ "path-slash",
+ "regex",
+ "reqwest 0.12.12",
+ "revm",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "solar-compiler",
+ "thiserror 2.0.12",
+ "tokio",
+ "tower 0.5.2",
+ "tracing",
+ "url",
+ "vergen",
+ "walkdir",
+ "yansi",
+]
+
+[[package]]
+name = "foundry-common-fmt"
+version = "1.4.4"
+source = "git+https://github.com/foundry-rs/foundry#a446ab30700b5c9384a42b5e53b1c72c43013799"
+dependencies = [
+ "alloy-consensus",
+ "alloy-dyn-abi",
+ "alloy-network",
+ "alloy-primitives",
+ "alloy-rpc-types",
+ "alloy-serde",
+ "chrono",
+ "eyre",
+ "revm",
+ "serde",
+ "serde_json",
+ "yansi",
+]
+
+[[package]]
+name = "foundry-compilers"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5767bfd01a240b57e6eb540e233b248d2ecb554d60b7936574cd077c0bd4c15e"
+dependencies = [
+ "alloy-json-abi",
+ "alloy-primitives",
+ "auto_impl",
+ "derive_more 2.0.1",
+ "dyn-clone",
+ "foundry-compilers-artifacts",
+ "foundry-compilers-core",
+ "itertools 0.14.0",
+ "path-slash",
+ "rayon",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "sha2",
+ "solar-compiler",
+ "svm-rs",
+ "svm-rs-builds",
+ "thiserror 2.0.12",
+ "tracing",
+ "winnow 0.7.11",
+ "yansi",
+]
+
+[[package]]
+name = "foundry-compilers-artifacts"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b35da40bb333baff6f4533431c050a94857a4d1a379365085da403938fc9edf"
+dependencies = [
+ "foundry-compilers-artifacts-solc",
+ "foundry-compilers-artifacts-vyper",
+]
+
+[[package]]
+name = "foundry-compilers-artifacts-solc"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eff50fa9f518e96f80c77d1596122bb41c6fb9f1ec8d93e3127e2cf7a4726faa"
+dependencies = [
+ "alloy-json-abi",
+ "alloy-primitives",
+ "foundry-compilers-core",
+ "memchr",
+ "path-slash",
+ "rayon",
+ "regex",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "thiserror 2.0.12",
+ "tracing",
+ "yansi",
+]
+
+[[package]]
+name = "foundry-compilers-artifacts-vyper"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34764d842fcf3aee77dc892beba3f12d7d5cebe196caf2050302caa986de8914"
+dependencies = [
+ "alloy-json-abi",
+ "alloy-primitives",
+ "foundry-compilers-artifacts-solc",
+ "foundry-compilers-core",
+ "path-slash",
+ "semver 1.0.23",
+ "serde",
+]
+
+[[package]]
+name = "foundry-compilers-core"
+version = "0.19.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48bcd9ff6881e2f5acd8544d490cc91d2c1d47c59c1e9337ea2ade66ce7e1800"
+dependencies = [
+ "alloy-primitives",
+ "cfg-if",
+ "dunce",
+ "path-slash",
+ "regex",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "svm-rs",
+ "thiserror 2.0.12",
+ "tokio",
+ "walkdir",
+ "xxhash-rust",
+]
+
 [[package]]
 name = "fragile"
 version = "2.0.0"
@@ -3182,7 +3789,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -3277,8 +3884,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
+ "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3354,6 +3963,17 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy 0.8.27",
+]
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -3470,6 +4090,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -3662,10 +4288,28 @@ dependencies = [
  "http 0.2.12",
  "hyper 0.14.29",
  "log",
- "rustls",
- "rustls-native-certs",
+ "rustls 0.21.12",
+ "rustls-native-certs 0.6.3",
+ "tokio",
+ "tokio-rustls 0.24.1",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http 1.1.0",
+ "hyper 1.6.0",
+ "hyper-util",
+ "rustls 0.23.34",
+ "rustls-native-certs 0.8.0",
+ "rustls-pki-types",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.26.4",
+ "tower-service",
+ "webpki-roots 1.0.3",
 ]
 
 [[package]]
@@ -3840,6 +4484,18 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "indenter"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5"
+
+[[package]]
+name = "index_vec"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44faf5bb8861a9c72e20d3fb0fdbd59233e43056e2b80475ab0aacdc2e781355"
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -3857,6 +4513,7 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
+ "arbitrary",
  "equivalent",
  "hashbrown 0.15.4",
  "serde",
@@ -3871,13 +4528,41 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "interprocess"
+version = "2.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d"
+dependencies = [
+ "doctest-file",
+ "futures-core",
+ "libc",
+ "recvmsg",
+ "tokio",
+ "widestring",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "inturn"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2efbe120e37f17bb33fcdc82bc1c65087242608be37ace3cf7ebf49f3164e37"
+dependencies = [
+ "boxcar",
+ "bumpalo",
+ "dashmap",
+ "hashbrown 0.14.5",
+ "thread_local",
+]
+
 [[package]]
 name = "io-uring"
 version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
  "cfg-if",
  "libc",
 ]
@@ -3888,6 +4573,17 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
+[[package]]
+name = "is-terminal"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
+dependencies = [
+ "hermit-abi 0.5.2",
+ "libc",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.0"
@@ -3937,12 +4633,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
-name = "js-sys"
-version = "0.3.69"
+name = "jiff"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
 dependencies = [
- "wasm-bindgen",
+ "jiff-static",
+ "log",
+ "portable-atomic",
+ "portable-atomic-util",
+ "serde",
+]
+
+[[package]]
+name = "jiff-static"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+dependencies = [
+ "wasm-bindgen",
 ]
 
 [[package]]
@@ -3960,6 +4680,21 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "jsonwebtoken"
+version = "9.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
+dependencies = [
+ "base64 0.22.1",
+ "js-sys",
+ "pem",
+ "ring",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
 [[package]]
 name = "k256"
 version = "0.13.4"
@@ -4025,6 +4760,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "libredox"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+dependencies = [
+ "bitflags 2.10.0",
+ "libc",
+]
+
 [[package]]
 name = "libsqlite3-sys"
 version = "0.27.0"
@@ -4036,6 +4781,15 @@ dependencies = [
  "vcpkg",
 ]
 
+[[package]]
+name = "libz-rs-sys"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd"
+dependencies = [
+ "zlib-rs",
+]
+
 [[package]]
 name = "libz-sys"
 version = "1.1.18"
@@ -4054,6 +4808,18 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "litrs"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
+
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -4064,6 +4830,12 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
 version = "0.4.21"
@@ -4109,7 +4881,7 @@ checksum = "1b27834086c65ec3f9387b096d66e99f221cf081c2b738042aa252bcd41204e3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4145,9 +4917,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "mimalloc"
@@ -4189,6 +4961,16 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
 [[package]]
 name = "mio"
 version = "1.0.4"
@@ -4251,7 +5033,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4345,6 +5127,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
+[[package]]
+name = "normalize-path"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5438dd2b2ff4c6df6e1ce22d825ed2fa93ee2922235cc45186991717f0a892d"
+
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -4411,6 +5199,16 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
+[[package]]
+name = "num-format"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
+dependencies = [
+ "arrayvec",
+ "itoa",
+]
+
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -4480,7 +5278,7 @@ checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4562,13 +5360,31 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
+
+[[package]]
+name = "once_map"
+version = "0.4.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29eefd5038c9eee9e788d90966d6b5578dd3f88363a91edaec117a7ae0adc2d5"
+dependencies = [
+ "ahash 0.8.11",
+ "hashbrown 0.16.0",
+ "parking_lot",
+ "stable_deref_trait",
+]
+
 [[package]]
 name = "openssl"
 version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -4585,7 +5401,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4680,6 +5496,12 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "order-validation"
 version = "0.1.0"
@@ -4753,6 +5575,18 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
 [[package]]
 name = "parity-scale-codec"
 version = "3.6.12"
@@ -4814,6 +5648,12 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
+[[package]]
+name = "path-slash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
+
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -4824,6 +5664,16 @@ dependencies = [
  "hmac",
 ]
 
+[[package]]
+name = "pem"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
+dependencies = [
+ "base64 0.22.1",
+ "serde_core",
+]
+
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -4850,6 +5700,16 @@ dependencies = [
  "ucd-trie",
 ]
 
+[[package]]
+name = "pharos"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
+dependencies = [
+ "futures",
+ "rustc_version 0.4.0",
+]
+
 [[package]]
 name = "pin-project"
 version = "1.1.5"
@@ -4867,7 +5727,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -4915,6 +5775,15 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
+[[package]]
+name = "portable-atomic-util"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
+dependencies = [
+ "portable-atomic",
+]
+
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -4971,6 +5840,25 @@ dependencies = [
  "termtree",
 ]
 
+[[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.108",
+]
+
+[[package]]
+name = "primeorder"
+version = "0.13.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
+dependencies = [
+ "elliptic-curve",
+]
+
 [[package]]
 name = "primitive-types"
 version = "0.12.2"
@@ -5035,14 +5923,14 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
@@ -5092,18 +5980,29 @@ checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
  "lazy_static",
  "num-traits",
  "rand 0.9.1",
  "rand_chacha 0.9.0",
  "rand_xorshift",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.8",
  "rusty-fork",
  "tempfile",
  "unarray",
 ]
 
+[[package]]
+name = "proptest-derive"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
 [[package]]
 name = "prost"
 version = "0.12.6"
@@ -5134,7 +6033,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -5147,7 +6046,7 @@ dependencies = [
  "itertools 0.14.0",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -5207,11 +6106,63 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
+[[package]]
+name = "quinn"
+version = "0.11.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
+dependencies = [
+ "bytes",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls 0.23.34",
+ "socket2 0.5.10",
+ "thiserror 2.0.12",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
+dependencies = [
+ "bytes",
+ "getrandom 0.2.15",
+ "rand 0.8.5",
+ "ring",
+ "rustc-hash",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.12",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2 0.6.0",
+ "tracing",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 dependencies = [
  "proc-macro2",
 ]
@@ -5315,6 +6266,32 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "rayon"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
+dependencies = [
+ "either",
+ "rayon-core",
+]
+
+[[package]]
+name = "rayon-core"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
+dependencies = [
+ "crossbeam-deque",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "recvmsg"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
+
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -5330,7 +6307,18 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
+]
+
+[[package]]
+name = "redox_users"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+dependencies = [
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -5363,14 +6351,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.13",
+ "regex-syntax 0.8.8",
 ]
 
 [[package]]
@@ -5384,13 +6372,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.8",
 ]
 
 [[package]]
@@ -5407,9 +6395,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "rend"
@@ -5479,6 +6467,7 @@ dependencies = [
  "http-body 1.0.0",
  "http-body-util",
  "hyper 1.6.0",
+ "hyper-rustls 0.27.7",
  "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
@@ -5489,22 +6478,202 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
+ "quinn",
+ "rustls 0.23.34",
+ "rustls-native-certs 0.8.0",
  "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
  "tokio",
  "tokio-native-tls",
+ "tokio-rustls 0.26.4",
+ "tokio-socks",
  "tower 0.5.2",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
+ "webpki-roots 0.26.11",
  "windows-registry",
 ]
 
+[[package]]
+name = "revm"
+version = "30.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76df793c6ef3bef8f88f05b3873ebebce1494385a3ce8f58ad2e2e111aa0de11"
+dependencies = [
+ "revm-bytecode",
+ "revm-context",
+ "revm-context-interface",
+ "revm-database",
+ "revm-database-interface",
+ "revm-handler",
+ "revm-inspector",
+ "revm-interpreter",
+ "revm-precompile",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-bytecode"
+version = "7.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "451748b17ac78bd2b0748ec472a5392cd78fc0f7d19d528be44770fda28fd6f7"
+dependencies = [
+ "bitvec",
+ "revm-primitives",
+]
+
+[[package]]
+name = "revm-context"
+version = "10.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7adcce0c14cf59b7128de34185a0fbf8f63309539b9263b35ead870d73584114"
+dependencies = [
+ "bitvec",
+ "cfg-if",
+ "derive-where",
+ "revm-bytecode",
+ "revm-context-interface",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-context-interface"
+version = "11.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d620a9725e443c171fb195a074331fa4a745fa5cbb0018b4bbf42619e64b563"
+dependencies = [
+ "alloy-eip2930",
+ "alloy-eip7702",
+ "auto_impl",
+ "either",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-database"
+version = "9.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdefd7f40835e992bab40a245124cb1243e6c7a1c4659798827c809a59b0fea9"
+dependencies = [
+ "revm-bytecode",
+ "revm-database-interface",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-database-interface"
+version = "8.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa488a73ac2738f11478650cdf1a0f263864c09d5f0e9bf6309e891a05323c60"
+dependencies = [
+ "auto_impl",
+ "either",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-handler"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1d8049b2fbff6636150f4740c95369aa174e41b0383034e0e256cfdffcfcd23"
+dependencies = [
+ "auto_impl",
+ "derive-where",
+ "revm-bytecode",
+ "revm-context",
+ "revm-context-interface",
+ "revm-database-interface",
+ "revm-interpreter",
+ "revm-precompile",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-inspector"
+version = "11.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2a21dd773b654ec7e080025eecef4ac84c711150d1bd36acadf0546f471329a"
+dependencies = [
+ "auto_impl",
+ "either",
+ "revm-context",
+ "revm-database-interface",
+ "revm-handler",
+ "revm-interpreter",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-interpreter"
+version = "28.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1de5c790122f8ded67992312af8acd41ccfcee629b25b819e10c5b1f69caf57"
+dependencies = [
+ "revm-bytecode",
+ "revm-context-interface",
+ "revm-primitives",
+ "revm-state",
+]
+
+[[package]]
+name = "revm-precompile"
+version = "28.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57aadd7a2087705f653b5aaacc8ad4f8e851f5d330661e3f4c43b5475bbceae"
+dependencies = [
+ "ark-bls12-381",
+ "ark-bn254",
+ "ark-ec",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "arrayref",
+ "aurora-engine-modexp",
+ "cfg-if",
+ "k256",
+ "p256",
+ "revm-primitives",
+ "ripemd",
+ "sha2",
+]
+
+[[package]]
+name = "revm-primitives"
+version = "21.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "536f30e24c3c2bf0d3d7d20fa9cf99b93040ed0f021fd9301c78cddb0dacda13"
+dependencies = [
+ "alloy-primitives",
+ "num_enum",
+ "once_cell",
+]
+
+[[package]]
+name = "revm-state"
+version = "8.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e6bd5e669b02007872a8ca2643a14e308fe1739ee4475d74122587c3388a06a"
+dependencies = [
+ "bitflags 2.10.0",
+ "revm-bytecode",
+ "revm-primitives",
+]
+
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -5604,6 +6773,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a68df0380e5c9d20ce49534f292a36a7514ae21350726efe1865bdb1fa91d278"
 dependencies = [
  "alloy-rlp",
+ "arbitrary",
  "ark-ff 0.3.0",
  "ark-ff 0.4.2",
  "ark-ff 0.5.0",
@@ -5658,6 +6828,9 @@ name = "rustc-hash"
 version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+dependencies = [
+ "rand 0.8.5",
+]
 
 [[package]]
 name = "rustc-hex"
@@ -5689,13 +6862,26 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
  "errno",
  "libc",
- "linux-raw-sys",
+ "linux-raw-sys 0.4.14",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "rustls"
 version = "0.21.12"
@@ -5704,10 +6890,24 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
  "sct",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.23.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
+dependencies = [
+ "once_cell",
+ "ring",
+ "rustls-pki-types",
+ "rustls-webpki 0.103.7",
+ "subtle",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.6.3"
@@ -5720,6 +6920,19 @@ dependencies = [
  "security-framework",
 ]
 
+[[package]]
+name = "rustls-native-certs"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 2.2.0",
+ "rustls-pki-types",
+ "schannel",
+ "security-framework",
+]
+
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -5744,6 +6957,7 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
+ "web-time",
  "zeroize",
 ]
 
@@ -5757,6 +6971,17 @@ dependencies = [
  "untrusted",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.103.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e10b3f4191e8a80e6b43eebabfac91e5dcecebb27a71f04e820c47ec41d314bf"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.17"
@@ -5795,6 +7020,15 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "schannel"
 version = "0.1.23"
@@ -5892,7 +7126,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -5923,6 +7157,9 @@ name = "semver"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "semver-parser"
@@ -5933,6 +7170,12 @@ dependencies = [
  "pest",
 ]
 
+[[package]]
+name = "send_wrapper"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
+
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -5960,7 +7203,7 @@ checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6032,7 +7275,7 @@ dependencies = [
  "darling 0.20.9",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6058,9 +7301,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.8"
+version = "0.10.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -6180,12 +7423,30 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
 [[package]]
 name = "simdutf8"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
 
+[[package]]
+name = "simple_asn1"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror 2.0.12",
+ "time",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.9"
@@ -6205,23 +7466,169 @@ dependencies = [
 ]
 
 [[package]]
-name = "socket2"
-version = "0.5.10"
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "solar-ast"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b6aaf98d032ba3be85dca5f969895ade113a9137bb5956f80c5faf14689de59"
+dependencies = [
+ "alloy-primitives",
+ "bumpalo",
+ "either",
+ "num-rational",
+ "semver 1.0.23",
+ "solar-data-structures",
+ "solar-interface",
+ "solar-macros",
+ "strum",
+]
+
+[[package]]
+name = "solar-compiler"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95e792060bcbb007a6b9b060292945fb34ff854c7d93a9628f81b6c809eb4360"
+dependencies = [
+ "alloy-primitives",
+ "solar-ast",
+ "solar-config",
+ "solar-data-structures",
+ "solar-interface",
+ "solar-macros",
+ "solar-parse",
+ "solar-sema",
+]
+
+[[package]]
+name = "solar-config"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff16d692734c757edd339f5db142ba91b42772f8cbe1db1ce3c747f1e777185f"
+dependencies = [
+ "colorchoice",
+ "strum",
+]
+
+[[package]]
+name = "solar-data-structures"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dea34e58332c7d6a8cde1f1740186d31682b7be46e098b8cc16fcb7ffd98bf5"
+dependencies = [
+ "bumpalo",
+ "index_vec",
+ "indexmap 2.10.0",
+ "parking_lot",
+ "rayon",
+ "rustc-hash",
+ "smallvec",
+]
+
+[[package]]
+name = "solar-interface"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d6163af2e773f4d455212fa9ba2c0664506029dd26232eb406f5046092ac311"
+dependencies = [
+ "annotate-snippets",
+ "anstream",
+ "anstyle",
+ "derive_more 2.0.1",
+ "dunce",
+ "inturn",
+ "itertools 0.14.0",
+ "itoa",
+ "normalize-path",
+ "once_map",
+ "rayon",
+ "scoped-tls",
+ "serde",
+ "serde_json",
+ "solar-config",
+ "solar-data-structures",
+ "solar-macros",
+ "thiserror 2.0.12",
+ "tracing",
+ "unicode-width 0.2.2",
+]
+
+[[package]]
+name = "solar-macros"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44a98045888d75d17f52e7b76f6098844b76078b5742a450c3ebcdbdb02da124"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "solar-parse"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+checksum = "19b77a9cbb07948e4586cdcf64f0a483424197308816ebd57a4cf06130b68562"
 dependencies = [
- "libc",
- "windows-sys 0.52.0",
+ "alloy-primitives",
+ "bitflags 2.10.0",
+ "bumpalo",
+ "itertools 0.14.0",
+ "memchr",
+ "num-bigint",
+ "num-rational",
+ "num-traits",
+ "ruint",
+ "smallvec",
+ "solar-ast",
+ "solar-data-structures",
+ "solar-interface",
+ "tracing",
 ]
 
 [[package]]
-name = "socket2"
-version = "0.6.0"
+name = "solar-sema"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
+checksum = "cd033af43a38da316a04b25bbd20b121ce5d728b61e6988fd8fd6e2f1e68d0a1"
 dependencies = [
- "libc",
- "windows-sys 0.59.0",
+ "alloy-json-abi",
+ "alloy-primitives",
+ "bitflags 2.10.0",
+ "bumpalo",
+ "derive_more 2.0.1",
+ "either",
+ "once_map",
+ "paste",
+ "rayon",
+ "serde",
+ "serde_json",
+ "solar-ast",
+ "solar-data-structures",
+ "solar-interface",
+ "solar-macros",
+ "solar-parse",
+ "strum",
+ "thread_local",
+ "tracing",
 ]
 
 [[package]]
@@ -6455,7 +7862,7 @@ dependencies = [
  "atoi",
  "base64 0.21.7",
  "bigdecimal",
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
  "byteorder",
  "bytes",
  "chrono",
@@ -6499,7 +7906,7 @@ dependencies = [
  "atoi",
  "base64 0.21.7",
  "bigdecimal",
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
  "byteorder",
  "chrono",
  "crc",
@@ -6555,6 +7962,12 @@ dependencies = [
  "urlencoding",
 ]
 
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -6596,7 +8009,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6605,6 +8018,37 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
+[[package]]
+name = "svm-rs"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11f15cc0fb280301739995e3b9f0f0dde3aecb876814f4768689f9138570cd3b"
+dependencies = [
+ "const-hex",
+ "dirs",
+ "reqwest 0.12.12",
+ "semver 1.0.23",
+ "serde",
+ "serde_json",
+ "sha2",
+ "tempfile",
+ "thiserror 2.0.12",
+ "url",
+ "zip",
+]
+
+[[package]]
+name = "svm-rs-builds"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31affc47068aeef445accc5c3d5f7fd24f9072cae0a651cef564239003c94ff8"
+dependencies = [
+ "const-hex",
+ "semver 1.0.23",
+ "serde_json",
+ "svm-rs",
+]
+
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -6618,9 +8062,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6629,14 +8073,14 @@ dependencies = [
 
 [[package]]
 name = "syn-solidity"
-version = "1.4.0"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2375c17f6067adc651d8c2c51658019cef32edfff4a982adaf1d7fd1c039f08b"
+checksum = "ff790eb176cc81bb8936aed0f7b9f14fc4670069a2d371b3e3b0ecce908b2cb3"
 dependencies = [
  "paste",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6648,7 +8092,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6707,10 +8151,20 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
- "rustix",
+ "rustix 0.38.34",
  "windows-sys 0.52.0",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix 0.38.34",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -6755,7 +8209,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6766,7 +8220,7 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6883,7 +8337,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -6902,7 +8356,29 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls",
+ "rustls 0.21.12",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+dependencies = [
+ "rustls 0.23.34",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-socks"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
+dependencies = [
+ "either",
+ "futures-util",
+ "thiserror 1.0.61",
  "tokio",
 ]
 
@@ -6918,6 +8394,22 @@ dependencies = [
  "tokio-util",
 ]
 
+[[package]]
+name = "tokio-tungstenite"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
+dependencies = [
+ "futures-util",
+ "log",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.4",
+ "tungstenite",
+ "webpki-roots 0.26.11",
+]
+
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
@@ -7074,7 +8566,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
  "bytes",
  "futures-core",
  "futures-util",
@@ -7119,7 +8611,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -7199,6 +8691,25 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
+[[package]]
+name = "tungstenite"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
+dependencies = [
+ "bytes",
+ "data-encoding",
+ "http 1.1.0",
+ "httparse",
+ "log",
+ "rand 0.9.1",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "sha1",
+ "thiserror 2.0.12",
+ "utf-8",
+]
+
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -7271,6 +8782,18 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
+[[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.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -7307,11 +8830,17 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
@@ -7367,6 +8896,16 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "want"
 version = "0.3.1"
@@ -7444,7 +8983,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "wasm-bindgen-shared",
 ]
 
@@ -7478,7 +9017,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -7554,6 +9093,24 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "webpki-roots"
+version = "0.26.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+dependencies = [
+ "webpki-roots 1.0.3",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "whoami"
 version = "1.5.1"
@@ -7564,6 +9121,12 @@ dependencies = [
  "wasite",
 ]
 
+[[package]]
+name = "widestring"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471"
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -7580,6 +9143,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@@ -7626,7 +9198,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -7637,7 +9209,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -7646,6 +9218,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -7703,6 +9281,15 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -7727,13 +9314,30 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm",
+ "windows_i686_gnullvm 0.52.6",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link 0.2.1",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -7746,6 +9350,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -7758,6 +9368,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -7770,12 +9386,24 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -7788,6 +9416,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -7800,6 +9434,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -7812,6 +9452,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -7824,6 +9470,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
 [[package]]
 name = "winnow"
 version = "0.5.40"
@@ -7867,7 +9519,26 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.9.1",
+ "bitflags 2.10.0",
+]
+
+[[package]]
+name = "ws_stream_wasm"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c173014acad22e83f16403ee360115b38846fe754e735c5d9d3803fe70c6abc"
+dependencies = [
+ "async_io_stream",
+ "futures",
+ "js-sys",
+ "log",
+ "pharos",
+ "rustc_version 0.4.0",
+ "send_wrapper",
+ "thiserror 2.0.12",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
 ]
 
 [[package]]
@@ -7885,13 +9556,37 @@ version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
 
+[[package]]
+name = "xxhash-rust"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
+
+[[package]]
+name = "yansi"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
+dependencies = [
+ "is-terminal",
+]
+
 [[package]]
 name = "zerocopy"
 version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
- "zerocopy-derive",
+ "zerocopy-derive 0.7.34",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive 0.8.27",
 ]
 
 [[package]]
@@ -7902,7 +9597,18 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
 ]
 
 [[package]]
@@ -7922,5 +9628,39 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.104",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "zip"
+version = "4.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1"
+dependencies = [
+ "arbitrary",
+ "crc32fast",
+ "flate2",
+ "indexmap 2.10.0",
+ "memchr",
+ "zopfli",
+]
+
+[[package]]
+name = "zlib-rs"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2"
+
+[[package]]
+name = "zopfli"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
+dependencies = [
+ "bumpalo",
+ "crc32fast",
+ "lockfree-object-pool",
+ "log",
+ "once_cell",
+ "simd-adler32",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 9c71dbd5de..5954153c37 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "3"
-members = ["crates/*"]
+members = [ "crates/*"]
 
 [workspace.dependencies]
 alloy = { version = "1.0.41", default-features = false }
@@ -100,5 +100,20 @@ tracing-opentelemetry = "0.31"
 tracing-serde = "0.2"
 vergen = "8"
 
+foundry-compilers = "0.19.5"
+walkdir = "2.5.0"
+
+forge-sol-macro-gen = {git = "https://github.com/foundry-rs/foundry", version = "1.4.1"}
+alloy-json-abi = "1.4.1"
+alloy-dyn-abi = "1.4.1"
+quote = "1.0.41"
+syn = "2.0.108"
+prettyplease = "0.2.37"
+contracts-generate = {path = "crates/contracts-generate"}
+eyre = "0.6.12"
+proc-macro2 = "1.0.103"
+alloy-sol-macro-input = "1.4.1"
+alloy-sol-macro-expander = "1.4.1"
+
 [workspace.lints]
 clippy.cast_possible_wrap = "deny"
diff --git a/crates/autopilot/src/infra/blockchain/contracts.rs b/crates/autopilot/src/infra/blockchain/contracts.rs
index 427437de80..bfee192fc4 100644
--- a/crates/autopilot/src/infra/blockchain/contracts.rs
+++ b/crates/autopilot/src/infra/blockchain/contracts.rs
@@ -1,12 +1,9 @@
 use {
     crate::domain,
     chain::Chain,
-    contracts::alloy::{
-        ChainalysisOracle,
-        GPv2AllowListAuthentication,
-        HooksTrampoline,
-        InstanceExt,
-        support::Balances,
+    contracts::{
+        alloy::{GPv2AllowListAuthentication, HooksTrampoline, InstanceExt, support::Balances},
+        bindings::ChainalysisOracle,
     },
     ethrpc::{Web3, alloy::conversions::IntoAlloy},
     primitive_types::H160,
diff --git a/crates/contracts-generate/Cargo.toml b/crates/contracts-generate/Cargo.toml
new file mode 100644
index 0000000000..8761d1b212
--- /dev/null
+++ b/crates/contracts-generate/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "contracts-generate"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+walkdir = {workspace = true}
+forge-sol-macro-gen = {workspace = true}
+
+alloy-json-abi = {workspace = true}
+alloy-dyn-abi = {workspace = true}
+# alloy = {workspace = true}
+quote = {workspace = true}
+syn = {workspace = true}
+prettyplease = {workspace = true}
+eyre = {workspace = true}
+proc-macro2 = {workspace = true}
+alloy-sol-macro-input = {workspace = true}
+alloy-sol-macro-expander = {workspace = true}
+
+[lints]
+workspace = true
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
new file mode 100644
index 0000000000..c00d4dbda2
--- /dev/null
+++ b/crates/contracts-generate/src/lib.rs
@@ -0,0 +1,235 @@
+use {
+    alloy_sol_macro_expander::expand::expand,
+    alloy_sol_macro_input::{SolInput, SolInputKind},
+    forge_sol_macro_gen::SolMacroGen,
+    quote::format_ident,
+    std::{
+        collections::HashMap,
+        fmt::Write,
+        path::{Path, PathBuf},
+    },
+};
+
+const MOD_HEADER: &'static str = r#"#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all, non_snake_case)]
+    //! This module contains the sol! generated bindings for solidity contracts.
+    //! This is autogenerated code.
+    //! Do not manually edit these files.
+    //! These files may be overwritten by the codegen system at any time.
+    "#;
+
+pub struct Contracts {
+    pub contracts: Vec<Contract>,
+}
+
+impl Contracts {
+    pub fn new() -> Self {
+        Self { contracts: vec![] }
+    }
+
+    pub fn add_contract(mut self, contract: Contract) -> Self {
+        self.contracts.push(contract);
+        self
+    }
+
+    pub fn write_formatted(
+        self,
+        bindings_folder: &Path,
+        all_derives: bool,
+        output_folder: &Path,
+    ) -> eyre::Result<()> {
+        let mut mod_file = String::from(MOD_HEADER);
+
+        for contract in self.contracts {
+            let name = contract.name.clone();
+            contract.write_formatted(bindings_folder, all_derives, output_folder)?;
+            write_mod_name(&mut mod_file, &name)?;
+        }
+
+        let file: syn::File = syn::parse_file(&mod_file)?;
+        let formatted = prettyplease::unparse(&file);
+        std::fs::write(output_folder.join("mod.rs"), formatted)?;
+
+        Ok(())
+    }
+}
+
+pub struct Contract {
+    pub name: String,
+    networks: HashMap<u64, (String, Option<u64>)>,
+}
+
+impl Contract {
+    pub fn new<S: AsRef<str>>(name: S) -> Self {
+        Self {
+            name: name.as_ref().to_string(),
+            networks: HashMap::new(),
+        }
+    }
+
+    pub fn with_network<S: AsRef<str>>(
+        mut self,
+        id: u64,
+        (address, block_number): (S, Option<u64>),
+    ) -> Self {
+        self.networks
+            .insert(id, (address.as_ref().to_string(), block_number));
+        self
+    }
+
+    fn bindings_path(&self, bindings_folder: &Path) -> PathBuf {
+        bindings_folder.join(&self.name).with_extension("json")
+    }
+
+    pub fn generate<P: AsRef<Path>>(
+        self,
+        bindings_folder: P,
+        all_derives: bool,
+    ) -> eyre::Result<proc_macro2::TokenStream> {
+        let bindings_path = self.bindings_path(bindings_folder.as_ref());
+        let mut instance = SolMacroGen::new(bindings_path, self.name.clone());
+        generate_binding(&mut instance, all_derives)?;
+
+        let module_name_ident = format_ident!("{}", self.name);
+        let instance_name_ident = format_ident!("{}Instance", self.name);
+
+        let network_entries = self.networks.iter().map(|(id, (address, block_number))| {
+            let block_expr = match block_number {
+                Some(block) => quote::quote! { Some(#block) },
+                None => quote::quote! { None },
+            };
+            quote::quote! {
+                (#id, (::alloy::primitives::address!(#address), #block_expr))
+            }
+        });
+
+        let extensions = quote::quote! {
+            use {
+                std::{
+                    sync::LazyLock,
+                    collections::HashMap
+                },
+                anyhow::{Result, Context},
+                alloy::{
+                    providers::{Provider, DynProvider},
+                    primitives::{address, Address},
+                },
+            };
+
+            pub type Instance = #module_name_ident :: #instance_name_ident<DynProvider>;
+            static DEPLOYMENT_INFO: LazyLock<HashMap<u64, (Address, Option<u64>)>> = LazyLock::new(|| {
+                ::std::collections::HashMap::from([
+                    #(#network_entries),*
+                ])
+            });
+
+
+            /// Returns the contract's deployment address (if one exists) for the given chain.
+            pub fn deployment_address(chain_id: &u64) -> Option<alloy::primitives::Address> {
+                DEPLOYMENT_INFO.get(chain_id).map(|(addr, _)| *addr)
+            }
+
+            impl crate::alloy::InstanceExt for Instance {
+                fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
+                    async move {
+                        let chain_id = provider
+                            .get_chain_id()
+                            .await
+                            .context("could not fetch current chain id")?;
+
+                        let (address, _deployed_block) = *DEPLOYMENT_INFO
+                            .get(&chain_id)
+                            .with_context(|| format!("no deployment info for chain {chain_id:?}"))?;
+
+                        Ok(Instance::new(
+                            address,
+                            provider.clone(),
+                        ))
+                    }
+                }
+
+                fn deployed_block(&self) -> impl Future<Output = Result<Option<u64>>> + Send {
+                    async move {
+                        let chain_id = self
+                            .provider()
+                            .get_chain_id()
+                            .await
+                            .context("could not fetch current chain id")?;
+                        if let Some((_address, deployed_block)) = DEPLOYMENT_INFO.get(&chain_id) {
+                            return Ok(*deployed_block);
+                        }
+                        Ok(None)
+                    }
+                }
+            }
+        };
+
+        let mut expansion = instance
+            .expansion
+            .expect("if the expansion failed, it should have errored earlier");
+        expansion.extend(extensions);
+
+        Ok(expansion)
+    }
+
+    pub fn write_formatted<P1, P2>(
+        self,
+        bindings_folder: P1,
+        all_derives: bool,
+        output_folder: P2,
+    ) -> eyre::Result<()>
+    where
+        P1: AsRef<Path>,
+        P2: AsRef<Path>,
+    {
+        let name = self.name.clone();
+        let token_stream = self.generate(bindings_folder, all_derives)?;
+        let mut buffer = String::new();
+        write!(buffer, "{}", token_stream.to_string())?;
+        let file: syn::File = syn::parse_file(&buffer)?;
+        let formatted = prettyplease::unparse(&file);
+        std::fs::write(
+            output_folder.as_ref().join(name).with_extension("rs"),
+            formatted,
+        )?;
+        Ok(())
+    }
+}
+
+fn generate_binding(instance: &mut SolMacroGen, all_derives: bool) -> eyre::Result<()> {
+    let input = instance.get_sol_input()?.normalize_json()?;
+    let SolInput {
+        attrs: _,
+        path: _,
+        kind,
+    } = input;
+
+    let tokens = match kind {
+        SolInputKind::Sol(mut file) => {
+            let sol_attr: syn::Attribute = if all_derives {
+                syn::parse_quote! {
+                        #[sol(rpc, alloy_sol_types = alloy::sol_types, alloy_contract =
+                alloy::contract, all_derives = true, extra_derives(serde::Serialize,
+                serde::Deserialize))]     }
+            } else {
+                syn::parse_quote! {
+                        #[sol(rpc, alloy_sol_types = alloy::sol_types, alloy_contract =
+                alloy::contract)]     }
+            };
+            file.attrs.push(sol_attr);
+            expand(file)?
+        }
+        _ => unreachable!(),
+    };
+
+    instance.expansion = Some(tokens);
+    Ok(())
+}
+
+fn write_mod_name(contents: &mut String, name: &str) -> eyre::Result<()> {
+    if syn::parse_str::<syn::ItemMod>(&format!("pub mod {name};")).is_ok() {
+        write!(contents, "pub mod {name};")?;
+    } else {
+        write!(contents, "pub mod r#{name};")?;
+    }
+    Ok(())
+}
diff --git a/crates/contracts/.gitignore b/crates/contracts/.gitignore
new file mode 100644
index 0000000000..b69411a661
--- /dev/null
+++ b/crates/contracts/.gitignore
@@ -0,0 +1 @@
+src/bindings
diff --git a/crates/contracts/Cargo.toml b/crates/contracts/Cargo.toml
index dbd069dbe8..ef9c4bfe92 100644
--- a/crates/contracts/Cargo.toml
+++ b/crates/contracts/Cargo.toml
@@ -35,6 +35,8 @@ tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"], optio
 [build-dependencies]
 ethcontract = { workspace = true }
 ethcontract-generate = { workspace = true }
+walkdir = {workspace = true}
+contracts-generate = {workspace = true}
 
 [lints]
 workspace = true
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index eb6192a8e2..89acdd18c6 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -1,3 +1,5 @@
+use contracts_generate::{Contract, Contracts};
+
 use {
     ethcontract::{
         Address,
@@ -22,6 +24,28 @@ const BNB: &str = "56";
 const OPTIMISM: &str = "10";
 const LENS: &str = "232";
 
+macro_rules! info {
+    ($addr:expr) => {
+        ($addr, None)
+    };
+    ($addr:expr, $block:expr) => {
+        ($addr, Some($block))
+    };
+}
+
+pub mod networks {
+    pub const MAINNET: u64 = 1;
+    pub const GNOSIS: u64 = 100;
+    pub const SEPOLIA: u64 = 11155111;
+    pub const ARBITRUM_ONE: u64 = 42161;
+    pub const BASE: u64 = 8453;
+    pub const POLYGON: u64 = 137;
+    pub const AVALANCHE: u64 = 43114;
+    pub const BNB: u64 = 56;
+    pub const OPTIMISM: u64 = 10;
+    pub const LENS: u64 = 232;
+}
+
 fn main() {
     // NOTE: This is a workaround for `rerun-if-changed` directives for
     // non-existent files cause the crate's build unit to get flagged for a
@@ -32,6 +56,42 @@ fn main() {
     // - https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
     println!("cargo:rerun-if-changed=build.rs");
 
+    std::fs::create_dir_all("src/bindings").unwrap();
+    Contracts::new()
+        .add_contract(
+            Contract::new("ChainalysisOracle")
+                .with_network(
+                    networks::MAINNET,
+                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
+                )
+                .with_network(
+                    networks::ARBITRUM_ONE,
+                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
+                )
+                .with_network(
+                    networks::BASE,
+                    info!("0x3A91A31cB3dC49b4db9Ce721F50a9D076c8D739B"),
+                )
+                .with_network(
+                    networks::AVALANCHE,
+                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
+                )
+                .with_network(
+                    networks::BNB,
+                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
+                )
+                .with_network(
+                    networks::OPTIMISM,
+                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
+                )
+                .with_network(
+                    networks::POLYGON,
+                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
+                ),
+        )
+        .write_formatted(Path::new("artifacts"), false, Path::new("src/bindings"))
+        .unwrap();
+
     generate_contract("ERC20");
     generate_contract_with_config("GPv2Settlement", |builder| {
         builder
diff --git a/crates/contracts/src/alloy.rs b/crates/contracts/src/alloy.rs
index de9503cf61..2c919300e0 100644
--- a/crates/contracts/src/alloy.rs
+++ b/crates/contracts/src/alloy.rs
@@ -11,19 +11,6 @@ pub mod networks {
     pub const LENS: u64 = 232;
 }
 
-crate::bindings!(
-    ChainalysisOracle,
-    crate::deployments! {
-        MAINNET => address!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-        ARBITRUM_ONE => address!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-        BASE => address!("0x3A91A31cB3dC49b4db9Ce721F50a9D076c8D739B"),
-        AVALANCHE => address!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-        BNB => address!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-        OPTIMISM => address!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-        POLYGON => address!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-    }
-);
-
 crate::bindings!(
     IZeroex,
     crate::deployments! {
diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index 15e4f3059c..cb8ba383d5 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -42,6 +42,8 @@ pub mod paths;
 pub mod vault;
 pub mod web3;
 
+pub mod bindings;
+
 macro_rules! include_contracts {
     ($($name:ident;)*) => {$(
         include!(concat!(env!("OUT_DIR"), "/", stringify!($name), ".rs"));
diff --git a/crates/order-validation/src/banned.rs b/crates/order-validation/src/banned.rs
index f7c27eb8d7..8b2e5b5d37 100644
--- a/crates/order-validation/src/banned.rs
+++ b/crates/order-validation/src/banned.rs
@@ -6,7 +6,7 @@
 
 use {
     alloy::primitives::Address,
-    contracts::alloy::ChainalysisOracle,
+    contracts::bindings::ChainalysisOracle,
     futures::future::join_all,
     moka::sync::Cache,
     std::{
diff --git a/crates/orderbook/src/run.rs b/crates/orderbook/src/run.rs
index 4d5818d055..d67a0f5487 100644
--- a/crates/orderbook/src/run.rs
+++ b/crates/orderbook/src/run.rs
@@ -17,12 +17,12 @@ use {
         WETH9,
         alloy::{
             BalancerV2Vault,
-            ChainalysisOracle,
             HooksTrampoline,
             IUniswapV3Factory,
             InstanceExt,
             support::Balances,
         },
+        bindings::ChainalysisOracle,
     },
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt, StreamExt},

From b879cfa5dbdd4358466f8cdec77395eaad81caa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Mon, 27 Oct 2025 17:03:26 +0000
Subject: [PATCH 02/36] wip

---
 .../src/infra/blockchain/contracts.rs         |   2 +-
 crates/contracts-generate/src/lib.rs          | 151 +++++++++++-------
 crates/contracts/build.rs                     |  51 ++----
 crates/contracts/src/lib.rs                   |   1 +
 4 files changed, 103 insertions(+), 102 deletions(-)

diff --git a/crates/autopilot/src/infra/blockchain/contracts.rs b/crates/autopilot/src/infra/blockchain/contracts.rs
index bfee192fc4..b2d28567eb 100644
--- a/crates/autopilot/src/infra/blockchain/contracts.rs
+++ b/crates/autopilot/src/infra/blockchain/contracts.rs
@@ -2,7 +2,7 @@ use {
     crate::domain,
     chain::Chain,
     contracts::{
-        alloy::{GPv2AllowListAuthentication, HooksTrampoline, InstanceExt, support::Balances},
+        alloy::{GPv2AllowListAuthentication, HooksTrampoline, support::Balances},
         bindings::ChainalysisOracle,
     },
     ethrpc::{Web3, alloy::conversions::IntoAlloy},
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index c00d4dbda2..07f7be499c 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -66,13 +66,15 @@ impl Contract {
         }
     }
 
-    pub fn with_network<S: AsRef<str>>(
-        mut self,
-        id: u64,
-        (address, block_number): (S, Option<u64>),
-    ) -> Self {
-        self.networks
-            .insert(id, (address.as_ref().to_string(), block_number));
+    pub fn with_networks<S, I>(mut self, networks: I) -> Self
+    where
+        S: AsRef<str>,
+        I: IntoIterator<Item = (u64, (S, Option<u64>))>,
+    {
+        for (id, (address, block_number)) in networks.into_iter() {
+            self.networks
+                .insert(id, (address.as_ref().to_string(), block_number));
+        }
         self
     }
 
@@ -86,8 +88,8 @@ impl Contract {
         all_derives: bool,
     ) -> eyre::Result<proc_macro2::TokenStream> {
         let bindings_path = self.bindings_path(bindings_folder.as_ref());
-        let mut instance = SolMacroGen::new(bindings_path, self.name.clone());
-        generate_binding(&mut instance, all_derives)?;
+        let mut macrogen = SolMacroGen::new(bindings_path, self.name.clone());
+        generate_binding(&mut macrogen, all_derives)?;
 
         let module_name_ident = format_ident!("{}", self.name);
         let instance_name_ident = format_ident!("{}Instance", self.name);
@@ -102,71 +104,78 @@ impl Contract {
             }
         });
 
-        let extensions = quote::quote! {
-            use {
-                std::{
-                    sync::LazyLock,
-                    collections::HashMap
-                },
-                anyhow::{Result, Context},
-                alloy::{
-                    providers::{Provider, DynProvider},
-                    primitives::{address, Address},
-                },
-            };
+        let instance = quote::quote! {
+            pub type Instance = #module_name_ident :: #instance_name_ident<::alloy::providers::DynProvider>;
+        };
 
-            pub type Instance = #module_name_ident :: #instance_name_ident<DynProvider>;
-            static DEPLOYMENT_INFO: LazyLock<HashMap<u64, (Address, Option<u64>)>> = LazyLock::new(|| {
-                ::std::collections::HashMap::from([
-                    #(#network_entries),*
-                ])
-            });
+        let deployment_info = if self.networks.is_empty() {
+            proc_macro2::TokenStream::new()
+        } else {
+            quote::quote! {
+                use {
+                    std::{
+                        sync::LazyLock,
+                        collections::HashMap
+                    },
+                    anyhow::{Result, Context},
+                    alloy::{
+                        providers::{Provider, DynProvider},
+                        primitives::{address, Address},
+                    },
+                };
 
+                static DEPLOYMENT_INFO: LazyLock<HashMap<u64, (Address, Option<u64>)>> = LazyLock::new(|| {
+                    ::std::collections::HashMap::from([
+                        #(#network_entries),*
+                    ])
+                });
 
-            /// Returns the contract's deployment address (if one exists) for the given chain.
-            pub fn deployment_address(chain_id: &u64) -> Option<alloy::primitives::Address> {
-                DEPLOYMENT_INFO.get(chain_id).map(|(addr, _)| *addr)
-            }
+                /// Returns the contract's deployment address (if one exists) for the given chain.
+                pub fn deployment_address(chain_id: &u64) -> Option<alloy::primitives::Address> {
+                    DEPLOYMENT_INFO.get(chain_id).map(|(addr, _)| *addr)
+                }
+
+                impl Instance {
+                    pub fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
+                        async move {
+                            let chain_id = provider
+                                .get_chain_id()
+                                .await
+                                .context("could not fetch current chain id")?;
+
+                            let (address, _deployed_block) = *DEPLOYMENT_INFO
+                                .get(&chain_id)
+                                .with_context(|| format!("no deployment info for chain {chain_id:?}"))?;
 
-            impl crate::alloy::InstanceExt for Instance {
-                fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
-                    async move {
-                        let chain_id = provider
-                            .get_chain_id()
-                            .await
-                            .context("could not fetch current chain id")?;
-
-                        let (address, _deployed_block) = *DEPLOYMENT_INFO
-                            .get(&chain_id)
-                            .with_context(|| format!("no deployment info for chain {chain_id:?}"))?;
-
-                        Ok(Instance::new(
-                            address,
-                            provider.clone(),
-                        ))
+                            Ok(Instance::new(
+                                address,
+                                provider.clone(),
+                            ))
+                        }
                     }
-                }
 
-                fn deployed_block(&self) -> impl Future<Output = Result<Option<u64>>> + Send {
-                    async move {
-                        let chain_id = self
-                            .provider()
-                            .get_chain_id()
-                            .await
-                            .context("could not fetch current chain id")?;
-                        if let Some((_address, deployed_block)) = DEPLOYMENT_INFO.get(&chain_id) {
-                            return Ok(*deployed_block);
+                    pub fn deployed_block(&self) -> impl Future<Output = Result<Option<u64>>> + Send {
+                        async move {
+                            let chain_id = self
+                                .provider()
+                                .get_chain_id()
+                                .await
+                                .context("could not fetch current chain id")?;
+                            if let Some((_address, deployed_block)) = DEPLOYMENT_INFO.get(&chain_id) {
+                                return Ok(*deployed_block);
+                            }
+                            Ok(None)
                         }
-                        Ok(None)
                     }
                 }
             }
         };
 
-        let mut expansion = instance
+        let mut expansion = macrogen
             .expansion
             .expect("if the expansion failed, it should have errored earlier");
-        expansion.extend(extensions);
+        expansion.extend(instance);
+        expansion.extend(deployment_info);
 
         Ok(expansion)
     }
@@ -233,3 +242,25 @@ fn write_mod_name(contents: &mut String, name: &str) -> eyre::Result<()> {
     }
     Ok(())
 }
+
+#[macro_export]
+macro_rules! networks {
+    // Entry point: accepts a list of entries and delegates to internal rules
+    [$(
+        $id:expr => $value:tt
+    ),* $(,)?] => {
+        [$(
+            networks!(@entry $id => $value)
+        ),*]
+    };
+
+    // Internal rule: handle entry with address and block (parenthesized)
+    (@entry $id:expr => ($addr:expr, $block:expr)) => {
+        ($id, ($addr, Some($block)))
+    };
+
+    // Internal rule: handle entry with just address
+    (@entry $id:expr => $value:expr) => {
+        ($id, ($value, None))
+    };
+}
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 89acdd18c6..1be350a03d 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -1,4 +1,4 @@
-use contracts_generate::{Contract, Contracts};
+use contracts_generate::{Contract, Contracts, networks};
 
 use {
     ethcontract::{
@@ -24,15 +24,6 @@ const BNB: &str = "56";
 const OPTIMISM: &str = "10";
 const LENS: &str = "232";
 
-macro_rules! info {
-    ($addr:expr) => {
-        ($addr, None)
-    };
-    ($addr:expr, $block:expr) => {
-        ($addr, Some($block))
-    };
-}
-
 pub mod networks {
     pub const MAINNET: u64 = 1;
     pub const GNOSIS: u64 = 100;
@@ -58,37 +49,15 @@ fn main() {
 
     std::fs::create_dir_all("src/bindings").unwrap();
     Contracts::new()
-        .add_contract(
-            Contract::new("ChainalysisOracle")
-                .with_network(
-                    networks::MAINNET,
-                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-                )
-                .with_network(
-                    networks::ARBITRUM_ONE,
-                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-                )
-                .with_network(
-                    networks::BASE,
-                    info!("0x3A91A31cB3dC49b4db9Ce721F50a9D076c8D739B"),
-                )
-                .with_network(
-                    networks::AVALANCHE,
-                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-                )
-                .with_network(
-                    networks::BNB,
-                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-                )
-                .with_network(
-                    networks::OPTIMISM,
-                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-                )
-                .with_network(
-                    networks::POLYGON,
-                    info!("0x40C57923924B5c5c5455c48D93317139ADDaC8fb"),
-                ),
-        )
+        .add_contract(Contract::new("ChainalysisOracle").with_networks(networks![
+            networks::MAINNET => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            networks::ARBITRUM_ONE => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            networks::BASE => "0x3A91A31cB3dC49b4db9Ce721F50a9D076c8D739B",
+            networks::AVALANCHE => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            networks::BNB => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            networks::OPTIMISM => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            networks::POLYGON => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+        ]))
         .write_formatted(Path::new("artifacts"), false, Path::new("src/bindings"))
         .unwrap();
 
diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index cb8ba383d5..0e54ba4ff5 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -42,6 +42,7 @@ pub mod paths;
 pub mod vault;
 pub mod web3;
 
+#[rustfmt::skip]
 pub mod bindings;
 
 macro_rules! include_contracts {

From df03e933d850510181313b503f203ea2567bdeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Mon, 27 Oct 2025 17:29:25 +0000
Subject: [PATCH 03/36] wip

---
 crates/contracts/build.rs | 235 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 235 insertions(+)

diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 1be350a03d..cb9ac0abe9 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -49,6 +49,241 @@ fn main() {
 
     std::fs::create_dir_all("src/bindings").unwrap();
     Contracts::new()
+        .add_contract(Contract::new("IZeroex").with_networks(networks![
+            networks::MAINNET => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            networks::SEPOLIA => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            networks::ARBITRUM_ONE => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            networks::BASE => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            networks::AVALANCHE => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            networks::BNB => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            networks::OPTIMISM => "0xdef1abe32c034e558cdd535791643c58a13acc10",
+            networks::POLYGON => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+        ]))
+        .add_contract(Contract::new("ERC20Mintable"))
+        .add_contract(Contract::new("GnosisSafe"))
+        .add_contract(Contract::new("GnosisSafeCompatibilityFallbackHandler"))
+        .add_contract(Contract::new("GnosisSafeProxy"))
+        .add_contract(Contract::new("GnosisSafeProxyFactory"))
+        .add_contract(Contract::new("BalancerV2Authorizer"))
+        .add_contract(Contract::new("BalancerV2BasePool"))
+        .add_contract(Contract::new("BalancerV2BasePoolFactory"))
+        .add_contract(Contract::new("BalancerV2WeightedPool"))
+        .add_contract(Contract::new("BalancerV2StablePool"))
+        .add_contract(Contract::new("BalancerV2ComposableStablePool"))
+        .add_contract(Contract::new("BalancerV2LiquidityBootstrappingPool"))
+        .add_contract(Contract::new("BalancerV2WeightedPoolFactory").with_networks(networks![
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+            // <https://etherscan.io/tx/0x0f9bb3624c185b4e107eaf9176170d2dc9cb1c48d0f070ed18416864b3202792>
+            networks::MAINNET => ("0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9", 12272147),
+        ]))
+        .add_contract(Contract::new("BalancerV2WeightedPoolFactoryV3").with_networks(networks![
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+            // <https://etherscan.io/tx/0x39f357b78c03954f0bcee2288bf3b223f454816c141ef20399a7bf38057254c4>
+            networks::MAINNET => ("0x5Dd94Da3644DDD055fcf6B3E1aa310Bb7801EB8b", 16520627),
+            // <https://gnosisscan.io/tx/0x2ac3d873b6f43de6dd77525c7e5b68a8fc3a1dee40303e1b6a680b0285b26091>
+            networks::GNOSIS => ("0xC128a9954e6c874eA3d62ce62B468bA073093F25", 26226256),
+            // <https://snowscan.xyz/tx/0xdf2c77743cc9287df2022cd6c5f9209ecfecde07371717ab0427d96042a88640>
+            networks::AVALANCHE => ("0x94f68b54191F62f781Fe8298A8A5Fa3ed772d227", 26389236),
+            // <https://optimistic.etherscan.io/tx/0xc5e79fb00b9a8e2c89b136aae0be098e58f8e832ede13e8079213a75c9cd9c08>
+            networks::OPTIMISM => ("0xA0DAbEBAAd1b243BBb243f933013d560819eB66f", 72832703),
+            // <https://polygonscan.com/tx/0x2bc079c0e725f43670898b474afedf38462feee72ef8e874a1efcec0736672fc>
+            networks::POLYGON => ("0x82e4cFaef85b1B6299935340c964C942280327f4", 39036828),
+            // <https://bscscan.com/tx/0x91107b9581e18ec0a4a575d4713bdd7b1fc08656c35522d216307930aa4de7b6>
+            networks::BNB => ("0x6e4cF292C5349c79cCd66349c3Ed56357dD11B46", 25474982),
+        ]))
+        .add_contract(Contract::new("BalancerV2WeightedPoolFactoryV4").with_networks(networks![
+            // <https://etherscan.io/tx/0xa5e6d73befaacc6fff0a4b99fd4eaee58f49949bcfb8262d91c78f24667fbfc9>
+            networks::MAINNET => ("0x897888115Ada5773E02aA29F775430BFB5F34c51", 16878323),
+            // <https://gnosisscan.io/tx/0xcb6768bd92add227d46668357291e1d67c864769d353f9f0041c59ad2a3b21bf>
+            networks::GNOSIS => ("0x6CaD2ea22BFA7F4C14Aae92E47F510Cd5C509bc7", 27055829),
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#pool-factories>
+            // <https://sepolia.etherscan.io/tx/0x7dd392b586f1cdecfc635e7dd40ee1444a7836772811e59321fd4873ecfdf3eb>
+            networks::SEPOLIA => ("0x7920BFa1b2041911b354747CA7A6cDD2dfC50Cfd", 3424893),
+            // <https://arbiscan.io/tx/0x167fe7eb776d1be36b21402d8ae120088c393e28ae7ca0bd1defac84e0f2848b>
+            networks::ARBITRUM_ONE => ("0xc7E5ED1054A24Ef31D827E6F86caA58B3Bc168d7", 72222060),
+            // <https://basescan.org/tx/0x0732d3a45a3233a134d6e0e72a00ca7a971d82cdc51f71477892ac517bf0d4c9>
+            networks::BASE => ("0x4C32a8a8fDa4E24139B51b456B42290f51d6A1c4", 1204869),
+            // <https://snowscan.xyz/tx/0xa3fc8aab3b9baba3905045a53e52a47daafe79d4aa26d4fef5c51f3840aa55fa>
+            networks::AVALANCHE => ("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a", 27739006),
+            // <https://optimistic.etherscan.io/tx/0xad915050179db368e43703f3ee1ec55ff5e5e5e0268c15f8839c9f360caf7b0b>
+            networks::OPTIMISM => ("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a", 82737545),
+            // <https://polygonscan.com/tx/0x65e6b13231c2c5656357005a9e419ad6697178ae74eda1ea7522ecdafcf77136>
+            networks::POLYGON => ("0xFc8a407Bba312ac761D8BFe04CE1201904842B76", 40611103),
+            // <https://bscscan.com/tx/0xc7fada60761e3240332c4cbd169633f1828b2a15de23f0148db9d121afebbb4b>
+            networks::BNB => ("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a", 26665331),
+        ]))
+        .add_contract(Contract::new("BalancerV2WeightedPool2TokensFactory").with_networks(networks![
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+            // <https://etherscan.io/tx/0xa5e6d73befaacc6fff0a4b99fd4eaee58f49949bcfb8262d91c78f24667fbfc9>
+            networks::MAINNET => ("0xa5bf2ddf098bb0ef6d120c98217dd6b141c74ee0", 12349891),
+            networks::ARBITRUM_ONE => ("0xCF0a32Bbef8F064969F21f7e02328FB577382018", 222864),
+            // <https://optimistic.etherscan.io/tx/0xd5754950d47179d822ea976a8b2af82ffa80e992cf0660b02c0c218359cc8987>
+            networks::OPTIMISM => ("0xdAE7e32ADc5d490a43cCba1f0c736033F2b4eFca", 7005512),
+            // <https://polygonscan.com/tx/0xb8ac851249cc95bc0943ef0732d28bbd53b0b36c7dd808372666acd8c5f26e1c>
+            networks::POLYGON => ("0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9", 15832998),
+        ]))
+        .add_contract(Contract::new("BalancerV2LiquidityBootstrappingPoolFactory").with_networks(networks![
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+            // <https://etherscan.io/tx/0x665ac1c7c5290d70154d9dfc1d91dc2562b143aaa9e8a77aa13e7053e4fe9b7c>
+            networks::MAINNET => ("0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE", 12871780),
+            networks::ARBITRUM_ONE => ("0x142B9666a0a3A30477b052962ddA81547E7029ab", 222870),
+            // <https://polygonscan.com/tx/0xd9b5b9a9e6ea17a87f85574e93577e3646c9c2f9c8f38644f936949e6c853288>
+            networks::POLYGON => ("0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE", 17116402),
+        ]))
+        .add_contract(Contract::new("BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory").with_networks(networks![
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+            // <https://etherscan.io/tx/0x298381e567ff6643d9b32e8e7e9ff0f04a80929dce3e004f6fa1a0104b2b69c3>
+            networks::MAINNET => ("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", 13730248),
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/gnosis.html#ungrouped-active-current-contracts>
+            // <https://gnosis.blockscout.com/tx/0xbd56fefdb27e4ff1c0852e405f78311d6bc2befabaf6c87a405ab19de8c1506a>
+            networks::GNOSIS => ("0x85a80afee867aDf27B50BdB7b76DA70f1E853062", 25415236),
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#ungrouped-active-current-contracts>
+            // <https://sepolia.etherscan.io/tx/0xe0e8feb509a8aa8a1eaa0b0c4b34395ff2fd880fb854fbeeccc0af1826e395c9>
+            networks::SEPOLIA => ("0x45fFd460cC6642B8D8Fb12373DFd77Ceb0f4932B", 25415236),
+            networks::ARBITRUM_ONE => ("0x1802953277FD955f9a254B80Aa0582f193cF1d77", 4859669),
+            // <https://basescan.org/tx/0x0529de9dbe772f4b4f48da93ae2c2d2c46e3d3221ced9e0c4063a7a5bc47e874>
+            networks::BASE => ("0x0c6052254551EAe3ECac77B01DFcf1025418828f", 1206531),
+            // <https://snowscan.xyz/tx/0x33a75d83436ae9fcda4b4986713417bf3dc80d9ceb8d2541817846b1ac579d9f>
+            networks::AVALANCHE => ("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", 26386552),
+            // <https://bscscan.com/tx/0x8b964b97e6091bd41c93002c558d49adc26b8b31d2b30f3a33babbbbe8c55f47>
+            networks::BNB => ("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD", 22691243),
+            // <https://optimistic.etherscan.io/tx/0x14fb43f051eebdec645abf0125e52348dc875b0887b689f8db026d75f9c78dda>
+            networks::OPTIMISM => ("0xf302f9F50958c5593770FDf4d4812309fF77414f", 7005915),
+            // <https://polygonscan.com/tx/0x125bc007a86d771f8dc8f5fa1017de6e5a11162a458a72f25814503404bbeb0b>
+            networks::POLYGON => ("0x41B953164995c11C81DA73D212ED8Af25741b7Ac", 22067480),
+        ]))
+        .add_contract(Contract::new("BalancerV2StablePoolFactoryV2").with_networks(networks![
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+            // <https://etherscan.io/tx/0xef36451947ebd97b72278face57a53806e90071f4c902259db2db41d0c9a143d>
+            networks::MAINNET => ("0x8df6efec5547e31b0eb7d1291b511ff8a2bf987c", 14934936),
+            // <https://gnosisscan.io/tx/0xe062237f0c8583375b10cf514d091781bfcd52d9ababbd324180770a5efbc6b1>
+            networks::GNOSIS => ("0xf23b4DB826DbA14c0e857029dfF076b1c0264843", 25415344),
+            networks::ARBITRUM_ONE => ("0xEF44D6786b2b4d544b7850Fe67CE6381626Bf2D6", 14244664),
+            // <https://optimistic.etherscan.io/tx/0xcf9f0bd731ded0e513708200df28ac11d17246fb53fc852cddedf590e41c9c03>
+            networks::OPTIMISM => ("0xeb151668006CD04DAdD098AFd0a82e78F77076c3", 11088891),
+            // <https://polygonscan.com/tx/0xa2c41d014791888a29a9491204446c1b9b2f5dee3f3eb31ad03f290259067b44>
+            networks::POLYGON => ("0xcA96C4f198d343E251b1a01F3EBA061ef3DA73C1", 29371951),
+        ]))
+        .add_contract(Contract::new("BalancerV2ComposableStablePoolFactory").with_networks(networks![
+            // <https://etherscan.io/tx/0x3b9e93ae050e59b3ca3657958ca30d1fd13fbc43208f8f0aa01ae992294f9961>
+            networks::MAINNET => ("0xf9ac7B9dF2b3454E841110CcE5550bD5AC6f875F", 15485885),
+            networks::ARBITRUM_ONE => ("0xaEb406b0E430BF5Ea2Dc0B9Fe62E4E53f74B3a33", 23227044),
+            // <https://bscscan.com/tx/0x6c6e1c72c91c75714f698049f1c7b66d8f2baced54e0dd2522dfadff27b5ccf1>
+            networks::BNB => ("0xf302f9F50958c5593770FDf4d4812309fF77414f", 22691193),
+            // <https://optimistic.etherscan.io/tx/0xad2f330ad865dc7955376a3d9733486b38c53ba0d4757ad4e1b63b105401c506>
+            networks::OPTIMISM => ("0xf145caFB67081895EE80eB7c04A30Cf87f07b745", 22182522),
+            // <https://polygonscan.com/tx/0xe5d908be686056f1519663a407167c088924f60d29c799ec74438b9de891989e>
+            networks::POLYGON => ("0x136FD06Fa01eCF624C7F2B3CB15742c1339dC2c4", 32774224),
+        ]))
+        .add_contract(Contract::new("BalancerV2ComposableStablePoolFactoryV3").with_networks(networks![
+            // <https://etherscan.io/tx/0xd8c9ba758cb318beb0c9525b7621280a22b6dfe02cf725a3ece0718598f260ef>
+            networks::MAINNET => ("0xdba127fBc23fb20F5929C546af220A991b5C6e01", 16580899),
+            // <https://gnosisscan.io/tx/0x2abd7c865f8ab432b340f7de897192c677ffa254908fdec14091e0cd06962963>
+            networks::GNOSIS => ("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD", 26365805),
+            networks::ARBITRUM_ONE => ("0x1c99324EDC771c82A0DCCB780CC7DDA0045E50e7", 58948370),
+            // <https://bscscan.com/tx/0xfe0c47c2b124a059d11704c1bd1815dcc554834ae0c2d11c433946226015619f>
+            networks::BNB => ("0xacAaC3e6D6Df918Bf3c809DFC7d42de0e4a72d4C", 25475700),
+            // <https://optimistic.etherscan.io/tx/0x2bb1c3fbf1f370c6e20ecda36b555de1a4426340908055c4274823e31f92210e>
+            networks::OPTIMISM => ("0xe2E901AB09f37884BA31622dF3Ca7FC19AA443Be", 72832821),
+            // <https://polygonscan.com/tx/0xb189a45eac7ea59c0bb638b5ae6c4c93f9877f31ce826e96b792a9154e7a32a7>
+            networks::POLYGON => ("0x7bc6C0E73EDAa66eF3F6E2f27b0EE8661834c6C9", 39037615),
+        ]))
+        .add_contract(Contract::new("BalancerV2ComposableStablePoolFactoryV4").with_networks(networks![
+            // <https://etherscan.io/tx/0x3b61da162f3414c376cfe8b38d57ca6ba3c40b24446029ddab1187f4ae7c2bd7>
+            networks::MAINNET => ("0xfADa0f4547AB2de89D1304A668C39B3E09Aa7c76", 16878679),
+            // <https://gnosisscan.io/tx/0x2739416da7e44add08bdfb5e4e5a29ca981383b97162748887efcc5c1241b2f1>
+            networks::GNOSIS => ("0xD87F44Df0159DC78029AB9CA7D7e57E7249F5ACD", 27056416),
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#deprecated-contracts>
+            // <https://sepolia.etherscan.io/tx/0x9313a59ad9a95f2518076cbf4d0dc5f312e0b013a43a7ea4821cae2aa7a50aa2>
+            networks::SEPOLIA => ("0xA3fd20E29358c056B727657E83DFd139abBC9924", 3425277),
+            networks::ARBITRUM_ONE => ("0x2498A2B0d6462d2260EAC50aE1C3e03F4829BA95", 72235860),
+            // <https://snowscan.xyz/tx/0x7b396102e767ec5f2bc06fb2c9d7fb704d0ddc537c04f28cb538c6de7cc4261e>
+            networks::AVALANCHE => ("0x3B1eb8EB7b43882b385aB30533D9A2BeF9052a98", 29221425),
+            // <https://bscscan.com/tx/0x2819b490b5e04e27d66476730411df8e572bc33038aa869a370ecfa852de0cbf>
+            networks::BNB => ("0x1802953277FD955f9a254B80Aa0582f193cF1d77", 26666380),
+            // <https://optimistic.etherscan.io/tx/0x5d6c515442188eb4af83524618333c0fbdab0df809af01c4e7a9e380f1841199>
+            networks::OPTIMISM => ("0x1802953277FD955f9a254B80Aa0582f193cF1d77", 82748180),
+            // <https://polygonscan.com/tx/0x2cea6a0683e67ebdb7d4a1cf1ad303126c5f228f05f8c9e2ccafdb1f5a024376>
+            networks::POLYGON => ("0x6Ab5549bBd766A43aFb687776ad8466F8b42f777", 40613553),
+        ]))
+        .add_contract(Contract::new("BalancerV2ComposableStablePoolFactoryV5").with_networks(networks![
+            // <https://etherscan.io/tx/0x1fc28221925959c0713d04d9f9159255927ebb94b7fa76e4795db0e365643c07>
+            networks::MAINNET => ("0xDB8d758BCb971e482B2C45f7F8a7740283A1bd3A", 17672478),
+            // <https://gnosisscan.io/tx/0xcbf18b5a0d1f1fca9b30d08ab77d8554567c3bffa7efdd3add273073d20bb1e2>
+            networks::GNOSIS => ("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7", 28900564),
+            // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#ungrouped-active-current-contracts>
+            // <https://sepolia.etherscan.io/tx/0x2c155dde7c480929991dd2a3344d9fdd20252f235370d46d0887b151dc0416bd>
+            networks::SEPOLIA => ("0xa523f47A933D5020b23629dDf689695AA94612Dc", 3872211),
+            networks::ARBITRUM_ONE => ("0xA8920455934Da4D853faac1f94Fe7bEf72943eF1", 110212282),
+            // <https://basescan.org/tx/0x1d291ba796b0397d73581b17695cf0e53e61551e419c43d11d81198b00c2bfd3>
+            networks::BASE => ("0x8df317a729fcaA260306d7de28888932cb579b88", 1204710),
+            // <https://snowscan.xyz/tx/0x000659feb0831fc511f5c2ad12f3b2d466152b753c805fcb06e848701fd1b4b7>
+            networks::AVALANCHE => ("0xE42FFA682A26EF8F25891db4882932711D42e467", 32478827),
+            // <https://bscscan.com/tx/0x5bdfed936f82800e80543d5212cb287dceebb52c29133838acbe7e148bf1a447>
+            networks::BNB => ("0x4fb47126Fa83A8734991E41B942Ac29A3266C968", 29877945),
+            // <https://optimistic.etherscan.io/tx/0xa141b35dbbb18154e2452b1ae6ab7d82a6555724a878b5fccff40e18c8ae3484>
+            networks::OPTIMISM => ("0x043A2daD730d585C44FB79D2614F295D2d625412", 106752707),
+            // <https://polygonscan.com/tx/0xa3d9a1cf00eaca469d6f9ec2fb836bbbfdfbc3b0eeadc07619bb9e695bfdecb8>
+            networks::POLYGON => ("0xe2fa4e1d17725e72dcdAfe943Ecf45dF4B9E285b", 44961548),
+        ]))
+        .add_contract(Contract::new("BalancerV2ComposableStablePoolFactoryV6").with_networks(networks![
+            // <https://etherscan.io/tx/0x4149cadfe5d3431205d9819fca44ed7a4c2b101adc51adc75cc4586dee237be8>
+            networks::MAINNET => ("0x5B42eC6D40f7B7965BE5308c70e2603c0281C1E9", 19314764),
+            // <https://gnosisscan.io/tx/0xc3fc1fb96712a0659b7e9e5f406f63bdf5cbd5df9e04f0372c28f75785036791>
+            networks::GNOSIS => ("0x47B489bf5836f83ABD928C316F8e39bC0587B020", 32650879),
+            // <https://sepolia.etherscan.io/tx/0x53aa3587002469b758e2bb87135d9599fd06e7be944fe61c7f82045c45328566>
+            networks::SEPOLIA => ("0x05503B3aDE04aCA81c8D6F88eCB73Ba156982D2B", 5369821),
+            // <https://arbiscan.io/tx/0xfa1e7642e135fb32dc14c990b851e5e7a0ac7a463e3a60c5003ae4142396f45e>
+            networks::ARBITRUM_ONE => ("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7", 184805448),
+            // <https://basescan.org/tx/0x5d3342faf0368b939daa93247536afa26cc72c83de52ba7711ae1b8646688467>
+            networks::BASE => ("0x956CCab09898C0AF2aCa5e6C229c3aD4E93d9288", 11099703),
+            // <https://snowscan.xyz/tx/0x246248ad396826dbfbdc5360cb9cbbdb3a672efa08cc745d1670900888c58c7b>
+            networks::AVALANCHE => ("0xb9F8AB3ED3F3aCBa64Bc6cd2DcA74B7F38fD7B88", 42186350),
+            // <https://bscscan.com/tx/0x6784ab50138c7488bc14d4d9beb6a9e1ddc209a45f0a96b4ee98a7db84167dea>
+            networks::BNB => ("0x6B5dA774890Db7B7b96C6f44e6a4b0F657399E2e", 36485719),
+            // <https://optimistic.etherscan.io/tx/0xa38b696479f35a9751ca8b1f0ddeb160188b3146113975b8c2b657c2fe7d7fd2>
+            networks::OPTIMISM => ("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7", 116694338),
+            // <https://polygonscan.com/tx/0x7b9678ad538b1cd3f3a03e63455e7d49a1bc716ea42310fbf99df4bf93ecfdfa>
+            networks::POLYGON => ("0xEAedc32a51c510d35ebC11088fD5fF2b47aACF2E", 53996258),
+        ]))
+        .add_contract(Contract::new("BalancerV2Vault").with_networks(networks![
+            // Balancer addresses can be obtained from:
+            // <https://github.com/balancer/balancer-subgraph-v2/blob/master/networks.yaml>
+            // <https://etherscan.io/tx/0x28c44bb10d469cbd42accf97bd00b73eabbace138e9d44593e851231fbed1cb7>
+            networks::MAINNET => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 12272146),
+            // <https://gnosisscan.io/tx/0x21947751661e1b9197492f22779af1f5175b71dc7057869e5a8593141d40edf1>
+            networks::GNOSIS => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 24821598),
+            // <https://sepolia.etherscan.io/tx/0xb22509c6725dd69a975ecb96a0c594901eeee6a279cc66d9d5191022a7039ee6>
+            networks::SEPOLIA => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 3418831),
+            // <https://arbiscan.io/tx/0xe2c3826bd7b15ef8d338038769fe6140a44f1957a36b0f27ab321ab6c68d5a8e>
+            networks::ARBITRUM_ONE => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 222832),
+            // <https://basescan.org/tx/0x0dc2e3d436424f2f038774805116896d31828c0bf3795a6901337bdec4e0dff6>
+            networks::BASE => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 1196036),
+            // <https://snowscan.xyz/tx/0xc49af0372feb032e0edbba6988410304566b1fd65546c01ced620ac3c934120f>
+            networks::AVALANCHE => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 26386141),
+            // <https://bscscan.com/tx/0x1de8caa6c54ff9a25600e26d80865d84c9cc4d33c2b98611240529ee7de5cd74>
+            networks::BNB => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 22691002),
+            // <https://optimistic.etherscan.io/tx/0xa03cb990595df9eed6c5db17a09468cab534aed5f5589a06c0bb3d19dd2f7ce9>
+            networks::OPTIMISM => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 7003431),
+            // <https://polygonscan.com/tx/0x66f275a2ed102a5b679c0894ced62c4ebcb2a65336d086a916eb83bd1fe5c8d2>
+            networks::POLYGON => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 15832990),
+        ]))
+        .add_contract(Contract::new("BalancerV3BatchRouter").with_networks(networks![
+            // <https://etherscan.io/tx/0x41cb8619fb92dd532eb09b0e81fd4ce1c6006a10924893f02909e36a317777f3>
+            networks::MAINNET => ("0x136f1EFcC3f8f88516B9E94110D56FDBfB1778d1", 21339510),
+            // <https://gnosisscan.io/tx/0xeafddbace9f445266f851ef1d92928e3d01a4622a1a6780b41ac52d5872f12ab>
+            networks::GNOSIS => ("0xe2fa4e1d17725e72dcdAfe943Ecf45dF4B9E285b", 37377506),
+            // <https://sepolia.etherscan.io/tx/0x95ed8e1aaaa7bdc5881f3c8fc5a4914a66639bee52987c3a1ea88545083b0681>
+            networks::SEPOLIA => ("0xC85b652685567C1B074e8c0D4389f83a2E458b1C", 7219301),
+            // <https://arbiscan.io/tx/0xa7968c6bc0775208ffece789c6e5d09b0eea5f2c3ed2806e9bd94fb0b978ff0f>
+            networks::ARBITRUM_ONE => ("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E", 297828544),
+            // <https://basescan.org/tx/0x47b81146714630ce50445bfa28872a36973acedf785317ca423498810ec8e76c>
+            networks::BASE => ("0x85a80afee867aDf27B50BdB7b76DA70f1E853062", 25347205),
+            // <https://snowscan.xyz/tx/0x3bfaba7135ee2d67d98f20ee1aa4c8b7e81e47be64223376f3086bab429ac806>
+            networks::AVALANCHE => ("0xc9b36096f5201ea332Db35d6D195774ea0D5988f", 59965747),
+            // <https://optimistic.etherscan.io/tx/0xf370aab0d652f3e0f7c34e1a53e1afd98e86c487138300b0939d4e54b0088b67>
+            networks::OPTIMISM => ("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E", 133969588),
+        ]))
         .add_contract(Contract::new("ChainalysisOracle").with_networks(networks![
             networks::MAINNET => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
             networks::ARBITRUM_ONE => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",

From 63f914af35432a2f7e743e984d687a03f2147289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 28 Oct 2025 09:34:31 +0000
Subject: [PATCH 04/36] wip

---
 .../ethflow_events/event_retriever.rs         |   2 +-
 crates/autopilot/src/run.rs                   |   2 +-
 crates/contracts/build.rs                     | 286 ++++++++++++++++++
 crates/orderbook/src/run.rs                   |   7 +-
 .../bad_token/token_owner_finder/liquidity.rs |   2 +-
 .../src/bad_token/token_owner_finder/mod.rs   |   2 +-
 6 files changed, 293 insertions(+), 8 deletions(-)

diff --git a/crates/autopilot/src/database/ethflow_events/event_retriever.rs b/crates/autopilot/src/database/ethflow_events/event_retriever.rs
index f4bcd5e4df..41ad7a25e1 100644
--- a/crates/autopilot/src/database/ethflow_events/event_retriever.rs
+++ b/crates/autopilot/src/database/ethflow_events/event_retriever.rs
@@ -7,7 +7,7 @@ use {
         rpc::types::{Filter, FilterSet},
         sol_types::SolEvent,
     },
-    contracts::alloy::CoWSwapEthFlow::CoWSwapEthFlow,
+    contracts::bindings::CoWSwapEthFlow::CoWSwapEthFlow,
     shared::{ethrpc::Web3, event_handling::AlloyEventRetrieving},
 };
 
diff --git a/crates/autopilot/src/run.rs b/crates/autopilot/src/run.rs
index b591fc4bf8..0a63c559a2 100644
--- a/crates/autopilot/src/run.rs
+++ b/crates/autopilot/src/run.rs
@@ -26,7 +26,7 @@ use {
     },
     chain::Chain,
     clap::Parser,
-    contracts::alloy::{BalancerV2Vault, IUniswapV3Factory, InstanceExt},
+    contracts::bindings::{BalancerV2Vault, IUniswapV3Factory},
     ethcontract::{BlockNumber, H160, common::DeploymentInformation},
     ethrpc::{
         Web3,
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index cb9ac0abe9..5cb6fd9d1e 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -293,6 +293,292 @@ fn main() {
             networks::OPTIMISM => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
             networks::POLYGON => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
         ]))
+        // UniV2 Routers
+        .add_contract(Contract::new("BaoswapRouter").with_networks(networks![
+            networks::GNOSIS => "0x6093AeBAC87d62b1A5a4cEec91204e35020E38bE"
+        ]))
+        .add_contract(Contract::new("HoneyswapRouter").with_networks(networks![
+            networks::GNOSIS => "0x1C232F01118CB8B424793ae03F870aa7D0ac7f77"
+        ]))
+        .add_contract(Contract::new("PancakeRouter").with_networks(networks![
+            // <https://etherscan.io/tx/0x6e441248a9835ca10a3c29a19f2e1ed61d2e35f3ecb3a5b9e4ee170d62a22d16>
+            networks::MAINNET => "0xEfF92A263d31888d860bD50809A8D171709b7b1c",
+            // <https://arbiscan.io/tx/0x4a2da73cbfcaafb0347e4525307a095e38bf7532435cb0327d1f5ee2ee15a011>
+            networks::ARBITRUM_ONE => "0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb",
+            // <https://basescan.org/tx/0xda322aef5776698ac6da56be1ffaa0f9994a983cdeb9f2aeaba47437809ae6ef>
+            networks::BASE => "0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb",
+            // <https://bscscan.com/tx/0x1bfbff8411ed44e609d911476b0d35a28284545b690902806ea0a7ff0453e931>
+            networks::BNB => "0x10ED43C718714eb63d5aA57B78B54704E256024E"
+        ]))
+        .add_contract(Contract::new("SushiSwapRouter").with_networks(networks![
+            // <https://docs.sushi.com/contracts/cpamm>
+            // <https://etherscan.io/tx/0x4ff39eceee7ba9a63736eae38be69b10347975ff5fa4d9b85743a51e1c384094>
+            networks::MAINNET => "0xd9e1ce17f2641f24ae83637ab66a2cca9c378b9f",
+            // <https://gnosisscan.io/tx/0x8b45ccbc2afd0132ef8b636064e0e745ff93b53942a56e320bb930666dd0fb18>
+            networks::GNOSIS => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // <https://arbiscan.io/tx/0x40b22402bcac46330149ac9848f8bddd02b0a1e79d4a71934655a634051be1a1>
+            networks::ARBITRUM_ONE => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // <https://basescan.org/tx/0xbb673c483292e03d202e95a023048b8bda459bf12402e7688f7e10be8b4dc67d>
+            networks::BASE => "0x6bded42c6da8fbf0d2ba55b2fa120c5e0c8d7891",
+            // <https://snowtrace.io/tx/0x8185bcd3cc8544f8767e5270c4d7eb1e9b170fc0532fc4f0d7e7a1018e1f13ba>
+            networks::AVALANCHE => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // <https://bscscan.com/tx/0xf22f827ae797390f6e478b0a11aa6e92d6da527f47130ef70d313ff0e0b2a83f>
+            networks::BNB => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // <https://optimistic.etherscan.io/tx/0x88be6cc83f5bfccb8196db351866bac5c99ab8f7b451ea9975319ba05c3bf8f7>
+            networks::OPTIMISM => "0x2abf469074dc0b54d793850807e6eb5faf2625b1",
+            // <https://polygonscan.com/tx/0x3dcf8fc780ae6fbe40b1ae57927a8fb405f54cbe89d0021a781a100d2086e5ba>
+            networks::POLYGON => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+        ]))
+        .add_contract(Contract::new("SwaprRouter").with_networks(networks![
+            // <https://swapr.gitbook.io/swapr/contracts>
+            // <https://etherscan.io/tx/0x3f4ccc676637906db24caf043c89dafce959321c02266c6a4ab706fcec79a5f7>
+            networks::MAINNET => "0xb9960d9bca016e9748be75dd52f02188b9d0829f",
+            // <https://gnosisscan.io/tx/0x0406e774caced468b8f84d7c7ed9b6e9c324601af38f44e385aecf7a7d01feb4>
+            networks::GNOSIS => "0xE43e60736b1cb4a75ad25240E2f9a62Bff65c0C0",
+            // <https://arbiscan.io/tx/0x09771774fc138775472910f6bb0f2e03ff74e1e32a658e9c3e4d8f59f6431ba8>
+            networks::ARBITRUM_ONE => "0x530476d5583724A89c8841eB6Da76E7Af4C0F17E",
+        ]))
+        .add_contract(Contract::new("ISwaprPair"))
+        .add_contract(Contract::new("TestnetUniswapV2Router02").with_networks(networks![
+            // <https://sepolia.etherscan.io/tx/0x2bf9a91a42d53e161897d9c581f798df9db6fb00587803dde7e7b8859118d821>
+            networks::SEPOLIA => "0x86dcd3293C53Cf8EFd7303B57beb2a3F671dDE98",
+        ]))
+        .add_contract(Contract::new("UniswapV2Factory").with_networks(networks![
+            // <https://docs.uniswap.org/contracts/v2/reference/smart-contracts/factory>
+            // <https://etherscan.io/tx/0xc31d7e7e85cab1d38ce1b8ac17e821ccd47dbde00f9d57f2bd8613bff9428396>
+            networks::MAINNET => "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+            // <https://gnosisscan.io/tx/0x446de52c460bed3f49a4342eab247bb4b2fe2993962c284fb9bc14a983c7a3d4>
+            networks::GNOSIS => "0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7",
+            // <https://arbiscan.io/tx/0x83b597d54496c0b64d66a3b9a65c312e406262511c908f702ef06755d13ab2f3>
+            networks::ARBITRUM_ONE => "0xf1D7CC64Fb4452F05c498126312eBE29f30Fbcf9",
+            // <https://basescan.org/tx/0x3c94031f81d9afe3beeb8fbcf4dcf1bd5b5688b86081d94e3d0231514dc00d31>
+            networks::BASE => "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6",
+            // <https://sepolia.etherscan.io/tx/0x0a5e26b22f6b470857957a1d5a92ad4a7d3c5e7cf254ddd80edfe23df70eae71>
+            networks::SEPOLIA => "0xF62c03E08ada871A0bEb309762E260a7a6a880E6",
+            // <https://snowtrace.io/tx/0xd06a069b11fc0c998b404c5736957cc16c71cf1f7dbf8a7d4244c84036ea6edd>
+            networks::AVALANCHE => "0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C",
+            // <https://bscscan.com/tx/0x7305a4bddc54eee158f245a09526969697ac1a9f56d090b124ebfc85ff71a5cf>
+            networks::BNB => "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6",
+            // <https://optimistic.etherscan.io/tx/0xf7227dcbbfa4ea2bb2634f2a1f364a64b028f9e9e393974fea8d435cd097c72e>
+            networks::OPTIMISM => "0x0c3c1c532F1e39EdF36BE9Fe0bE1410313E074Bf",
+            // <https://polygonscan.com/tx/0x712ac56155a301fca4b7a761e232233f41a104865a74b1a59293835da355292a>
+            networks::POLYGON => "0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C",
+        ]))
+        .add_contract(Contract::new("UniswapV2Router02").with_networks(networks![
+            // <https://docs.uniswap.org/contracts/v2/reference/smart-contracts/router-02>
+            // <https://etherscan.io/tx/0x4fc1580e7f66c58b7c26881cce0aab9c3509afe6e507527f30566fbf8039bcd0>
+            networks::MAINNET => "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
+            // <https://gnosisscan.io/tx/0xfcc495cdb313b48bbb0cd0a25cb2e8fd512eb8fb0b15f75947a9d5668e47a918>
+            networks::GNOSIS => "0x1C232F01118CB8B424793ae03F870aa7D0ac7f77",
+            // <https://arbiscan.io/tx/0x630cd9d56a85e1bac7795d254fef861304a6838e28869badef19f19defb48ba6>
+            networks::ARBITRUM_ONE => "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
+            // <https://basescan.org/tx/0x039224ce16ebe5574f51da761acbdfbd21099d6230c39fcd8ff566bbfd6a50a9>
+            networks::BASE => "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
+            // <https://sepolia.etherscan.io/tx/0x92674b51681d2e99e71e03bd387bc0f0e79f2412302b49ed5626d1fa2311bab9>
+            networks::SEPOLIA => "0xeE567Fe1712Faf6149d80dA1E6934E354124CfE3",
+            // <https://snowtrace.io/tx/0x7372f1eedf9d32fb4185d486911f44542723dae766eea04bc3f14724bae9552e>
+            networks::AVALANCHE => "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
+            // <https://bscscan.com/tx/0x9e940f846abea7dcc1f0bd5c261f405c104628c855346f8cac966f52905ee0fa>
+            networks::BNB => "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
+            // <https://optimistic.etherscan.io/tx/0x2dcb9a76100e5be49e89085b87bd447b1966a9d823d5985e1a8197834c60e6bd>
+            networks::OPTIMISM => "0x4A7b5Da61326A6379179b40d00F57E5bbDC962c2",
+            // <https://polygonscan.com/tx/0x66186e0cacd2f6b3ad2eae586bd331daafd0572eb80bf71be694181858198025>
+            networks::POLYGON => "0xedf6066a2b290C185783862C7F4776A2C8077AD1",
+        ]))
+        .add_contract(Contract::new("IUniswapLikeRouter"))
+        .add_contract(Contract::new("IUniswapLikePair"))
+        // UniV3
+        .add_contract(Contract::new("UniswapV3Pool"))
+        .add_contract(Contract::new("UniswapV3QuoterV2").with_networks(networks![
+            // <https://docs.uniswap.org/contracts/v3/reference/deployments/>
+            networks::MAINNET => "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
+            networks::ARBITRUM_ONE => "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
+            networks::BASE => "0x3d4e44Eb1374240CE5F1B871ab261CD16335B76a",
+            networks::AVALANCHE => "0xbe0F5544EC67e9B3b2D979aaA43f18Fd87E6257F",
+            networks::BNB => "0x78D78E420Da98ad378D7799bE8f4AF69033EB077",
+            networks::OPTIMISM => "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
+            networks::POLYGON => "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
+            networks::LENS => "0x1eEA2B790Dc527c5a4cd3d4f3ae8A2DDB65B2af1",
+        ]))
+        .add_contract(Contract::new("UniswapV3SwapRouterV2").with_networks(networks![
+            // <https://github.com/Uniswap/v3-periphery/blob/697c2474757ea89fec12a4e6db16a574fe259610/deploys.md>
+            networks::ARBITRUM_ONE => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+            networks::MAINNET => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+            networks::POLYGON => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+            networks::OPTIMISM => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+            networks::BASE => "0x2626664c2603336E57B271c5C0b26F421741e481",
+            networks::AVALANCHE => "0xbb00FF08d01D300023C629E8fFfFcb65A5a578cE",
+            networks::BNB => "0xB971eF87ede563556b2ED4b1C0b0019111Dd85d2",
+            networks::LENS => "0x6ddD32cd941041D8b61df213B9f515A7D288Dc13",
+        ]))
+        .add_contract(Contract::new("IUniswapV3Factory").with_networks(networks![
+            // <https://github.com/Uniswap/v3-periphery/blob/697c2474757ea89fec12a4e6db16a574fe259610/deploys.md>
+            networks::MAINNET => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            networks::SEPOLIA => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            networks::ARBITRUM_ONE => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            networks::BASE => "0x33128a8fC17869897dcE68Ed026d694621f6FDfD",
+            networks::AVALANCHE => "0x740b1c1de25031C31FF4fC9A62f554A55cdC1baD",
+            networks::BNB => "0xdB1d10011AD0Ff90774D0C6Bb92e5C5c8b4461F7",
+            networks::OPTIMISM => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            networks::POLYGON => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            networks::LENS => "0xc3A5b857Ba82a2586A45a8B59ECc3AA50Bc3D0e3",
+        ]))
+        // CoW Protocol
+        .add_contract(Contract::new("HooksTrampoline").with_networks(networks![
+            // <https://github.com/cowprotocol/hooks-trampoline/blob/993427166ade6c65875b932f853776299290ac4b/networks.json>
+            networks::MAINNET => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            // Gnosis is using the old instance of the hook trampoline since it's hardcoded in gnosis pay rebalance integration.
+            networks::GNOSIS => "0x01DcB88678aedD0C4cC9552B20F4718550250574",
+            networks::SEPOLIA => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            networks::ARBITRUM_ONE => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            networks::BASE => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            networks::AVALANCHE => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            networks::BNB => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            networks::OPTIMISM => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            networks::POLYGON => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            networks::LENS => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+        ]))
+        .add_contract(Contract::new("CoWSwapEthFlow").with_networks(networks![
+            // <https://etherscan.io/tx/0x0247e3c15f59a52b099f192265f1c1e6227f48a280717b3eefd7a5d9d0c051a1>
+            networks::MAINNET => ("0x40a50cf069e992aa4536211b23f286ef88752187", 16169866),
+            // <https://gnosisscan.io/tx/0x6280e079f454fbb5de3c52beddd64ca2b5be0a4b3ec74edfd5f47e118347d4fb>
+            networks::GNOSIS => ("0x40a50cf069e992aa4536211b23f286ef88752187", 25414331),
+            // <https://github.com/cowprotocol/ethflowcontract/blob/v1.1.0-artifacts/networks.prod.json#L11-L14>
+            // <https://sepolia.etherscan.io/tx/0x558a7608a770b5c4f68fffa9b02e7908a40f61b557b435ea768a4c62cb79ae25>
+            networks::SEPOLIA => ("0x0b7795E18767259CC253a2dF471db34c72B49516", 4718739),
+            // <https://arbiscan.io/tx/0xa4066ca77bbe1f21776b4c26315ead3b1c054b35814b49e0c35afcbff23e1b8d>
+            networks::ARBITRUM_ONE => ("0x6DFE75B5ddce1ADE279D4fa6BD6AeF3cBb6f49dB", 204747458),
+            // <https://basescan.org/tx/0xc3555c4b065867cbf34382438e1bbaf8ee39eaf10fb0c70940c8955962e76e2c>
+            networks::BASE => ("0x3C3eA1829891BC9bEC3d06A81d5d169e52a415e3", 21490258),
+            // <https://snowscan.xyz/tx/0x71a2ed9754247210786effa3269bc6eb68b7521b5052ac9f205af7ac364f608f>
+            networks::AVALANCHE => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 60496408),
+            // <https://bscscan.com/tx/0x959a60a42d36e0efd247b3cf19ed9d6da503d01bce6f87ed31e5e5921111222e>
+            networks::BNB => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 48411237),
+            // <https://optimistic.etherscan.io/tx/0x0644f10f7ae5448240fc592ad21abf4dabac473a9d80904af5f7865f2d6509e2>
+            networks::OPTIMISM => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 134607215),
+            // <https://polygonscan.com/tx/0xc3781c19674d97623d13afc938fca94d53583f4051020512100e84fecd230f91>
+            networks::POLYGON => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 71296258),
+            // <https://explorer.lens.xyz/tx/0xc59b5ffadb40158f9390b1d77f19346dbe9214b27f26346dfa2990ad379a1a32>
+            networks::LENS => ("0xFb337f8a725A142f65fb9ff4902d41cc901de222", 3007173),
+        ]))
+        .add_contract(Contract::new("CoWSwapOnchainOrders"))
+        .add_contract(Contract::new("ERC1271SignatureValidator"))
+        .add_contract(Contract::new("GPv2AllowListAuthentication").with_networks(networks![
+            // <https://etherscan.io/tx/0xb84bf720364f94c749f1ec1cdf0d4c44c70411b716459aaccfd24fc677013375>
+            networks::MAINNET => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 12593263),
+            // <https://gnosisscan.io/tx/0x1a2d87a05a94bc6680a4faee31bbafbd74e9ddb63dd3941c717b5c609c08b957>
+            networks::GNOSIS => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 16465099),
+            // <https://sepolia.etherscan.io/tx/0x73c54c75b3f382304f3adf33e3876c8999fb10df786d4a902733369251033cd1>
+            networks::SEPOLIA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 4717469),
+            // <https://arbiscan.io/tx/0xe994adff141a2e72bd9dab3eb7b3480637013bdfb1aa42c62d9d6c90de091237>
+            networks::ARBITRUM_ONE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 204702129),
+            // <https://basescan.org/tx/0x5497004d2a37c9eafd0bd1e5861a67d3a209c5b845724166e3dbca9527ee05ec>
+            networks::BASE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 21407137),
+            // <https://snowscan.xyz/tx/0xa58fc76846917779d7bcbb7d34f4a2a44aab2b702ef983594e34e6972a0c626b>
+            networks::AVALANCHE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 59891351),
+            // <https://bscscan.com/tx/0x8da639c62eb4a810573c178ed245184944d66c834122e3f88994ebf679b50e34>
+            networks::BNB => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 48173639),
+            // <https://optimistic.etherscan.io/tx/0x5b6403b485e369ce524d04234807df782e6639e55a7c1d859f0a67925d9a5f49>
+            networks::OPTIMISM => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 134254466),
+            // <https://polygonscan.com/tx/0x686e4bbcfd6ebae91f0fcc667407c831953629877ec622457916729de3d461c3>
+            networks::POLYGON => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 45854728),
+            // <https://explorer.lens.xyz/tx/0x0730c21885153dcc9a25ab7abdc38309ec7c7a8db15b763fbbaf574d1e7ec498>
+            networks::LENS => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 2612937),
+        ]))
+        // DeFi Infrastructure
+        .add_contract(Contract::new("BalancerQueries").with_networks(networks![
+            // Used in the gnosis/solvers repo for the balancer solver
+            // <https://etherscan.io/tx/0x30799534f3a0ab8c7fa492b88b56e9354152ffaddad15415184a3926c0dd9b09>
+            networks::MAINNET => ("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5", 15188261),
+            // <https://arbiscan.io/tx/0x710d93aab52b6c10197eab20f9d6db1af3931f9890233d8832268291ef2f54b3>
+            networks::ARBITRUM_ONE => ("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5", 18238624),
+            // <https://optimistic.etherscan.io/tx/0xf3b2aaf3e12c7de0987dc99a26242b227b9bc055342dda2e013dab0657d6f9f1>
+            networks::OPTIMISM => ("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5", 15288107),
+            // <https://basescan.org/tx/0x425d04ee79511c17d06cd96fe1df9e0727f7e7d46b31f36ecaa044ada6a0d29a>
+            networks::BASE => ("0x300Ab2038EAc391f26D9F895dc61F8F66a548833", 1205869),
+            // <https://gnosisscan.io/tx/0x5beb3051d393aac24cb236dc850c644f345af65c4927030bd1033403e2f2e503>
+            networks::GNOSIS => ("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", 24821845),
+            // <https://polygonscan.com/tx/0x0b74f5c230f9b7df8c7a7f0d1ebd5e6c3fab51a67a9bcc8f05c350180041682e>
+            networks::POLYGON => ("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5", 30988035),
+            // <https://snowtrace.io/tx/0xf484e1efde47209bad5f72642bcb8d8e2a4092a5036434724ffa2d039e93a1bf?chainid=43114>
+            networks::AVALANCHE => ("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD", 26387068),
+        ]))
+        .add_contract(Contract::new("ILiquoriceSettlement").with_networks(networks![
+            // <https://liquorice.gitbook.io/liquorice-docs/links/smart-contracts>
+            networks::MAINNET => "0x0448633eb8B0A42EfED924C42069E0DcF08fb552",
+            networks::ARBITRUM_ONE => "0x0448633eb8B0A42EfED924C42069E0DcF08fb552",
+        ]))
+        .add_contract(Contract::new("FlashLoanRouter").with_networks(networks![
+            networks::MAINNET => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            networks::GNOSIS => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            networks::SEPOLIA => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            networks::ARBITRUM_ONE => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            networks::BASE => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            networks::POLYGON => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            networks::AVALANCHE => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+        ]))
+        .add_contract(Contract::new("Permit2").with_networks(networks![
+            // Only used in <github.com/gnosis/solvers>
+            // <https://etherscan.io/tx/0xf2f1fe96c16ee674bb7fcee166be52465a418927d124f5f1d231b36eae65d377>
+            networks::MAINNET => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 15986406),
+            // <https://gnosisscan.io/tx/0x3ba511410edc92cafe94bd100e25adb37981499d17947a3d64c8523fbfd31864>
+            networks::GNOSIS => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 27338672),
+            // <https://sepolia.etherscan.io/tx/0x363df5deeead44d8fd38425f3986e3e81946a6c59d8b68fe33926cc700713173>
+            networks::SEPOLIA => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 2356287),
+            // <https://arbiscan.io/tx/0xe244dafca8211ed6fb123efaa5075b7d5813749718412ca435c872afd0e2ea82>
+            networks::ARBITRUM_ONE => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 38692735),
+            // <https://basescan.org/tx/0x26fbdea9a47ba8e21676bc6b6a72a19dded1a0c270e96d5236886ca9c5000d3f>
+            networks::BASE => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 1425180),
+            // <https://snowscan.xyz/tx/0x38fd76c2165d920c7e006defd67eeeb0069bf93e41741eec3bbb83d196610a56>
+            networks::AVALANCHE => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 28844415),
+            // <https://bscscan.com/tx/0xb038ec7b72db4207e0c0d5433e1cabc41b4e4f9b9cac577173b3188fc508a6c3>
+            networks::BNB => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 25343783),
+            // <https://optimistic.etherscan.io/tx/0xf0a51e0d0579ef8cc7965f5797bd7665ddac14d4d2141423676b8862f7668352>
+            networks::OPTIMISM => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 38854427),
+            // <https://polygonscan.com/tx/0xe2a4d996de0d6a23108f701b37acba6c47ee34448bb51fec5c23f542a6f3ccc8>
+            networks::POLYGON => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 35701901),
+        ]))
+        // Support contracts
+        .add_contract(Contract::new("CowAmmFactoryGetter"))
+        .add_contract(Contract::new("AnyoneAuthenticator"))
+        .add_contract(Contract::new("Solver"))
+        .add_contract(Contract::new("Spardose"))
+        .add_contract(Contract::new("Trader"))
+        .add_contract(Contract::new("Swapper"))
+        .add_contract(Contract::new("Signatures").with_networks(networks![
+            networks::MAINNET => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::ARBITRUM_ONE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::BASE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::AVALANCHE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::BNB => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::OPTIMISM => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::POLYGON => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::LENS => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::GNOSIS => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            networks::SEPOLIA => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+        ]))
+        .add_contract(Contract::new("Balances").with_networks(networks![
+            networks::MAINNET => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::ARBITRUM_ONE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::BASE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::AVALANCHE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::BNB => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::OPTIMISM => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::POLYGON => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::LENS => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::GNOSIS => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            networks::SEPOLIA => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+        ]))
+        // Test contracts
+        .add_contract(Contract::new("GasHog"))
+        .add_contract(Contract::new("Counter"))
+        .add_contract(Contract::new("CowProtocolToken").with_networks(networks![
+            networks::MAINNET => "0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB",
+            networks::GNOSIS => "0x177127622c4A00F3d409B75571e12cB3c8973d3c",
+            networks::SEPOLIA => "0x0625aFB445C3B6B7B929342a04A22599fd5dBB59",
+            networks::ARBITRUM_ONE => "0xcb8b5CD20BdCaea9a010aC1F8d835824F5C87A04",
+            networks::BASE => "0xc694a91e6b071bF030A18BD3053A7fE09B6DaE69",
+        ]))
         .write_formatted(Path::new("artifacts"), false, Path::new("src/bindings"))
         .unwrap();
 
diff --git a/crates/orderbook/src/run.rs b/crates/orderbook/src/run.rs
index d67a0f5487..1a027679d0 100644
--- a/crates/orderbook/src/run.rs
+++ b/crates/orderbook/src/run.rs
@@ -15,14 +15,13 @@ use {
     contracts::{
         GPv2Settlement,
         WETH9,
-        alloy::{
+        bindings::{
             BalancerV2Vault,
+            Balances,
+            ChainalysisOracle,
             HooksTrampoline,
             IUniswapV3Factory,
-            InstanceExt,
-            support::Balances,
         },
-        bindings::ChainalysisOracle,
     },
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt, StreamExt},
diff --git a/crates/shared/src/bad_token/token_owner_finder/liquidity.rs b/crates/shared/src/bad_token/token_owner_finder/liquidity.rs
index 85ba7220f8..a70cfc5c05 100644
--- a/crates/shared/src/bad_token/token_owner_finder/liquidity.rs
+++ b/crates/shared/src/bad_token/token_owner_finder/liquidity.rs
@@ -5,7 +5,7 @@ use {
     crate::sources::{uniswap_v2::pair_provider::PairProvider, uniswap_v3_pair_provider},
     alloy::eips::BlockNumberOrTag,
     anyhow::Result,
-    contracts::alloy::{BalancerV2Vault, IUniswapV3Factory},
+    contracts::bindings::{BalancerV2Vault, IUniswapV3Factory},
     ethcontract::H160,
     ethrpc::alloy::conversions::IntoLegacy,
     model::TokenPair,
diff --git a/crates/shared/src/bad_token/token_owner_finder/mod.rs b/crates/shared/src/bad_token/token_owner_finder/mod.rs
index 21cc299313..28e0991e9e 100644
--- a/crates/shared/src/bad_token/token_owner_finder/mod.rs
+++ b/crates/shared/src/bad_token/token_owner_finder/mod.rs
@@ -33,7 +33,7 @@ use {
     chain::Chain,
     contracts::{
         ERC20,
-        alloy::{BalancerV2Vault, IUniswapV3Factory},
+        bindings::{BalancerV2Vault, IUniswapV3Factory},
         errors::EthcontractErrorType,
     },
     ethcontract::U256,

From 319f708c2f30d11174a5e47ed4e6a63c49ce10f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Wed, 29 Oct 2025 18:22:19 +0000
Subject: [PATCH 05/36] Migrate the remaining ERC20

---
 crates/contracts/build.rs                     |  46 -----
 crates/contracts/src/lib.rs                   |  10 --
 crates/cow-amm/src/maintainers.rs             |   8 +-
 .../driver/src/infra/blockchain/contracts.rs  |  13 +-
 crates/driver/src/infra/blockchain/mod.rs     |   6 -
 crates/driver/src/infra/blockchain/token.rs   |  41 ++---
 crates/e2e/src/setup/mod.rs                   |  10 +-
 crates/e2e/tests/e2e/buffers.rs               |   2 +-
 crates/e2e/tests/e2e/liquidity.rs             | 168 +++++++++++-------
 .../e2e/liquidity_source_notification.rs      | 158 ++++++++++------
 crates/e2e/tests/e2e/protocol_fee.rs          |  14 +-
 crates/ethrpc/Cargo.toml                      |   2 +-
 crates/ethrpc/src/alloy/errors.rs             |  44 +++++
 crates/ethrpc/src/alloy/mod.rs                |   2 +-
 .../shared/src/account_balances/simulation.rs |  72 ++++----
 .../src/bad_token/token_owner_finder/mod.rs   |  26 +--
 .../balance_overrides/detector.rs             |  16 +-
 crates/shared/src/sources/swapr.rs            |   9 +-
 .../src/sources/uniswap_v2/pool_fetching.rs   |  68 +++----
 crates/shared/src/token_info.rs               |  35 ++--
 crates/solver/src/interactions/allowances.rs  |  37 ++--
 21 files changed, 412 insertions(+), 375 deletions(-)
 delete mode 100644 crates/contracts/build.rs
 create mode 100644 crates/ethrpc/src/alloy/errors.rs

diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
deleted file mode 100644
index 805b62a231..0000000000
--- a/crates/contracts/build.rs
+++ /dev/null
@@ -1,46 +0,0 @@
-use {
-    ethcontract_generate::{ContractBuilder, loaders::TruffleLoader},
-    std::{env, path::Path},
-};
-
-#[path = "src/paths.rs"]
-mod paths;
-
-fn main() {
-    // NOTE: This is a workaround for `rerun-if-changed` directives for
-    // non-existent files cause the crate's build unit to get flagged for a
-    // rebuild if any files in the workspace change.
-    //
-    // See:
-    // - https://github.com/rust-lang/cargo/issues/6003
-    // - https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
-    println!("cargo:rerun-if-changed=build.rs");
-
-    generate_contract("ERC20");
-}
-
-fn generate_contract(name: &str) {
-    generate_contract_with_config(name, |builder| builder)
-}
-
-fn generate_contract_with_config(
-    name: &str,
-    config: impl FnOnce(ContractBuilder) -> ContractBuilder,
-) {
-    let path = paths::contract_artifacts_dir()
-        .join(name)
-        .with_extension("json");
-    let contract = TruffleLoader::new()
-        .name(name)
-        .load_contract_from_file(&path)
-        .unwrap();
-    let dest = env::var("OUT_DIR").unwrap();
-
-    println!("cargo:rerun-if-changed={}", path.display());
-
-    config(ContractBuilder::new().visibility_modifier("pub"))
-        .generate(&contract)
-        .unwrap()
-        .write_to_file(Path::new(&dest).join(format!("{name}.rs")))
-        .unwrap();
-}
diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index 91fc45b6ef..b39baad16f 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -42,16 +42,6 @@ pub mod paths;
 pub mod vault;
 pub mod web3;
 
-macro_rules! include_contracts {
-    ($($name:ident;)*) => {$(
-        include!(concat!(env!("OUT_DIR"), "/", stringify!($name), ".rs"));
-    )*};
-}
-
-include_contracts! {
-    ERC20;
-}
-
 #[cfg(test)]
 mod tests {
     use {
diff --git a/crates/cow-amm/src/maintainers.rs b/crates/cow-amm/src/maintainers.rs
index 3522c71eb9..bb93ea3438 100644
--- a/crates/cow-amm/src/maintainers.rs
+++ b/crates/cow-amm/src/maintainers.rs
@@ -1,8 +1,8 @@
 use {
     crate::{Amm, cache::Storage},
-    contracts::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::futures::future::{join_all, select_ok},
-    ethrpc::{Web3, alloy::conversions::IntoLegacy},
+    ethrpc::Web3,
     shared::maintenance::Maintaining,
     std::sync::Arc,
     tokio::sync::RwLock,
@@ -25,8 +25,8 @@ impl EmptyPoolRemoval {
             .traded_tokens()
             .iter()
             .map(move |token| async move {
-                ERC20::at(&self.web3, token.into_legacy())
-                    .balance_of(amm_address.into_legacy())
+                ERC20::Instance::new(*token, self.web3.alloy.clone())
+                    .balanceOf(*amm_address)
                     .call()
                     .await
                     .map_err(|err| {
diff --git a/crates/driver/src/infra/blockchain/contracts.rs b/crates/driver/src/infra/blockchain/contracts.rs
index ec03aa7627..ae374376ee 100644
--- a/crates/driver/src/infra/blockchain/contracts.rs
+++ b/crates/driver/src/infra/blockchain/contracts.rs
@@ -1,5 +1,5 @@
 use {
-    crate::{domain::eth, infra::blockchain::Ethereum},
+    crate::domain::eth,
     chain::Chain,
     contracts::alloy::{
         BalancerV2Vault,
@@ -183,17 +183,6 @@ pub fn deployment_address(
     )
 }
 
-/// A trait for initializing contract instances with dynamic addresses.
-pub trait ContractAt {
-    fn at(eth: &Ethereum, address: eth::ContractAddress) -> Self;
-}
-
-impl ContractAt for contracts::ERC20 {
-    fn at(eth: &Ethereum, address: eth::ContractAddress) -> Self {
-        Self::at(&eth.web3, address.into())
-    }
-}
-
 #[derive(Debug, Error)]
 pub enum Error {
     #[error("method error: {0:?}")]
diff --git a/crates/driver/src/infra/blockchain/mod.rs b/crates/driver/src/infra/blockchain/mod.rs
index de79a07084..d286d5f5d8 100644
--- a/crates/driver/src/infra/blockchain/mod.rs
+++ b/crates/driver/src/infra/blockchain/mod.rs
@@ -1,5 +1,4 @@
 use {
-    self::contracts::ContractAt,
     crate::{boundary, domain::eth},
     chain::Chain,
     ethcontract::{U256, errors::ExecutionError},
@@ -159,11 +158,6 @@ impl Ethereum {
         &self.inner.contracts
     }
 
-    /// Create a contract instance at the specified address.
-    pub fn contract_at<T: ContractAt>(&self, address: eth::ContractAddress) -> T {
-        T::at(self, address)
-    }
-
     /// Check if a smart contract is deployed to the given address.
     pub async fn is_contract(&self, address: eth::Address) -> Result<bool, Error> {
         let code = self.web3.eth().code(address.into(), None).await?;
diff --git a/crates/driver/src/infra/blockchain/token.rs b/crates/driver/src/infra/blockchain/token.rs
index 6e930c5840..8ece066b4e 100644
--- a/crates/driver/src/infra/blockchain/token.rs
+++ b/crates/driver/src/infra/blockchain/token.rs
@@ -1,25 +1,32 @@
 use {
     super::{Error, Ethereum},
     crate::domain::eth,
+    ethrpc::alloy::{
+        conversions::{IntoAlloy, IntoLegacy},
+        errors::ContractErrorExt,
+    },
 };
 
 /// An ERC-20 token.
 ///
 /// https://eips.ethereum.org/EIPS/eip-20
 pub struct Erc20 {
-    token: contracts::ERC20,
+    token: contracts::alloy::ERC20::Instance,
 }
 
 impl Erc20 {
     pub(super) fn new(eth: &Ethereum, address: eth::TokenAddress) -> Self {
         Self {
-            token: eth.contract_at(address.into()),
+            token: contracts::alloy::ERC20::Instance::new(
+                address.0.0.into_alloy(),
+                eth.web3.alloy.clone(),
+            ),
         }
     }
 
     /// Returns the [`eth::TokenAddress`] of the ERC20.
     pub fn address(&self) -> eth::TokenAddress {
-        self.token.address().into()
+        self.token.address().into_legacy().into()
     }
 
     /// Fetch the ERC20 allowance for the spender. See the allowance method in
@@ -31,11 +38,15 @@ impl Erc20 {
         owner: eth::Address,
         spender: eth::Address,
     ) -> Result<eth::allowance::Existing, Error> {
-        let amount = self.token.allowance(owner.0, spender.0).call().await?;
+        let amount = self
+            .token
+            .allowance(owner.0.into_alloy(), spender.0.into_alloy())
+            .call()
+            .await?;
         Ok(eth::Allowance {
-            token: self.token.address().into(),
+            token: self.token.address().into_legacy().into(),
             spender,
-            amount,
+            amount: amount.into_legacy(),
         }
         .into())
     }
@@ -47,7 +58,7 @@ impl Erc20 {
     pub async fn decimals(&self) -> Result<Option<u8>, Error> {
         match self.token.decimals().call().await {
             Ok(decimals) => Ok(Some(decimals)),
-            Err(err) if is_contract_error(&err) => Ok(None),
+            Err(err) if err.is_contract_err() => Ok(None),
             Err(err) => Err(err.into()),
         }
     }
@@ -59,7 +70,7 @@ impl Erc20 {
     pub async fn symbol(&self) -> Result<Option<String>, Error> {
         match self.token.symbol().call().await {
             Ok(symbol) => Ok(Some(symbol)),
-            Err(err) if is_contract_error(&err) => Ok(None),
+            Err(err) if err.is_contract_err() => Ok(None),
             Err(err) => Err(err.into()),
         }
     }
@@ -70,21 +81,11 @@ impl Erc20 {
     /// https://eips.ethereum.org/EIPS/eip-20#balanceof
     pub async fn balance(&self, holder: eth::Address) -> Result<eth::TokenAmount, Error> {
         self.token
-            .balance_of(holder.0)
+            .balanceOf(holder.0.into_alloy())
             .call()
             .await
+            .map(IntoLegacy::into_legacy)
             .map(Into::into)
             .map_err(Into::into)
     }
 }
-
-/// Returns `true` if a [`ethcontract::errors::MethodError`] is the result of
-/// some on-chain computation error.
-fn is_contract_error(err: &ethcontract::errors::MethodError) -> bool {
-    // Assume that any error that isn't a `Web3` error is a "contract error",
-    // this can mean things like:
-    // - The contract call reverted
-    // - The returndata cannot be decoded
-    // - etc.
-    !matches!(&err.inner, ethcontract::errors::ExecutionError::Web3(_))
-}
diff --git a/crates/e2e/src/setup/mod.rs b/crates/e2e/src/setup/mod.rs
index 40423f647b..454d3b149a 100644
--- a/crates/e2e/src/setup/mod.rs
+++ b/crates/e2e/src/setup/mod.rs
@@ -250,12 +250,14 @@ async fn run<F, Fut, T>(
 #[macro_export]
 macro_rules! assert_approximately_eq {
     ($executed_value:expr_2021, $expected_value:expr_2021) => {{
-        let lower = $expected_value * U256::from(99999999999u128) / U256::from(100000000000u128);
-        let upper =
-            ($expected_value * U256::from(100000000001u128) / U256::from(100000000000u128)) + 1;
+        let lower = $expected_value * ::alloy::primitives::U256::from(99999999999u128)
+            / ::alloy::primitives::U256::from(100000000000u128);
+        let upper = ($expected_value * ::alloy::primitives::U256::from(100000000001u128)
+            / ::alloy::primitives::U256::from(100000000000u128))
+            + ::alloy::primitives::U256::ONE;
         assert!(
             $executed_value >= lower && $executed_value <= upper,
-            "Expected: ~{}, got: {}",
+            "Expected: ~{}, got: {}, ({lower}, {upper})",
             $expected_value,
             $executed_value
         );
diff --git a/crates/e2e/tests/e2e/buffers.rs b/crates/e2e/tests/e2e/buffers.rs
index 56237ac9bd..62901d7ff6 100644
--- a/crates/e2e/tests/e2e/buffers.rs
+++ b/crates/e2e/tests/e2e/buffers.rs
@@ -128,7 +128,7 @@ async fn onchain_settlement_without_liquidity(web3: Web3) {
         .await
         .unwrap();
     // Check that internal buffers were used
-    assert!(settlement_contract_balance == U256::ZERO);
+    assert!(settlement_contract_balance.is_zero(), "{}", settlement_contract_balance);
 
     // Same order can trade again with external liquidity
     let order = OrderCreation {
diff --git a/crates/e2e/tests/e2e/liquidity.rs b/crates/e2e/tests/e2e/liquidity.rs
index 0a5e547850..1598e095f4 100644
--- a/crates/e2e/tests/e2e/liquidity.rs
+++ b/crates/e2e/tests/e2e/liquidity.rs
@@ -1,14 +1,14 @@
 use {
-    chrono::{NaiveDateTime, Utc},
-    contracts::{
-        ERC20,
-        alloy::{IZeroex, InstanceExt},
+    alloy::{
+        primitives::{Address, address},
+        providers::ext::{AnvilApi, ImpersonateConfig},
     },
+    chrono::{NaiveDateTime, Utc},
+    contracts::alloy::{ERC20, IZeroex, InstanceExt},
     driver::domain::eth::H160,
     e2e::{
         api::zeroex::{Eip712TypedZeroExOrder, ZeroExApi},
         assert_approximately_eq,
-        nodes::forked_node::ForkedNodeApi,
         setup::{
             OnchainComponents,
             Services,
@@ -20,17 +20,16 @@ use {
             to_wei_with_exp,
             wait_for_condition,
         },
-        tx,
     },
     ethcontract::{Account, H256, prelude::U256},
     ethrpc::{
         Web3,
         alloy::{
+            CallBuilderExt,
             ProviderSignerExt,
             conversions::{IntoAlloy, IntoLegacy, TryIntoAlloyAsync},
         },
     },
-    hex_literal::hex,
     model::{
         order::{OrderCreation, OrderKind},
         signature::EcdsaSigningScheme,
@@ -41,8 +40,8 @@ use {
 
 /// The block number from which we will fetch state for the forked tests.
 pub const FORK_BLOCK: u64 = 23112197;
-pub const USDT_WHALE: H160 = H160(hex!("F977814e90dA44bFA03b6295A0616a897441aceC"));
-pub const USDC_WHALE: H160 = H160(hex!("28c6c06298d514db089934071355e5743bf21d60"));
+pub const USDT_WHALE: Address = address!("F977814e90dA44bFA03b6295A0616a897441aceC");
+pub const USDC_WHALE: Address = address!("28c6c06298d514db089934071355e5743bf21d60");
 
 #[tokio::test]
 #[ignore]
@@ -58,23 +57,18 @@ async fn forked_node_zero_ex_liquidity_mainnet() {
 
 async fn zero_ex_liquidity(web3: Web3) {
     let mut onchain = OnchainComponents::deployed(web3.clone()).await;
-    let forked_node_api = web3.api::<ForkedNodeApi<_>>();
 
     let [solver] = onchain.make_solvers_forked(to_wei(1)).await;
     let [trader, zeroex_maker] = onchain.make_accounts(to_wei(1)).await;
 
-    let token_usdc = ERC20::at(
-        &web3,
-        "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-            .parse()
-            .unwrap(),
+    let token_usdc = ERC20::Instance::new(
+        address!("a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"),
+        web3.alloy.clone(),
     );
 
-    let token_usdt = ERC20::at(
-        &web3,
-        "0xdac17f958d2ee523a2206206994597c13d831ec7"
-            .parse()
-            .unwrap(),
+    let token_usdt = ERC20::Instance::new(
+        address!("dac17f958d2ee523a2206206994597c13d831ec7"),
+        web3.alloy.clone(),
     );
 
     let zeroex_provider = {
@@ -83,41 +77,90 @@ async fn zero_ex_liquidity(web3: Web3) {
     };
     let zeroex = IZeroex::Instance::deployed(&zeroex_provider).await.unwrap();
 
-    let amount = to_wei_with_exp(5, 8);
+    let amount = to_wei_with_exp(5, 8).into_alloy();
 
     // Give trader some USDC
-    let usdc_whale = forked_node_api.impersonate(&USDC_WHALE).await.unwrap();
-    tx!(usdc_whale, token_usdc.transfer(trader.address(), amount));
+    web3.alloy
+        .anvil_send_impersonated_transaction_with_config(
+            token_usdc
+                .transfer(trader.address().into_alloy(), amount)
+                .from(USDC_WHALE)
+                .into_transaction_request(),
+            ImpersonateConfig {
+                fund_amount: None,
+                stop_impersonate: true,
+            },
+        )
+        .await
+        .unwrap()
+        .watch()
+        .await
+        .unwrap();
 
     // Give 0x maker a bit more USDT
-    let usdt_whale = forked_node_api.impersonate(&USDT_WHALE).await.unwrap();
-    tx!(
-        usdt_whale,
-        // With a lower amount 0x contract shows much lower fillable amount
-        token_usdt.transfer(zeroex_maker.address(), amount * 4)
-    );
+    // With a lower amount 0x contract shows much lower fillable amount
+    web3.alloy
+        .anvil_send_impersonated_transaction_with_config(
+            token_usdt
+                .transfer(
+                    zeroex_maker.address().into_alloy(),
+                    amount * alloy::primitives::U256::from(4),
+                )
+                .from(USDT_WHALE)
+                .into_transaction_request(),
+            ImpersonateConfig {
+                fund_amount: None,
+                stop_impersonate: true,
+            },
+        )
+        .await
+        .unwrap()
+        .watch()
+        .await
+        .unwrap();
     // Required for the remaining fillable taker amount
-    tx!(usdc_whale, token_usdc.transfer(solver.address(), amount));
+    web3.alloy
+        .anvil_send_impersonated_transaction_with_config(
+            token_usdc
+                .transfer(solver.address().into_alloy(), amount)
+                .from(USDC_WHALE)
+                .into_transaction_request(),
+            ImpersonateConfig {
+                fund_amount: None,
+                stop_impersonate: true,
+            },
+        )
+        .await
+        .unwrap()
+        .watch()
+        .await
+        .unwrap();
 
-    tx!(
-        trader.account(),
-        token_usdc.approve(onchain.contracts().allowance, amount)
-    );
-    tx!(
-        zeroex_maker.account(),
-        // With a lower amount 0x contract shows much lower fillable amount
-        token_usdt.approve(zeroex.address().into_legacy(), amount * 4)
-    );
-    tx!(
-        solver.account(),
-        token_usdc.approve(zeroex.address().into_legacy(), amount)
-    );
+    token_usdc
+        .approve(onchain.contracts().allowance.into_alloy(), amount)
+        .from(trader.address().into_alloy())
+        .send_and_watch()
+        .await
+        .unwrap();
+    // With a lower amount 0x contract shows much lower fillable amount
+    token_usdt
+        .approve(*zeroex.address(), amount * alloy::primitives::U256::from(4))
+        .from(zeroex_maker.address().into_alloy())
+        .send_and_watch()
+        .await
+        .unwrap();
+    token_usdc
+        .approve(*zeroex.address(), amount)
+        .from(solver.address().into_alloy())
+        .send_and_watch()
+        .await
+        .unwrap();
 
     let order = OrderCreation {
-        sell_token: token_usdc.address(),
-        sell_amount: amount,
-        buy_token: token_usdt.address(),
-        buy_amount: amount,
+        sell_token: token_usdc.address().into_legacy(),
+        sell_amount: amount.into_legacy(),
+        buy_token: token_usdt.address().into_legacy(),
+        buy_amount: amount.into_legacy(),
         valid_to: model::time::now_in_epoch_seconds() + 300,
         kind: OrderKind::Sell,
         ..Default::default()
@@ -179,12 +222,12 @@ async fn zero_ex_liquidity(web3: Web3) {
 
     // Drive solution
     let sell_token_balance_before = token_usdc
-        .balance_of(trader.address())
+        .balanceOf(trader.address().into_alloy())
         .call()
         .await
         .unwrap();
     let buy_token_balance_before = token_usdt
-        .balance_of(trader.address())
+        .balanceOf(trader.address().into_alloy())
         .call()
         .await
         .unwrap();
@@ -195,7 +238,7 @@ async fn zero_ex_liquidity(web3: Web3) {
     tracing::info!("Waiting for trade.");
     wait_for_condition(TIMEOUT, || async {
         token_usdc
-            .balance_of(trader.address())
+            .balanceOf(trader.address().into_alloy())
             .call()
             .await
             .is_ok_and(|balance| balance < sell_token_balance_before)
@@ -204,7 +247,7 @@ async fn zero_ex_liquidity(web3: Web3) {
     .unwrap();
     wait_for_condition(TIMEOUT, || async {
         token_usdt
-            .balance_of(trader.address())
+            .balanceOf(trader.address().into_alloy())
             .call()
             .await
             .is_ok_and(|balance| balance >= buy_token_balance_before + amount)
@@ -218,21 +261,21 @@ async fn zero_ex_liquidity(web3: Web3) {
     // [`relative-slippage`] config value is set to 0.1
     // crates/e2e/src/setup/colocation.rs:110 which is then applied to the
     // original filled amount crates/solver/src/liquidity/slippage.rs:110
-    let expected_filled_amount = amount.as_u128() + amount.as_u128() / 10u128;
+    let expected_filled_amount = amount + amount / alloy::primitives::U256::from(10);
     assert_approximately_eq!(
-        U256::from(zeroex_order_amounts.filled),
-        U256::from(expected_filled_amount)
+        alloy::primitives::U256::from(zeroex_order_amounts.filled),
+        expected_filled_amount
     );
     assert!(zeroex_order_amounts.fillable > 0u128);
     assert_approximately_eq!(
-        U256::from(zeroex_order_amounts.fillable),
-        U256::from(amount.as_u128() * 2 - expected_filled_amount)
+        alloy::primitives::U256::from(zeroex_order_amounts.fillable),
+        (amount * alloy::primitives::U256::from(2)) - expected_filled_amount
     );
 
     // Fill the remaining part of the 0x order
     let zeroex_order = Eip712TypedZeroExOrder {
-        maker_token: token_usdt.address(),
-        taker_token: token_usdc.address(),
+        maker_token: token_usdt.address().into_legacy(),
+        taker_token: token_usdc.address().into_legacy(),
         maker_amount: zeroex_order_amounts.fillable,
         taker_amount: zeroex_order_amounts.fillable,
         // doesn't participate in the hash calculation
@@ -254,10 +297,13 @@ async fn zero_ex_liquidity(web3: Web3) {
         .await
         .unwrap();
     assert_approximately_eq!(
-        U256::from(zeroex_order_amounts.filled),
-        U256::from(amount.as_u128() * 2 - expected_filled_amount)
+        alloy::primitives::U256::from(zeroex_order_amounts.filled),
+        (amount * alloy::primitives::U256::from(2)) - expected_filled_amount
+    );
+    assert_approximately_eq!(
+        alloy::primitives::U256::from(zeroex_order_amounts.fillable),
+        alloy::primitives::U256::ZERO
     );
-    assert_approximately_eq!(U256::from(zeroex_order_amounts.fillable), U256::zero());
 }
 
 fn create_zeroex_liquidity_orders(
diff --git a/crates/e2e/tests/e2e/liquidity_source_notification.rs b/crates/e2e/tests/e2e/liquidity_source_notification.rs
index bf02e1ee12..e74754bdc9 100644
--- a/crates/e2e/tests/e2e/liquidity_source_notification.rs
+++ b/crates/e2e/tests/e2e/liquidity_source_notification.rs
@@ -1,14 +1,13 @@
 use {
-    alloy::primitives::Bytes,
-    chrono::Utc,
-    contracts::{
-        ERC20,
-        alloy::{ILiquoriceSettlement, InstanceExt},
+    alloy::{
+        primitives::{Bytes, address},
+        providers::ext::{AnvilApi, ImpersonateConfig},
     },
-    driver::{domain::eth::H160, infra},
+    chrono::Utc,
+    contracts::alloy::{ERC20, ILiquoriceSettlement, InstanceExt},
+    driver::infra,
     e2e::{
         api,
-        nodes::forked_node::ForkedNodeApi,
         setup::{
             OnchainComponents,
             Services,
@@ -20,14 +19,15 @@ use {
             to_wei_with_exp,
             wait_for_condition,
         },
-        tx,
     },
     ethcontract::prelude::U256,
     ethrpc::{
         Web3,
-        alloy::conversions::{IntoAlloy, IntoLegacy},
+        alloy::{
+            CallBuilderExt,
+            conversions::{IntoAlloy, IntoLegacy},
+        },
     },
-    hex_literal::hex,
     model::{
         order::{OrderCreation, OrderKind},
         signature::EcdsaSigningScheme,
@@ -40,8 +40,10 @@ use {
 
 /// The block number from which we will fetch state for the forked tests.
 pub const FORK_BLOCK: u64 = 23326100;
-pub const USDT_WHALE: H160 = H160(hex!("6AC38D1b2f0c0c3b9E816342b1CA14d91D5Ff60B"));
-pub const USDC_WHALE: H160 = H160(hex!("01b8697695eab322a339c4bf75740db75dc9375e"));
+pub const USDT_WHALE: alloy::primitives::Address =
+    address!("6AC38D1b2f0c0c3b9E816342b1CA14d91D5Ff60B");
+pub const USDC_WHALE: alloy::primitives::Address =
+    address!("01b8697695eab322a339c4bf75740db75dc9375e");
 
 #[tokio::test]
 #[ignore]
@@ -58,7 +60,6 @@ async fn forked_node_liquidity_source_notification_mainnet() {
 async fn liquidity_source_notification(web3: Web3) {
     // Start onchain components
     let mut onchain = OnchainComponents::deployed(web3.clone()).await;
-    let forked_node_api = web3.api::<ForkedNodeApi<_>>();
 
     // Define trade params
     let trade_amount = to_wei_with_exp(5, 8);
@@ -73,41 +74,63 @@ async fn liquidity_source_notification(web3: Web3) {
     let [trader, liquorice_maker] = onchain.make_accounts(to_wei(1)).await;
 
     // Access trade tokens contracts
-    let token_usdc = ERC20::at(
-        &web3,
-        "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-            .parse()
-            .unwrap(),
+    let token_usdc = ERC20::Instance::new(
+        address!("a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"),
+        web3.alloy.clone(),
     );
 
-    let token_usdt = ERC20::at(
-        &web3,
-        "0xdac17f958d2ee523a2206206994597c13d831ec7"
-            .parse()
-            .unwrap(),
+    let token_usdt = ERC20::Instance::new(
+        address!("dac17f958d2ee523a2206206994597c13d831ec7"),
+        web3.alloy.clone(),
     );
 
     // CoW onchain setup
-    {
-        // Fund trader
-        let usdc_whale = forked_node_api.impersonate(&USDC_WHALE).await.unwrap();
-        tx!(
-            usdc_whale,
-            token_usdc.transfer(trader.address(), trade_amount)
-        );
+    // Fund trader
+    web3.alloy
+        .anvil_send_impersonated_transaction_with_config(
+            token_usdc
+                .transfer(trader.address().into_alloy(), trade_amount.into_alloy())
+                .from(USDC_WHALE)
+                .into_transaction_request(),
+            ImpersonateConfig {
+                fund_amount: None,
+                stop_impersonate: true,
+            },
+        )
+        .await
+        .unwrap()
+        .watch()
+        .await
+        .unwrap();
 
-        // Fund solver
-        tx!(
-            usdc_whale,
-            token_usdc.transfer(solver.address(), trade_amount)
-        );
+    // Fund solver
+    web3.alloy
+        .anvil_send_impersonated_transaction_with_config(
+            token_usdc
+                .transfer(solver.address().into_alloy(), trade_amount.into_alloy())
+                .from(USDC_WHALE)
+                .into_transaction_request(),
+            ImpersonateConfig {
+                fund_amount: None,
+                stop_impersonate: true,
+            },
+        )
+        .await
+        .unwrap()
+        .watch()
+        .await
+        .unwrap();
 
-        // Trader gives approval to the CoW allowance contract
-        tx!(
-            trader.account(),
-            token_usdc.approve(onchain.contracts().allowance, U256::MAX)
-        );
-    }
+    // Trader gives approval to the CoW allowance contract
+    token_usdc
+        .approve(
+            onchain.contracts().allowance.into_alloy(),
+            alloy::primitives::U256::MAX,
+        )
+        .from(trader.address().into_alloy())
+        .send_and_watch()
+        .await
+        .unwrap();
 
     // Liquorice onchain setup
 
@@ -124,19 +147,36 @@ async fn liquidity_source_notification(web3: Web3) {
         .into_legacy();
 
     // Fund `liquorice_maker`
-    {
-        let usdt_whale = forked_node_api.impersonate(&USDT_WHALE).await.unwrap();
-        tx!(
-            usdt_whale,
-            token_usdt.transfer(liquorice_maker.address(), trade_amount)
-        );
-    }
+    web3.alloy
+        .anvil_send_impersonated_transaction_with_config(
+            token_usdt
+                .transfer(
+                    liquorice_maker.address().into_alloy(),
+                    trade_amount.into_alloy(),
+                )
+                .from(USDT_WHALE)
+                .into_transaction_request(),
+            ImpersonateConfig {
+                fund_amount: None,
+                stop_impersonate: true,
+            },
+        )
+        .await
+        .unwrap()
+        .watch()
+        .await
+        .unwrap();
 
     // Maker gives approval to the Liquorice balance manager contract
-    tx!(
-        liquorice_maker.account(),
-        token_usdt.approve(liquorice_balance_manager_address, U256::MAX)
-    );
+    token_usdt
+        .approve(
+            liquorice_balance_manager_address.into_alloy(),
+            alloy::primitives::U256::MAX,
+        )
+        .from(liquorice_maker.address().into_alloy())
+        .send_and_watch()
+        .await
+        .unwrap();
 
     // Liquorice API setup
     let liquorice_api = api::liquorice::server::LiquoriceApi::start().await;
@@ -200,9 +240,9 @@ http-timeout = "10s"
     // Create CoW order
     let order_id = {
         let order = OrderCreation {
-            sell_token: token_usdc.address(),
+            sell_token: token_usdc.address().into_legacy(),
             sell_amount: trade_amount,
-            buy_token: token_usdt.address(),
+            buy_token: token_usdt.address().into_legacy(),
             buy_amount: trade_amount,
             valid_to: model::time::now_in_epoch_seconds() + 300,
             kind: OrderKind::Sell,
@@ -224,8 +264,8 @@ http-timeout = "10s"
         nonce: U256::from(0),
         trader: onchain.contracts().gp_settlement.address().into_legacy(),
         effective_trader: onchain.contracts().gp_settlement.address().into_legacy(),
-        base_token: token_usdc.address(),
-        quote_token: token_usdt.address(),
+        base_token: token_usdc.address().into_legacy(),
+        quote_token: token_usdt.address().into_legacy(),
         base_token_amount: trade_amount,
         quote_token_amount: trade_amount,
         min_fill_amount: U256::from(1),
@@ -283,8 +323,8 @@ http-timeout = "10s"
     liquorice_solver_api_mock.configure_solution(Some(Solution {
         id: 1,
         prices: HashMap::from([
-            (token_usdc.address(), to_wei(11)),
-            (token_usdt.address(), to_wei(10)),
+            (token_usdc.address().into_legacy(), to_wei(11)),
+            (token_usdt.address().into_legacy(), to_wei(10)),
         ]),
         trades: vec![solvers_dto::solution::Trade::Fulfillment(
             solvers_dto::solution::Fulfillment {
@@ -300,7 +340,7 @@ http-timeout = "10s"
                 calldata: liquorice_solution_calldata,
                 value: 0.into(),
                 allowances: vec![solvers_dto::solution::Allowance {
-                    token: token_usdc.address(),
+                    token: token_usdc.address().into_legacy(),
                     spender: liquorice_balance_manager_address,
                     amount: trade_amount,
                 }],
diff --git a/crates/e2e/tests/e2e/protocol_fee.rs b/crates/e2e/tests/e2e/protocol_fee.rs
index 133f94dd6b..f0e657f562 100644
--- a/crates/e2e/tests/e2e/protocol_fee.rs
+++ b/crates/e2e/tests/e2e/protocol_fee.rs
@@ -372,11 +372,17 @@ async fn combined_protocol_fees(web3: Web3) {
     .unwrap()
     .try_into()
     .expect("Expected exactly four elements");
-    assert_approximately_eq!(market_executed_fee_in_buy_token, market_order_token_balance);
-    assert_approximately_eq!(limit_executed_fee_in_buy_token, limit_order_token_balance);
     assert_approximately_eq!(
-        partner_fee_executed_fee_in_buy_token,
-        partner_fee_order_token_balance
+        market_executed_fee_in_buy_token.into_alloy(),
+        market_order_token_balance.into_alloy()
+    );
+    assert_approximately_eq!(
+        limit_executed_fee_in_buy_token.into_alloy(),
+        limit_order_token_balance.into_alloy()
+    );
+    assert_approximately_eq!(
+        partner_fee_executed_fee_in_buy_token.into_alloy(),
+        partner_fee_order_token_balance.into_alloy()
     );
 }
 
diff --git a/crates/ethrpc/Cargo.toml b/crates/ethrpc/Cargo.toml
index 36d43c02c5..b85f18c342 100644
--- a/crates/ethrpc/Cargo.toml
+++ b/crates/ethrpc/Cargo.toml
@@ -11,7 +11,7 @@ name = "ethrpc"
 path = "src/lib.rs"
 
 [dependencies]
-alloy = { workspace = true, default-features = false, features = ["json-rpc", "providers", "rpc-client", "rpc-types", "transports", "reqwest", "signers", "signer-aws", "signer-local", "eips", "reqwest-default-tls"] }
+alloy = { workspace = true, default-features = false, features = ["json-rpc", "providers", "rpc-client", "rpc-types", "transports", "reqwest", "signers", "signer-aws", "signer-local", "eips", "reqwest-default-tls", "contract"] }
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 ethcontract = { workspace = true }
diff --git a/crates/ethrpc/src/alloy/errors.rs b/crates/ethrpc/src/alloy/errors.rs
new file mode 100644
index 0000000000..5475de5789
--- /dev/null
+++ b/crates/ethrpc/src/alloy/errors.rs
@@ -0,0 +1,44 @@
+use alloy::{contract::Error as ContractError, sol_types::GenericContractError};
+
+/// Bubbles up node errors, ignoring all other errors.
+// This function can be made to return only the RPC error that wasn't decode
+pub fn handle_alloy_contract_error<T>(
+    result: Result<T, ContractError>,
+) -> anyhow::Result<Option<T>> {
+    match result {
+        Ok(result) => Ok(Some(result)),
+        // Alloy "hides" the contract execution errors under the transport error
+        Err(err @ alloy::contract::Error::TransportError(_)) => {
+            // So we need to try to decode the error as a generic contract error,
+            // we return in case it isn't a contract error
+            match err.try_decode_into_interface_error::<GenericContractError>() {
+                Ok(_) => Ok(None), // contract error
+                Err(err) => Err(err)?,
+            }
+        }
+        Err(_) => Ok(None),
+    }
+}
+
+pub trait ContractErrorExt {
+    /// Returns if a given error is a contract error, this is considered to be
+    /// all errors except the transport error.
+    fn is_contract_err(&self) -> bool;
+
+    /// Returns if a given error is a transport error.
+    fn is_transport_error(&self) -> bool;
+}
+
+impl ContractErrorExt for ContractError {
+    fn is_contract_err(&self) -> bool {
+        !self.is_transport_error()
+    }
+
+    fn is_transport_error(&self) -> bool {
+        if let ContractError::TransportError(rpc_error) = self {
+            rpc_error.is_transport_error()
+        } else {
+            false
+        }
+    }
+}
diff --git a/crates/ethrpc/src/alloy/mod.rs b/crates/ethrpc/src/alloy/mod.rs
index 8161d559a9..14661482bd 100644
--- a/crates/ethrpc/src/alloy/mod.rs
+++ b/crates/ethrpc/src/alloy/mod.rs
@@ -1,7 +1,7 @@
 mod buffering;
 pub mod conversions;
+pub mod errors;
 mod instrumentation;
-
 mod wallet;
 
 use {
diff --git a/crates/shared/src/account_balances/simulation.rs b/crates/shared/src/account_balances/simulation.rs
index cdeb96230b..e0319989cc 100644
--- a/crates/shared/src/account_balances/simulation.rs
+++ b/crates/shared/src/account_balances/simulation.rs
@@ -6,13 +6,13 @@ use {
     super::{BalanceFetching, Query, TransferSimulationError},
     crate::account_balances::BalanceSimulator,
     anyhow::Result,
-    contracts::{alloy::BalancerV2Vault::BalancerV2Vault, erc20::Contract},
+    contracts::alloy::{BalancerV2Vault::BalancerV2Vault, ERC20},
     ethcontract::{H160, U256},
     ethrpc::{
         Web3,
         alloy::conversions::{IntoAlloy, IntoLegacy},
     },
-    futures::{TryFutureExt, future},
+    futures::future,
     model::order::SellTokenSource,
     tracing::instrument,
 };
@@ -66,58 +66,59 @@ impl Balances {
         })
     }
 
-    async fn tradable_balance_simple(&self, query: &Query, token: &Contract) -> Result<U256> {
+    async fn tradable_balance_simple(
+        &self,
+        query: &Query,
+        token: &ERC20::Instance,
+    ) -> Result<U256> {
         let usable_balance = match query.source {
             SellTokenSource::Erc20 => {
-                let balance = token.balance_of(query.owner).call();
-                let allowance = token.allowance(query.owner, self.vault_relayer()).call();
-                let (balance, allowance) = futures::try_join!(balance, allowance)?;
-                std::cmp::min(balance, allowance)
+                let balance = token.balanceOf(query.owner.into_alloy());
+                let allowance =
+                    token.allowance(query.owner.into_alloy(), self.vault_relayer().into_alloy());
+                let (balance, allowance) = futures::try_join!(
+                    balance.call().into_future(),
+                    allowance.call().into_future()
+                )?;
+                std::cmp::min(balance, allowance).into_legacy()
             }
             SellTokenSource::External => {
                 let vault = BalancerV2Vault::new(self.vault().into_alloy(), &self.web3.alloy);
-                // NOTE: the anyhow error conversion can be removed after migrating the token to
-                // alloy
-                let balance = token
-                    .balance_of(query.owner)
-                    .call()
-                    .map_err(anyhow::Error::from);
-                let has_approved_relayer = vault.hasApprovedRelayer(
+                let balance = token.balanceOf(query.owner.into_alloy());
+                let approved = vault.hasApprovedRelayer(
                     query.owner.into_alloy(),
                     self.vault_relayer().into_alloy(),
                 );
-                let approved = has_approved_relayer
-                    .call()
-                    .into_future()
-                    .map_err(anyhow::Error::from);
-                let allowance = token
-                    .allowance(query.owner, self.vault())
-                    .call()
-                    .map_err(anyhow::Error::from);
-                let (balance, approved, allowance) =
-                    futures::try_join!(balance, approved, allowance)?;
+                let allowance =
+                    token.allowance(query.owner.into_alloy(), self.vault().into_alloy());
+                let (balance, approved, allowance) = futures::try_join!(
+                    balance.call().into_future(),
+                    approved.call().into_future(),
+                    allowance.call().into_future()
+                )?;
                 match approved {
                     true => std::cmp::min(balance, allowance),
-                    false => 0.into(),
+                    false => alloy::primitives::U256::ZERO,
                 }
+                .into_legacy()
             }
             SellTokenSource::Internal => {
                 let vault = BalancerV2Vault::new(self.vault().into_alloy(), &self.web3.alloy);
-
-                let get_internal_balance = vault
+                let balance = vault
                     .getInternalBalance(query.owner.into_alloy(), vec![query.token.into_alloy()]);
-                let balance = get_internal_balance.call().into_future();
-
-                let has_approved_relayer = vault.hasApprovedRelayer(
+                let approved = vault.hasApprovedRelayer(
                     query.owner.into_alloy(),
                     self.vault_relayer().into_alloy(),
                 );
-                let approved = has_approved_relayer.call().into_future();
-                let (balance, approved) = futures::try_join!(balance, approved)?;
+                let (balance, approved) = futures::try_join!(
+                    balance.call().into_future(),
+                    approved.call().into_future()
+                )?;
                 match approved {
-                    true => balance[0].into_legacy(), // internal approvals are always U256::MAX
-                    false => 0.into(),
+                    true => balance[0], // internal approvals are always U256::MAX
+                    false => alloy::primitives::U256::ZERO,
                 }
+                .into_legacy()
             }
         };
         Ok(usable_balance)
@@ -133,7 +134,8 @@ impl BalanceFetching for Balances {
             .iter()
             .map(|query| async {
                 if query.interactions.is_empty() {
-                    let token = contracts::ERC20::at(&self.web3, query.token);
+                    let token =
+                        ERC20::Instance::new(query.token.into_alloy(), self.web3.alloy.clone());
                     self.tradable_balance_simple(query, &token).await
                 } else {
                     self.tradable_balance_simulated(query).await
diff --git a/crates/shared/src/bad_token/token_owner_finder/mod.rs b/crates/shared/src/bad_token/token_owner_finder/mod.rs
index 550ab09b4d..9818504d49 100644
--- a/crates/shared/src/bad_token/token_owner_finder/mod.rs
+++ b/crates/shared/src/bad_token/token_owner_finder/mod.rs
@@ -31,12 +31,12 @@ use {
     },
     anyhow::{Context, Result},
     chain::Chain,
-    contracts::{
-        ERC20,
-        alloy::{BalancerV2Vault, IUniswapV3Factory},
-        errors::EthcontractErrorType,
-    },
+    contracts::alloy::{BalancerV2Vault, ERC20, IUniswapV3Factory},
     ethcontract::U256,
+    ethrpc::alloy::{
+        conversions::{IntoAlloy, IntoLegacy},
+        errors::ContractErrorExt,
+    },
     futures::{Stream, StreamExt as _},
     primitive_types::H160,
     rate_limit::Strategy,
@@ -420,7 +420,7 @@ impl TokenOwnerFinder {
 #[async_trait::async_trait]
 impl TokenOwnerFinding for TokenOwnerFinder {
     async fn find_owner(&self, token: H160, min_balance: U256) -> Result<Option<(H160, U256)>> {
-        let instance = ERC20::at(&self.web3, token);
+        let instance = ERC20::Instance::new(token.into_alloy(), self.web3.alloy.clone());
 
         // We use a stream with ready_chunks so that we can start with the addresses of
         // fast TokenOwnerFinding implementations first without having to wait
@@ -435,12 +435,12 @@ impl TokenOwnerFinding for TokenOwnerFinder {
                 // owner is not the settlement contract.
                 .filter(|owner| *owner != self.settlement_contract)
                 .map(|owner| {
-                    let call = instance.balance_of(owner).call();
+                    let balance = instance.balanceOf(owner.into_alloy());
                     async move {
-                        match call.await {
+                        match balance.call().await {
                             Ok(balance) => Ok((owner, balance)),
-                            Err(err) if EthcontractErrorType::is_contract_err(&err) => {
-                                Ok((owner, 0.into()))
+                            Err(err) if err.is_contract_err() => {
+                                Ok((owner, alloy::primitives::U256::ZERO))
                             }
                             Err(err) => Err(err),
                         }
@@ -448,11 +448,11 @@ impl TokenOwnerFinding for TokenOwnerFinder {
                 });
             let balances = futures::future::try_join_all(futures).await?;
 
-            if let Some(holder) = balances
+            if let Some((addr, balance)) = balances
                 .into_iter()
-                .find(|(_, balance)| *balance >= min_balance)
+                .find(|(_, balance)| *balance >= min_balance.into_alloy())
             {
-                return Ok(Some(holder));
+                return Ok(Some((addr, balance.into_legacy())));
             }
         }
 
diff --git a/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs b/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
index acbbc392a0..94ad5a0712 100644
--- a/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
+++ b/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
@@ -2,8 +2,9 @@ use {
     super::Strategy,
     crate::tenderly_api::SimulationError,
     anyhow::Context,
-    contracts::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::{Address, H256, U256, state_overrides::StateOverride},
+    ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     maplit::hashmap,
     std::{
         collections::HashMap,
@@ -100,23 +101,26 @@ impl Detector {
     /// Returns an `Err` if it cannot detect the strategy or an internal
     /// simulation fails.
     pub async fn detect(&self, token: Address) -> Result<Strategy, DetectionError> {
-        let token = ERC20::at(&self.web3, token);
+        let token = ERC20::Instance::new(token.into_alloy(), self.web3.alloy.clone());
         let overrides = hashmap! {
-            token.address() => StateOverride {
+            token.address().into_legacy() => StateOverride {
                 state_diff: Some(self.state_overrides.clone()),
                 ..Default::default()
             },
         };
         let balance = token
-            .balance_of(self.holder)
-            .call_with_state_overrides(&overrides)
+            .balanceOf(self.holder.into_alloy())
+            .state(overrides.into_alloy())
+            .call()
             .await
             .context("eth_call with state overrides failed")
             .map_err(|e| DetectionError::Simulation(SimulationError::Other(e)))?;
 
         self.strategies
             .iter()
-            .find_map(|helper| (helper.balance == balance).then_some(helper.strategy.clone()))
+            .find_map(|helper| {
+                (helper.balance.into_alloy() == balance).then_some(helper.strategy.clone())
+            })
             .ok_or(DetectionError::NotFound)
     }
 }
diff --git a/crates/shared/src/sources/swapr.rs b/crates/shared/src/sources/swapr.rs
index 2896817333..877201f899 100644
--- a/crates/shared/src/sources/swapr.rs
+++ b/crates/shared/src/sources/swapr.rs
@@ -1,16 +1,11 @@
 //! A pool state reading implementation specific to Swapr.
 
 use {
-    crate::sources::uniswap_v2::pool_fetching::{
-        DefaultPoolReader,
-        Pool,
-        PoolReading,
-        handle_alloy_contract_error,
-    },
+    crate::sources::uniswap_v2::pool_fetching::{DefaultPoolReader, Pool, PoolReading},
     anyhow::Result,
     contracts::alloy::ISwaprPair,
     ethcontract::BlockId,
-    ethrpc::alloy::conversions::IntoAlloy,
+    ethrpc::alloy::{conversions::IntoAlloy, errors::handle_alloy_contract_error},
     futures::{FutureExt as _, future::BoxFuture},
     model::TokenPair,
     num::rational::Ratio,
diff --git a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
index e2801e2ea9..a50b88ac6f 100644
--- a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
@@ -1,16 +1,17 @@
 use {
     super::pair_provider::PairProvider,
     crate::{baseline_solver::BaselineSolvable, ethrpc::Web3, recent_block_cache::Block},
-    alloy::sol_types::GenericContractError,
     anyhow::Result,
     cached::{Cached, TimedCache},
     contracts::{
-        ERC20,
-        alloy::IUniswapLikePair::{self, IUniswapLikePair::getReservesReturn},
+        alloy::{
+            ERC20,
+            IUniswapLikePair::{self, IUniswapLikePair::getReservesReturn},
+        },
         errors::EthcontractErrorType,
     },
     ethcontract::{BlockId, H160, U256, errors::MethodError},
-    ethrpc::alloy::conversions::IntoAlloy,
+    ethrpc::alloy::{conversions::IntoAlloy, errors::handle_alloy_contract_error},
     futures::{
         FutureExt as _,
         future::{self, BoxFuture},
@@ -274,21 +275,25 @@ impl PoolReading for DefaultPoolReader {
         let pair_address = self.pair_provider.pair_address(&pair);
 
         // Fetch ERC20 token balances of the pools to sanity check with reserves
-        let token0 = ERC20::at(&self.web3, pair.get().0);
-        let token1 = ERC20::at(&self.web3, pair.get().1);
-
-        let fetch_token0_balance = token0.balance_of(pair_address).block(block).call();
-        let fetch_token1_balance = token1.balance_of(pair_address).block(block).call();
+        let token0 = ERC20::Instance::new(pair.get().0.into_alloy(), self.web3.alloy.clone());
+        let token1 = ERC20::Instance::new(pair.get().1.into_alloy(), self.web3.alloy.clone());
 
         async move {
+            let fetch_token0_balance = token0
+                .balanceOf(pair_address.into_alloy())
+                .block(block.into_alloy());
+            let fetch_token1_balance = token1
+                .balanceOf(pair_address.into_alloy())
+                .block(block.into_alloy());
+
             let pair_contract =
                 IUniswapLikePair::Instance::new(pair_address.into_alloy(), self.web3.alloy.clone());
             let fetch_reserves = pair_contract.getReserves().block(block.into_alloy());
 
             let (reserves, token0_balance, token1_balance) = futures::join!(
                 fetch_reserves.call().into_future(),
-                fetch_token0_balance,
-                fetch_token1_balance
+                fetch_token0_balance.call().into_future(),
+                fetch_token1_balance.call().into_future()
             );
 
             handle_results(
@@ -308,8 +313,8 @@ impl PoolReading for DefaultPoolReader {
 struct FetchedPool {
     pair: TokenPair,
     reserves: Result<getReservesReturn, alloy::contract::Error>,
-    token0_balance: Result<U256, MethodError>,
-    token1_balance: Result<U256, MethodError>,
+    token0_balance: Result<alloy::primitives::U256, alloy::contract::Error>,
+    token1_balance: Result<alloy::primitives::U256, alloy::contract::Error>,
 }
 
 // Node errors should be bubbled up but contract errors should lead to the pool
@@ -324,31 +329,10 @@ pub fn handle_contract_error<T>(result: Result<T, MethodError>) -> Result<Option
     }
 }
 
-/// Node errors should be bubbled up but contract errors should lead to the pool
-/// being skipped.
-// Based on `handle_contract_error`.
-pub fn handle_alloy_contract_error<T>(
-    result: Result<T, alloy::contract::Error>,
-) -> Result<Option<T>> {
-    match result {
-        Ok(result) => Ok(Some(result)),
-        // Alloy "hides" the contract execution errors under the transport error
-        Err(err @ alloy::contract::Error::TransportError(_)) => {
-            // So we need to try to decode the error as a generic contract error,
-            // we return in case it isn't a contract error
-            match err.try_decode_into_interface_error::<GenericContractError>() {
-                Ok(_) => Ok(None), // contract error
-                Err(err) => Err(err)?,
-            }
-        }
-        Err(_) => Ok(None),
-    }
-}
-
 fn handle_results(fetched_pool: FetchedPool, address: H160) -> Result<Option<Pool>> {
     let reserves = handle_alloy_contract_error(fetched_pool.reserves)?;
-    let token0_balance = handle_contract_error(fetched_pool.token0_balance)?;
-    let token1_balance = handle_contract_error(fetched_pool.token1_balance)?;
+    let token0_balance = handle_alloy_contract_error(fetched_pool.token0_balance)?;
+    let token1_balance = handle_alloy_contract_error(fetched_pool.token1_balance)?;
 
     let pool = reserves.and_then(|reserves| {
         let r0 = u128::try_from(reserves.reserve0).ok()?;
@@ -366,7 +350,9 @@ fn handle_results(fetched_pool: FetchedPool, address: H160) -> Result<Option<Poo
         // benefit by withdrawing the excess from the pool without selling anything).
         // We therefore exclude all pools where the pool's token balance of either token
         // in the pair is less than the cached reserve.
-        if U256::from(r0) > token0_balance? || U256::from(r1) > token1_balance? {
+        if alloy::primitives::U256::from(r0) > token0_balance?
+            || alloy::primitives::U256::from(r1) > token1_balance?
+        {
             return None;
         }
         // Errors here should never happen because reserves are uint<112, 2>
@@ -541,8 +527,8 @@ mod tests {
         let fetched_pool = FetchedPool {
             reserves: Err(testing_alloy_node_error()),
             pair: Default::default(),
-            token0_balance: Ok(1.into()),
-            token1_balance: Ok(1.into()),
+            token0_balance: Ok(alloy::primitives::U256::from(1)),
+            token1_balance: Ok(alloy::primitives::U256::from(1)),
         };
         let pool_address = Default::default();
         assert!(handle_results(fetched_pool, pool_address).is_err());
@@ -553,8 +539,8 @@ mod tests {
         let fetched_pool = FetchedPool {
             reserves: Err(testing_alloy_contract_error()),
             pair: Default::default(),
-            token0_balance: Ok(1.into()),
-            token1_balance: Ok(1.into()),
+            token0_balance: Ok(alloy::primitives::U256::from(1)),
+            token1_balance: Ok(alloy::primitives::U256::from(1)),
         };
         let pool_address = Default::default();
         assert!(
diff --git a/crates/shared/src/token_info.rs b/crates/shared/src/token_info.rs
index a49dcf5fc2..e3fbb40bcd 100644
--- a/crates/shared/src/token_info.rs
+++ b/crates/shared/src/token_info.rs
@@ -1,9 +1,12 @@
 use {
     anyhow::Result,
     async_trait::async_trait,
-    contracts::{ERC20, errors::EthcontractErrorType},
-    ethcontract::{H160, errors::MethodError},
-    ethrpc::Web3,
+    contracts::alloy::ERC20,
+    ethcontract::H160,
+    ethrpc::{
+        Web3,
+        alloy::{conversions::IntoAlloy, errors::handle_alloy_contract_error},
+    },
     futures::{
         FutureExt,
         future::{BoxFuture, Shared},
@@ -52,29 +55,21 @@ impl TokenInfoFetcher {
             });
         }
 
-        let erc20 = ERC20::at(&self.web3, address);
-        let (decimals, symbol) = futures::join!(
-            erc20.methods().decimals().call(),
-            erc20.methods().symbol().call(),
-        );
+        let erc20 = ERC20::Instance::new(address.into_alloy(), self.web3.alloy.clone());
+        let (decimals, symbol) = {
+            let decimals = erc20.decimals();
+            let symbol = erc20.symbol();
+            futures::join!(decimals.call().into_future(), symbol.call().into_future())
+        };
 
         Ok(TokenInfo {
-            decimals: classify_error(decimals)?,
-            symbol: classify_error(symbol)?,
+            decimals: handle_alloy_contract_error(decimals)
+                .map_err(|err| Error(err.to_string()))?,
+            symbol: handle_alloy_contract_error(symbol).map_err(|err| Error(err.to_string()))?,
         })
     }
 }
 
-fn classify_error<T>(result: Result<T, MethodError>) -> Result<Option<T>, Error> {
-    match result {
-        Ok(value) => Ok(Some(value)),
-        Err(err) => match EthcontractErrorType::classify(&err) {
-            EthcontractErrorType::Node => Err(Error(err.to_string())),
-            EthcontractErrorType::Contract => Ok(None),
-        },
-    }
-}
-
 #[async_trait]
 impl TokenInfoFetching for TokenInfoFetcher {
     async fn get_token_info(&self, address: H160) -> Result<TokenInfo, Error> {
diff --git a/crates/solver/src/interactions/allowances.rs b/crates/solver/src/interactions/allowances.rs
index 59a41f5c97..b50211373e 100644
--- a/crates/solver/src/interactions/allowances.rs
+++ b/crates/solver/src/interactions/allowances.rs
@@ -4,8 +4,9 @@
 
 use {
     crate::interactions::Erc20ApproveInteraction,
+    ::alloy::sol_types::SolCall,
     anyhow::{Context as _, Result, anyhow, ensure},
-    contracts::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::{H160, U256},
     ethrpc::{Web3, alloy::conversions::IntoAlloy},
     maplit::hashmap,
@@ -16,7 +17,6 @@ use {
     std::{
         collections::{HashMap, HashSet},
         slice,
-        sync::Arc,
     },
     web3::types::CallRequest,
 };
@@ -131,17 +131,11 @@ impl Interaction for Approval {
 pub struct AllowanceManager {
     web3: Web3,
     owner: H160,
-    erc20: Arc<ERC20>,
 }
 
 impl AllowanceManager {
     pub fn new(web3: Web3, owner: H160) -> Self {
-        // Only instantiate a single contract instance to generate calldata.
-        // The actual call will be done with the web3 instance using the respective
-        // `token` as the `to` address. (performance optimization)
-        let erc20 = Arc::new(ERC20::at(&web3, owner));
-
-        Self { web3, owner, erc20 }
+        Self { web3, owner }
     }
 }
 
@@ -150,7 +144,6 @@ impl AllowanceManaging for AllowanceManager {
     async fn get_allowances(&self, tokens: HashSet<H160>, spender: H160) -> Result<Allowances> {
         Ok(fetch_allowances(
             self.web3.clone(),
-            self.erc20.clone(),
             self.owner,
             hashmap! { spender => tokens },
         )
@@ -168,13 +161,7 @@ impl AllowanceManaging for AllowanceManager {
                 .insert(request.token);
         }
 
-        let allowances = fetch_allowances(
-            self.web3.clone(),
-            self.erc20.clone(),
-            self.owner,
-            spender_tokens,
-        )
-        .await?;
+        let allowances = fetch_allowances(self.web3.clone(), self.owner, spender_tokens).await?;
         let mut result = Vec::new();
         for request in requests {
             let allowance = allowances
@@ -189,7 +176,6 @@ impl AllowanceManaging for AllowanceManager {
 
 async fn fetch_allowances<T>(
     web3: Web3<T>,
-    erc20: Arc<ERC20>,
     owner: H160,
     spender_tokens: HashMap<H160, HashSet<H160>>,
 ) -> Result<HashMap<H160, Allowances>>
@@ -203,11 +189,17 @@ where
         .flat_map(|(spender, tokens)| tokens.into_iter().map(move |token| (spender, token)))
         .map(|(spender, token)| {
             let web3 = web3.clone();
-            let erc20 = erc20.clone();
 
             async move {
-                let calldata = erc20.allowance(owner, spender).m.tx.data.unwrap();
-                let req = CallRequest::builder().to(token).data(calldata).build();
+                let calldata = ERC20::ERC20::allowanceCall {
+                    owner: owner.into_alloy(),
+                    spender: spender.into_alloy(),
+                }
+                .abi_encode();
+                let req = CallRequest::builder()
+                    .to(token)
+                    .data(calldata.into())
+                    .build();
                 let allowance = web3.eth().call(req, None).await;
                 (spender, token, allowance)
             }
@@ -419,11 +411,8 @@ mod tests {
                 }
             });
 
-        let erc20 = Arc::new(ERC20::at(&web3, Default::default()));
-
         let allowances = fetch_allowances(
             web3,
-            erc20,
             owner,
             hashmap! {
                 spender => hashset![H160([0x11; 20]), H160([0x22; 20])],

From a197a1f3026f8905b918af13e10ac07bccb7fa25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 08:43:42 +0000
Subject: [PATCH 06/36] fmt

---
 crates/e2e/tests/e2e/buffers.rs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crates/e2e/tests/e2e/buffers.rs b/crates/e2e/tests/e2e/buffers.rs
index 62901d7ff6..6b63195493 100644
--- a/crates/e2e/tests/e2e/buffers.rs
+++ b/crates/e2e/tests/e2e/buffers.rs
@@ -128,7 +128,11 @@ async fn onchain_settlement_without_liquidity(web3: Web3) {
         .await
         .unwrap();
     // Check that internal buffers were used
-    assert!(settlement_contract_balance.is_zero(), "{}", settlement_contract_balance);
+    assert!(
+        settlement_contract_balance.is_zero(),
+        "{}",
+        settlement_contract_balance
+    );
 
     // Same order can trade again with external liquidity
     let order = OrderCreation {

From 386295cd5beff03f2df594f269f7f7e97240e28d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 10:35:50 +0000
Subject: [PATCH 07/36] commetn

---
 crates/e2e/tests/e2e/buffers.rs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/crates/e2e/tests/e2e/buffers.rs b/crates/e2e/tests/e2e/buffers.rs
index 6b63195493..c294fa35f6 100644
--- a/crates/e2e/tests/e2e/buffers.rs
+++ b/crates/e2e/tests/e2e/buffers.rs
@@ -128,11 +128,7 @@ async fn onchain_settlement_without_liquidity(web3: Web3) {
         .await
         .unwrap();
     // Check that internal buffers were used
-    assert!(
-        settlement_contract_balance.is_zero(),
-        "{}",
-        settlement_contract_balance
-    );
+    assert_eq!(settlement_contract_balance, alloy::primitives::U256::ZERO);
 
     // Same order can trade again with external liquidity
     let order = OrderCreation {

From f57e73d02449109d00ef5e4d262ef5e8b9f0016e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 10:46:51 +0000
Subject: [PATCH 08/36] address comments

---
 crates/ethrpc/src/alloy/errors.rs                 | 15 +++------------
 crates/shared/src/sources/swapr.rs                |  4 ++--
 .../src/sources/uniswap_v2/pool_fetching.rs       |  8 ++++----
 crates/shared/src/token_info.rs                   |  7 +++----
 4 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/crates/ethrpc/src/alloy/errors.rs b/crates/ethrpc/src/alloy/errors.rs
index 5475de5789..bd273462cd 100644
--- a/crates/ethrpc/src/alloy/errors.rs
+++ b/crates/ethrpc/src/alloy/errors.rs
@@ -1,21 +1,12 @@
-use alloy::{contract::Error as ContractError, sol_types::GenericContractError};
+use alloy::contract::Error as ContractError;
 
 /// Bubbles up node errors, ignoring all other errors.
-// This function can be made to return only the RPC error that wasn't decode
-pub fn handle_alloy_contract_error<T>(
+pub fn ignore_non_transport_error<T>(
     result: Result<T, ContractError>,
 ) -> anyhow::Result<Option<T>> {
     match result {
         Ok(result) => Ok(Some(result)),
-        // Alloy "hides" the contract execution errors under the transport error
-        Err(err @ alloy::contract::Error::TransportError(_)) => {
-            // So we need to try to decode the error as a generic contract error,
-            // we return in case it isn't a contract error
-            match err.try_decode_into_interface_error::<GenericContractError>() {
-                Ok(_) => Ok(None), // contract error
-                Err(err) => Err(err)?,
-            }
-        }
+        Err(err) if err.is_contract_err() => Err(err.into()),
         Err(_) => Ok(None),
     }
 }
diff --git a/crates/shared/src/sources/swapr.rs b/crates/shared/src/sources/swapr.rs
index 877201f899..b70a5b87d0 100644
--- a/crates/shared/src/sources/swapr.rs
+++ b/crates/shared/src/sources/swapr.rs
@@ -5,7 +5,7 @@ use {
     anyhow::Result,
     contracts::alloy::ISwaprPair,
     ethcontract::BlockId,
-    ethrpc::alloy::{conversions::IntoAlloy, errors::handle_alloy_contract_error},
+    ethrpc::alloy::{conversions::IntoAlloy, errors::ignore_non_transport_error},
     futures::{FutureExt as _, future::BoxFuture},
     model::TokenPair,
     num::rational::Ratio,
@@ -41,7 +41,7 @@ fn handle_results(
     pool: Result<Option<Pool>>,
     fee: Result<u32, alloy::contract::Error>,
 ) -> Result<Option<Pool>> {
-    let fee = handle_alloy_contract_error(fee)?;
+    let fee = ignore_non_transport_error(fee)?;
     Ok(pool?.and_then(|pool| {
         Some(Pool {
             fee: Ratio::new(fee?, FEE_BASE),
diff --git a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
index a50b88ac6f..0f61a5fe6c 100644
--- a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
@@ -11,7 +11,7 @@ use {
         errors::EthcontractErrorType,
     },
     ethcontract::{BlockId, H160, U256, errors::MethodError},
-    ethrpc::alloy::{conversions::IntoAlloy, errors::handle_alloy_contract_error},
+    ethrpc::alloy::{conversions::IntoAlloy, errors::ignore_non_transport_error},
     futures::{
         FutureExt as _,
         future::{self, BoxFuture},
@@ -330,9 +330,9 @@ pub fn handle_contract_error<T>(result: Result<T, MethodError>) -> Result<Option
 }
 
 fn handle_results(fetched_pool: FetchedPool, address: H160) -> Result<Option<Pool>> {
-    let reserves = handle_alloy_contract_error(fetched_pool.reserves)?;
-    let token0_balance = handle_alloy_contract_error(fetched_pool.token0_balance)?;
-    let token1_balance = handle_alloy_contract_error(fetched_pool.token1_balance)?;
+    let reserves = ignore_non_transport_error(fetched_pool.reserves)?;
+    let token0_balance = ignore_non_transport_error(fetched_pool.token0_balance)?;
+    let token1_balance = ignore_non_transport_error(fetched_pool.token1_balance)?;
 
     let pool = reserves.and_then(|reserves| {
         let r0 = u128::try_from(reserves.reserve0).ok()?;
diff --git a/crates/shared/src/token_info.rs b/crates/shared/src/token_info.rs
index e3fbb40bcd..58db753926 100644
--- a/crates/shared/src/token_info.rs
+++ b/crates/shared/src/token_info.rs
@@ -5,7 +5,7 @@ use {
     ethcontract::H160,
     ethrpc::{
         Web3,
-        alloy::{conversions::IntoAlloy, errors::handle_alloy_contract_error},
+        alloy::{conversions::IntoAlloy, errors::ignore_non_transport_error},
     },
     futures::{
         FutureExt,
@@ -63,9 +63,8 @@ impl TokenInfoFetcher {
         };
 
         Ok(TokenInfo {
-            decimals: handle_alloy_contract_error(decimals)
-                .map_err(|err| Error(err.to_string()))?,
-            symbol: handle_alloy_contract_error(symbol).map_err(|err| Error(err.to_string()))?,
+            decimals: ignore_non_transport_error(decimals).map_err(|err| Error(err.to_string()))?,
+            symbol: ignore_non_transport_error(symbol).map_err(|err| Error(err.to_string()))?,
         })
     }
 }

From 495dbb77d4de2fa7f77758b6a9c7cc16ece23508 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 10:53:27 +0000
Subject: [PATCH 09/36] fix

---
 crates/e2e/tests/e2e/buffers.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/e2e/tests/e2e/buffers.rs b/crates/e2e/tests/e2e/buffers.rs
index c294fa35f6..cd4ce06679 100644
--- a/crates/e2e/tests/e2e/buffers.rs
+++ b/crates/e2e/tests/e2e/buffers.rs
@@ -128,7 +128,7 @@ async fn onchain_settlement_without_liquidity(web3: Web3) {
         .await
         .unwrap();
     // Check that internal buffers were used
-    assert_eq!(settlement_contract_balance, alloy::primitives::U256::ZERO);
+    assert_eq!(settlement_contract_balance, U256::ZERO);
 
     // Same order can trade again with external liquidity
     let order = OrderCreation {

From 865e32ed2c81cef23ccb632c8d913442e2e4485d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 11:48:37 +0000
Subject: [PATCH 10/36] fix errors

---
 crates/contracts/src/errors.rs                | 10 ---
 crates/ethrpc/src/alloy/errors.rs             | 81 +++++++++++++++++--
 crates/shared/Cargo.toml                      |  1 +
 crates/shared/src/sources/swapr.rs            |  6 +-
 .../src/sources/uniswap_v2/pool_fetching.rs   | 10 +--
 crates/shared/src/token_info.rs               |  6 +-
 6 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/crates/contracts/src/errors.rs b/crates/contracts/src/errors.rs
index d7ca2fa8dd..6eb7c907e6 100644
--- a/crates/contracts/src/errors.rs
+++ b/crates/contracts/src/errors.rs
@@ -57,16 +57,6 @@ pub fn testing_contract_error() -> MethodError {
     }
 }
 
-/// Create an arbitrary alloy error that will convert into a "contract" error. Useful for testing.
-pub fn testing_alloy_contract_error() -> alloy::contract::Error {
-    alloy::contract::Error::NotADeploymentTransaction
-}
-
-/// Create an arbitrary alloy error that will convert into a "node" error. Useful for testing.
-pub fn testing_alloy_node_error() -> alloy::contract::Error {
-    alloy::contract::Error::TransportError(alloy::transports::TransportError::NullResp)
-}
-
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/ethrpc/src/alloy/errors.rs b/crates/ethrpc/src/alloy/errors.rs
index bd273462cd..8b0287bdf4 100644
--- a/crates/ethrpc/src/alloy/errors.rs
+++ b/crates/ethrpc/src/alloy/errors.rs
@@ -1,23 +1,32 @@
 use alloy::contract::Error as ContractError;
 
 /// Bubbles up node errors, ignoring all other errors.
-pub fn ignore_non_transport_error<T>(
-    result: Result<T, ContractError>,
-) -> anyhow::Result<Option<T>> {
+pub fn ignore_non_node_error<T>(result: Result<T, ContractError>) -> anyhow::Result<Option<T>> {
     match result {
         Ok(result) => Ok(Some(result)),
-        Err(err) if err.is_contract_err() => Err(err.into()),
+        Err(err) if err.is_node_error() => Err(err.into()),
         Err(_) => Ok(None),
     }
 }
 
 pub trait ContractErrorExt {
-    /// Returns if a given error is a contract error, this is considered to be
-    /// all errors except the transport error.
+    /// Returns whether a given error is a contract error, this is considered to
+    /// be all errors except the transport error.
     fn is_contract_err(&self) -> bool;
 
-    /// Returns if a given error is a transport error.
+    /// Returns whether a given error is specifically a transport error.
+    ///
+    /// alloy has two layers for transport nodes, this checks for the inner
+    /// most; for a more general function use
+    /// [`is_node_error`](ContractErrorExt::is_node_error).
     fn is_transport_error(&self) -> bool;
+
+    /// Returns whether a given error is a node error.
+    ///
+    /// alloy has two layers for transport nodes, this checks for the outer
+    /// most; for transport-only errors use
+    /// [`is_transport_error`](ContractErrorExt::is_transport_error).
+    fn is_node_error(&self) -> bool;
 }
 
 impl ContractErrorExt for ContractError {
@@ -32,4 +41,62 @@ impl ContractErrorExt for ContractError {
             false
         }
     }
+
+    fn is_node_error(&self) -> bool {
+        matches!(self, ContractError::TransportError(_))
+    }
+}
+
+/// Create an arbitrary alloy error that will convert into a "contract" error.
+/// Useful for testing.
+#[cfg(any(test, feature = "test-util"))]
+pub fn testing_alloy_contract_error() -> alloy::contract::Error {
+    alloy::contract::Error::NotADeploymentTransaction
+}
+
+/// Create an arbitrary alloy error that will convert into a "transport" error.
+/// Useful for testing.
+#[cfg(any(test, feature = "test-util"))]
+pub fn testing_alloy_transport_error() -> alloy::contract::Error {
+    alloy::contract::Error::TransportError(alloy::transports::TransportError::Transport(
+        alloy::transports::TransportErrorKind::BackendGone,
+    ))
+}
+
+/// Create an arbitrary alloy error that will convert into a "node" error.
+/// Useful for testing.
+#[cfg(any(test, feature = "test-util"))]
+pub fn testing_alloy_node_error() -> alloy::contract::Error {
+    alloy::contract::Error::TransportError(alloy::transports::TransportError::NullResp)
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::alloy::errors::{
+        ContractErrorExt,
+        testing_alloy_contract_error,
+        testing_alloy_node_error,
+        testing_alloy_transport_error,
+    };
+
+    #[test]
+    fn test_contract_error() {
+        assert!(testing_alloy_contract_error().is_contract_err());
+        assert!(!testing_alloy_transport_error().is_contract_err());
+        assert!(!testing_alloy_node_error().is_transport_error());
+    }
+
+    #[test]
+    fn test_transport_error() {
+        assert!(!testing_alloy_contract_error().is_transport_error());
+        assert!(testing_alloy_transport_error().is_transport_error());
+        assert!(!testing_alloy_node_error().is_transport_error());
+    }
+
+    #[test]
+    fn test_node_error() {
+        assert!(!testing_alloy_contract_error().is_node_error());
+        assert!(testing_alloy_transport_error().is_node_error());
+        assert!(testing_alloy_node_error().is_node_error());
+    }
 }
diff --git a/crates/shared/Cargo.toml b/crates/shared/Cargo.toml
index a01d9254cf..cb5cee77c4 100644
--- a/crates/shared/Cargo.toml
+++ b/crates/shared/Cargo.toml
@@ -68,6 +68,7 @@ testlib = { workspace = true }
 app-data = { workspace = true, features = ["test_helpers"] }
 tokio = { workspace = true, features = ["rt-multi-thread"] }
 mockall = { workspace = true }
+ethrpc = {workspace = true, features = ["test-util"]}
 
 [features]
 test-util = ["dep:mockall"]
diff --git a/crates/shared/src/sources/swapr.rs b/crates/shared/src/sources/swapr.rs
index b70a5b87d0..28a81b3180 100644
--- a/crates/shared/src/sources/swapr.rs
+++ b/crates/shared/src/sources/swapr.rs
@@ -5,7 +5,7 @@ use {
     anyhow::Result,
     contracts::alloy::ISwaprPair,
     ethcontract::BlockId,
-    ethrpc::alloy::{conversions::IntoAlloy, errors::ignore_non_transport_error},
+    ethrpc::alloy::{conversions::IntoAlloy, errors::ignore_non_node_error},
     futures::{FutureExt as _, future::BoxFuture},
     model::TokenPair,
     num::rational::Ratio,
@@ -41,7 +41,7 @@ fn handle_results(
     pool: Result<Option<Pool>>,
     fee: Result<u32, alloy::contract::Error>,
 ) -> Result<Option<Pool>> {
-    let fee = ignore_non_transport_error(fee)?;
+    let fee = ignore_non_node_error(fee)?;
     Ok(pool?.and_then(|pool| {
         Some(Pool {
             fee: Ratio::new(fee?, FEE_BASE),
@@ -59,8 +59,8 @@ mod tests {
             recent_block_cache::Block,
             sources::{BaselineSource, uniswap_v2},
         },
-        contracts::errors::testing_alloy_contract_error,
         ethcontract::H160,
+        ethrpc::alloy::errors::testing_alloy_contract_error,
         maplit::hashset,
     };
 
diff --git a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
index 0f61a5fe6c..5a1f77a388 100644
--- a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
@@ -11,7 +11,7 @@ use {
         errors::EthcontractErrorType,
     },
     ethcontract::{BlockId, H160, U256, errors::MethodError},
-    ethrpc::alloy::{conversions::IntoAlloy, errors::ignore_non_transport_error},
+    ethrpc::alloy::{conversions::IntoAlloy, errors::ignore_non_node_error},
     futures::{
         FutureExt as _,
         future::{self, BoxFuture},
@@ -330,9 +330,9 @@ pub fn handle_contract_error<T>(result: Result<T, MethodError>) -> Result<Option
 }
 
 fn handle_results(fetched_pool: FetchedPool, address: H160) -> Result<Option<Pool>> {
-    let reserves = ignore_non_transport_error(fetched_pool.reserves)?;
-    let token0_balance = ignore_non_transport_error(fetched_pool.token0_balance)?;
-    let token1_balance = ignore_non_transport_error(fetched_pool.token1_balance)?;
+    let reserves = ignore_non_node_error(fetched_pool.reserves)?;
+    let token0_balance = ignore_non_node_error(fetched_pool.token0_balance)?;
+    let token1_balance = ignore_non_node_error(fetched_pool.token1_balance)?;
 
     let pool = reserves.and_then(|reserves| {
         let r0 = u128::try_from(reserves.reserve0).ok()?;
@@ -391,7 +391,7 @@ pub mod test_util {
 mod tests {
     use {
         super::*,
-        contracts::errors::{testing_alloy_contract_error, testing_alloy_node_error},
+        ethrpc::alloy::errors::{testing_alloy_contract_error, testing_alloy_node_error},
     };
 
     #[test]
diff --git a/crates/shared/src/token_info.rs b/crates/shared/src/token_info.rs
index 58db753926..a47c389d37 100644
--- a/crates/shared/src/token_info.rs
+++ b/crates/shared/src/token_info.rs
@@ -5,7 +5,7 @@ use {
     ethcontract::H160,
     ethrpc::{
         Web3,
-        alloy::{conversions::IntoAlloy, errors::ignore_non_transport_error},
+        alloy::{conversions::IntoAlloy, errors::ignore_non_node_error},
     },
     futures::{
         FutureExt,
@@ -63,8 +63,8 @@ impl TokenInfoFetcher {
         };
 
         Ok(TokenInfo {
-            decimals: ignore_non_transport_error(decimals).map_err(|err| Error(err.to_string()))?,
-            symbol: ignore_non_transport_error(symbol).map_err(|err| Error(err.to_string()))?,
+            decimals: ignore_non_node_error(decimals).map_err(|err| Error(err.to_string()))?,
+            symbol: ignore_non_node_error(symbol).map_err(|err| Error(err.to_string()))?,
         })
     }
 }

From c259961c3aba8a138a84a2b01468fc1e189ffe7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 12:42:42 +0000
Subject: [PATCH 11/36] address comment

---
 crates/driver/src/infra/blockchain/token.rs   | 12 +++++---
 crates/ethrpc/src/alloy/errors.rs             | 29 +++++++++++--------
 .../src/bad_token/token_owner_finder/mod.rs   |  2 +-
 3 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/crates/driver/src/infra/blockchain/token.rs b/crates/driver/src/infra/blockchain/token.rs
index 8ece066b4e..67678d978d 100644
--- a/crates/driver/src/infra/blockchain/token.rs
+++ b/crates/driver/src/infra/blockchain/token.rs
@@ -58,8 +58,10 @@ impl Erc20 {
     pub async fn decimals(&self) -> Result<Option<u8>, Error> {
         match self.token.decimals().call().await {
             Ok(decimals) => Ok(Some(decimals)),
-            Err(err) if err.is_contract_err() => Ok(None),
-            Err(err) => Err(err.into()),
+            // Check for the transport because if a method is not available it returns an empty
+            // response that doesn't decode to a proper contract error
+            Err(err) if err.is_transport_error() => Err(err.into()),
+            Err(_) => Ok(None),
         }
     }
 
@@ -70,8 +72,10 @@ impl Erc20 {
     pub async fn symbol(&self) -> Result<Option<String>, Error> {
         match self.token.symbol().call().await {
             Ok(symbol) => Ok(Some(symbol)),
-            Err(err) if err.is_contract_err() => Ok(None),
-            Err(err) => Err(err.into()),
+            // Check for the transport because if a method is not available it returns an empty
+            // response that doesn't decode to a proper contract error
+            Err(err) if err.is_transport_error() => Err(err.into()),
+            Err(_) => Ok(None),
         }
     }
 
diff --git a/crates/ethrpc/src/alloy/errors.rs b/crates/ethrpc/src/alloy/errors.rs
index 8b0287bdf4..5ff0da7c40 100644
--- a/crates/ethrpc/src/alloy/errors.rs
+++ b/crates/ethrpc/src/alloy/errors.rs
@@ -1,4 +1,4 @@
-use alloy::contract::Error as ContractError;
+use alloy::{contract::Error as ContractError, rpc::json_rpc::ErrorPayload, transports::RpcError};
 
 /// Bubbles up node errors, ignoring all other errors.
 pub fn ignore_non_node_error<T>(result: Result<T, ContractError>) -> anyhow::Result<Option<T>> {
@@ -12,7 +12,7 @@ pub fn ignore_non_node_error<T>(result: Result<T, ContractError>) -> anyhow::Res
 pub trait ContractErrorExt {
     /// Returns whether a given error is a contract error, this is considered to
     /// be all errors except the transport error.
-    fn is_contract_err(&self) -> bool;
+    fn is_contract_error(&self) -> bool;
 
     /// Returns whether a given error is specifically a transport error.
     ///
@@ -30,20 +30,23 @@ pub trait ContractErrorExt {
 }
 
 impl ContractErrorExt for ContractError {
-    fn is_contract_err(&self) -> bool {
-        !self.is_transport_error()
+    fn is_contract_error(&self) -> bool {
+        !self.is_node_error()
     }
 
     fn is_transport_error(&self) -> bool {
-        if let ContractError::TransportError(rpc_error) = self {
-            rpc_error.is_transport_error()
-        } else {
-            false
+        match self {
+            ContractError::TransportError(RpcError::Transport(_)) => true,
+            _ => false,
         }
     }
 
     fn is_node_error(&self) -> bool {
-        matches!(self, ContractError::TransportError(_))
+        match self {
+            ContractError::TransportError(RpcError::ErrorResp(_))
+            | ContractError::TransportError(RpcError::Transport(_)) => true,
+            _ => false,
+        }
     }
 }
 
@@ -67,7 +70,9 @@ pub fn testing_alloy_transport_error() -> alloy::contract::Error {
 /// Useful for testing.
 #[cfg(any(test, feature = "test-util"))]
 pub fn testing_alloy_node_error() -> alloy::contract::Error {
-    alloy::contract::Error::TransportError(alloy::transports::TransportError::NullResp)
+    alloy::contract::Error::TransportError(alloy::transports::TransportError::ErrorResp(
+        ErrorPayload::internal_error(),
+    ))
 }
 
 #[cfg(test)]
@@ -81,8 +86,8 @@ mod tests {
 
     #[test]
     fn test_contract_error() {
-        assert!(testing_alloy_contract_error().is_contract_err());
-        assert!(!testing_alloy_transport_error().is_contract_err());
+        assert!(testing_alloy_contract_error().is_contract_error());
+        assert!(!testing_alloy_transport_error().is_contract_error());
         assert!(!testing_alloy_node_error().is_transport_error());
     }
 
diff --git a/crates/shared/src/bad_token/token_owner_finder/mod.rs b/crates/shared/src/bad_token/token_owner_finder/mod.rs
index 9818504d49..9282789fb3 100644
--- a/crates/shared/src/bad_token/token_owner_finder/mod.rs
+++ b/crates/shared/src/bad_token/token_owner_finder/mod.rs
@@ -439,7 +439,7 @@ impl TokenOwnerFinding for TokenOwnerFinder {
                     async move {
                         match balance.call().await {
                             Ok(balance) => Ok((owner, balance)),
-                            Err(err) if err.is_contract_err() => {
+                            Err(err) if err.is_contract_error() => {
                                 Ok((owner, alloy::primitives::U256::ZERO))
                             }
                             Err(err) => Err(err),

From 0592d9f9d4cfb3c7a10947dd024978533eca8e92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 13:20:38 +0000
Subject: [PATCH 12/36] fix clippy

---
 crates/ethrpc/src/alloy/errors.rs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/crates/ethrpc/src/alloy/errors.rs b/crates/ethrpc/src/alloy/errors.rs
index 5ff0da7c40..6356e46604 100644
--- a/crates/ethrpc/src/alloy/errors.rs
+++ b/crates/ethrpc/src/alloy/errors.rs
@@ -35,18 +35,15 @@ impl ContractErrorExt for ContractError {
     }
 
     fn is_transport_error(&self) -> bool {
-        match self {
-            ContractError::TransportError(RpcError::Transport(_)) => true,
-            _ => false,
-        }
+        matches!(self, ContractError::TransportError(RpcError::Transport(_)))
     }
 
     fn is_node_error(&self) -> bool {
-        match self {
+        matches!(
+            self,
             ContractError::TransportError(RpcError::ErrorResp(_))
-            | ContractError::TransportError(RpcError::Transport(_)) => true,
-            _ => false,
-        }
+                | ContractError::TransportError(RpcError::Transport(_))
+        )
     }
 }
 

From e95a825ae2042422c89bad80fe6d12c2ac73c96d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 16:53:15 +0000
Subject: [PATCH 13/36] Fix contract error handling

---
 crates/driver/src/infra/blockchain/token.rs |  9 ++--
 crates/ethrpc/src/alloy/errors.rs           | 60 +++++++--------------
 2 files changed, 21 insertions(+), 48 deletions(-)

diff --git a/crates/driver/src/infra/blockchain/token.rs b/crates/driver/src/infra/blockchain/token.rs
index 67678d978d..685e200f53 100644
--- a/crates/driver/src/infra/blockchain/token.rs
+++ b/crates/driver/src/infra/blockchain/token.rs
@@ -1,6 +1,7 @@
 use {
     super::{Error, Ethereum},
     crate::domain::eth,
+    alloy::contract,
     ethrpc::alloy::{
         conversions::{IntoAlloy, IntoLegacy},
         errors::ContractErrorExt,
@@ -58,9 +59,7 @@ impl Erc20 {
     pub async fn decimals(&self) -> Result<Option<u8>, Error> {
         match self.token.decimals().call().await {
             Ok(decimals) => Ok(Some(decimals)),
-            // Check for the transport because if a method is not available it returns an empty
-            // response that doesn't decode to a proper contract error
-            Err(err) if err.is_transport_error() => Err(err.into()),
+            Err(err) if err.is_node_error() => Err(err.into()),
             Err(_) => Ok(None),
         }
     }
@@ -72,9 +71,7 @@ impl Erc20 {
     pub async fn symbol(&self) -> Result<Option<String>, Error> {
         match self.token.symbol().call().await {
             Ok(symbol) => Ok(Some(symbol)),
-            // Check for the transport because if a method is not available it returns an empty
-            // response that doesn't decode to a proper contract error
-            Err(err) if err.is_transport_error() => Err(err.into()),
+            Err(err) if err.is_node_error() => Err(err.into()),
             Err(_) => Ok(None),
         }
     }
diff --git a/crates/ethrpc/src/alloy/errors.rs b/crates/ethrpc/src/alloy/errors.rs
index 6356e46604..18721e17dc 100644
--- a/crates/ethrpc/src/alloy/errors.rs
+++ b/crates/ethrpc/src/alloy/errors.rs
@@ -1,4 +1,8 @@
-use alloy::{contract::Error as ContractError, rpc::json_rpc::ErrorPayload, transports::RpcError};
+use alloy::{
+    contract::Error as ContractError,
+    sol_types::GenericContractError,
+    transports::RpcError,
+};
 
 /// Bubbles up node errors, ignoring all other errors.
 pub fn ignore_non_node_error<T>(result: Result<T, ContractError>) -> anyhow::Result<Option<T>> {
@@ -14,18 +18,7 @@ pub trait ContractErrorExt {
     /// be all errors except the transport error.
     fn is_contract_error(&self) -> bool;
 
-    /// Returns whether a given error is specifically a transport error.
-    ///
-    /// alloy has two layers for transport nodes, this checks for the inner
-    /// most; for a more general function use
-    /// [`is_node_error`](ContractErrorExt::is_node_error).
-    fn is_transport_error(&self) -> bool;
-
     /// Returns whether a given error is a node error.
-    ///
-    /// alloy has two layers for transport nodes, this checks for the outer
-    /// most; for transport-only errors use
-    /// [`is_transport_error`](ContractErrorExt::is_transport_error).
     fn is_node_error(&self) -> bool;
 }
 
@@ -34,16 +27,18 @@ impl ContractErrorExt for ContractError {
         !self.is_node_error()
     }
 
-    fn is_transport_error(&self) -> bool {
-        matches!(self, ContractError::TransportError(RpcError::Transport(_)))
-    }
-
     fn is_node_error(&self) -> bool {
-        matches!(
-            self,
-            ContractError::TransportError(RpcError::ErrorResp(_))
-                | ContractError::TransportError(RpcError::Transport(_))
-        )
+        match self {
+            // When the revert data is empty (e.g. you perform a call to a missing function)
+            // alloy's decode breaks, because even though there is revert data, it is empty
+            // so alloy's decode method fails leading your (the caller) to think there wasn't one
+            // Thus, to properly check for any kind of revert, just look at the revert data
+            ContractError::TransportError(RpcError::ErrorResp(err)) => {
+                err.as_revert_data().is_none()
+            }
+            ContractError::TransportError(_) => true,
+            _ => false,
+        }
     }
 }
 
@@ -54,21 +49,12 @@ pub fn testing_alloy_contract_error() -> alloy::contract::Error {
     alloy::contract::Error::NotADeploymentTransaction
 }
 
-/// Create an arbitrary alloy error that will convert into a "transport" error.
-/// Useful for testing.
-#[cfg(any(test, feature = "test-util"))]
-pub fn testing_alloy_transport_error() -> alloy::contract::Error {
-    alloy::contract::Error::TransportError(alloy::transports::TransportError::Transport(
-        alloy::transports::TransportErrorKind::BackendGone,
-    ))
-}
-
 /// Create an arbitrary alloy error that will convert into a "node" error.
 /// Useful for testing.
 #[cfg(any(test, feature = "test-util"))]
 pub fn testing_alloy_node_error() -> alloy::contract::Error {
     alloy::contract::Error::TransportError(alloy::transports::TransportError::ErrorResp(
-        ErrorPayload::internal_error(),
+        alloy::rpc::json_rpc::ErrorPayload::internal_error(),
     ))
 }
 
@@ -78,27 +64,17 @@ mod tests {
         ContractErrorExt,
         testing_alloy_contract_error,
         testing_alloy_node_error,
-        testing_alloy_transport_error,
     };
 
     #[test]
     fn test_contract_error() {
         assert!(testing_alloy_contract_error().is_contract_error());
-        assert!(!testing_alloy_transport_error().is_contract_error());
-        assert!(!testing_alloy_node_error().is_transport_error());
-    }
-
-    #[test]
-    fn test_transport_error() {
-        assert!(!testing_alloy_contract_error().is_transport_error());
-        assert!(testing_alloy_transport_error().is_transport_error());
-        assert!(!testing_alloy_node_error().is_transport_error());
+        assert!(!testing_alloy_node_error().is_contract_error());
     }
 
     #[test]
     fn test_node_error() {
         assert!(!testing_alloy_contract_error().is_node_error());
-        assert!(testing_alloy_transport_error().is_node_error());
         assert!(testing_alloy_node_error().is_node_error());
     }
 }

From 442203f2d198b1555ccb9ef0b725d0091ee55d25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Thu, 30 Oct 2025 17:00:33 +0000
Subject: [PATCH 14/36] lints

---
 crates/driver/src/infra/blockchain/token.rs | 1 -
 crates/ethrpc/src/alloy/errors.rs           | 6 +-----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/crates/driver/src/infra/blockchain/token.rs b/crates/driver/src/infra/blockchain/token.rs
index 685e200f53..b9758000cc 100644
--- a/crates/driver/src/infra/blockchain/token.rs
+++ b/crates/driver/src/infra/blockchain/token.rs
@@ -1,7 +1,6 @@
 use {
     super::{Error, Ethereum},
     crate::domain::eth,
-    alloy::contract,
     ethrpc::alloy::{
         conversions::{IntoAlloy, IntoLegacy},
         errors::ContractErrorExt,
diff --git a/crates/ethrpc/src/alloy/errors.rs b/crates/ethrpc/src/alloy/errors.rs
index 18721e17dc..96bbdf0ea1 100644
--- a/crates/ethrpc/src/alloy/errors.rs
+++ b/crates/ethrpc/src/alloy/errors.rs
@@ -1,8 +1,4 @@
-use alloy::{
-    contract::Error as ContractError,
-    sol_types::GenericContractError,
-    transports::RpcError,
-};
+use alloy::{contract::Error as ContractError, transports::RpcError};
 
 /// Bubbles up node errors, ignoring all other errors.
 pub fn ignore_non_node_error<T>(result: Result<T, ContractError>) -> anyhow::Result<Option<T>> {

From 9e7b790260c2af809f9330333fa73caf8e48fae7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Fri, 31 Oct 2025 10:01:08 +0000
Subject: [PATCH 15/36] More details for the error mapping

---
 crates/ethrpc/src/alloy/errors.rs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/crates/ethrpc/src/alloy/errors.rs b/crates/ethrpc/src/alloy/errors.rs
index 96bbdf0ea1..657c655f28 100644
--- a/crates/ethrpc/src/alloy/errors.rs
+++ b/crates/ethrpc/src/alloy/errors.rs
@@ -24,13 +24,27 @@ impl ContractErrorExt for ContractError {
     }
 
     fn is_node_error(&self) -> bool {
+        // This mapping is "ported" from ethcontract's error hierarchy, although in it
+        // contract errors are better defined. Essentially, everything that isn't web3
+        // related in ethcontract gets classified as a contract error, however, in alloy
+        // some contract errors are "hidden" inside transport errors, as such we need to
+        // check if transport errors have revert data to rule out contract errors.
+        //
+        // NOTE: using alloy's decoding functions doesn't work here because it requires
+        // the revert data to *not* be empty, otherwise it will return `None` as if a
+        // revert wasn't present or wasn't able to be decoded, though the usage of
+        // `Option` erases the existing nuances of the failure
         match self {
             // When the revert data is empty (e.g. you perform a call to a missing function)
             // alloy's decode breaks, because even though there is revert data, it is empty
             // so alloy's decode method fails leading your (the caller) to think there wasn't one
             // Thus, to properly check for any kind of revert, just look at the revert data
             ContractError::TransportError(RpcError::ErrorResp(err)) => {
-                err.as_revert_data().is_none()
+                // Due to the mismatch between error APIs and best-effort approximation this log
+                // line is left here as a debugging tool in case we start having RPC issues
+                let has_revert_data = err.as_revert_data().is_none();
+                tracing::debug!(?err, %has_revert_data, "transport rpc error");
+                has_revert_data
             }
             ContractError::TransportError(_) => true,
             _ => false,

From e6a6eb5d86e0befbdd54129ae9da7c84c81e46d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Fri, 31 Oct 2025 13:40:07 +0000
Subject: [PATCH 16/36] wip

---
 Cargo.lock                           | 2592 ++++++++++++--------------
 crates/contracts-generate/src/lib.rs |   30 +
 crates/contracts/Cargo.toml          |    2 -
 crates/contracts/build.rs            |  707 +++++++
 4 files changed, 1927 insertions(+), 1404 deletions(-)
 create mode 100644 crates/contracts/build.rs

diff --git a/Cargo.lock b/Cargo.lock
index 848ea82fb4..bdb467b237 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -12,6 +12,21 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "addr2line"
+version = "0.22.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "adler2"
 version = "2.0.1"
@@ -24,29 +39,29 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
 ]
 
 [[package]]
 name = "ahash"
-version = "0.8.12"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.3.4",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
- "zerocopy",
+ "zerocopy 0.7.34",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.4"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -76,15 +91,15 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.21"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "alloy"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e84ab07ca0c3210734019e4d0e5392952ed574196ab0f904ab9c7ba0ae15595"
+checksum = "ae62e633fa48b4190af5e841eb05179841bb8b713945103291e2c0867037c0d1"
 dependencies = [
  "alloy-consensus",
  "alloy-contract",
@@ -106,9 +121,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-chains"
-version = "0.2.17"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6068f356948cd84b5ad9ac30c50478e433847f14a50714d2b68f15d052724049"
+checksum = "5674914c2cfdb866c21cb0c09d82374ee39a1395cf512e7515f4c014083b3fff"
 dependencies = [
  "alloy-primitives",
  "num_enum",
@@ -118,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3abecb92ba478a285fbf5689100dbafe4003ded4a09bf4b5ef62cca87cd4f79e"
+checksum = "b9b151e38e42f1586a01369ec52a6934702731d07e8509a7307331b09f6c46dc"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -139,14 +154,14 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e864d4f11d1fb8d3ac2fd8f3a15f1ee46d55ec6d116b342ed1b2cb737f25894"
+checksum = "6e2d5e8668ef6215efdb7dcca6f22277b4e483a5650e05f5de22b2350971f4b8"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -158,9 +173,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-contract"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c98d21aeef3e0783046c207abd3eb6cb41f6e77e0c0fc8077ebecd6df4f9d171"
+checksum = "630288cf4f3a34a8c6bc75c03dce1dbd47833138f65f37d53a1661eafc96b83f"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -175,14 +190,14 @@ dependencies = [
  "futures",
  "futures-util",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-core"
-version = "1.4.1"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca96214615ec8cf3fa2a54b32f486eb49100ca7fe7eb0b8c1137cd316e7250a"
+checksum = "575053cea24ea8cb7e775e39d5c53c33b19cfd0ca1cf6c0fd653f3d8c682095f"
 dependencies = [
  "alloy-dyn-abi",
  "alloy-json-abi",
@@ -206,7 +221,7 @@ dependencies = [
  "proptest",
  "serde",
  "serde_json",
- "winnow",
+ "winnow 0.7.11",
 ]
 
 [[package]]
@@ -219,7 +234,7 @@ dependencies = [
  "alloy-rlp",
  "crc",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -243,14 +258,14 @@ dependencies = [
  "alloy-rlp",
  "k256",
  "serde",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07d9a64522a0db6ebcc4ff9c904e329e77dd737c2c25d30f1bdc32ca6c6ce334"
+checksum = "e5434834adaf64fa20a6fb90877bc1d33214c41b055cc49f82189c98614368cc"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -265,7 +280,7 @@ dependencies = [
  "serde",
  "serde_with",
  "sha2",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -282,24 +297,24 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87b774478fcc616993e97659697f3e3c7988fdad598e46ee0ed11209cd0d8ee"
+checksum = "d7c69f6c9c68a1287c9d5ff903d0010726934de0dac10989be37b75a29190d55"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
- "http 1.3.1",
+ "http 1.1.0",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tracing",
 ]
 
 [[package]]
 name = "alloy-network"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d6ed73d440bae8f27771b7cd507fa8f10f19ddf0b8f67e7622a52e0dbf798e"
+checksum = "8eaf2ae05219e73e0979cb2cf55612aafbab191d130f203079805eaf881cca58"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -318,14 +333,14 @@ dependencies = [
  "futures-utils-wasm",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219dccd2cf753a43bd9b0fbb7771a16927ffdb56e43e3a15755bef1a74d614aa"
+checksum = "e58f4f345cef483eab7374f2b6056973c7419ffe8ad35e994b7a7f5d8e0c7ba4"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -347,16 +362,16 @@ dependencies = [
  "const-hex",
  "derive_more 2.0.1",
  "foldhash 0.2.0",
- "getrandom 0.3.4",
+ "getrandom 0.3.3",
  "hashbrown 0.16.0",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "itoa",
  "k256",
  "keccak-asm",
  "paste",
  "proptest",
  "proptest-derive",
- "rand 0.9.2",
+ "rand 0.9.1",
  "ruint",
  "rustc-hash",
  "serde",
@@ -366,9 +381,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ef8cbc2b68e2512acf04b2d296c05c98a661bc460462add6414528f4ff3d9b"
+checksum = "de2597751539b1cc8fe4204e5325f9a9ed83fcacfb212018dfcfa7877e76de21"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -396,10 +411,10 @@ dependencies = [
  "lru 0.13.0",
  "parking_lot",
  "pin-project",
- "reqwest 0.12.24",
+ "reqwest 0.12.12",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tokio",
  "tracing",
  "url",
@@ -408,9 +423,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be028fb1c6c173f5765d0baa3580a11d69826ea89fe00ee5c9d7eddb2c3509cd"
+checksum = "06e45a68423e732900a0c824b8e22237db461b79d2e472dd68b7547c16104427"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -452,9 +467,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0f67d1e655ed93efca217213340d21cce982333cc44a1d918af9150952ef66"
+checksum = "edf8eb8be597cfa8c312934d2566ec4516f066d69164f9212d7a148979fdcfd8"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -462,7 +477,7 @@ dependencies = [
  "alloy-transport-http",
  "futures",
  "pin-project",
- "reqwest 0.12.24",
+ "reqwest 0.12.12",
  "serde",
  "serde_json",
  "tokio",
@@ -475,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe106e50522980bc9e7cc9016f445531edf1a53e0fdba904c833b98c6fdff3f0"
+checksum = "339af7336571dd39ae3a15bde08ae6a647e62f75350bd415832640268af92c06"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-anvil",
@@ -491,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cf94d581b3aa13ebacb90ea52e0179985b7c20d8a522319e7d40768d56667a"
+checksum = "83d98fb386a462e143f5efa64350860af39950c49e7c0cbdba419c16793116ef"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -503,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "425e14ee32eb8b7edd6a2247fe0ed640785e6eba75af27db27f1e6220c15ef0d"
+checksum = "fbde0801a32d21c5f111f037bee7e22874836fba7add34ed4a6919932dd7cf23"
 dependencies = [
  "alloy-consensus-any",
  "alloy-rpc-types-eth",
@@ -514,9 +529,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-debug"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f69c12784cdf1059936249a6e705ec03bf8cea1a12181ed5cea9ca2be9cca684"
+checksum = "388cf910e66bd4f309a81ef746dcf8f9bca2226e3577890a8d56c5839225cf46"
 dependencies = [
  "alloy-primitives",
  "derive_more 2.0.1",
@@ -526,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabc17f0eac3f747eeddebc768c8e30763d6f6c53188f5335a935dedc57ddfbd"
+checksum = "605ec375d91073851f566a3082548af69a28dca831b27a8be7c1b4c49f5c6ca2"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -544,9 +559,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0185f68a0f8391ab996d335a887087d7ccdbc97952efab3516f6307d456ba2cd"
+checksum = "361cd87ead4ba7659bda8127902eda92d17fa7ceb18aba1676f7be10f7222487"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -560,28 +575,28 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d31a6766c8f91d18d07a36b57f55efd981752df619d30b395a92332a8b28ea05"
+checksum = "de4e95fb0572b97b17751d0fdf5cdc42b0050f9dd9459eddd1bf2e2fbfed0a33"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
  "alloy-serde",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "596cfa360922ba9af901cc7370c68640e4f72adb6df0ab064de32f21fec498d7"
+checksum = "64600fc6c312b7e0ba76f73a381059af044f4f21f43e07f51f1fa76c868fe302"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -590,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f06333680d04370c8ed3a6b0eccff384e422c3d8e6b19e61fedc3a9f0ab7743"
+checksum = "5772858492b26f780468ae693405f895d6a27dea6e3eab2c36b6217de47c2647"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -600,14 +615,14 @@ dependencies = [
  "either",
  "elliptic-curve",
  "k256",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
 name = "alloy-signer-aws"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a59f1e68c38d447b5ebf8b53d91f7373e59be1de438e77bdb030ea6b2da529b"
+checksum = "66acf5f8745dd935e94855aada39d83b555112872321d9293748424de144897e"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -618,15 +633,15 @@ dependencies = [
  "aws-sdk-kms",
  "k256",
  "spki",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tracing",
 ]
 
 [[package]]
 name = "alloy-signer-local"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "590dcaeb290cdce23155e68af4791d093afc3754b1a331198a25d2d44c5456e8"
+checksum = "f4195b803d0a992d8dbaab2ca1986fc86533d4bc80967c0cce7668b26ad99ef9"
 dependencies = [
  "alloy-consensus",
  "alloy-network",
@@ -637,7 +652,7 @@ dependencies = [
  "coins-bip39",
  "k256",
  "rand 0.8.5",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "zeroize",
 ]
 
@@ -665,7 +680,7 @@ dependencies = [
  "alloy-sol-macro-input",
  "const-hex",
  "heck 0.5.0",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "proc-macro-error2",
  "proc-macro2",
  "quote",
@@ -699,7 +714,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "954d1b2533b9b2c7959652df3076954ecb1122a28cc740aa84e7b0a49f6ac0a9"
 dependencies = [
  "serde",
- "winnow",
+ "winnow 0.7.11",
 ]
 
 [[package]]
@@ -716,11 +731,12 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55bbdcee53e4e3857b5ddbc2986ebe9c2ab5f352ec285cb0da04c1e8f2ca9c18"
+checksum = "025a940182bddaeb594c26fe3728525ae262d0806fe6a4befdf5d7bc13d54bce"
 dependencies = [
  "alloy-json-rpc",
+ "alloy-primitives",
  "auto_impl",
  "base64 0.22.1",
  "derive_more 2.0.1",
@@ -729,7 +745,7 @@ dependencies = [
  "parking_lot",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tokio",
  "tower 0.5.2",
  "tracing",
@@ -739,13 +755,13 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793967215109b4a334047c810ed6db5e873ad3ea07f65cc02202bd4b810d9615"
+checksum = "e3b5064d1e1e1aabc918b5954e7fb8154c39e77ec6903a581b973198b26628fa"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
- "reqwest 0.12.24",
+ "reqwest 0.12.12",
  "serde_json",
  "tower 0.5.2",
  "tracing",
@@ -754,9 +770,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e182e5ae0c4858bb87df23ebfe31018d7e51fe1a264b8a8a2b26932cb04861"
+checksum = "d47962f3f1d9276646485458dc842b4e35675f42111c9d814ae4711c664c8300"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -774,14 +790,14 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e9dc891c80d6216003d4b04f0a7463015d0873d36e4ac2ec0bcc9196aa4ea7"
+checksum = "9476a36a34e2fb51b6746d009c53d309a186a825aa95435407f0e07149f4ad2d"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
  "futures",
- "http 1.3.1",
+ "http 1.1.0",
  "rustls 0.23.34",
  "serde_json",
  "tokio",
@@ -792,9 +808,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-trie"
-version = "0.9.1"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3412d52bb97c6c6cc27ccc28d4e6e8cf605469101193b50b0bd5813b1f990b5"
+checksum = "bada1fc392a33665de0dc50d401a3701b62583c655e3522a323490a5da016962"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
@@ -808,16 +824,23 @@ dependencies = [
 
 [[package]]
 name = "alloy-tx-macros"
-version = "1.0.42"
+version = "1.0.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab54221eccefa254ce9f65b079c097b1796e48c21c7ce358230f8988d75392fb"
+checksum = "f8e52276fdb553d3c11563afad2898f4085165e4093604afe3d78b69afbf408f"
 dependencies = [
- "darling",
+ "alloy-primitives",
+ "darling 0.21.3",
  "proc-macro2",
  "quote",
  "syn 2.0.108",
 ]
 
+[[package]]
+name = "android-tzdata"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
+
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -835,7 +858,7 @@ checksum = "025c7edcdffa4ccc5c0905f472a0ae3759378cfbef88ef518a3575e19ae3aebd"
 dependencies = [
  "anstyle",
  "memchr",
- "unicode-width",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -855,26 +878,26 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.13"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.7"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -955,14 +978,14 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
 dependencies = [
- "ahash 0.8.12",
+ "ahash 0.8.11",
  "ark-ff 0.5.0",
  "ark-poly",
  "ark-serialize 0.5.0",
  "ark-std 0.5.0",
  "educe",
  "fnv",
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
  "itertools 0.13.0",
  "num-bigint",
  "num-integer",
@@ -1004,7 +1027,7 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "paste",
- "rustc_version 0.4.1",
+ "rustc_version 0.4.0",
  "zeroize",
 ]
 
@@ -1102,13 +1125,13 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
 dependencies = [
- "ahash 0.8.12",
+ "ahash 0.8.11",
  "ark-ff 0.5.0",
  "ark-serialize 0.5.0",
  "ark-std 0.5.0",
  "educe",
  "fnv",
- "hashbrown 0.15.5",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -1194,42 +1217,42 @@ checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.6"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "async-compression"
-version = "0.4.32"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a89bce6054c720275ac2432fbba080a66a2106a44a1b804553930ca6909f4e0"
+checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
 dependencies = [
- "compression-codecs",
- "compression-core",
+ "flate2",
  "futures-core",
+ "memchr",
  "pin-project-lite",
  "tokio",
 ]
 
 [[package]]
 name = "async-lock"
-version = "3.4.1"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 5.4.1",
+ "event-listener 5.4.0",
  "event-listener-strategy",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-stream"
-version = "0.3.6"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -1238,9 +1261,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.6"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1249,9 +1272,9 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.89"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1266,7 +1289,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
 dependencies = [
  "futures",
  "pharos",
- "rustc_version 0.4.1",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
@@ -1318,9 +1341,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.5.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "autopilot"
@@ -1346,7 +1369,7 @@ dependencies = [
  "futures",
  "hex-literal",
  "humantime",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "itertools 0.14.0",
  "maplit",
  "mimalloc",
@@ -1369,7 +1392,7 @@ dependencies = [
  "shared",
  "sqlx",
  "strum",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
  "url",
@@ -1379,9 +1402,9 @@ dependencies = [
 
 [[package]]
 name = "aws-config"
-version = "1.8.8"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37cf2b6af2a95a20e266782b4f76f1a5e12bf412a9db2de9c1e9123b9d8c0ad8"
+checksum = "2ac9889352d632214df943e26740c46a0f3da6e329fbd28164fe7ae1b061da7b"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1398,7 +1421,8 @@ dependencies = [
  "bytes",
  "fastrand",
  "hex",
- "http 1.3.1",
+ "http 0.2.12",
+ "hyper 0.14.29",
  "ring",
  "time",
  "tokio",
@@ -1409,9 +1433,9 @@ dependencies = [
 
 [[package]]
 name = "aws-credential-types"
-version = "1.2.8"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faf26925f4a5b59eb76722b63c2892b1d70d06fa053c72e4a100ec308c1d47bc"
+checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-runtime-api",
@@ -1419,41 +1443,17 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "aws-lc-rs"
-version = "1.14.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "879b6c89592deb404ba4dc0ae6b58ffd1795c78991cbb5b8bc441c48a070440d"
-dependencies = [
- "aws-lc-sys",
- "zeroize",
-]
-
-[[package]]
-name = "aws-lc-sys"
-version = "0.32.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "107a4e9d9cab9963e04e84bb8dee0e25f2a987f9a8bad5ed054abd439caa8f8c"
-dependencies = [
- "bindgen",
- "cc",
- "cmake",
- "dunce",
- "fs_extra",
-]
-
 [[package]]
 name = "aws-runtime"
-version = "1.5.12"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa006bb32360ed90ac51203feafb9d02e3d21046e1fd3a450a404b90ea73e5d"
+checksum = "75588e7ee5e8496eed939adac2035a6dbab9f7eb2acdd9ab2d31856dab6f3955"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
  "aws-smithy-async",
  "aws-smithy-eventstream",
  "aws-smithy-http",
- "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "aws-types",
@@ -1469,9 +1469,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-kms"
-version = "1.91.0"
+version = "1.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30662f9c5a2be685ee921f92d5ad88d5bc6ac971e8c0e49c5907bd52b2b069df"
+checksum = "da951fb0dd1a02728a91c58af8464098766f1a0600af932dd3f8361b23e1bfc9"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1483,18 +1483,19 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand",
  "http 0.2.12",
+ "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-s3"
-version = "1.109.0"
+version = "1.34.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c6d81b75f8ff78882e70c5909804b44553d56136899fb4015a0a68ecc870e0e"
+checksum = "724119d8fd2d2638b9979673f3b5c2979fa388c9ca27815e3cb5ad6234fac3f5"
 dependencies = [
+ "ahash 0.8.11",
  "aws-credential-types",
  "aws-runtime",
  "aws-sigv4",
@@ -1513,9 +1514,9 @@ dependencies = [
  "hex",
  "hmac",
  "http 0.2.12",
- "http 1.3.1",
  "http-body 0.4.6",
- "lru 0.12.5",
+ "lru 0.12.3",
+ "once_cell",
  "percent-encoding",
  "regex-lite",
  "sha2",
@@ -1525,9 +1526,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.87.0"
+version = "1.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4af747ffcb5aa8da8be8f0679ef6940f1afdb8c2e10c36738c9ebeb8d17b95e"
+checksum = "da75cf91cbb46686a27436d639a720a3a198b148efa76dc2467b7e5374a67fc0"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1539,17 +1540,17 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand",
  "http 0.2.12",
+ "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.89.0"
+version = "1.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "695dc67bb861ccb8426c9129b91c30e266a0e3d85650cafdf62fcca14c8fd338"
+checksum = "cf2ec8a6687299685ed0a4a3137c129cdb132b5235bc3aa3443f6cffe468b9ff"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1561,17 +1562,17 @@ dependencies = [
  "aws-smithy-types",
  "aws-types",
  "bytes",
- "fastrand",
  "http 0.2.12",
+ "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.89.0"
+version = "1.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "928e87698cd916cf1efd5268148347269e6d2911028742c0061ff6261e639e3c"
+checksum = "458f1031e094b1411b59b49b19e4118f069e1fe13a9c5b8888e933daaf7ffdd6"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -1584,17 +1585,17 @@ dependencies = [
  "aws-smithy-types",
  "aws-smithy-xml",
  "aws-types",
- "fastrand",
  "http 0.2.12",
+ "once_cell",
  "regex-lite",
  "tracing",
 ]
 
 [[package]]
 name = "aws-sigv4"
-version = "1.3.5"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bffc03068fbb9c8dd5ce1c6fb240678a5cffb86fb2b7b1985c999c4b83c8df68"
+checksum = "58b56f1cbe6fd4d0c2573df72868f20ab1c125ca9c9dbce17927a463433a2e57"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-eventstream",
@@ -1606,7 +1607,8 @@ dependencies = [
  "hex",
  "hmac",
  "http 0.2.12",
- "http 1.3.1",
+ "http 1.1.0",
+ "once_cell",
  "percent-encoding",
  "sha2",
  "time",
@@ -1615,9 +1617,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-async"
-version = "1.2.6"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "127fcfad33b7dfc531141fda7e1c402ac65f88aca5511a4d31e2e3d2cd01ce9c"
+checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c"
 dependencies = [
  "futures-util",
  "pin-project-lite",
@@ -1626,14 +1628,15 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-checksums"
-version = "0.63.10"
+version = "0.60.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb9a26b2831e728924ec0089e92697a78a2f9cdcf90d81e8cfcc6a6c85080369"
+checksum = "6242d6a54d3b4b83458f4abd7057ba93c4419dc71e8217e9acd3a748d656d99e"
 dependencies = [
  "aws-smithy-http",
  "aws-smithy-types",
  "bytes",
- "crc-fast",
+ "crc32c",
+ "crc32fast",
  "hex",
  "http 0.2.12",
  "http-body 0.4.6",
@@ -1646,9 +1649,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-eventstream"
-version = "0.60.13"
+version = "0.60.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e29a304f8319781a39808847efb39561351b1bb76e933da7aa90232673638658"
+checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858"
 dependencies = [
  "aws-smithy-types",
  "bytes",
@@ -1657,9 +1660,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-http"
-version = "0.62.5"
+version = "0.60.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "445d5d720c99eed0b4aa674ed00d835d9b1427dd73e04adaf2f94c6b2d6f9fca"
+checksum = "4a7de001a1b9a25601016d8057ea16e31a45fdca3751304c8edf4ad72e706c08"
 dependencies = [
  "aws-smithy-eventstream",
  "aws-smithy-runtime-api",
@@ -1667,69 +1670,29 @@ dependencies = [
  "bytes",
  "bytes-utils",
  "futures-core",
- "futures-util",
  "http 0.2.12",
- "http 1.3.1",
  "http-body 0.4.6",
+ "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "pin-utils",
  "tracing",
 ]
 
-[[package]]
-name = "aws-smithy-http-client"
-version = "1.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "623254723e8dfd535f566ee7b2381645f8981da086b5c4aa26c0c41582bb1d2c"
-dependencies = [
- "aws-smithy-async",
- "aws-smithy-runtime-api",
- "aws-smithy-types",
- "h2 0.3.27",
- "h2 0.4.12",
- "http 0.2.12",
- "http 1.3.1",
- "http-body 0.4.6",
- "hyper 0.14.32",
- "hyper 1.7.0",
- "hyper-rustls 0.24.2",
- "hyper-rustls 0.27.7",
- "hyper-util",
- "pin-project-lite",
- "rustls 0.21.12",
- "rustls 0.23.34",
- "rustls-native-certs 0.8.2",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.26.4",
- "tower 0.5.2",
- "tracing",
-]
-
 [[package]]
 name = "aws-smithy-json"
-version = "0.61.7"
+version = "0.60.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2db31f727935fc63c6eeae8b37b438847639ec330a9161ece694efba257e0c54"
+checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6"
 dependencies = [
  "aws-smithy-types",
 ]
 
-[[package]]
-name = "aws-smithy-observability"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d1881b1ea6d313f9890710d65c158bdab6fb08c91ea825f74c1c8c357baf4cc"
-dependencies = [
- "aws-smithy-runtime-api",
-]
-
 [[package]]
 name = "aws-smithy-query"
-version = "0.60.8"
+version = "0.60.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d28a63441360c477465f80c7abac3b9c4d075ca638f982e605b7dc2a2c7156c9"
+checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb"
 dependencies = [
  "aws-smithy-types",
  "urlencoding",
@@ -1737,39 +1700,41 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.9.4"
+version = "1.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bbe9d018d646b96c7be063dd07987849862b0e6d07c778aad7d93d1be6c1ef0"
+checksum = "d0d3965f6417a92a6d1009c5958a67042f57e46342afb37ca58f9ad26744ec73"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
- "aws-smithy-http-client",
- "aws-smithy-observability",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
  "bytes",
  "fastrand",
+ "h2 0.3.26",
  "http 0.2.12",
- "http 1.3.1",
  "http-body 0.4.6",
- "http-body 1.0.1",
+ "http-body 1.0.0",
+ "hyper 0.14.29",
+ "hyper-rustls 0.24.2",
+ "once_cell",
  "pin-project-lite",
  "pin-utils",
+ "rustls 0.21.12",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "aws-smithy-runtime-api"
-version = "1.9.2"
+version = "1.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7204f9fd94749a7c53b26da1b961b4ac36bf070ef1e0b94bb09f79d4f6c193"
+checksum = "4179bd8a1c943e1aceb46c5b9fc014a561bd6c35a2153e816ba29076ee49d245"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-types",
  "bytes",
  "http 0.2.12",
- "http 1.3.1",
+ "http 1.1.0",
  "pin-project-lite",
  "tokio",
  "tracing",
@@ -1778,18 +1743,18 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-types"
-version = "1.3.4"
+version = "1.1.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25f535879a207fce0db74b679cfc3e91a3159c8144d717d55f5832aea9eef46e"
+checksum = "5b6764ba7e1c5ede1c9f9e4046645534f06c2581402461c559b481a420330a83"
 dependencies = [
  "base64-simd",
  "bytes",
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
- "http 1.3.1",
+ "http 1.1.0",
  "http-body 0.4.6",
- "http-body 1.0.1",
+ "http-body 1.0.0",
  "http-body-util",
  "itoa",
  "num-integer",
@@ -1804,24 +1769,25 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-xml"
-version = "0.60.12"
+version = "0.60.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab77cdd036b11056d2a30a7af7b775789fb024bf216acc13884c6c97752ae56"
+checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55"
 dependencies = [
  "xmlparser",
 ]
 
 [[package]]
 name = "aws-types"
-version = "1.3.9"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2fd329bf0e901ff3f60425691410c69094dc2a1f34b331f37bfc4e9ac1565a1"
+checksum = "6f734808d43702a67e57d478a12e227d4d038d0b90c9005a78c87890d3805922"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-async",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
- "rustc_version 0.4.1",
+ "http 0.2.12",
+ "rustc_version 0.4.0",
  "tracing",
 ]
 
@@ -1838,7 +1804,7 @@ dependencies = [
  "futures-util",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "itoa",
  "matchit",
  "memchr",
@@ -1874,6 +1840,21 @@ dependencies = [
  "tower-service",
 ]
 
+[[package]]
+name = "backtrace"
+version = "0.3.72"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17c6a35df3749d2e8bb1b7b21a976d82b15548788d2735b9d82f329268f71a11"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide 0.7.3",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base-x"
 version = "0.2.11"
@@ -1886,16 +1867,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
 
-[[package]]
-name = "base256emoji"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e9430d9a245a77c92176e649af6e275f20839a48389859d1661e9a128d077c"
-dependencies = [
- "const-str",
- "match-lookup",
-]
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -1920,9 +1891,9 @@ dependencies = [
 
 [[package]]
 name = "base64ct"
-version = "1.8.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
 [[package]]
 name = "bech32"
@@ -1948,26 +1919,6 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
 
-[[package]]
-name = "bindgen"
-version = "0.72.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
-dependencies = [
- "bitflags 2.10.0",
- "cexpr",
- "clang-sys",
- "itertools 0.13.0",
- "log",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -2037,9 +1988,9 @@ dependencies = [
 
 [[package]]
 name = "blst"
-version = "0.3.16"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcdb4c7013139a150f9fc55d123186dbfaba0d912817466282c73ac49e71fb45"
+checksum = "4fd49896f12ac9b6dcd7a5998466b9b58263a695a3dd1ecc1aaca2e12a90b080"
 dependencies = [
  "cc",
  "glob",
@@ -2049,9 +2000,9 @@ dependencies = [
 
 [[package]]
 name = "borsh"
-version = "1.5.7"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+checksum = "a6362ed55def622cddc70a4746a68554d7b687713770de539e59a739b249f8ed"
 dependencies = [
  "borsh-derive",
  "cfg_aliases",
@@ -2059,15 +2010,16 @@ dependencies = [
 
 [[package]]
 name = "borsh-derive"
-version = "1.5.7"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
+checksum = "c3ef8005764f53cd4dca619f5bf64cafd4664dada50ece25e4d81de54c80cc0b"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
  "proc-macro2",
  "quote",
  "syn 2.0.108",
+ "syn_derive",
 ]
 
 [[package]]
@@ -2088,15 +2040,15 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.19.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "byte-slice-cast"
-version = "1.2.3"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7575182f7272186991736b70173b0ea045398f984bf5ebbb3804736ce1330c9d"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
 
 [[package]]
 name = "bytecheck"
@@ -2128,9 +2080,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.10.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+checksum = "f61dac84819c6588b558454b194026eb1f09c293b9036ae9b159e74e73ab6cf9"
 dependencies = [
  "serde",
 ]
@@ -2157,9 +2109,9 @@ dependencies = [
 
 [[package]]
 name = "c-kzg"
-version = "2.1.5"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e00bf4b112b07b505472dbefd19e37e53307e2bfed5a79e0cc161d58ccd0e687"
+checksum = "7318cfa722931cb5fe0838b98d3ce5621e75f6a6408abc21721d80de9223f2e4"
 dependencies = [
  "blst",
  "cc",
@@ -2179,35 +2131,23 @@ dependencies = [
  "hashbrown 0.14.5",
  "instant",
  "once_cell",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.44"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
 dependencies = [
- "find-msvc-tools",
- "jobserver",
- "libc",
  "shlex",
 ]
 
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
 [[package]]
 name = "cfg-if"
-version = "1.0.4"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "cfg_aliases"
@@ -2222,19 +2162,20 @@ dependencies = [
  "derive_more 1.0.0",
  "ethcontract",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
 name = "chrono"
-version = "0.4.42"
+version = "0.4.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
 dependencies = [
+ "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-link",
+ "windows-link 0.1.3",
 ]
 
 [[package]]
@@ -2264,22 +2205,11 @@ dependencies = [
  "half",
 ]
 
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading",
-]
-
 [[package]]
 name = "clap"
-version = "4.5.51"
+version = "4.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
+checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -2287,9 +2217,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.51"
+version = "4.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
+checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df"
 dependencies = [
  "anstream",
  "anstyle",
@@ -2297,14 +2227,14 @@ dependencies = [
  "strsim",
  "terminal_size",
  "unicase",
- "unicode-width",
+ "unicode-width 0.1.14",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.49"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
@@ -2314,18 +2244,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
-
-[[package]]
-name = "cmake"
-version = "0.1.54"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
-dependencies = [
- "cc",
-]
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "coins-bip32"
@@ -2340,7 +2261,7 @@ dependencies = [
  "k256",
  "serde",
  "sha2",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
@@ -2356,7 +2277,7 @@ dependencies = [
  "pbkdf2",
  "rand 0.8.5",
  "sha2",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
@@ -2375,14 +2296,14 @@ dependencies = [
  "serde",
  "sha2",
  "sha3",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
 name = "colorchoice"
-version = "1.0.4"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "comfy-table"
@@ -2392,26 +2313,9 @@ checksum = "b03b7db8e0b4b2fdad6c551e634134e99ec000e5c8c3b6856c65e8bbaded7a3b"
 dependencies = [
  "crossterm",
  "unicode-segmentation",
- "unicode-width",
-]
-
-[[package]]
-name = "compression-codecs"
-version = "0.4.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef8a506ec4b81c460798f572caead636d57d3d7e940f998160f52bd254bf2d23"
-dependencies = [
- "compression-core",
- "flate2",
- "memchr",
+ "unicode-width 0.2.2",
 ]
 
-[[package]]
-name = "compression-core"
-version = "0.4.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e47641d3deaf41fb1538ac1f54735925e275eaf3bf4d55c81b137fba797e5cbb"
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -2477,26 +2381,20 @@ version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
 
-[[package]]
-name = "const-str"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f421161cb492475f1661ddc9815a745a1c894592070661180fdec3d4872e9c3"
-
 [[package]]
 name = "const_format"
-version = "0.2.35"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7faa7469a93a566e9ccc1c73fe783b4a65c274c5ace346038dca9c39fe0030ad"
+checksum = "e3a214c7af3d04997541b18d432afaff4c455e79e2029079647e72fc2bd27673"
 dependencies = [
  "const_format_proc_macros",
 ]
 
 [[package]]
 name = "const_format_proc_macros"
-version = "0.2.34"
+version = "0.2.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d57c2eccfb16dbac1f4e61e206105db5820c9d26c3c472bc17c774259ef7744"
+checksum = "c7f6ff08fd20f4f299298a28e2dfa8a8ba1036e6cd2460ac1de7b425d76f2500"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2598,21 +2496,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "core-foundation"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.7"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
 
 [[package]]
 name = "cow-amm"
@@ -2641,18 +2529,18 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.17"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc"
-version = "3.3.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
 dependencies = [
  "crc-catalog",
 ]
@@ -2664,23 +2552,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
-name = "crc-fast"
-version = "1.3.0"
+name = "crc32c"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf62af4cc77d8fe1c22dde4e721d87f2f54056139d8c412e1366b740305f56f"
+checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2"
 dependencies = [
- "crc",
- "digest 0.10.7",
- "libc",
- "rand 0.9.2",
- "regex",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.5.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -2715,18 +2599,18 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-queue"
-version = "0.3.12"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
 dependencies = [
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.21"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crossterm"
@@ -2738,7 +2622,7 @@ dependencies = [
  "crossterm_winapi",
  "document-features",
  "parking_lot",
- "rustix",
+ "rustix 1.1.2",
  "winapi",
 ]
 
@@ -2753,9 +2637,9 @@ dependencies = [
 
 [[package]]
 name = "crunchy"
-version = "0.2.4"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
 
 [[package]]
 name = "crypto-bigint"
@@ -2781,24 +2665,24 @@ dependencies = [
 
 [[package]]
 name = "curl"
-version = "0.4.49"
+version = "0.4.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79fc3b6dd0b87ba36e565715bf9a2ced221311db47bd18011676f24a6066edbc"
+checksum = "1e2161dd6eba090ff1594084e95fd67aeccf04382ffea77999ea94ed42ec67b6"
 dependencies = [
  "curl-sys",
  "libc",
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "socket2 0.6.1",
- "windows-sys 0.59.0",
+ "socket2 0.5.10",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "curl-sys"
-version = "0.4.83+curl-8.15.0"
+version = "0.4.72+curl-8.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5830daf304027db10c82632a464879d46a3f7c4ba17a31592657ad16c719b483"
+checksum = "29cbdc8314c447d11e8fd156dcdd031d9e02a7a976163e396b548c03153bc9ea"
 dependencies = [
  "cc",
  "libc",
@@ -2806,7 +2690,17 @@ dependencies = [
  "openssl-sys",
  "pkg-config",
  "vcpkg",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+dependencies = [
+ "darling_core 0.20.9",
+ "darling_macro 0.20.9",
 ]
 
 [[package]]
@@ -2815,38 +2709,63 @@ version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9cdf337090841a411e2a7f3deb9187445851f91b309c0c0a29e05f74a00a48c0"
 dependencies = [
- "darling_core",
- "darling_macro",
+ "darling_core 0.21.3",
+ "darling_macro 0.21.3",
 ]
 
 [[package]]
 name = "darling_core"
-version = "0.21.3"
+version = "0.20.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
+checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
- "serde",
  "strsim",
  "syn 2.0.108",
 ]
 
 [[package]]
-name = "darling_macro"
+name = "darling_core"
 version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+checksum = "1247195ecd7e3c85f83c8d2a366e4210d588e802133e1e355180a9870b517ea4"
 dependencies = [
- "darling_core",
+ "fnv",
+ "ident_case",
+ "proc-macro2",
  "quote",
+ "serde",
+ "strsim",
  "syn 2.0.108",
 ]
 
 [[package]]
-name = "dashmap"
+name = "darling_macro"
+version = "0.20.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+dependencies = [
+ "darling_core 0.20.9",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38308df82d1080de0afee5d069fa14b0326a88c14f15c5ccda35b4a6c414c81"
+dependencies = [
+ "darling_core 0.21.3",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "dashmap"
 version = "6.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf"
@@ -2861,15 +2780,15 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.9.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.18"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47ce6c96ea0102f01122a185683611bd5ac8d99e62bc59dd12e6bda344ee673d"
+checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -2877,12 +2796,12 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.16"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d162beedaa69905488a8da94f5ac3edb4dd4788b732fadb7bd120b2625c1976"
+checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f"
 dependencies = [
  "data-encoding",
- "syn 2.0.108",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -2904,9 +2823,9 @@ dependencies = [
 
 [[package]]
 name = "der"
-version = "0.7.10"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+checksum = "f55bf8e7b65898637379c1b74eb1551107c8294ed26d855ceb9fd1a09cfc9bc0"
 dependencies = [
  "const-oid",
  "pem-rfc7468",
@@ -2915,12 +2834,12 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.5.5"
+version = "0.3.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
- "serde_core",
+ "serde",
 ]
 
 [[package]]
@@ -2958,15 +2877,15 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.20"
+version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
+checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.1",
- "syn 2.0.108",
+ "rustc_version 0.4.0",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -3058,18 +2977,7 @@ dependencies = [
  "libc",
  "option-ext",
  "redox_users",
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "displaydoc"
-version = "0.2.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3126,7 +3034,7 @@ dependencies = [
  "hex-literal",
  "humantime",
  "humantime-serde",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "itertools 0.14.0",
  "maplit",
  "mimalloc",
@@ -3149,11 +3057,11 @@ dependencies = [
  "solver",
  "solvers-dto",
  "tempfile",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tokio",
  "toml",
  "tower 0.4.13",
- "tower-http 0.4.4",
+ "tower-http",
  "tracing",
  "url",
  "vergen",
@@ -3272,27 +3180,27 @@ dependencies = [
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.35"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "enum-ordinalize"
-version = "4.3.2"
+version = "4.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0"
+checksum = "fea0dcfa4e54eeb516fe454635a95753ddd39acda650ce703031c6973e315dd5"
 dependencies = [
  "enum-ordinalize-derive",
 ]
 
 [[package]]
 name = "enum-ordinalize-derive"
-version = "4.3.2"
+version = "4.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631"
+checksum = "0d28318a75d4aead5c4db25382e8ef717932d0346600cacae6357eb5941bc5ff"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3301,9 +3209,9 @@ dependencies = [
 
 [[package]]
 name = "equivalent"
-version = "1.0.2"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
@@ -3312,7 +3220,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 dependencies = [
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -3339,7 +3247,7 @@ dependencies = [
  "serde",
  "serde_json",
  "sha3",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "uint",
 ]
 
@@ -3376,7 +3284,7 @@ dependencies = [
  "secp256k1 0.27.0",
  "serde",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "uint",
  "web3",
  "zeroize",
@@ -3392,7 +3300,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tiny-keccak",
  "web3",
 ]
@@ -3433,7 +3341,7 @@ dependencies = [
  "ethcontract",
  "hex",
  "mockall 0.11.4",
- "predicates 3.1.3",
+ "predicates 3.1.0",
  "rlp",
 ]
 
@@ -3491,9 +3399,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
 [[package]]
 name = "event-listener"
-version = "5.4.1"
+version = "5.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -3502,11 +3410,11 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.5.4"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 5.4.1",
+ "event-listener 5.4.0",
  "pin-project-lite",
 ]
 
@@ -3522,9 +3430,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "fastrlp"
@@ -3558,12 +3466,6 @@ dependencies = [
  "subtle",
 ]
 
-[[package]]
-name = "find-msvc-tools"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
-
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -3584,7 +3486,7 @@ checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
  "libz-rs-sys",
- "miniz_oxide",
+ "miniz_oxide 0.8.9",
 ]
 
 [[package]]
@@ -3596,24 +3498,15 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "float-cmp"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "flume"
-version = "0.11.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0e4dd2a88388a1f4ccc7c9ce104604dab68d9f408dc34cd45823d5a9069095"
+checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
 dependencies = [
  "futures-core",
  "futures-sink",
- "spin",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -3667,9 +3560,9 @@ dependencies = [
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.2"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
 dependencies = [
  "percent-encoding",
 ]
@@ -3684,11 +3577,11 @@ dependencies = [
  "alloy-json-abi",
  "alloy-primitives",
  "foundry-compilers",
- "reqwest 0.12.24",
- "semver 1.0.27",
+ "reqwest 0.12.12",
+ "semver 1.0.23",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tracing",
 ]
 
@@ -3732,13 +3625,13 @@ dependencies = [
  "num-format",
  "path-slash",
  "regex",
- "reqwest 0.12.24",
+ "reqwest 0.12.12",
  "revm",
- "semver 1.0.27",
+ "semver 1.0.23",
  "serde",
  "serde_json",
  "solar-compiler",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tokio",
  "tower 0.5.2",
  "tracing",
@@ -3783,16 +3676,16 @@ dependencies = [
  "itertools 0.14.0",
  "path-slash",
  "rayon",
- "semver 1.0.27",
+ "semver 1.0.23",
  "serde",
  "serde_json",
  "sha2",
  "solar-compiler",
  "svm-rs",
  "svm-rs-builds",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tracing",
- "winnow",
+ "winnow 0.7.11",
  "yansi",
 ]
 
@@ -3819,10 +3712,10 @@ dependencies = [
  "path-slash",
  "rayon",
  "regex",
- "semver 1.0.27",
+ "semver 1.0.23",
  "serde",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tracing",
  "yansi",
 ]
@@ -3838,7 +3731,7 @@ dependencies = [
  "foundry-compilers-artifacts-solc",
  "foundry-compilers-core",
  "path-slash",
- "semver 1.0.27",
+ "semver 1.0.23",
  "serde",
 ]
 
@@ -3853,11 +3746,11 @@ dependencies = [
  "dunce",
  "path-slash",
  "regex",
- "semver 1.0.27",
+ "semver 1.0.23",
  "serde",
  "serde_json",
  "svm-rs",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tokio",
  "walkdir",
  "xxhash-rust",
@@ -3865,15 +3758,9 @@ dependencies = [
 
 [[package]]
 name = "fragile"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
-
-[[package]]
-name = "fs_extra"
-version = "1.3.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c"
+checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
 name = "funty"
@@ -3883,9 +3770,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -3914,9 +3801,9 @@ checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.31"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -4012,11 +3899,24 @@ dependencies = [
  "web3",
 ]
 
+[[package]]
+name = "generator"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "log",
+ "rustversion",
+ "windows",
+]
+
 [[package]]
 name = "generic-array"
-version = "0.14.9"
+version = "0.14.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
  "typenum",
  "version_check",
@@ -4025,36 +3925,40 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.16"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi",
+ "wasi 0.11.0+wasi-snapshot-preview1",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.4"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "r-efi",
- "wasip2",
- "wasm-bindgen",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+
 [[package]]
 name = "glob"
-version = "0.3.3"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
 
 [[package]]
 name = "group"
@@ -4069,9 +3973,9 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.3.27"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -4079,7 +3983,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4088,17 +3992,17 @@ dependencies = [
 
 [[package]]
 name = "h2"
-version = "0.4.12"
+version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
 dependencies = [
  "atomic-waker",
  "bytes",
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.3.1",
- "indexmap 2.12.0",
+ "http 1.1.0",
+ "indexmap 2.10.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4113,7 +4017,7 @@ checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 dependencies = [
  "cfg-if",
  "crunchy",
- "zerocopy",
+ "zerocopy 0.8.27",
 ]
 
 [[package]]
@@ -4131,15 +4035,15 @@ version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
- "ahash 0.8.12",
+ "ahash 0.8.11",
  "allocator-api2",
 ]
 
 [[package]]
 name = "hashbrown"
-version = "0.15.5"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -4226,6 +4130,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
+
 [[package]]
 name = "hermit-abi"
 version = "0.5.2"
@@ -4273,11 +4183,11 @@ dependencies = [
 
 [[package]]
 name = "home"
-version = "0.5.12"
+version = "0.5.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
 dependencies = [
- "windows-sys 0.61.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4293,9 +4203,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.3.1"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
  "fnv",
@@ -4315,24 +4225,24 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "1.0.1"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
 dependencies = [
  "bytes",
- "http 1.3.1",
+ "http 1.1.0",
 ]
 
 [[package]]
 name = "http-body-util"
-version = "0.1.3"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d"
 dependencies = [
  "bytes",
  "futures-core",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "pin-project-lite",
 ]
 
@@ -4356,9 +4266,9 @@ checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
 
 [[package]]
 name = "humantime"
-version = "2.3.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
+checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "humantime-serde"
@@ -4372,15 +4282,15 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "0.14.32"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2 0.3.27",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
  "httparse",
@@ -4396,21 +4306,19 @@ dependencies = [
 
 [[package]]
 name = "hyper"
-version = "1.7.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
 dependencies = [
- "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-core",
- "h2 0.4.12",
- "http 1.3.1",
- "http-body 1.0.1",
+ "futures-util",
+ "h2 0.4.10",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "httparse",
  "itoa",
  "pin-project-lite",
- "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -4424,7 +4332,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http 0.2.12",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "log",
  "rustls 0.21.12",
  "rustls-native-certs 0.6.3",
@@ -4438,11 +4346,11 @@ version = "0.27.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
 dependencies = [
- "http 1.3.1",
- "hyper 1.7.0",
+ "http 1.1.0",
+ "hyper 1.6.0",
  "hyper-util",
  "rustls 0.23.34",
- "rustls-native-certs 0.8.2",
+ "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.4",
@@ -4456,7 +4364,7 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
 dependencies = [
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "pin-project-lite",
  "tokio",
  "tokio-io-timeout",
@@ -4468,7 +4376,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
 dependencies = [
- "hyper 1.7.0",
+ "hyper 1.6.0",
  "hyper-util",
  "pin-project-lite",
  "tokio",
@@ -4482,7 +4390,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
 dependencies = [
  "bytes",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "native-tls",
  "tokio",
  "tokio-native-tls",
@@ -4496,7 +4404,7 @@ checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
  "http-body-util",
- "hyper 1.7.0",
+ "hyper 1.6.0",
  "hyper-util",
  "native-tls",
  "tokio",
@@ -4506,23 +4414,20 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.17"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
+checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
 dependencies = [
- "base64 0.22.1",
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "hyper 1.7.0",
- "ipnet",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "hyper 1.6.0",
  "libc",
- "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.1",
+ "socket2 0.5.10",
  "tokio",
  "tower-service",
  "tracing",
@@ -4530,17 +4435,16 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.64"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
- "log",
  "wasm-bindgen",
- "windows-core",
+ "windows-core 0.52.0",
 ]
 
 [[package]]
@@ -4552,87 +4456,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "icu_collections"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
-dependencies = [
- "displaydoc",
- "potential_utf",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locale_core"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
-dependencies = [
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
-
-[[package]]
-name = "icu_properties"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
-dependencies = [
- "icu_collections",
- "icu_locale_core",
- "icu_properties_data",
- "icu_provider",
- "zerotrie",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
-
-[[package]]
-name = "icu_provider"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
-dependencies = [
- "displaydoc",
- "icu_locale_core",
- "writeable",
- "yoke",
- "zerofrom",
- "zerotrie",
- "zerovec",
-]
-
 [[package]]
 name = "ident_case"
 version = "1.0.1"
@@ -4661,23 +4484,12 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
-dependencies = [
- "idna_adapter",
- "smallvec",
- "utf8_iter",
-]
-
-[[package]]
-name = "idna_adapter"
-version = "1.2.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
- "icu_normalizer",
- "icu_properties",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -4709,13 +4521,13 @@ dependencies = [
 
 [[package]]
 name = "impl-trait-for-tuples"
-version = "0.2.3"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0eb5a3343abf848c0984fe4604b2b105da9539376e24fc0a3b0007411ae4fd9"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -4743,15 +4555,14 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.12.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "arbitrary",
  "equivalent",
- "hashbrown 0.16.0",
+ "hashbrown 0.15.4",
  "serde",
- "serde_core",
 ]
 
 [[package]]
@@ -4792,20 +4603,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "ipnet"
-version = "2.11.0"
+name = "io-uring"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+dependencies = [
+ "bitflags 2.10.0",
+ "cfg-if",
+ "libc",
+]
 
 [[package]]
-name = "iri-string"
-version = "0.7.8"
+name = "ipnet"
+version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
-dependencies = [
- "memchr",
- "serde",
-]
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
 [[package]]
 name = "is-terminal"
@@ -4815,14 +4627,14 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 dependencies = [
  "hermit-abi 0.5.2",
  "libc",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.2"
+version = "1.70.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
 
 [[package]]
 name = "itertools"
@@ -4862,9 +4674,9 @@ dependencies = [
 
 [[package]]
 name = "itoa"
-version = "1.0.15"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jiff"
@@ -4890,23 +4702,12 @@ dependencies = [
  "syn 2.0.108",
 ]
 
-[[package]]
-name = "jobserver"
-version = "0.1.34"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
-dependencies = [
- "getrandom 0.3.4",
- "libc",
-]
-
 [[package]]
 name = "js-sys"
-version = "0.3.82"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
- "once_cell",
  "wasm-bindgen",
 ]
 
@@ -4976,40 +4777,30 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.5.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 dependencies = [
- "spin",
+ "spin 0.5.2",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.177"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
-
-[[package]]
-name = "libloading"
-version = "0.8.9"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
-dependencies = [
- "cfg-if",
- "windows-link",
-]
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libm"
-version = "0.2.15"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "libmimalloc-sys"
-version = "0.1.44"
+version = "0.1.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "667f4fec20f29dfc6bc7357c582d91796c169ad7e2fce709468aefeb2c099870"
+checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44"
 dependencies = [
  "cc",
  "libc",
@@ -5023,7 +4814,6 @@ checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
 dependencies = [
  "bitflags 2.10.0",
  "libc",
- "redox_syscall",
 ]
 
 [[package]]
@@ -5048,9 +4838,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.22"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
 dependencies = [
  "cc",
  "libc",
@@ -5060,15 +4850,15 @@ dependencies = [
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.11.0"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
-name = "litemap"
-version = "0.8.1"
+name = "linux-raw-sys"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 
 [[package]]
 name = "litrs"
@@ -5078,42 +4868,56 @@ checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
 
 [[package]]
 name = "lock_api"
-version = "0.4.14"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
+ "autocfg",
  "scopeguard",
 ]
 
+[[package]]
+name = "lockfree-object-pool"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
+
 [[package]]
 name = "log"
-version = "0.4.28"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
-name = "lru"
-version = "0.12.5"
+name = "loom"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
+checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca"
 dependencies = [
- "hashbrown 0.15.5",
+ "cfg-if",
+ "generator",
+ "scoped-tls",
+ "tracing",
+ "tracing-subscriber",
 ]
 
 [[package]]
 name = "lru"
-version = "0.13.0"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
+checksum = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc"
 dependencies = [
- "hashbrown 0.15.5",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
-name = "lru-slab"
-version = "0.1.2"
+name = "lru"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+checksum = "227748d55f2f0ab4735d87fd623798cb6b664512fe979705f829c9f81c934465"
+dependencies = [
+ "hashbrown 0.15.4",
+]
 
 [[package]]
 name = "macro-string"
@@ -5132,24 +4936,13 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d"
 
-[[package]]
-name = "match-lookup"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1265724d8cb29dbbc2b0f06fffb8bf1a8c0cf73a78eede9ba73a4a66c52a981e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "matchers"
-version = "0.2.0"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
- "regex-automata",
+ "regex-automata 0.1.10",
 ]
 
 [[package]]
@@ -5176,9 +4969,9 @@ checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "mimalloc"
-version = "0.1.48"
+version = "0.1.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1ee66a4b64c74f4ef288bcbb9192ad9c3feaad75193129ac8509af543894fd8"
+checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633"
 dependencies = [
  "libmimalloc-sys",
 ]
@@ -5191,9 +4984,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
 [[package]]
 name = "mime_guess"
-version = "2.0.5"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
+checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
 dependencies = [
  "mime",
  "unicase",
@@ -5205,6 +4998,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
+[[package]]
+name = "miniz_oxide"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "miniz_oxide"
 version = "0.8.9"
@@ -5217,13 +5019,13 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.1.0"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
- "wasi",
- "windows-sys 0.61.2",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -5252,7 +5054,7 @@ dependencies = [
  "fragile",
  "lazy_static",
  "mockall_derive 0.12.1",
- "predicates 3.1.3",
+ "predicates 3.1.0",
  "predicates-tree",
 ]
 
@@ -5307,42 +5109,42 @@ dependencies = [
 
 [[package]]
 name = "moka"
-version = "0.12.11"
+version = "0.12.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077"
+checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926"
 dependencies = [
  "async-lock",
  "crossbeam-channel",
  "crossbeam-epoch",
  "crossbeam-utils",
- "equivalent",
- "event-listener 5.4.1",
+ "event-listener 5.4.0",
  "futures-util",
+ "loom",
  "parking_lot",
  "portable-atomic",
- "rustc_version 0.4.1",
+ "rustc_version 0.4.0",
  "smallvec",
  "tagptr",
+ "thiserror 1.0.61",
  "uuid",
 ]
 
 [[package]]
 name = "multibase"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8694bb4835f452b0e3bb06dbebb1d6fc5385b6ca1caf2e55fd165c042390ec77"
+checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404"
 dependencies = [
  "base-x",
- "base256emoji",
  "data-encoding",
  "data-encoding-macro",
 ]
 
 [[package]]
 name = "native-tls"
-version = "0.2.14"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
  "libc",
  "log",
@@ -5350,7 +5152,7 @@ dependencies = [
  "openssl-probe",
  "openssl-sys",
  "schannel",
- "security-framework 2.11.1",
+ "security-framework",
  "security-framework-sys",
  "tempfile",
 ]
@@ -5379,11 +5181,12 @@ checksum = "f5438dd2b2ff4c6df6e1ce22d825ed2fa93ee2922235cc45186991717f0a892d"
 
 [[package]]
 name = "nu-ansi-term"
-version = "0.50.3"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
 dependencies = [
- "windows-sys 0.61.2",
+ "overload",
+ "winapi",
 ]
 
 [[package]]
@@ -5402,9 +5205,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.6"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -5495,19 +5298,19 @@ dependencies = [
 
 [[package]]
 name = "num_cpus"
-version = "1.17.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b"
+checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.5.2",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
 [[package]]
 name = "num_enum"
-version = "0.7.5"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c"
+checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
 dependencies = [
  "num_enum_derive",
  "rustversion",
@@ -5515,9 +5318,9 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.7.5"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7"
+checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5548,9 +5351,9 @@ dependencies = [
 
 [[package]]
 name = "nybbles"
-version = "0.4.6"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4b5ecbd0beec843101bffe848217f770e8b8da81d8355b7d6e226f2199b3dc"
+checksum = "675b3a54e5b12af997abc8b6638b0aee51a28caedab70d4967e0d5db3a3f1d06"
 dependencies = [
  "alloy-rlp",
  "cfg-if",
@@ -5560,6 +5363,15 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "object"
+version = "0.35.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8ec7ab813848ba4522158d5517a6093db1ded27575b070f4177b8d12b41db5e"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "observe"
 version = "0.1.0"
@@ -5606,7 +5418,7 @@ version = "0.4.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "29eefd5038c9eee9e788d90966d6b5578dd3f88363a91edaec117a7ae0adc2d5"
 dependencies = [
- "ahash 0.8.12",
+ "ahash 0.8.11",
  "hashbrown 0.16.0",
  "parking_lot",
  "stable_deref_trait",
@@ -5614,9 +5426,9 @@ dependencies = [
 
 [[package]]
 name = "openssl"
-version = "0.10.74"
+version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ad14dd45412269e1a30f52ad8f0664f0f4f4a89ee8fe28c3b3527021ebb654"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
  "bitflags 2.10.0",
  "cfg-if",
@@ -5640,15 +5452,15 @@ dependencies = [
 
 [[package]]
 name = "openssl-probe"
-version = "0.1.6"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-sys"
-version = "0.9.110"
+version = "0.9.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a9f0075ba3c21b09f8e8b2026584b1d18d49388648f2fbbf3c97ea8deced8e2"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
 dependencies = [
  "cc",
  "libc",
@@ -5666,7 +5478,7 @@ dependencies = [
  "futures-sink",
  "js-sys",
  "pin-project-lite",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tracing",
 ]
 
@@ -5678,9 +5490,9 @@ checksum = "50f6639e842a97dbea8886e3439710ae463120091e2e064518ba8e716e6ac36d"
 dependencies = [
  "async-trait",
  "bytes",
- "http 1.3.1",
+ "http 1.1.0",
  "opentelemetry",
- "reqwest 0.12.24",
+ "reqwest 0.12.12",
 ]
 
 [[package]]
@@ -5689,14 +5501,14 @@ version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbee664a43e07615731afc539ca60c6d9f1a9425e25ca09c57bc36c87c55852b"
 dependencies = [
- "http 1.3.1",
+ "http 1.1.0",
  "opentelemetry",
  "opentelemetry-http",
  "opentelemetry-proto",
  "opentelemetry_sdk",
  "prost 0.13.5",
- "reqwest 0.12.24",
- "thiserror 2.0.17",
+ "reqwest 0.12.12",
+ "thiserror 2.0.12",
  "tokio",
  "tonic 0.13.1",
  "tracing",
@@ -5725,9 +5537,9 @@ dependencies = [
  "futures-util",
  "opentelemetry",
  "percent-encoding",
- "rand 0.9.2",
+ "rand 0.9.1",
  "serde_json",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -5744,7 +5556,7 @@ dependencies = [
  "contracts",
  "futures",
  "moka",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
 ]
@@ -5770,7 +5582,7 @@ dependencies = [
  "futures",
  "hex-literal",
  "humantime",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "mimalloc",
  "mockall 0.12.1",
  "model",
@@ -5789,7 +5601,7 @@ dependencies = [
  "shared",
  "sqlx",
  "strum",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
  "url",
@@ -5799,9 +5611,15 @@ dependencies = [
 
 [[package]]
 name = "outref"
-version = "0.5.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e"
+checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a"
+
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
 [[package]]
 name = "p256"
@@ -5817,30 +5635,28 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.7.5"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "799781ae679d79a948e13d4824a40970bfa500058d245760dd857301059810fa"
+checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
 dependencies = [
  "arrayvec",
  "bitvec",
  "byte-slice-cast",
- "const_format",
  "impl-trait-for-tuples",
  "parity-scale-codec-derive",
- "rustversion",
  "serde",
 ]
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.7.5"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34b4653168b563151153c9e4c08ebed57fb8262bebfa79711552fa983c623e7a"
+checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.108",
+ "syn 1.0.109",
 ]
 
 [[package]]
@@ -5851,9 +5667,9 @@ checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.5"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -5861,15 +5677,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.12"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.1",
  "smallvec",
- "windows-link",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5915,17 +5731,18 @@ dependencies = [
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.2"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.8.3"
+version = "2.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e7521a040efde50c3ab6bbadafbe15ab6dc042686926be59ac35d74607df4"
+checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323"
 dependencies = [
  "memchr",
+ "thiserror 2.0.12",
  "ucd-trie",
 ]
 
@@ -5936,23 +5753,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
 dependencies = [
  "futures",
- "rustc_version 0.4.1",
+ "rustc_version 0.4.0",
 ]
 
 [[package]]
 name = "pin-project"
-version = "1.1.10"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.10"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5961,9 +5778,9 @@ dependencies = [
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.16"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
 
 [[package]]
 name = "pin-utils"
@@ -5994,15 +5811,15 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.32"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
 [[package]]
 name = "portable-atomic-util"
@@ -6013,15 +5830,6 @@ dependencies = [
  "portable-atomic",
 ]
 
-[[package]]
-name = "potential_utf"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
-dependencies = [
- "zerovec",
-]
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -6030,12 +5838,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.21"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
-dependencies = [
- "zerocopy",
-]
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "predicates"
@@ -6044,7 +5849,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
 dependencies = [
  "difflib",
- "float-cmp 0.9.0",
+ "float-cmp",
  "itertools 0.10.5",
  "normalize-line-endings",
  "predicates-core",
@@ -6053,13 +5858,13 @@ dependencies = [
 
 [[package]]
 name = "predicates"
-version = "3.1.3"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5d19ee57562043d37e82899fade9a22ebab7be9cef5026b07fda9cdd4293573"
+checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
 dependencies = [
  "anstyle",
  "difflib",
- "float-cmp 0.10.0",
+ "float-cmp",
  "normalize-line-endings",
  "predicates-core",
  "regex",
@@ -6067,15 +5872,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.9"
+version = "1.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "727e462b119fe9c93fd0eb1429a5f7647394014cf3c04ab2c0350eeb09095ffa"
+checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.12"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72dd2d6d381dfb73a193c7fca536518d7caee39fc8503f74e7dc0be0531b425c"
+checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -6115,11 +5920,34 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.4.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "toml_edit 0.23.7",
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
 ]
 
 [[package]]
@@ -6165,7 +5993,7 @@ dependencies = [
  "memchr",
  "parking_lot",
  "protobuf",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
 ]
 
 [[package]]
@@ -6192,18 +6020,19 @@ dependencies = [
 
 [[package]]
 name = "proptest"
-version = "1.9.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40"
+checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
 dependencies = [
  "bit-set",
  "bit-vec",
  "bitflags 2.10.0",
+ "lazy_static",
  "num-traits",
- "rand 0.9.2",
+ "rand 0.9.1",
  "rand_chacha 0.9.0",
  "rand_xorshift",
- "regex-syntax",
+ "regex-syntax 0.8.8",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -6309,11 +6138,11 @@ dependencies = [
 
 [[package]]
 name = "publicsuffix"
-version = "2.3.0"
+version = "2.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf"
+checksum = "96a8c1bda5ae1af7f99a2962e49df150414a43d62404644d98dd5c3a93d07457"
 dependencies = [
- "idna 1.1.0",
+ "idna 0.3.0",
  "psl-types",
 ]
 
@@ -6325,40 +6154,37 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quinn"
-version = "0.11.9"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
 dependencies = [
  "bytes",
- "cfg_aliases",
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
  "rustls 0.23.34",
- "socket2 0.6.1",
- "thiserror 2.0.17",
+ "socket2 0.5.10",
+ "thiserror 2.0.12",
  "tokio",
  "tracing",
- "web-time",
 ]
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.13"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
 dependencies = [
  "bytes",
- "getrandom 0.3.4",
- "lru-slab",
- "rand 0.9.2",
+ "getrandom 0.2.15",
+ "rand 0.8.5",
  "ring",
  "rustc-hash",
  "rustls 0.23.34",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tinyvec",
  "tracing",
  "web-time",
@@ -6373,9 +6199,9 @@ dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.6.1",
+ "socket2 0.6.0",
  "tracing",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6413,9 +6239,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.2"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
 dependencies = [
  "rand_chacha 0.9.0",
  "rand_core 0.9.3",
@@ -6448,7 +6274,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.16",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
@@ -6457,7 +6283,7 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.4",
+ "getrandom 0.3.3",
  "serde",
 ]
 
@@ -6481,7 +6307,7 @@ dependencies = [
  "prometheus",
  "prometheus-metric-storage",
  "reqwest 0.11.27",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
 ]
@@ -6514,42 +6340,31 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
-dependencies = [
- "bitflags 2.10.0",
-]
-
-[[package]]
-name = "redox_users"
-version = "0.5.2"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
- "getrandom 0.2.16",
- "libredox",
- "thiserror 2.0.17",
+ "bitflags 1.3.2",
 ]
 
 [[package]]
-name = "ref-cast"
-version = "1.0.25"
+name = "redox_syscall"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "ref-cast-impl",
+ "bitflags 2.10.0",
 ]
 
 [[package]]
-name = "ref-cast-impl"
-version = "1.0.25"
+name = "redox_users"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da"
+checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
+ "getrandom 0.2.15",
+ "libredox",
+ "thiserror 2.0.12",
 ]
 
 [[package]]
@@ -6588,8 +6403,17 @@ checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata",
- "regex-syntax",
+ "regex-automata 0.4.13",
+ "regex-syntax 0.8.8",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
+dependencies = [
+ "regex-syntax 0.6.29",
 ]
 
 [[package]]
@@ -6600,14 +6424,20 @@ checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax",
+ "regex-syntax 0.8.8",
 ]
 
 [[package]]
 name = "regex-lite"
-version = "0.1.8"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d942b98df5e658f56f20d592c7f868833fe38115e65c33003d8cd224b0155da"
+checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e"
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
@@ -6638,10 +6468,10 @@ dependencies = [
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2 0.3.27",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "hyper-tls 0.5.0",
  "ipnet",
  "js-sys",
@@ -6651,7 +6481,7 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -6670,30 +6500,34 @@ dependencies = [
 
 [[package]]
 name = "reqwest"
-version = "0.12.24"
+version = "0.12.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+checksum = "43e734407157c3c2034e0258f5e4473ddb361b1e85f95a66690d67264d7cd1da"
 dependencies = [
  "base64 0.22.1",
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "http-body-util",
- "hyper 1.7.0",
+ "hyper 1.6.0",
  "hyper-rustls 0.27.7",
  "hyper-tls 0.6.0",
  "hyper-util",
+ "ipnet",
  "js-sys",
  "log",
+ "mime",
  "native-tls",
+ "once_cell",
  "percent-encoding",
  "pin-project-lite",
  "quinn",
  "rustls 0.23.34",
- "rustls-native-certs 0.8.2",
+ "rustls-native-certs 0.8.0",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "serde",
  "serde_json",
@@ -6702,14 +6536,15 @@ dependencies = [
  "tokio",
  "tokio-native-tls",
  "tokio-rustls 0.26.4",
+ "tokio-socks",
  "tower 0.5.2",
- "tower-http 0.6.6",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 1.0.3",
+ "webpki-roots 0.26.11",
+ "windows-registry",
 ]
 
 [[package]]
@@ -6903,7 +6738,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.16",
+ "getrandom 0.2.15",
  "libc",
  "untrusted",
  "windows-sys 0.52.0",
@@ -6920,9 +6755,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv"
-version = "0.7.45"
+version = "0.7.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
+checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
 dependencies = [
  "bitvec",
  "bytecheck",
@@ -6938,9 +6773,9 @@ dependencies = [
 
 [[package]]
 name = "rkyv_derive"
-version = "0.7.45"
+version = "0.7.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
+checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -6998,7 +6833,7 @@ dependencies = [
  "primitive-types",
  "proptest",
  "rand 0.8.5",
- "rand 0.9.2",
+ "rand 0.9.1",
  "rlp",
  "ruint-macro",
  "serde_core",
@@ -7014,9 +6849,9 @@ checksum = "48fd7bd8a6377e15ad9d42a8ec25371b94ddc67abe7c8b9127bec79bebaaae18"
 
 [[package]]
 name = "rust_decimal"
-version = "1.39.0"
+version = "1.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
+checksum = "1790d1c4c0ca81211399e0e0af16333276f375209e71a37b67698a373db5b47a"
 dependencies = [
  "arrayvec",
  "borsh",
@@ -7028,6 +6863,12 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "rustc-demangle"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -7054,11 +6895,24 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.4.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.27",
+ "semver 1.0.23",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.14",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7070,8 +6924,8 @@ dependencies = [
  "bitflags 2.10.0",
  "errno",
  "libc",
- "linux-raw-sys",
- "windows-sys 0.61.2",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7092,7 +6946,6 @@ version = "0.23.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
 dependencies = [
- "aws-lc-rs",
  "once_cell",
  "ring",
  "rustls-pki-types",
@@ -7108,21 +6961,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
  "schannel",
- "security-framework 2.11.1",
+ "security-framework",
 ]
 
 [[package]]
 name = "rustls-native-certs"
-version = "0.8.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9980d917ebb0c0536119ba501e90834767bffc3d60641457fd84a1f3fd337923"
+checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
 dependencies = [
  "openssl-probe",
+ "rustls-pemfile 2.2.0",
  "rustls-pki-types",
  "schannel",
- "security-framework 3.5.1",
+ "security-framework",
 ]
 
 [[package]]
@@ -7134,11 +6988,20 @@ dependencies = [
  "base64 0.21.7",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
 [[package]]
 name = "rustls-pki-types"
-version = "1.13.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
  "web-time",
  "zeroize",
@@ -7160,7 +7023,6 @@ version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
- "aws-lc-rs",
  "ring",
  "rustls-pki-types",
  "untrusted",
@@ -7168,15 +7030,15 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.22"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "rusty-fork"
-version = "0.3.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
 dependencies = [
  "fnv",
  "quick-error",
@@ -7186,9 +7048,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.20"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "s3"
@@ -7215,35 +7077,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.28"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
 dependencies = [
- "windows-sys 0.61.2",
-]
-
-[[package]]
-name = "schemars"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "schemars"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
-dependencies = [
- "dyn-clone",
- "ref-cast",
- "serde",
- "serde_json",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -7295,7 +7133,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
 dependencies = [
- "secp256k1-sys 0.8.2",
+ "secp256k1-sys 0.8.1",
 ]
 
 [[package]]
@@ -7312,9 +7150,9 @@ dependencies = [
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.8.2"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4473013577ec77b4ee3668179ef1186df3146e2cf2d927bd200974c6fe60fd99"
+checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e"
 dependencies = [
  "cc",
 ]
@@ -7330,25 +7168,12 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
-dependencies = [
- "bitflags 2.10.0",
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "libc",
- "security-framework-sys",
-]
-
-[[package]]
-name = "security-framework"
-version = "3.5.1"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
  "bitflags 2.10.0",
- "core-foundation 0.10.1",
+ "core-foundation",
  "core-foundation-sys",
  "libc",
  "security-framework-sys",
@@ -7356,9 +7181,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.15.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -7375,12 +7200,11 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.27"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 dependencies = [
  "serde",
- "serde_core",
 ]
 
 [[package]]
@@ -7430,33 +7254,30 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.145"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
- "memchr",
  "ryu",
  "serde",
- "serde_core",
 ]
 
 [[package]]
 name = "serde_path_to_error"
-version = "0.1.20"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a9ff822e371bb5403e391ecd83e182e0e77ba7f6fe0160b795797109d1b457"
+checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
 dependencies = [
  "itoa",
  "serde",
- "serde_core",
 ]
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.9"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -7475,18 +7296,17 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.15.1"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa66c845eee442168b2c8134fec70ac50dc20e760769c8ba0ad1319ca1959b04"
+checksum = "0ad483d2ab0149d5a5ebcd9972a3852711e0153d863bf5a5d0391d28883c4a20"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.12.0",
- "schemars 0.9.0",
- "schemars 1.0.4",
- "serde_core",
+ "indexmap 2.10.0",
+ "serde",
+ "serde_derive",
  "serde_json",
  "serde_with_macros",
  "time",
@@ -7494,11 +7314,11 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.15.1"
+version = "3.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91a903660542fced4e99881aa481bdbaec1634568ee02e0b8bd57c64cb38955"
+checksum = "65569b702f41443e8bc8bbb1c5779bd0450bbe723b56198980e80ec45780bce2"
 dependencies = [
- "darling",
+ "darling 0.20.9",
  "proc-macro2",
  "quote",
  "syn 2.0.108",
@@ -7593,7 +7413,7 @@ dependencies = [
  "gas-estimation",
  "hex-literal",
  "humantime",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "itertools 0.14.0",
  "maplit",
  "mockall 0.12.1",
@@ -7616,7 +7436,7 @@ dependencies = [
  "serde_with",
  "strum",
  "testlib",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tokio",
  "tracing",
  "tracing-subscriber",
@@ -7632,9 +7452,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.6"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -7657,9 +7477,9 @@ checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
 name = "simdutf8"
-version = "0.1.5"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
 
 [[package]]
 name = "simple_asn1"
@@ -7669,21 +7489,24 @@ checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
 dependencies = [
  "num-bigint",
  "num-traits",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "time",
 ]
 
 [[package]]
 name = "slab"
-version = "0.4.11"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
 
 [[package]]
 name = "smallvec"
-version = "1.15.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 dependencies = [
  "serde",
 ]
@@ -7700,12 +7523,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.6.1"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
 dependencies = [
  "libc",
- "windows-sys 0.60.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -7718,7 +7541,7 @@ dependencies = [
  "bumpalo",
  "either",
  "num-rational",
- "semver 1.0.27",
+ "semver 1.0.23",
  "solar-data-structures",
  "solar-interface",
  "solar-macros",
@@ -7759,7 +7582,7 @@ checksum = "2dea34e58332c7d6a8cde1f1740186d31682b7be46e098b8cc16fcb7ffd98bf5"
 dependencies = [
  "bumpalo",
  "index_vec",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "parking_lot",
  "rayon",
  "rustc-hash",
@@ -7789,9 +7612,9 @@ dependencies = [
  "solar-config",
  "solar-data-structures",
  "solar-macros",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "tracing",
- "unicode-width",
+ "unicode-width 0.2.2",
 ]
 
 [[package]]
@@ -7907,7 +7730,7 @@ dependencies = [
  "ethrpc",
  "futures",
  "hex-literal",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "itertools 0.14.0",
  "mimalloc",
  "model",
@@ -7926,7 +7749,7 @@ dependencies = [
  "tokio",
  "toml",
  "tower 0.4.13",
- "tower-http 0.4.4",
+ "tower-http",
  "tracing",
  "url",
  "vergen",
@@ -7948,6 +7771,12 @@ dependencies = [
  "web3",
 ]
 
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
 [[package]]
 name = "spin"
 version = "0.9.8"
@@ -7996,7 +7825,7 @@ version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6"
 dependencies = [
- "ahash 0.8.12",
+ "ahash 0.8.11",
  "atoi",
  "bigdecimal",
  "byteorder",
@@ -8013,7 +7842,7 @@ dependencies = [
  "futures-util",
  "hashlink",
  "hex",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "log",
  "memchr",
  "native-tls",
@@ -8025,7 +7854,7 @@ dependencies = [
  "sha2",
  "smallvec",
  "sqlformat",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tokio",
  "tokio-stream",
  "tracing",
@@ -8110,7 +7939,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tracing",
  "whoami",
 ]
@@ -8151,7 +7980,7 @@ dependencies = [
  "smallvec",
  "sqlx-core",
  "stringprep",
- "thiserror 1.0.69",
+ "thiserror 1.0.61",
  "tracing",
  "whoami",
 ]
@@ -8232,9 +8061,9 @@ dependencies = [
 
 [[package]]
 name = "subtle"
-version = "2.6.1"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "svm-rs"
@@ -8244,13 +8073,13 @@ checksum = "11f15cc0fb280301739995e3b9f0f0dde3aecb876814f4768689f9138570cd3b"
 dependencies = [
  "const-hex",
  "dirs",
- "reqwest 0.12.24",
- "semver 1.0.27",
+ "reqwest 0.12.12",
+ "semver 1.0.23",
  "serde",
  "serde_json",
  "sha2",
  "tempfile",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "url",
  "zip",
 ]
@@ -8262,7 +8091,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "31affc47068aeef445accc5c3d5f7fd24f9072cae0a651cef564239003c94ff8"
 dependencies = [
  "const-hex",
- "semver 1.0.27",
+ "semver 1.0.23",
  "serde_json",
  "svm-rs",
 ]
@@ -8301,6 +8130,18 @@ dependencies = [
  "syn 2.0.108",
 ]
 
+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
 [[package]]
 name = "sync_wrapper"
 version = "0.1.2"
@@ -8316,17 +8157,6 @@ dependencies = [
  "futures-core",
 ]
 
-[[package]]
-name = "synstructure"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -8334,7 +8164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
 dependencies = [
  "bitflags 1.3.2",
- "core-foundation 0.9.4",
+ "core-foundation",
  "system-configuration-sys",
 ]
 
@@ -8362,32 +8192,31 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "tempfile"
-version = "3.23.0"
+version = "3.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
+ "cfg-if",
  "fastrand",
- "getrandom 0.3.4",
- "once_cell",
- "rustix",
- "windows-sys 0.61.2",
+ "rustix 0.38.34",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "terminal_size"
-version = "0.4.3"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b8cb979cb11c32ce1603f8137b22262a9d131aaa5c37b5678025f22b8becd0"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
 dependencies = [
- "rustix",
- "windows-sys 0.60.2",
+ "rustix 0.38.34",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "termtree"
-version = "0.5.1"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683"
+checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "testlib"
@@ -8403,27 +8232,27 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.69"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
- "thiserror-impl 1.0.69",
+ "thiserror-impl 1.0.61",
 ]
 
 [[package]]
 name = "thiserror"
-version = "2.0.17"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.17",
+ "thiserror-impl 2.0.12",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.69"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8432,9 +8261,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.17"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8443,11 +8272,12 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.9"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
+ "once_cell",
 ]
 
 [[package]]
@@ -8461,9 +8291,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.44"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -8478,15 +8308,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.6"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.24"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -8501,21 +8331,11 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
 [[package]]
 name = "tinyvec"
-version = "1.10.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -8528,26 +8348,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.48.0"
+version = "1.47.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038"
 dependencies = [
+ "backtrace",
  "bytes",
+ "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.6.1",
+ "slab",
+ "socket2 0.6.0",
  "tokio-macros",
  "tracing",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "tokio-io-timeout"
-version = "1.2.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76"
+checksum = "30b74022ada614a1b4834de765f9bb43877f910cc8ce4be40e89042c9223a8bf"
 dependencies = [
  "pin-project-lite",
  "tokio",
@@ -8555,9 +8378,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-macros"
-version = "2.6.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8594,6 +8417,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-socks"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
+dependencies = [
+ "either",
+ "futures-util",
+ "thiserror 1.0.61",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.17"
@@ -8624,9 +8459,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.16"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14307c986784f72ef81c89db7d9e28d6ac26d16213b109ea501696195e6e3ce5"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -8637,75 +8472,49 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.23"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.11",
- "toml_edit 0.22.27",
+ "toml_datetime",
+ "toml_edit 0.22.14",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.11"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
 ]
 
 [[package]]
-name = "toml_datetime"
-version = "0.7.3"
+name = "toml_edit"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "serde_core",
+ "indexmap 2.10.0",
+ "toml_datetime",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.27"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "serde",
  "serde_spanned",
- "toml_datetime 0.6.11",
- "toml_write",
- "winnow",
+ "toml_datetime",
+ "winnow 0.6.13",
 ]
 
-[[package]]
-name = "toml_edit"
-version = "0.23.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
-dependencies = [
- "indexmap 2.12.0",
- "toml_datetime 0.7.3",
- "toml_parser",
- "winnow",
-]
-
-[[package]]
-name = "toml_parser"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
-dependencies = [
- "winnow",
-]
-
-[[package]]
-name = "toml_write"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
-
 [[package]]
 name = "tonic"
 version = "0.11.0"
@@ -8717,10 +8526,10 @@ dependencies = [
  "axum",
  "base64 0.21.7",
  "bytes",
- "h2 0.3.27",
+ "h2 0.3.26",
  "http 0.2.12",
  "http-body 0.4.6",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "hyper-timeout 0.4.1",
  "percent-encoding",
  "pin-project",
@@ -8742,10 +8551,10 @@ dependencies = [
  "async-trait",
  "base64 0.22.1",
  "bytes",
- "http 1.3.1",
- "http-body 1.0.1",
+ "http 1.1.0",
+ "http-body 1.0.0",
  "http-body-util",
- "hyper 1.7.0",
+ "hyper 1.6.0",
  "hyper-timeout 0.5.2",
  "hyper-util",
  "percent-encoding",
@@ -8787,7 +8596,7 @@ checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "pin-project-lite",
  "slab",
  "sync_wrapper 1.0.2",
@@ -8817,24 +8626,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "tower-http"
-version = "0.6.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
-dependencies = [
- "bitflags 2.10.0",
- "bytes",
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "iri-string",
- "pin-project-lite",
- "tower 0.5.2",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "tower-layer"
 version = "0.3.3"
@@ -8861,9 +8652,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.30"
+version = "0.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8872,9 +8663,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.34"
+version = "0.1.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
 dependencies = [
  "once_cell",
  "valuable",
@@ -8921,14 +8712,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.20"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5"
+checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008"
 dependencies = [
  "matchers",
  "nu-ansi-term",
  "once_cell",
- "regex-automata",
+ "regex",
  "serde",
  "serde_json",
  "sharded-slab",
@@ -8955,22 +8746,22 @@ checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
 dependencies = [
  "bytes",
  "data-encoding",
- "http 1.3.1",
+ "http 1.1.0",
  "httparse",
  "log",
- "rand 0.9.2",
+ "rand 0.9.1",
  "rustls 0.23.34",
  "rustls-pki-types",
  "sha1",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "utf-8",
 ]
 
 [[package]]
 name = "typenum"
-version = "1.19.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
@@ -8998,42 +8789,51 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicase"
-version = "2.8.1"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
+dependencies = [
+ "version_check",
+]
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.18"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.22"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.25"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
 dependencies = [
  "tinyvec",
 ]
 
 [[package]]
 name = "unicode-properties"
-version = "0.1.4"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
+checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291"
 
 [[package]]
 name = "unicode-segmentation"
-version = "1.12.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-width"
@@ -9043,9 +8843,9 @@ checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.6"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
+checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
 
 [[package]]
 name = "unicode_categories"
@@ -9061,12 +8861,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.7"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
 dependencies = [
  "form_urlencoded",
- "idna 1.1.0",
+ "idna 0.5.0",
  "percent-encoding",
  "serde",
 ]
@@ -9083,12 +8883,6 @@ version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -9097,20 +8891,18 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "uuid"
-version = "1.18.1"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+checksum = "a183cf7feeba97b4dd1c0d46788634f6221d87fa961b305bed08c851829efcc0"
 dependencies = [
- "getrandom 0.3.4",
- "js-sys",
- "wasm-bindgen",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
 name = "valuable"
-version = "0.1.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
+checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
 
 [[package]]
 name = "vcpkg"
@@ -9120,9 +8912,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "vergen"
-version = "8.3.2"
+version = "8.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2990d9ea5967266ea0ccf413a4aa5c42a93dbcfda9cb49a97de6931726b12566"
+checksum = "e27d6bdd219887a9eadd19e1c34f32e47fa332301184935c6d9bca26f3cca525"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -9132,9 +8924,9 @@ dependencies = [
 
 [[package]]
 name = "version_check"
-version = "0.9.5"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "vsimd"
@@ -9180,7 +8972,7 @@ dependencies = [
  "futures-util",
  "headers",
  "http 0.2.12",
- "hyper 0.14.32",
+ "hyper 0.14.29",
  "log",
  "mime",
  "mime_guess",
@@ -9198,17 +8990,17 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
+version = "0.11.0+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
-name = "wasip2"
-version = "1.0.1+wasi-0.2.4"
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
- "wit-bindgen",
+ "wit-bindgen-rt",
 ]
 
 [[package]]
@@ -9219,35 +9011,46 @@ checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.105"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
- "once_cell",
- "rustversion",
  "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.92"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.55"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
 dependencies = [
  "cfg-if",
  "js-sys",
- "once_cell",
  "wasm-bindgen",
  "web-sys",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.105"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -9255,31 +9058,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.105"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
- "bumpalo",
  "proc-macro2",
  "quote",
  "syn 2.0.108",
+ "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.105"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
-dependencies = [
- "unicode-ident",
-]
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasmtimer"
-version = "0.4.3"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c598d6b99ea013e35844697fc4670d08339d5cda15588f193c6beedd12f644b"
+checksum = "d8d49b5d6c64e8558d9b1b065014426f35c18de636895d24893dbbd329743446"
 dependencies = [
  "futures",
  "js-sys",
@@ -9291,9 +9091,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.82"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -9318,7 +9118,7 @@ dependencies = [
  "arrayvec",
  "base64 0.21.7",
  "bytes",
- "derive_more 0.99.20",
+ "derive_more 0.99.17",
  "ethabi",
  "ethereum-types",
  "futures",
@@ -9360,11 +9160,11 @@ dependencies = [
 
 [[package]]
 name = "whoami"
-version = "1.6.1"
+version = "1.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
+checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9"
 dependencies = [
- "libredox",
+ "redox_syscall 0.4.1",
  "wasite",
 ]
 
@@ -9396,7 +9196,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.59.0",
 ]
 
 [[package]]
@@ -9405,24 +9205,43 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
+dependencies = [
+ "windows-core 0.58.0",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-core"
-version = "0.62.2"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.58.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
 dependencies = [
  "windows-implement",
  "windows-interface",
- "windows-link",
  "windows-result",
  "windows-strings",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-implement"
-version = "0.60.2"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9431,37 +9250,55 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.59.3"
+version = "0.58.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.108",
 ]
 
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
 [[package]]
 name = "windows-link"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-result"
-version = "0.4.1"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
 dependencies = [
- "windows-link",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.5.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
 dependencies = [
- "windows-link",
+ "windows-result",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -9500,15 +9337,6 @@ dependencies = [
  "windows-targets 0.53.5",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.61.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
-dependencies = [
- "windows-link",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -9546,7 +9374,7 @@ version = "0.53.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
 dependencies = [
- "windows-link",
+ "windows-link 0.2.1",
  "windows_aarch64_gnullvm 0.53.1",
  "windows_aarch64_msvc 0.53.1",
  "windows_i686_gnu 0.53.1",
@@ -9697,9 +9525,27 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
 
 [[package]]
 name = "winnow"
-version = "0.7.13"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+checksum = "74c7b26e3480b707944fc872477815d29a8e429d2f93a1ce000f5fa84a15cbcd"
 dependencies = [
  "memchr",
 ]
@@ -9715,16 +9561,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "wit-bindgen"
-version = "0.46.0"
+name = "wit-bindgen-rt"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
-
-[[package]]
-name = "writeable"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags 2.10.0",
+]
 
 [[package]]
 name = "ws_stream_wasm"
@@ -9737,9 +9580,9 @@ dependencies = [
  "js-sys",
  "log",
  "pharos",
- "rustc_version 0.4.1",
+ "rustc_version 0.4.0",
  "send_wrapper",
- "thiserror 2.0.17",
+ "thiserror 2.0.12",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
@@ -9776,26 +9619,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "yoke"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
-dependencies = [
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.8.1"
+name = "zerocopy"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
- "synstructure",
+ "zerocopy-derive 0.7.34",
 ]
 
 [[package]]
@@ -9804,14 +9633,14 @@ version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
- "zerocopy-derive",
+ "zerocopy-derive 0.8.27",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.27"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9819,31 +9648,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "zerofrom"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.6"
+name = "zerocopy-derive"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.108",
- "synstructure",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.8.2"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
@@ -9859,39 +9678,6 @@ dependencies = [
  "syn 2.0.108",
 ]
 
-[[package]]
-name = "zerotrie"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.11.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "zip"
 version = "4.6.1"
@@ -9901,7 +9687,7 @@ dependencies = [
  "arbitrary",
  "crc32fast",
  "flate2",
- "indexmap 2.12.0",
+ "indexmap 2.10.0",
  "memchr",
  "zopfli",
 ]
@@ -9914,12 +9700,14 @@ checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2"
 
 [[package]]
 name = "zopfli"
-version = "0.8.3"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
+checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
 dependencies = [
  "bumpalo",
  "crc32fast",
+ "lockfree-object-pool",
  "log",
+ "once_cell",
  "simd-adler32",
 ]
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index 07f7be499c..9ca3afdb52 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -10,6 +10,19 @@ use {
     },
 };
 
+pub const MAINNET: u64 = 1;
+pub const GNOSIS: u64 = 100;
+pub const SEPOLIA: u64 = 11155111;
+pub const ARBITRUM_ONE: u64 = 42161;
+pub const BASE: u64 = 8453;
+pub const POLYGON: u64 = 137;
+pub const AVALANCHE: u64 = 43114;
+pub const BNB: u64 = 56;
+pub const OPTIMISM: u64 = 10;
+pub const LENS: u64 = 232;
+pub const LINEA: u64 = 59144;
+pub const PLASMA: u64 = 9745;
+
 const MOD_HEADER: &'static str = r#"#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all, non_snake_case)]
     //! This module contains the sol! generated bindings for solidity contracts.
     //! This is autogenerated code.
@@ -243,6 +256,23 @@ fn write_mod_name(contents: &mut String, name: &str) -> eyre::Result<()> {
     Ok(())
 }
 
+/// Declare a network tuple with an optional block number.
+///
+/// Example, without blocks:
+/// ```no_run
+/// networks! {
+///     MAINNET => "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+///     SEPOLIA => "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14",
+/// }
+/// ```
+///
+/// Example, with blocks:
+/// ```no_run
+/// networks! {
+///     MAINNET => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 12593265),
+///     SEPOLIA => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 4717488),
+/// }
+/// ```
 #[macro_export]
 macro_rules! networks {
     // Entry point: accepts a list of entries and delegates to internal rules
diff --git a/crates/contracts/Cargo.toml b/crates/contracts/Cargo.toml
index ef9c4bfe92..02bfe431c2 100644
--- a/crates/contracts/Cargo.toml
+++ b/crates/contracts/Cargo.toml
@@ -33,8 +33,6 @@ tracing = { workspace = true, optional = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"], optional = true }
 
 [build-dependencies]
-ethcontract = { workspace = true }
-ethcontract-generate = { workspace = true }
 walkdir = {workspace = true}
 contracts-generate = {workspace = true}
 
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
new file mode 100644
index 0000000000..5708d1290d
--- /dev/null
+++ b/crates/contracts/build.rs
@@ -0,0 +1,707 @@
+use std::path::Path;
+
+use contracts_generate::{networks, Contract, Contracts};
+
+fn main() {
+    // NOTE: This is a workaround for `rerun-if-changed` directives for
+    // non-existent files cause the crate's build unit to get flagged for a
+    // rebuild if any files in the workspace change.
+    //
+    // See:
+    // - https://github.com/rust-lang/cargo/issues/6003
+    // - https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
+    println!("cargo:rerun-if-changed=build.rs");
+
+    use contracts_generate::*;
+
+    Contracts::new()
+        // 0x
+        .add_contract(Contract::new("IZeroex").with_networks(networks![
+            MAINNET => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            SEPOLIA => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            ARBITRUM_ONE => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            BASE => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            AVALANCHE => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            BNB => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            OPTIMISM => "0xdef1abe32c034e558cdd535791643c58a13acc10",
+            POLYGON => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
+            // Not available on Lens
+        ]))
+        // Misc
+        .add_contract(Contract::new("ERC20Mintable"))
+        // GnosisSafe
+        .add_contract(Contract::new("GnosisSafe"))
+        .add_contract(Contract::new("GnosisSafeCompatibilityFallbackHandler"))
+        .add_contract(Contract::new("GnosisSafeProxy"))
+        .add_contract(Contract::new("GnosisSafeProxyFactory"))
+        // Balancer V2
+        .add_contract(Contract::new("BalancerV2Authorizer"))
+        .add_contract(Contract::new("BalancerV2BasePool"))
+        .add_contract(Contract::new("BalancerV2BasePoolFactory"))
+        .add_contract(Contract::new("BalancerV2WeightedPool"))
+        .add_contract(Contract::new("BalancerV2StablePool"))
+        .add_contract(Contract::new("BalancerV2ComposableStablePool"))
+        .add_contract(Contract::new("BalancerV2LiquidityBootstrappingPool"))
+        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+        .add_contract(
+            Contract::new("BalancerV2WeightedPoolFactory").with_networks(networks![
+                // <https://etherscan.io/tx/0x0f9bb3624c185b4e107eaf9176170d2dc9cb1c48d0f070ed18416864b3202792>
+                MAINNET => ("0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9", 12272147),
+                // Not available on Sepolia (only version ≥ 4)
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
+                // Not available on Lens
+            ]),
+        )
+        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+        .add_contract(
+            Contract::new("BalancerV2WeightedPoolFactoryV3").with_networks(networks![
+                // <https://etherscan.io/tx/0x39f357b78c03954f0bcee2288bf3b223f454816c141ef20399a7bf38057254c4>
+                MAINNET => ("0x5Dd94Da3644DDD055fcf6B3E1aa310Bb7801EB8b", 16520627),
+                // <https://gnosisscan.io/tx/0x2ac3d873b6f43de6dd77525c7e5b68a8fc3a1dee40303e1b6a680b0285b26091>
+                GNOSIS => ("0xC128a9954e6c874eA3d62ce62B468bA073093F25", 26226256),
+                // <https://snowscan.xyz/tx/0xdf2c77743cc9287df2022cd6c5f9209ecfecde07371717ab0427d96042a88640>
+                AVALANCHE => ("0x94f68b54191F62f781Fe8298A8A5Fa3ed772d227", 26389236),
+                // <https://optimistic.etherscan.io/tx/0xc5e79fb00b9a8e2c89b136aae0be098e58f8e832ede13e8079213a75c9cd9c08>
+                OPTIMISM => ("0xA0DAbEBAAd1b243BBb243f933013d560819eB66f", 72832703),
+                // <https://polygonscan.com/tx/0x2bc079c0e725f43670898b474afedf38462feee72ef8e874a1efcec0736672fc>
+                POLYGON => ("0x82e4cFaef85b1B6299935340c964C942280327f4", 39036828),
+                // <https://bscscan.com/tx/0x91107b9581e18ec0a4a575d4713bdd7b1fc08656c35522d216307930aa4de7b6>
+                BNB => ("0x6e4cF292C5349c79cCd66349c3Ed56357dD11B46", 25474982),
+                // Not available on Sepolia (only version ≥ 4)
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
+                // Not available on Lens
+            ]),
+        )
+        .add_contract(
+            Contract::new("BalancerV2WeightedPoolFactoryV4").with_networks(networks![
+                // <https://etherscan.io/tx/0xa5e6d73befaacc6fff0a4b99fd4eaee58f49949bcfb8262d91c78f24667fbfc9>
+                MAINNET => ("0x897888115Ada5773E02aA29F775430BFB5F34c51", 16878323),
+                // <https://gnosisscan.io/tx/0xcb6768bd92add227d46668357291e1d67c864769d353f9f0041c59ad2a3b21bf>
+                GNOSIS => ("0x6CaD2ea22BFA7F4C14Aae92E47F510Cd5C509bc7", 27055829),
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#pool-factories>
+                // <https://sepolia.etherscan.io/tx/0x7dd392b586f1cdecfc635e7dd40ee1444a7836772811e59321fd4873ecfdf3eb>
+                SEPOLIA => ("0x7920BFa1b2041911b354747CA7A6cDD2dfC50Cfd", 3424893),
+                // <https://arbiscan.io/tx/0x167fe7eb776d1be36b21402d8ae120088c393e28ae7ca0bd1defac84e0f2848b>
+                ARBITRUM_ONE => ("0xc7E5ED1054A24Ef31D827E6F86caA58B3Bc168d7", 72222060),
+                // <https://basescan.org/tx/0x0732d3a45a3233a134d6e0e72a00ca7a971d82cdc51f71477892ac517bf0d4c9>
+                BASE => ("0x4C32a8a8fDa4E24139B51b456B42290f51d6A1c4", 1204869),
+                // <https://snowscan.xyz/tx/0xa3fc8aab3b9baba3905045a53e52a47daafe79d4aa26d4fef5c51f3840aa55fa>
+                AVALANCHE => ("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a", 27739006),
+                // <https://optimistic.etherscan.io/tx/0xad915050179db368e43703f3ee1ec55ff5e5e5e0268c15f8839c9f360caf7b0b>
+                OPTIMISM => ("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a", 82737545),
+                // <https://polygonscan.com/tx/0x65e6b13231c2c5656357005a9e419ad6697178ae74eda1ea7522ecdafcf77136>
+                POLYGON => ("0xFc8a407Bba312ac761D8BFe04CE1201904842B76", 40611103),
+                // <https://bscscan.com/tx/0xc7fada60761e3240332c4cbd169633f1828b2a15de23f0148db9d121afebbb4b>
+                BNB => ("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a", 26665331),
+                // Not available on Base and Lens
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
+            ]),
+        )
+        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+        .add_contract(
+            Contract::new("BalancerV2WeightedPool2TokensFactory").with_networks(networks![
+                // <https://etherscan.io/tx/0xa5e6d73befaacc6fff0a4b99fd4eaee58f49949bcfb8262d91c78f24667fbfc9>
+                MAINNET => ("0xa5bf2ddf098bb0ef6d120c98217dd6b141c74ee0", 12349891),
+                ARBITRUM_ONE => ("0xCF0a32Bbef8F064969F21f7e02328FB577382018", 222864),
+                // <https://optimistic.etherscan.io/tx/0xd5754950d47179d822ea976a8b2af82ffa80e992cf0660b02c0c218359cc8987>
+                OPTIMISM => ("0xdAE7e32ADc5d490a43cCba1f0c736033F2b4eFca", 7005512),
+                // <https://polygonscan.com/tx/0xb8ac851249cc95bc0943ef0732d28bbd53b0b36c7dd808372666acd8c5f26e1c>
+                POLYGON => ("0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9", 15832998),
+                // Not available on Sepolia, Base, Avalanche, BNB and Lens
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
+            ]),
+        )
+        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+        .add_contract(
+            Contract::new("BalancerV2StablePoolFactoryV2").with_networks(networks![
+                // <https://etherscan.io/tx/0xef36451947ebd97b72278face57a53806e90071f4c902259db2db41d0c9a143d>
+                MAINNET => ("0x8df6efec5547e31b0eb7d1291b511ff8a2bf987c", 14934936),
+                // <https://gnosisscan.io/tx/0xe062237f0c8583375b10cf514d091781bfcd52d9ababbd324180770a5efbc6b1>
+                GNOSIS => ("0xf23b4DB826DbA14c0e857029dfF076b1c0264843", 25415344),
+                ARBITRUM_ONE => ("0xEF44D6786b2b4d544b7850Fe67CE6381626Bf2D6", 14244664),
+                // <https://optimistic.etherscan.io/tx/0xcf9f0bd731ded0e513708200df28ac11d17246fb53fc852cddedf590e41c9c03>
+                OPTIMISM => ("0xeb151668006CD04DAdD098AFd0a82e78F77076c3", 11088891),
+                // <https://polygonscan.com/tx/0xa2c41d014791888a29a9491204446c1b9b2f5dee3f3eb31ad03f290259067b44>
+                POLYGON => ("0xcA96C4f198d343E251b1a01F3EBA061ef3DA73C1", 29371951),
+                // Not available on Sepolia, Base, Avalanche, BNB and Lens
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
+            ]),
+        )
+        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+        .add_contract(
+            Contract::new("BalancerV2LiquidityBootstrappingPoolFactory").with_networks(networks![
+                // <https://etherscan.io/tx/0x665ac1c7c5290d70154d9dfc1d91dc2562b143aaa9e8a77aa13e7053e4fe9b7c>
+                MAINNET => ("0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE", 12871780),
+                ARBITRUM_ONE => ("0x142B9666a0a3A30477b052962ddA81547E7029ab", 222870),
+                // <https://polygonscan.com/tx/0xd9b5b9a9e6ea17a87f85574e93577e3646c9c2f9c8f38644f936949e6c853288>
+                POLYGON => ("0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE", 17116402),
+                // Not available on Sepolia, Base, Avalanche, BNB, Optimism and Lens
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
+            ]),
+        )
+        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
+        .add_contract(
+            Contract::new("BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory")
+                .with_networks(networks![
+                    // <https://etherscan.io/tx/0x298381e567ff6643d9b32e8e7e9ff0f04a80929dce3e004f6fa1a0104b2b69c3>
+                    MAINNET => ("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", 13730248),
+                    // <https://docs.balancer.fi/reference/contracts/deployment-addresses/gnosis.html#ungrouped-active-current-contracts>
+                    // <https://gnosis.blockscout.com/tx/0xbd56fefdb27e4ff1c0852e405f78311d6bc2befabaf6c87a405ab19de8c1506a>
+                    GNOSIS => ("0x85a80afee867aDf27B50BdB7b76DA70f1E853062", 25415236),
+                    // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#ungrouped-active-current-contracts>
+                    // <https://sepolia.etherscan.io/tx/0xe0e8feb509a8aa8a1eaa0b0c4b34395ff2fd880fb854fbeeccc0af1826e395c9>
+                    SEPOLIA => ("0x45fFd460cC6642B8D8Fb12373DFd77Ceb0f4932B", 25415236),
+                    ARBITRUM_ONE => ("0x1802953277FD955f9a254B80Aa0582f193cF1d77", 4859669),
+                    // <https://basescan.org/tx/0x0529de9dbe772f4b4f48da93ae2c2d2c46e3d3221ced9e0c4063a7a5bc47e874>
+                    BASE => ("0x0c6052254551EAe3ECac77B01DFcf1025418828f", 1206531),
+                    // <https://snowscan.xyz/tx/0x33a75d83436ae9fcda4b4986713417bf3dc80d9ceb8d2541817846b1ac579d9f>
+                    AVALANCHE => ("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", 26386552),
+                    // <https://bscscan.com/tx/0x8b964b97e6091bd41c93002c558d49adc26b8b31d2b30f3a33babbbbe8c55f47>
+                    BNB => ("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD", 22691243),
+                    // <https://optimistic.etherscan.io/tx/0x14fb43f051eebdec645abf0125e52348dc875b0887b689f8db026d75f9c78dda>
+                    OPTIMISM => ("0xf302f9F50958c5593770FDf4d4812309fF77414f", 7005915),
+                    // <https://polygonscan.com/tx/0x125bc007a86d771f8dc8f5fa1017de6e5a11162a458a72f25814503404bbeb0b>
+                    POLYGON => ("0x41B953164995c11C81DA73D212ED8Af25741b7Ac", 22067480),
+                    // Not available on Lens
+                ]),
+        )
+        .add_contract(
+            Contract::new("BalancerV2ComposableStablePoolFactory").with_networks(networks![
+                // <https://etherscan.io/tx/0x3b9e93ae050e59b3ca3657958ca30d1fd13fbc43208f8f0aa01ae992294f9961>
+                MAINNET => ("0xf9ac7B9dF2b3454E841110CcE5550bD5AC6f875F", 15485885),
+                ARBITRUM_ONE => ("0xaEb406b0E430BF5Ea2Dc0B9Fe62E4E53f74B3a33", 23227044),
+                // <https://bscscan.com/tx/0x6c6e1c72c91c75714f698049f1c7b66d8f2baced54e0dd2522dfadff27b5ccf1>
+                BNB => ("0xf302f9F50958c5593770FDf4d4812309fF77414f", 22691193),
+                // <https://optimistic.etherscan.io/tx/0xad2f330ad865dc7955376a3d9733486b38c53ba0d4757ad4e1b63b105401c506>
+                OPTIMISM => ("0xf145caFB67081895EE80eB7c04A30Cf87f07b745", 22182522),
+                // <https://polygonscan.com/tx/0xe5d908be686056f1519663a407167c088924f60d29c799ec74438b9de891989e>
+                POLYGON => ("0x136FD06Fa01eCF624C7F2B3CB15742c1339dC2c4", 32774224),
+                // Not available on Sepolia, Gnosis Chain, Base, Avalanche and Lens
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
+            ]),
+        )
+        .add_contract(
+            Contract::new("BalancerV2ComposableStablePoolFactoryV3").with_networks(networks![
+                // <https://etherscan.io/tx/0xd8c9ba758cb318beb0c9525b7621280a22b6dfe02cf725a3ece0718598f260ef>
+                MAINNET => ("0xdba127fBc23fb20F5929C546af220A991b5C6e01", 16580899),
+                // <https://gnosisscan.io/tx/0x2abd7c865f8ab432b340f7de897192c677ffa254908fdec14091e0cd06962963>
+                GNOSIS => ("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD", 26365805),
+                ARBITRUM_ONE => ("0x1c99324EDC771c82A0DCCB780CC7DDA0045E50e7", 58948370),
+                // <https://bscscan.com/tx/0xfe0c47c2b124a059d11704c1bd1815dcc554834ae0c2d11c433946226015619f>
+                BNB => ("0xacAaC3e6D6Df918Bf3c809DFC7d42de0e4a72d4C", 25475700),
+                // <https://optimistic.etherscan.io/tx/0x2bb1c3fbf1370c6e20ecda36b555de1a4426340908055c4274823e31f92210e>
+                OPTIMISM => ("0xe2E901AB09f37884BA31622dF3Ca7FC19AA443Be", 72832821),
+                // <https://polygonscan.com/tx/0xb189a45eac7ea59c0bb638b5ae6c4c93f9877f31ce826e96b792a9154e7a32a7>
+                POLYGON => ("0x7bc6C0E73EDAa66eF3F6E2f27b0EE8661834c6C9", 39037615),
+                // Not available on Sepolia (only version ≥ 4) and on Base (only version ≥ 5)
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
+                // Not available on Lens
+            ]),
+        )
+        .add_contract(
+            Contract::new("BalancerV2ComposableStablePoolFactoryV4").with_networks(networks![
+                // <https://etherscan.io/tx/0x3b61da162f3414c376cfe8b38d57ca6ba3c40b24446029ddab1187f4ae7c2bd7>
+                MAINNET => ("0xfADa0f4547AB2de89D1304A668C39B3E09Aa7c76", 16878679),
+                // <https://gnosisscan.io/tx/0x2739416da7e44add08bdfb5e4e5a29ca981383b97162748887efcc5c1241b2f1>
+                GNOSIS => ("0xD87F44Df0159DC78029AB9CA7D7e57E7249F5ACD", 27056416),
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#deprecated-contracts>
+                // <https://sepolia.etherscan.io/tx/0x9313a59ad9a95f2518076cbf4d0dc5f312e0b013a43a7ea4821cae2aa7a50aa2>
+                SEPOLIA => ("0xA3fd20E29358c056B727657E83DFd139abBC9924", 3425277),
+                ARBITRUM_ONE => ("0x2498A2B0d6462d2260EAC50aE1C3e03F4829BA95", 72235860),
+                // <https://snowscan.xyz/tx/0x7b396102e767ec5f2bc06fb2c9d7fb704d0ddc537c04f28cb538c6de7cc4261e>
+                AVALANCHE => ("0x3B1eb8EB7b43882b385aB30533D9A2BeF9052a98", 29221425),
+                // <https://bscscan.com/tx/0x2819b490b5e04e27d66476730411df8e572bc33038aa869a370ecfa852de0cbf>
+                BNB => ("0x1802953277FD955f9a254B80Aa0582f193cF1d77", 26666380),
+                // <https://optimistic.etherscan.io/tx/0x5d6c515442188eb4af83524618333c0fbdab0df809af01c4e7a9e380f1841199>
+                OPTIMISM => ("0x1802953277FD955f9a254B80Aa0582f193cF1d77", 82748180),
+                // <https://polygonscan.com/tx/0x2cea6a0683e67ebdb7d4a1cf1ad303126c5f228f05f8c9e2ccafdb1f5a024376>
+                POLYGON => ("0x6Ab5549bBd766A43aFb687776ad8466F8b42f777", 40613553),
+                // Not available on Base and Lens
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
+            ]),
+        )
+        .add_contract(
+            Contract::new("BalancerV2ComposableStablePoolFactoryV5").with_networks(networks![
+                // <https://etherscan.io/tx/0x1fc28221925959c0713d04d9f9159255927ebb94b7fa76e4795db0e365643c07>
+                MAINNET => ("0xDB8d758BCb971e482B2C45f7F8a7740283A1bd3A", 17672478),
+                // <https://gnosisscan.io/tx/0xcbf18b5a0d1f1fca9b30d08ab77d8554567c3bffa7efdd3add273073d20bb1e2>
+                GNOSIS => ("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7", 28900564),
+                // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#ungrouped-active-current-contracts>
+                // <https://sepolia.etherscan.io/tx/0x2c155dde7c480929991dd2a3344d9fdd20252f235370d46d0887b151dc0416bd>
+                SEPOLIA => ("0xa523f47A933D5020b23629dDf689695AA94612Dc", 3872211),
+                ARBITRUM_ONE => ("0xA8920455934Da4D853faac1f94Fe7bEf72943eF1", 110212282),
+                // <https://basescan.org/tx/0x1d291ba796b0397d73581b17695cf0e53e61551e419c43d11d81198b00c2bfd3>
+                BASE => ("0x8df317a729fcaA260306d7de28888932cb579b88", 1204710),
+                // <https://snowscan.xyz/tx/0x000659feb0831fc511f5c2ad12f3b2d466152b753c805fcb06e848701fd1b4b7>
+                AVALANCHE => ("0xE42FFA682A26EF8F25891db4882932711D42e467", 32478827),
+                // <https://bscscan.com/tx/0x5bdfed936f82800e80543d5212cb287dceebb52c29133838acbe7e148bf1a447>
+                BNB => ("0x4fb47126Fa83A8734991E41B942Ac29A3266C968", 29877945),
+                // <https://optimistic.etherscan.io/tx/0xa141b35dbbb18154e2452b1ae6ab7d82a6555724a878b5fccff40e18c8ae3484>
+                OPTIMISM => ("0x043A2daD730d585C44FB79D2614F295D2d625412", 106752707),
+                // <https://polygonscan.com/tx/0xa3d9a1cf00eaca469d6f9ec2fb836bbbfdfbc3b0eeadc07619bb9e695bfdecb8>
+                POLYGON => ("0xe2fa4e1d17725e72dcdAfe943Ecf45dF4B9E285b", 44961548),
+                // Not available on Lens
+            ]),
+        )
+        .add_contract(
+            Contract::new("BalancerV2ComposableStablePoolFactoryV6").with_networks(networks![
+                // <https://etherscan.io/tx/0x4149cadfe5d3431205d9819fca44ed7a4c2b101adc51adc75cc4586dee237be8>
+                MAINNET => ("0x5B42eC6D40f7B7965BE5308c70e2603c0281C1E9", 19314764),
+                // <https://gnosisscan.io/tx/0xc3fc1fb96712a0659b7e9e5f406f63bdf5cbd5df9e04f0372c28f75785036791>
+                GNOSIS => ("0x47B489bf5836f83ABD928C316F8e39bC0587B020", 32650879),
+                // <https://sepolia.etherscan.io/tx/0x53aa3587002469b758e2bb87135d9599fd06e7be944fe61c7f82045c45328566>
+                SEPOLIA => ("0x05503B3aDE04aCA81c8D6F88eCB73Ba156982D2B", 5369821),
+                // <https://arbiscan.io/tx/0xfa1e7642e135fb32dc14c990b851e5e7a0ac7a463e3a60c5003ae4142396f45e>
+                ARBITRUM_ONE => ("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7", 184805448),
+                // <https://basescan.org/tx/0x5d3342faf0368b939daa93247536afa26cc72c83de52ba7711ae1b8646688467>
+                BASE => ("0x956CCab09898C0AF2aCa5e6C229c3aD4E93d9288", 11099703),
+                // <https://snowscan.xyz/tx/0x246248ad396826dbfbdc5360cb9cbbdb3a672efa08cc745d1670900888c58c7b>
+                AVALANCHE => ("0xb9F8AB3ED3F3aCBa64Bc6cd2DcA74B7F38fD7B88", 42186350),
+                // <https://bscscan.com/tx/0x6784ab50138c7488bc14d4d9beb6a9e1ddc209a45f0a96b4ee98a7db84167dea>
+                BNB => ("0x6B5dA774890Db7B7b96C6f44e6a4b0F657399E2e", 36485719),
+                // <https://optimistic.etherscan.io/tx/0xa38b696479f35a9751ca8b1f0ddeb160188b3146113975b8c2b657c2fe7d7fd2>
+                OPTIMISM => ("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7", 116694338),
+                // <https://polygonscan.com/tx/0x7b9678ad538b1cd3f3a03e63455e7d49a1bc716ea42310fbf99df4bf93ecfdfa>
+                POLYGON => ("0xEAedc32a51c510d35ebC11088fD5fF2b47aACF2E", 53996258),
+                // Not available on Lens
+            ]),
+        )
+        // Balancer addresses can be obtained from:
+        // <https://github.com/balancer/balancer-subgraph-v2/blob/master/networks.yaml>
+        .add_contract(Contract::new("BalancerV2Vault").with_networks(networks![
+            // <https://etherscan.io/tx/0x28c44bb10d469cbd42accf97bd00b73eabbace138e9d44593e851231fbed1cb7>
+            MAINNET => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 12272146),
+            // <https://gnosisscan.io/tx/0x21947751661e1b9197492f22779af1f5175b71dc7057869e5a8593141d40edf1>
+            GNOSIS => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 24821598),
+            // <https://sepolia.etherscan.io/tx/0xb22509c6725dd69a975ecb96a0c594901eeee6a279cc66d9d5191022a7039ee6>
+            SEPOLIA => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 3418831),
+            // <https://arbiscan.io/tx/0xe2c3826bd7b15ef8d338038769fe6140a44f1957a36b0f27ab321ab6c68d5a8e>
+            ARBITRUM_ONE => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 222832),
+            // <https://basescan.org/tx/0x0dc2e3d436424f2f038774805116896d31828c0bf3795a6901337bdec4e0dff6>
+            BASE => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 1196036),
+            // <https://snowscan.xyz/tx/0xc49af0372feb032e0edbba6988410304566b1fd65546c01ced620ac3c934120f>
+            AVALANCHE => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 26386141),
+            // <https://bscscan.com/tx/0x1de8caa6c54ff9a25600e26d80865d84c9cc4d33c2b98611240529ee7de5cd74>
+            BNB => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 22691002),
+            // <https://optimistic.etherscan.io/tx/0xa03cb990595df9eed6c5db17a09468cab534aed5f5589a06c0bb3d19dd2f7ce9>
+            OPTIMISM => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 7003431),
+            // <https://polygonscan.com/tx/0x66f275a2ed102a5b679c0894ced62c4ebcb2a65336d086a916eb83bd1fe5c8d2>
+            POLYGON => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 15832990),
+            // Not available on Lens
+        ]))
+        .add_contract(Contract::new("BalancerV3BatchRouter").with_networks(networks![
+            // <https://etherscan.io/tx/0x41cb8619fb92dd532eb09b0e81fd4ce1c6006a10924893f02909e36a317777f3>
+            MAINNET => ("0x136f1EFcC3f8f88516B9E94110D56FDBfB1778d1", 21339510),
+            // <https://gnosisscan.io/tx/0xeafddbace9f445266f851ef1d92928e3d01a4622a1a6780b41ac52d5872f12ab>
+            GNOSIS => ("0xe2fa4e1d17725e72dcdAfe943Ecf45dF4B9E285b", 37377506),
+            // <https://sepolia.etherscan.io/tx/0x95ed8e1aaaa7bdc5881f3c8fc5a4914a66639bee52987c3a1ea88545083b0681>
+            SEPOLIA => ("0xC85b652685567C1B074e8c0D4389f83a2E458b1C", 7219301),
+            // <https://arbiscan.io/tx/0xa7968c6bc0775208ffece789c6e5d09b0eea5f2c3ed2806e9bd94fb0b978ff0f>
+            ARBITRUM_ONE => ("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E", 297828544),
+            // <https://basescan.org/tx/0x47b81146714630ce50445bfa28872a36973acedf785317ca423498810ec8e76c>
+            BASE => ("0x85a80afee867aDf27B50BdB7b76DA70f1E853062", 25347205),
+            // <https://snowscan.xyz/tx/0x3bfaba7135ee2d67d98f20ee1aa4c8b7e81e47be64223376f3086bab429ac806>
+            AVALANCHE => ("0xc9b36096f5201ea332Db35d6D195774ea0D5988f", 59965747),
+            // <https://optimistic.etherscan.io/tx/0xf370aab0d652f3e0f7c34e1a53e1afd98e86c487138300b0939d4e54b0088b67>
+            OPTIMISM => ("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E", 133969588),
+            // Not available on Lens, Polygon, BNB
+        ]))
+        // UniV2
+        .add_contract(Contract::new("BaoswapRouter").with_networks(networks![
+            // https://gnosisscan.io/tx/0xdcbfa037f2c6c7456022df0632ec8d6a75d0f9a195238eec679d5d26895eb7b1
+            GNOSIS => "0x6093AeBAC87d62b1A5a4cEec91204e35020E38bE",
+        ]))
+        .add_contract(Contract::new("HoneyswapRouter").with_networks(networks![
+            GNOSIS => "0x1C232F01118CB8B424793ae03F870aa7D0ac7f77",
+        ]))
+        .add_contract(Contract::new("PancakeRouter").with_networks(networks![
+            // <https://etherscan.io/tx/0x6e441248a9835ca10a3c29a19f2e1ed61d2e35f3ecb3a5b9e4ee170d62a22d16>
+            MAINNET => "0xEfF92A263d31888d860bD50809A8D171709b7b1c",
+            // <https://arbiscan.io/tx/0x4a2da73cbfcaafb0347e4525307a095e38bf7532435cb0327d1f5ee2ee15a011>
+            ARBITRUM_ONE => "0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb",
+            // <https://basescan.org/tx/0xda322aef5776698ac6da56be1ffaa0f9994a983cdeb9f2aeaba47437809ae6ef>
+            BASE => "0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb",
+            // <https://bscscan.com/tx/0x1bfbff8411ed44e609d911476b0d35a28284545b690902806ea0a7ff0453e931>
+            BNB => "0x10ED43C718714eb63d5aA57B78B54704E256024E",
+        ]))
+        // <https://docs.sushi.com/contracts/cpamm>
+        .add_contract(Contract::new("SushiSwapRouter").with_networks(networks![
+            // <https://etherscan.io/tx/0x4ff39eceee7ba9a63736eae38be69b10347975ff5fa4d9b85743a51e1c384094>
+            MAINNET => "0xd9e1ce17f2641f24ae83637ab66a2cca9c378b9f",
+            // <https://gnosisscan.io/tx/0x8b45ccbc2afd0132ef8b636064e0e745ff93b53942a56e320bb930666dd0fb18>
+            GNOSIS => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // <https://arbiscan.io/tx/0x40b22402bcac46330149ac9848f8bddd02b0a1e79d4a71934655a634051be1a1>
+            ARBITRUM_ONE => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // <https://basescan.org/tx/0xbb673c483292e03d202e95a023048b8bda459bf12402e7688f7e10be8b4dc67d>
+            BASE => "0x6bded42c6da8fbf0d2ba55b2fa120c5e0c8d7891",
+            // <https://snowtrace.io/tx/0x8185bcd3cc8544f8767e5270c4d7eb1e9b170fc0532fc4f0d7e7a1018e1f13ba>
+            AVALANCHE => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // <https://bscscan.com/tx/0xf22f827ae797390f6e478b0a11aa6e92d6da527f47130ef70d313ff0e0b2a83f>
+            BNB => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // <https://optimistic.etherscan.io/tx/0x88be6cc83f5bfccb8196db351866bac5c99ab8f7b451ea9975319ba05c3bf8f7>
+            OPTIMISM => "0x2abf469074dc0b54d793850807e6eb5faf2625b1",
+            // <https://polygonscan.com/tx/0x3dcf8fc780ae6fbe40b1ae57927a8fb405f54cbe89d0021a781a100d2086e5ba>
+            POLYGON => "0x1b02da8cb0d097eb8d57a175b88c7d8b47997506",
+            // Not available on Lens
+        ]))
+        // <https://swapr.gitbook.io/swapr/contracts>
+        .add_contract(Contract::new("SwaprRouter").with_networks(networks![
+            // <https://etherscan.io/tx/0x3f4ccc676637906db24caf043c89dafce959321c02266c6a4ab706fcec79a5f7>
+            MAINNET => "0xb9960d9bca016e9748be75dd52f02188b9d0829f",
+            // <https://gnosisscan.io/tx/0x0406e774caced468b8f84d7c7ed9b6e9c324601af38f44e385aecf7a7d01feb4>
+            GNOSIS => "0xE43e60736b1cb4a75ad25240E2f9a62Bff65c0C0",
+            // <https://arbiscan.io/tx/0x09771774fc138775472910f6bb0f2e03ff74e1e32a658e9c3e4d8f59f6431ba8>
+            ARBITRUM_ONE => "0x530476d5583724A89c8841eB6Da76E7Af4C0F17E",
+            // Not available on Base and Lens
+        ]))
+        .add_contract(Contract::new("ISwaprPair"))
+        .add_contract(Contract::new("TestnetUniswapV2Router02").with_networks(networks![
+            // <https://sepolia.etherscan.io/tx/0x2bf9a91a42d53e161897d9c581f798df9db6fb00587803dde7e7b8859118d821>
+            SEPOLIA => "0x86dcd3293C53Cf8EFd7303B57beb2a3F671dDE98",
+        ]))
+        // <https://docs.uniswap.org/contracts/v2/reference/smart-contracts/factory>
+        .add_contract(Contract::new("UniswapV2Factory").with_networks(networks![
+            // <https://etherscan.io/tx/0xc31d7e7e85cab1d38ce1b8ac17e821ccd47dbde00f9d57f2bd8613bff9428396>
+            MAINNET => "0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f",
+            // <https://gnosisscan.io/tx/0x446de52c460bed3f49a4342eab247bb4b2fe2993962c284fb9bc14a983c7a3d4>
+            GNOSIS => "0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7",
+            // <https://arbiscan.io/tx/0x83b597d54496c0b64d66a3b9a65c312e406262511c908f702ef06755d13ab2f3>
+            ARBITRUM_ONE => "0xf1D7CC64Fb4452F05c498126312eBE29f30Fbcf9",
+            // <https://basescan.org/tx/0x3c94031f81d9afe3beeb8fbcf4dcf1bd5b5688b86081d94e3d0231514dc00d31>
+            BASE => "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6",
+            // <https://sepolia.etherscan.io/tx/0x0a5e26b22f6b470857957a1d5a92ad4a7d3c5e7cf254ddd80edfe23df70eae71>
+            SEPOLIA => "0xF62c03E08ada871A0bEb309762E260a7a6a880E6",
+            // <https://snowtrace.io/tx/0xd06a069b11fc0c998b404c5736957cc16c71cf1f7dbf8a7d4244c84036ea6edd>
+            AVALANCHE => "0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C",
+            // <https://bscscan.com/tx/0x7305a4bddc54eee158f245a09526969697ac1a9f56d090b124ebfc85ff71a5cf>
+            BNB => "0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6",
+            // <https://optimistic.etherscan.io/tx/0xf7227dcbbfa4ea2bb2634f2a1f364a64b028f9e9e393974fea8d435cd097c72e>
+            OPTIMISM => "0x0c3c1c532F1e39EdF36BE9Fe0bE1410313E074Bf",
+            // <https://polygonscan.com/tx/0x712ac56155a301fca4b7a761e232233f41a104865a74b1a59293835da355292a>
+            POLYGON => "0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C",
+            // Not available on Lens
+        ]))
+        // <https://docs.uniswap.org/contracts/v2/reference/smart-contracts/router-02>
+        .add_contract(Contract::new("UniswapV2Router02").with_networks(networks![
+            // <https://etherscan.io/tx/0x4fc1580e7f66c58b7c26881cce0aab9c3509afe6e507527f30566fbf8039bcd0>
+            MAINNET => "0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D",
+            // <https://gnosisscan.io/tx/0xfcc495cdb313b48bbb0cd0a25cb2e8fd512eb8fb0b15f75947a9d5668e47a918>
+            GNOSIS => "0x1C232F01118CB8B424793ae03F870aa7D0ac7f77",
+            // <https://arbiscan.io/tx/0x630cd9d56a85e1bac7795d254fef861304a6838e28869badef19f19defb48ba6>
+            ARBITRUM_ONE => "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
+            // <https://basescan.org/tx/0x039224ce16ebe5574f51da761acbdfbd21099d6230c39fcd8ff566bbfd6a50a9>
+            BASE => "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
+            // <https://sepolia.etherscan.io/tx/0x92674b51681d2e99e71e03bd387bc0f0e79f2412302b49ed5626d1fa2311bab9>
+            SEPOLIA => "0xeE567Fe1712Faf6149d80dA1E6934E354124CfE3",
+            // <https://snowtrace.io/tx/0x7372f1eedf9d32fb4185d486911f44542723dae766eea04bc3f14724bae9552e>
+            AVALANCHE => "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
+            // <https://bscscan.com/tx/0x9e940f846abea7dcc1f0bd5c261f405c104628c855346f8cac966f52905ee0fa>
+            BNB => "0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24",
+            // <https://optimistic.etherscan.io/tx/0x2dcb9a76100e5be49e89085b87bd447b1966a9d823d5985e1a8197834c60e6bd>
+            OPTIMISM => "0x4A7b5Da61326A6379179b40d00F57E5bbDC962c2",
+            // <https://polygonscan.com/tx/0x66186e0cacd2f6b3ad2eae586bd331daafd0572eb80bf71be694181858198025>
+            POLYGON => "0xedf6066a2b290C185783862C7F4776A2C8077AD1",
+            // Not available on Lens
+        ]))
+        .add_contract(Contract::new("IUniswapLikeRouter"))
+        .add_contract(Contract::new("IUniswapLikePair"))
+        .add_contract(Contract::new("UniswapV3Pool"))
+        // <https://docs.uniswap.org/contracts/v3/reference/deployments/>
+        .add_contract(Contract::new("UniswapV3QuoterV2").with_networks(networks![
+            MAINNET => "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
+            ARBITRUM_ONE => "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
+            BASE => "0x3d4e44Eb1374240CE5F1B871ab261CD16335B76a",
+            AVALANCHE => "0xbe0F5544EC67e9B3b2D979aaA43f18Fd87E6257F",
+            BNB => "0x78D78E420Da98ad378D7799bE8f4AF69033EB077",
+            OPTIMISM => "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
+            POLYGON => "0x61fFE014bA17989E743c5F6cB21bF9697530B21e",
+            LENS => "0x1eEA2B790Dc527c5a4cd3d4f3ae8A2DDB65B2af1",
+            LINEA => "0x42bE4D6527829FeFA1493e1fb9F3676d2425C3C1",
+            // Not listed on Gnosis and Sepolia chains
+        ]))
+        // <https://github.com/Uniswap/v3-periphery/blob/697c2474757ea89fec12a4e6db16a574fe259610/deploys.md>
+        .add_contract(Contract::new("UniswapV3SwapRouterV2").with_networks(networks![
+            ARBITRUM_ONE => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+            MAINNET => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+            POLYGON => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+            OPTIMISM => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+            BASE => "0x2626664c2603336E57B271c5C0b26F421741e481",
+            AVALANCHE => "0xbb00FF08d01D300023C629E8fFfFcb65A5a578cE",
+            BNB => "0xB971eF87ede563556b2ED4b1C0b0019111Dd85d2",
+            LENS => "0x6ddD32cd941041D8b61df213B9f515A7D288Dc13",
+            LINEA => "0x3d4e44Eb1374240CE5F1B871ab261CD16335B76a",
+            // Not available on Gnosis Chain
+        ]))
+        // <https://github.com/Uniswap/v3-periphery/blob/697c2474757ea89fec12a4e6db16a574fe259610/deploys.md>
+        .add_contract(Contract::new("IUniswapV3Factory").with_networks(networks![
+            MAINNET => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            SEPOLIA => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            ARBITRUM_ONE => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            BASE => "0x33128a8fC17869897dcE68Ed026d694621f6FDfD",
+            AVALANCHE => "0x740b1c1de25031C31FF4fC9A62f554A55cdC1baD",
+            BNB => "0xdB1d10011AD0Ff90774D0C6Bb92e5C5c8b4461F7",
+            OPTIMISM => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            POLYGON => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
+            // not official
+            LENS => "0xc3A5b857Ba82a2586A45a8B59ECc3AA50Bc3D0e3",
+            LINEA => "0x31FAfd4889FA1269F7a13A66eE0fB458f27D72A9",
+            // Not available on Gnosis Chain
+        ]))
+        // <https://github.com/cowprotocol/hooks-trampoline/blob/993427166ade6c65875b932f853776299290ac4b/networks.json>
+        .add_contract(Contract::new("HooksTrampoline").with_networks(networks![
+            MAINNET => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            // Gnosis is using the old instance of the hook trampoline since it's hardcoded in gnosis pay rebalance integration.
+            GNOSIS => "0x01DcB88678aedD0C4cC9552B20F4718550250574",
+            SEPOLIA => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            ARBITRUM_ONE => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            BASE => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            AVALANCHE => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            BNB => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            OPTIMISM => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            POLYGON => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            LENS => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+            // compiled with an older, linea-compatible evm version
+            LINEA => "0xeFcf0d30DB41Ae0b136c5E3B4340dFeE2D099Ada",
+            PLASMA => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
+        ]))
+        .add_contract(Contract::new("CoWSwapEthFlow").with_networks(networks![
+            // <https://etherscan.io/tx/0x0247e3c15f59a52b099f192265f1c1e6227f48a280717b3eefd7a5d9d0c051a1>
+            MAINNET => ("0x40a50cf069e992aa4536211b23f286ef88752187", 16169866),
+            // <https://gnosisscan.io/tx/0x6280e079f454fbb5de3c52beddd64ca2b5be0a4b3ec74edfd5f47e118347d4fb>
+            GNOSIS => ("0x40a50cf069e992aa4536211b23f286ef88752187", 25414331),
+            // <https://github.com/cowprotocol/ethflowcontract/blob/v1.1.0-artifacts/networks.prod.json#L11-L14>
+            // <https://sepolia.etherscan.io/tx/0x558a7608a770b5c4f68fffa9b02e7908a40f61b557b435ea768a4c62cb79ae25>
+            SEPOLIA => ("0x0b7795E18767259CC253a2dF471db34c72B49516", 4718739),
+            // <https://arbiscan.io/tx/0xa4066ca77bbe1f21776b4c26315ead3b1c054b35814b49e0c35afcbff23e1b8d>
+            ARBITRUM_ONE => ("0x6DFE75B5ddce1ADE279D4fa6BD6AeF3cBb6f49dB", 204747458),
+            // <https://basescan.org/tx/0xc3555c4b065867cbf34382438e1bbaf8ee39eaf10fb0c70940c8955962e76e2c>
+            BASE => ("0x3C3eA1829891BC9bEC3d06A81d5d169e52a415e3", 21490258),
+            // <https://snowscan.xyz/tx/0x71a2ed9754247210786effa3269bc6eb68b7521b5052ac9f205af7ac364f608f>
+            AVALANCHE => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 60496408),
+            // <https://bscscan.com/tx/0x959a60a42d36e0efd247b3cf19ed9d6da503d01bce6f87ed31e5e5921111222e>
+            BNB => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 48411237),
+            // <https://optimistic.etherscan.io/tx/0x0644f10f7ae5448240fc592ad21abf4dabac473a9d80904af5f7865f2d6509e2>
+            OPTIMISM => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 134607215),
+            // <https://polygonscan.com/tx/0xc3781c19674d97623d13afc938fca94d53583f4051020512100e84fecd230f91>
+            POLYGON => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 71296258),
+            // <https://explorer.lens.xyz/tx/0xc59b5ffadb40158f9390b1d77f19346dbe9214b27f26346dfa2990ad379a1a32>
+            LENS => ("0xFb337f8a725A142f65fb9ff4902d41cc901de222", 3007173),
+            // <https://lineascan.build/tx/0x0e20a4e0bbce2e28b89b7dcfc4dd4dfb48f5b0b8473b3b5bdeb1bf9f09943485>
+            LINEA => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 24522097),
+            // <https://plasmascan.to/tx/0xda72b111ac2a7d182bf3c884373882add6f4c78f6d4bdae7efcae143be716b38>
+            PLASMA => ("0x04501b9b1d52e67f6862d157e00d13419d2d6e95", 3521855),
+        ]))
+        .add_contract(Contract::new("CoWSwapOnchainOrders"))
+        .add_contract(Contract::new("ERC1271SignatureValidator"))
+        // Used in the gnosis/solvers repo for the balancer solver
+        .add_contract(Contract::new("BalancerQueries").with_networks(networks![
+            // <https://etherscan.io/tx/0x30799534f3a0ab8c7fa492b88b56e9354152ffaddad15415184a3926c0dd9b09>
+            MAINNET => ("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5", 15188261),
+            // <https://arbiscan.io/tx/0x710d93aab52b6c10197eab20f9d6db1af3931f9890233d8832268291ef2f54b3>
+            ARBITRUM_ONE => ("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5", 18238624),
+            // <https://optimistic.etherscan.io/tx/0xf3b2aaf3e12c7de0987dc99a26242b227b9bc055342dda2e013dab0657d6f9f1>
+            OPTIMISM => ("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5", 15288107),
+            // <https://basescan.org/tx/0x425d04ee79511c17d06cd96fe1df9e0727f7e7d46b31f36ecaa044ada6a0d29a>
+            BASE => ("0x300Ab2038EAc391f26D9F895dc61F8F66a548833", 1205869),
+            // <https://gnosisscan.io/tx/0x5beb3051d393aac24cb236dc850c644f345af65c4927030bd1033403e2f2e503>
+            GNOSIS => ("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e", 24821845),
+            // <https://polygonscan.com/tx/0x0b74f5c230f9b7df8c7a7f0d1ebd5e6c3fab51a67a9bcc8f05c350180041682e>
+            POLYGON => ("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5", 30988035),
+            // <https://snowtrace.io/tx/0xf484e1efde47209bad5f72642bcb8d8e2a4092a5036434724ffa2d039e93a1bf?chainid=43114>
+            AVALANCHE => ("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD", 26387068),
+            // Not available on Lens
+        ]))
+        // <https://liquorice.gitbook.io/liquorice-docs/links/smart-contracts>
+        .add_contract(Contract::new("LiquoriceSettlement").with_networks(networks![
+            MAINNET => "0x0448633eb8B0A42EfED924C42069E0DcF08fb552",
+            ARBITRUM_ONE => "0x0448633eb8B0A42EfED924C42069E0DcF08fb552",
+        ]))
+        .add_contract(Contract::new("FlashLoanRouter").with_networks(networks![
+            MAINNET => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            GNOSIS => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            SEPOLIA => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            ARBITRUM_ONE => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            BASE => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            POLYGON => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+            AVALANCHE => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
+        ]))
+        .add_contract(Contract::new("ICowWrapper"))
+        .add_contract(Contract::new("ChainalysisOracle").with_networks(networks![
+            MAINNET => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            ARBITRUM_ONE => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            BASE => "0x3A91A31cB3dC49b4db9Ce721F50a9D076c8D739B",
+            AVALANCHE => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            BNB => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            OPTIMISM => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+            POLYGON => "0x40C57923924B5c5c5455c48D93317139ADDaC8fb",
+        ]))
+        // Only used in <github.com/gnosis/solvers>
+        .add_contract(Contract::new("Permit2").with_networks(networks![
+            // <https://etherscan.io/tx/0xf2f1fe96c16ee674bb7fcee166be52465a418927d124f5f1d231b36eae65d377>
+            MAINNET => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 15986406),
+            // <https://gnosisscan.io/tx/0x3ba511410edc92cafe94bd100e25adb37981499d17947a3d64c8523fbfd31864>
+            GNOSIS => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 27338672),
+            // <https://sepolia.etherscan.io/tx/0x363df5deeead44d8fd38425f3986e3e81946a6c59d8b68fe33926cc700713173>
+            SEPOLIA => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 2356287),
+            // <https://arbiscan.io/tx/0xe244dafca8211ed6fb123efaa5075b7d5813749718412ca435c872afd0e2ea82>
+            ARBITRUM_ONE => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 38692735),
+            // <https://basescan.org/tx/0x26fbdea9a47ba8e21676bc6b6a72a19dded1a0c270e96d5236886ca9c5000d3f>
+            BASE => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 1425180),
+            // <https://snowscan.xyz/tx/0x38fd76c2165d920c7e006defd67eeeb0069bf93e41741eec3bbb83d196610a56>
+            AVALANCHE => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 28844415),
+            // <https://bscscan.com/tx/0xb038ec7b72db4207e0c0d5433e1cabc41b4e4f9b9cac577173b3188fc508a6c3>
+            BNB => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 25343783),
+            // <https://optimistic.etherscan.io/tx/0xf0a51e0d0579ef8cc7965f5797bd7665ddac14d4d2141423676b8862f7668352>
+            OPTIMISM => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 38854427),
+            // <https://polygonscan.com/tx/0xe2a4d996de0d6a23108f701b37acba6c47ee34448bb51fec5c23f542a6f3ccc8>
+            POLYGON => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 35701901),
+        ]))
+        .add_contract(Contract::new("GPv2AllowListAuthentication").with_networks(networks![
+            // <https://etherscan.io/tx/0xb84bf720364f94c749f1ec1cdf0d4c44c70411b716459aaccfd24fc677013375>
+            MAINNET => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 12593263),
+            // <https://gnosisscan.io/tx/0x1a2d87a05a94bc6680a4faee31bbafbd74e9ddb63dd3941c717b5c609c08b957>
+            GNOSIS => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 16465099),
+            // <https://sepolia.etherscan.io/tx/0x73c54c75b3f382304f3adf33e3876c8999fb10df786d4a902733369251033cd1>
+            SEPOLIA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 4717469),
+            // <https://arbiscan.io/tx/0xe994adff141a2e72bd9dab3eb7b3480637013bdfb1aa42c62d9d6c90de091237>
+            ARBITRUM_ONE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 204702129),
+            // <https://basescan.org/tx/0x5497004d2a37c9eafd0bd1e5861a67d3a209c5b845724166e3dbca9527ee05ec>
+            BASE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 21407137),
+            // <https://snowscan.xyz/tx/0xa58fc76846917779d7bcbb7d34f4a2a44aab2b702ef983594e34e6972a0c626b>
+            AVALANCHE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 59891351),
+            // <https://bscscan.com/tx/0x8da639c62eb4a810573c178ed245184944d66c834122e3f88994ebf679b50e34>
+            BNB => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 48173639),
+            // <https://optimistic.etherscan.io/tx/0x5b6403b485e369ce524d04234807df782e6639e55a7c1d859f0a67925d9a5f49>
+            OPTIMISM => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 134254466),
+            // <https://polygonscan.com/tx/0x686e4bbcfd6ebae91f0fcc667407c831953629877ec622457916729de3d461c3>
+            POLYGON => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 45854728),
+            // <https://explorer.lens.xyz/tx/0x0730c21885153dcc9a25ab7abdc38309ec7c7a8db15b763fbbaf574d1e7ec498>
+            LENS => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 2612937),
+            // <https://lineascan.build/tx/0x6e5d2c4381320efdd21ccde1534560ded1b9ab07638776833faa22820c378155>
+            LINEA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 24333100),
+            // <https://plasmascan.to/tx/0xc2ac50ad302e402c4db1e956bd357af7d84e3684ad65e4fdee58abea092ac88c>
+            PLASMA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 3439709),
+        ]))
+        .add_contract(Contract::new("GPv2Settlement").with_networks(networks![
+            // <https://etherscan.io/tx/0xf49f90aa5a268c40001d1227b76bb4dd8247f18361fcad9fffd4a7a44f1320d3>
+            MAINNET => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 12593265),
+            // <https://blockscout.com/xdai/mainnet/tx/0x9ddc538f89cd8433f4a19bc4de0de27e7c68a1d04a14b327185e4bba9af87133>
+            GNOSIS => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 16465100),
+            // <https://sepolia.etherscan.io/tx/0x6bba22a00ffcff6bca79aced546e18d2a5a4f4e484a4e4dbafab13daf42f718d>
+            SEPOLIA => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 4717488),
+            // <https://arbiscan.io/tx/0x240486f35ebf42ea69b2b3f1569d587c18c87f98c0ec997bef7d18182ca4c38c>
+            ARBITRUM_ONE => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 204704802),
+            // <https://basescan.org/tx/0x00a3c4e2dc4241465208beeba27e90a9ce3159ad4f41581c4c3a1ef02d6e37cb>
+            BASE => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 21407238),
+            // <https://snowscan.xyz/tx/0x374b84f0ea6bc554abc3ffdc3fbce4374fefc76f2bd25e324ce95a62cafcc142>
+            AVALANCHE => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 59891356),
+            // <https://bscscan.com/tx/0x9e0c16a655ceadcb95ba2de3bf59d2b3a3d10cce7bdf52aa5520164b58ffd969>
+            BNB => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 48173641),
+            // <https://optimistic.etherscan.io/tx/0xd1bbd68ee6b0eecf6f883e148284fc4fb4c960299b75004dfddd5135246cd5eb>
+            OPTIMISM => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 134254624),
+            // <https://polygonscan.com/tx/0x0e24d3a2a8530eaad5ae62e54e64d57665a77ce3970227d20c1b77da315cbbf6>
+            POLYGON => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 45859743),
+            // <https://explorer.lens.xyz/tx/0x01584b767dda7b115394b93dbcfecadfe589862ae3f7957846a2db82f2f5c703>
+            LENS => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 2621745),
+            // <https://lineascan.build/tx/0x6e5d2c4381320efdd21ccde1534560ded1b9ab07638776833faa22820c378155>
+            LINEA => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 24333100),
+            // <https://plasmascan.to/tx/0xf16bd6f307dce94ab252d8dd8266ab30091879fb3d631cbcf3d0ffddf9e6ad05?chainid=9745>
+            PLASMA => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 3439711),
+        ]))
+        // Note: the WETH address must be consistent with the one used by the ETH-flow
+        // contract
+        .add_contract(Contract::new("WETH9").with_networks(networks![
+            MAINNET => "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+            GNOSIS => "0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d",
+            SEPOLIA => "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14",
+            ARBITRUM_ONE => "0x82aF49447D8a07e3bd95BD0d56f35241523fBab1",
+            BASE => "0x4200000000000000000000000000000000000006",
+            AVALANCHE => "0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7",
+            BNB => "0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c",
+            OPTIMISM => "0x4200000000000000000000000000000000000006",
+            POLYGON => "0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270",
+            LENS => "0x6bDc36E20D267Ff0dd6097799f82e78907105e2F",
+            LINEA => "0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f",
+            PLASMA => "0x6100E367285b01F48D07953803A2d8dCA5D19873",
+        ]))
+        .add_contract(Contract::new("ERC20"))
+        // cow_amm module
+        .add_contract(Contract::new("CowAmm"))
+        .add_contract(
+            Contract::new("CowAmmConstantProductFactory").with_networks(networks![
+                // <https://etherscan.io/tx/0xf37fc438ddacb00c28305bd7dea3b79091cd5be3405a2b445717d9faf946fa50>
+                MAINNET => ("0x40664207e3375FB4b733d4743CE9b159331fd034", 19861952),
+                // <https://gnosisscan.io/tx/0x4121efab4ad58ae7ad73b50448cccae0de92905e181648e5e08de3d6d9c66083>
+                GNOSIS => ("0xdb1cba3a87f2db53b6e1e6af48e28ed877592ec0", 33874317),
+                // <https://sepolia.etherscan.io/tx/0x5e6af00c670eb421b96e78fd2e3b9df573b19e6e0ea77d8003e47cdde384b048>
+                SEPOLIA => ("0xb808e8183e3a72d196457d127c7fd4befa0d7fd3", 5874562),
+            ]),
+        )
+        .add_contract(Contract::new("CowAmmLegacyHelper").with_networks(networks![
+            // <https://etherscan.io/tx/0x07f0ce50fb9cd30e69799a63ae9100869a3c653d62ea3ba49d2e5e1282f42b63>
+            MAINNET => ("0x3705ceee5eaa561e3157cf92641ce28c45a3999c", 20332745),
+            // <https://gnosisscan.io/tx/0x09e56c7173ab1e1c5d02bc2832799422ebca6d9a40e5bae77f6ca908696bfebf>
+            GNOSIS => ("0xd9ec06b001957498ab1bc716145515d1d0e30ffb", 35026999),
+        ]))
+        .add_contract(Contract::new("CowAmmUniswapV2PriceOracle"))
+        .add_contract(Contract::new("CowAmmFactoryGetter"))
+        // support module
+        // Support contracts used for trade and token simulations.
+        .add_contract(Contract::new("AnyoneAuthenticator"))
+        .add_contract(Contract::new("Solver"))
+        .add_contract(Contract::new("Spardose"))
+        .add_contract(Contract::new("Trader"))
+        // Support contract used for solver fee simulations in the gnosis/solvers repo.
+        .add_contract(Contract::new("Swapper"))
+        .add_contract(Contract::new("Signatures").with_networks(networks![
+            MAINNET => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            ARBITRUM_ONE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            BASE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            AVALANCHE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            BNB => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            OPTIMISM => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            POLYGON => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            LENS => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            GNOSIS => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            SEPOLIA => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+            // built with evm=London, because deployment reverts on Linea otherwise
+            LINEA => "0xf6E57e72F7dB3D9A51a8B4c149C00475b94A37e4",
+            PLASMA => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+        ]))
+        // Support contracts used for various order simulations.
+        .add_contract(Contract::new("Balances").with_networks(networks![
+            MAINNET => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            ARBITRUM_ONE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            BASE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            AVALANCHE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            BNB => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            OPTIMISM => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            POLYGON => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            LENS => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            GNOSIS => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            SEPOLIA => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            PLASMA => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+            // built with evm=London, because deployment reverts on Linea otherwise
+            LINEA => "0x361350f708f7c0c63c8a505226592c3e5d1faa29",
+        ]))
+        // test module
+        // Test Contract for using up a specified amount of gas.
+        .add_contract(Contract::new("GasHog"))
+        // Test Contract for incrementing arbitrary counters.
+        .add_contract(Contract::new("Counter"))
+        // Token with support for `permit` (for pre-interaction tests)
+        .add_contract(Contract::new("CowProtocolToken").with_networks(networks![
+            MAINNET => "0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB",
+            GNOSIS => "0x177127622c4A00F3d409B75571e12cB3c8973d3c",
+            SEPOLIA => "0x0625aFB445C3B6B7B929342a04A22599fd5dBB59",
+            ARBITRUM_ONE => "0xcb8b5CD20BdCaea9a010aC1F8d835824F5C87A04",
+            BASE => "0xc694a91e6b071bF030A18BD3053A7fE09B6DaE69",
+        ]))
+        .write_formatted(Path::new("artifacts"), false, Path::new("src/bindings"))
+        .unwrap();
+}

From 9f08facba208fb9cdd29d2cc699fb39de9c1c840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Mon, 3 Nov 2025 16:11:53 +0000
Subject: [PATCH 17/36] wip

---
 Cargo.lock                                    |   1 +
 .../src/boundary/events/settlement.rs         |   4 +-
 .../ethflow_events/event_retriever.rs         |   2 +-
 .../database/ethflow_events/event_storing.rs  |   2 +-
 crates/autopilot/src/database/events.rs       |   2 +-
 .../onchain_order_events/ethflow_events.rs    |   4 +-
 .../onchain_order_events/event_retriever.rs   |   4 +-
 .../src/database/onchain_order_events/mod.rs  |  16 +-
 .../src/domain/settlement/transaction/mod.rs  |   4 +-
 .../settlement/transaction/tokenized.rs       |   2 +-
 .../src/infra/blockchain/contracts.rs         |   9 +-
 crates/autopilot/src/run.rs                   |   3 +-
 crates/contracts-generate/src/lib.rs          |   4 +
 crates/contracts/Cargo.toml                   |   1 +
 crates/contracts/build.rs                     | 147 ++++++++++--------
 crates/contracts/src/lib.rs                   |  48 +-----
 crates/contracts/src/vault.rs                 |  12 +-
 crates/cow-amm/src/amm.rs                     |   2 +-
 crates/cow-amm/src/cache.rs                   |   2 +-
 crates/cow-amm/src/factory.rs                 |   2 +-
 crates/cow-amm/src/lib.rs                     |   4 +-
 crates/cow-amm/src/maintainers.rs             |   2 +-
 crates/cow-amm/src/registry.rs                |   2 +-
 .../src/boundary/liquidity/balancer/v2/mod.rs |   2 +-
 .../src/boundary/liquidity/uniswap/v2.rs      |   2 +-
 .../driver/src/boundary/liquidity/zeroex.rs   |   3 +-
 .../domain/competition/solution/encoding.rs   |   6 +-
 crates/driver/src/domain/cow_amm.rs           |  11 +-
 crates/driver/src/domain/liquidity/zeroex.rs  |   2 +-
 .../driver/src/infra/blockchain/contracts.rs  |  16 +-
 crates/driver/src/infra/blockchain/token.rs   |   4 +-
 crates/driver/src/infra/liquidity/config.rs   |  44 +++---
 .../liquidity_sources/liquorice/notifier.rs   |   4 +-
 crates/driver/src/tests/setup/blockchain.rs   |  19 ++-
 crates/driver/src/tests/setup/solver.rs       |   2 +-
 crates/e2e/src/setup/deploy.rs                |   6 +-
 .../e2e/src/setup/onchain_components/mod.rs   |   6 +-
 .../e2e/src/setup/onchain_components/safe.rs  |   8 +-
 crates/e2e/tests/e2e/banned_users.rs          |   2 +-
 crates/e2e/tests/e2e/cow_amm.rs               |  48 +++---
 crates/e2e/tests/e2e/ethflow.rs               |   2 +-
 crates/e2e/tests/e2e/hooks.rs                 |   6 +-
 crates/e2e/tests/e2e/limit_orders.rs          |   2 +-
 crates/e2e/tests/e2e/liquidity.rs             |   2 +-
 .../e2e/liquidity_source_notification.rs      |   2 +-
 crates/e2e/tests/e2e/smart_contract_orders.rs |   2 +-
 crates/e2e/tests/e2e/univ2.rs                 |   2 +-
 crates/e2e/tests/e2e/wrapper.rs               |   2 +-
 crates/orderbook/src/run.rs                   |  20 +--
 crates/refunder/src/ethflow_order.rs          |   2 +-
 crates/refunder/src/lib.rs                    |   2 +-
 crates/refunder/src/refund_service.rs         |   2 +-
 crates/refunder/src/submitter.rs              |   2 +-
 crates/shared/src/account_balances/mod.rs     |   2 +-
 .../shared/src/account_balances/simulation.rs |   6 +-
 .../src/bad_token/token_owner_finder/mod.rs   |   7 +-
 crates/shared/src/bad_token/trace_call.rs     |   4 +-
 crates/shared/src/event_handling.rs           |   4 +-
 crates/shared/src/order_validation.rs         |   2 +-
 crates/shared/src/price_estimation/factory.rs |   2 +-
 .../balance_overrides/detector.rs             |   2 +-
 .../price_estimation/trade_verifier/mod.rs    |   6 +-
 crates/shared/src/signature_validator/mod.rs  |   4 +-
 .../src/signature_validator/simulation.rs     |   4 +-
 .../sources/balancer_v2/pool_fetching/mod.rs  |   3 +-
 .../balancer_v2/pool_fetching/pool_storage.rs |   2 +-
 .../balancer_v2/pool_fetching/registry.rs     |   2 +-
 .../src/sources/balancer_v2/pools/common.rs   |   4 +-
 .../balancer_v2/pools/composable_stable.rs    |   2 +-
 .../pools/liquidity_bootstrapping.rs          |   2 +-
 .../src/sources/balancer_v2/pools/stable.rs   |   2 +-
 .../src/sources/balancer_v2/pools/weighted.rs |   2 +-
 crates/shared/src/sources/swapr.rs            |   2 +-
 crates/shared/src/sources/uniswap_v2/mod.rs   |  20 +--
 .../src/sources/uniswap_v2/pool_fetching.rs   |   2 +-
 .../src/sources/uniswap_v3/event_fetching.rs  |   2 +-
 .../src/sources/uniswap_v3/pool_fetching.rs   |   4 +-
 crates/shared/src/token_info.rs               |   2 +-
 crates/solver/src/interactions/allowances.rs  |   4 +-
 crates/solver/src/interactions/balancer_v2.rs |   2 +-
 crates/solver/src/interactions/erc20.rs       |   2 +-
 crates/solver/src/interactions/uniswap_v2.rs  |   2 +-
 crates/solver/src/interactions/uniswap_v3.rs  |   2 +-
 crates/solver/src/interactions/weth.rs        |   2 +-
 crates/solver/src/interactions/zeroex.rs      |   2 +-
 crates/solver/src/liquidity/balancer_v2.rs    |   2 +-
 crates/solver/src/liquidity/uniswap_v3.rs     |   2 +-
 crates/solver/src/liquidity/zeroex.rs         |   2 +-
 .../src/settlement/settlement_encoder.rs      |   2 +-
 crates/solvers/src/boundary/baseline.rs       |   4 +-
 .../src/boundary/liquidity/concentrated.rs    |   4 +-
 crates/solvers/src/domain/solver.rs           |   5 +-
 crates/solvers/src/infra/contracts.rs         |   2 +-
 93 files changed, 297 insertions(+), 348 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8f1d698546..fb3ffd5105 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2411,6 +2411,7 @@ dependencies = [
  "ethcontract",
  "ethcontract-generate",
  "paste",
+ "serde",
  "serde_json",
  "tracing",
  "tracing-subscriber",
diff --git a/crates/autopilot/src/boundary/events/settlement.rs b/crates/autopilot/src/boundary/events/settlement.rs
index 1520b67b21..ebb9c84dc6 100644
--- a/crates/autopilot/src/boundary/events/settlement.rs
+++ b/crates/autopilot/src/boundary/events/settlement.rs
@@ -5,7 +5,7 @@ use {
         rpc::types::{Filter, Log},
     },
     anyhow::Result,
-    contracts::alloy::GPv2Settlement::GPv2Settlement::GPv2SettlementEvents,
+    contracts::bindings::GPv2Settlement::GPv2Settlement::GPv2SettlementEvents,
     ethrpc::{AlloyProvider, block_stream::RangeInclusive},
     shared::event_handling::{AlloyEventRetrieving, EventStoring},
 };
@@ -28,7 +28,7 @@ impl AlloyEventRetrieving for GPv2SettlementContract {
         Filter::new().address(self.address)
     }
 
-    fn provider(&self) -> &contracts::alloy::Provider {
+    fn provider(&self) -> &alloy::providers::DynProvider {
         &self.provider
     }
 }
diff --git a/crates/autopilot/src/database/ethflow_events/event_retriever.rs b/crates/autopilot/src/database/ethflow_events/event_retriever.rs
index 41ad7a25e1..b5dc58d697 100644
--- a/crates/autopilot/src/database/ethflow_events/event_retriever.rs
+++ b/crates/autopilot/src/database/ethflow_events/event_retriever.rs
@@ -29,7 +29,7 @@ impl EthFlowRefundRetriever {
 impl AlloyEventRetrieving for EthFlowRefundRetriever {
     type Event = CoWSwapEthFlow::CoWSwapEthFlowEvents;
 
-    fn provider(&self) -> &contracts::alloy::Provider {
+    fn provider(&self) -> &alloy::providers::DynProvider {
         &self.web3.alloy
     }
 
diff --git a/crates/autopilot/src/database/ethflow_events/event_storing.rs b/crates/autopilot/src/database/ethflow_events/event_storing.rs
index d9046a9e3d..93369cc1ab 100644
--- a/crates/autopilot/src/database/ethflow_events/event_storing.rs
+++ b/crates/autopilot/src/database/ethflow_events/event_storing.rs
@@ -4,7 +4,7 @@ use {
     crate::database::{Postgres, events::bytes_to_order_uid},
     alloy::rpc::types::Log,
     anyhow::Result,
-    contracts::alloy::CoWSwapEthFlow::CoWSwapEthFlow::CoWSwapEthFlowEvents,
+    contracts::bindings::CoWSwapEthFlow::CoWSwapEthFlow::CoWSwapEthFlowEvents,
     database::ethflow_orders::Refund,
     ethrpc::block_stream::RangeInclusive,
     shared::event_handling::EventStoring,
diff --git a/crates/autopilot/src/database/events.rs b/crates/autopilot/src/database/events.rs
index 47138a673b..f18f902f6f 100644
--- a/crates/autopilot/src/database/events.rs
+++ b/crates/autopilot/src/database/events.rs
@@ -1,7 +1,7 @@
 use {
     alloy::rpc::types::Log,
     anyhow::{Context, Result},
-    contracts::alloy::GPv2Settlement::GPv2Settlement::{self, GPv2SettlementEvents},
+    contracts::bindings::GPv2Settlement::GPv2Settlement::{self, GPv2SettlementEvents},
     database::{
         OrderUid,
         PgTransaction,
diff --git a/crates/autopilot/src/database/onchain_order_events/ethflow_events.rs b/crates/autopilot/src/database/onchain_order_events/ethflow_events.rs
index 9dd67203b7..27fb795688 100644
--- a/crates/autopilot/src/database/onchain_order_events/ethflow_events.rs
+++ b/crates/autopilot/src/database/onchain_order_events/ethflow_events.rs
@@ -3,7 +3,7 @@ use {
     crate::database::events::log_to_event_index,
     alloy::{eips::BlockNumberOrTag, rpc::types::Log},
     anyhow::{Context, Result, anyhow},
-    contracts::alloy::{
+    contracts::bindings::{
         CoWSwapOnchainOrders::CoWSwapOnchainOrders::{
             CoWSwapOnchainOrdersEvents as ContractEvent,
             OrderPlacement as ContractOrderPlacement,
@@ -293,7 +293,7 @@ mod test {
     use {
         super::*,
         alloy::primitives::{Address, U256},
-        contracts::alloy::CoWSwapOnchainOrders,
+        contracts::bindings::CoWSwapOnchainOrders,
         model::order::{BuyTokenDestination, OrderKind, SellTokenSource},
     };
 
diff --git a/crates/autopilot/src/database/onchain_order_events/event_retriever.rs b/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
index ed99df97bf..b40f38aded 100644
--- a/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
+++ b/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
@@ -4,7 +4,7 @@ use {
         rpc::types::{Filter, FilterSet},
         sol_types::SolEvent,
     },
-    contracts::alloy::CoWSwapOnchainOrders,
+    contracts::bindings::CoWSwapOnchainOrders,
     shared::{ethrpc::Web3, event_handling::AlloyEventRetrieving},
 };
 
@@ -42,7 +42,7 @@ impl AlloyEventRetrieving for CoWSwapOnchainOrdersContract {
             ]))
     }
 
-    fn provider(&self) -> &contracts::alloy::Provider {
+    fn provider(&self) -> &alloy::providers::DynProvider {
         &self.web3.alloy
     }
 }
diff --git a/crates/autopilot/src/database/onchain_order_events/mod.rs b/crates/autopilot/src/database/onchain_order_events/mod.rs
index c7a7a12738..0ecdd6ffc8 100644
--- a/crates/autopilot/src/database/onchain_order_events/mod.rs
+++ b/crates/autopilot/src/database/onchain_order_events/mod.rs
@@ -12,7 +12,7 @@ use {
     anyhow::{Context, Result, anyhow, bail},
     app_data::AppDataHash,
     chrono::{TimeZone, Utc},
-    contracts::alloy::{
+    contracts::bindings::{
         CoWSwapOnchainOrders::CoWSwapOnchainOrders::{
             CoWSwapOnchainOrdersEvents as ContractEvent,
             OrderInvalidation,
@@ -784,7 +784,7 @@ mod test {
         super::*,
         crate::database::Config,
         alloy::primitives::U256,
-        contracts::alloy::{CoWSwapOnchainOrders, InstanceExt},
+        contracts::bindings::CoWSwapOnchainOrders,
         database::{byte_array::ByteArray, onchain_broadcasted_orders::OnchainOrderPlacement},
         ethcontract::H160,
         ethrpc::Web3,
@@ -954,7 +954,7 @@ mod test {
 
         let order_placement = ContractOrderPlacement {
             sender,
-            order: contracts::alloy::CoWSwapOnchainOrders::GPv2Order::Data {
+            order: contracts::bindings::CoWSwapOnchainOrders::GPv2Order::Data {
                 sellToken: sell_token,
                 buyToken: buy_token,
                 receiver,
@@ -969,7 +969,7 @@ mod test {
                 buyTokenBalance: BuyTokenDestination::ERC20.into(),
             },
             signature:
-                contracts::alloy::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
+                contracts::bindings::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
                     scheme: 0,
                     data: owner.0.into(),
                 },
@@ -1065,7 +1065,7 @@ mod test {
         };
         let order_placement = ContractOrderPlacement {
             sender,
-            order: contracts::alloy::CoWSwapOnchainOrders::GPv2Order::Data {
+            order: contracts::bindings::CoWSwapOnchainOrders::GPv2Order::Data {
                 sellToken: sell_token,
                 buyToken: buy_token,
                 receiver,
@@ -1080,7 +1080,7 @@ mod test {
                 buyTokenBalance: BuyTokenDestination::ERC20.into(),
             },
             signature:
-                contracts::alloy::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
+                contracts::bindings::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
                     scheme: 0,
                     data: owner.0.into(),
                 },
@@ -1166,7 +1166,7 @@ mod test {
         let owner = Address::from([6; 20]);
         let order_placement = ContractOrderPlacement {
             sender,
-            order: contracts::alloy::CoWSwapOnchainOrders::GPv2Order::Data {
+            order: contracts::bindings::CoWSwapOnchainOrders::GPv2Order::Data {
                 sellToken: sell_token,
                 buyToken: buy_token,
                 receiver,
@@ -1181,7 +1181,7 @@ mod test {
                 buyTokenBalance: BuyTokenDestination::ERC20.into(),
             },
             signature:
-                contracts::alloy::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
+                contracts::bindings::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
                     scheme: 0,
                     data: owner.0.into(),
                 },
diff --git a/crates/autopilot/src/domain/settlement/transaction/mod.rs b/crates/autopilot/src/domain/settlement/transaction/mod.rs
index c1a673c4b4..81a4bf9370 100644
--- a/crates/autopilot/src/domain/settlement/transaction/mod.rs
+++ b/crates/autopilot/src/domain/settlement/transaction/mod.rs
@@ -4,7 +4,7 @@ use {
         domain::{self, auction::order, eth},
     },
     alloy::sol_types::SolCall,
-    contracts::alloy::{GPv2AllowListAuthentication, GPv2Settlement},
+    contracts::bindings::{GPv2AllowListAuthentication, GPv2Settlement},
     ethcontract::BlockId,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     std::collections::HashSet,
@@ -76,7 +76,7 @@ impl Transaction {
         // Find trace call to settlement contract
         let (calldata, callers) = find_settlement_trace_and_callers(&transaction.trace_calls, settlement_contract)
             .map(|(trace, path)| (trace.input.clone(), path.clone()))
-            // All transactions emitting settlement events should have a /settle call, 
+            // All transactions emitting settlement events should have a /settle call,
             // otherwise it's an execution client bug
             .ok_or(Error::MissingCalldata)?;
 
diff --git a/crates/autopilot/src/domain/settlement/transaction/tokenized.rs b/crates/autopilot/src/domain/settlement/transaction/tokenized.rs
index a6c6b249cc..a6cfb016b6 100644
--- a/crates/autopilot/src/domain/settlement/transaction/tokenized.rs
+++ b/crates/autopilot/src/domain/settlement/transaction/tokenized.rs
@@ -4,7 +4,7 @@ use {
         domain::{self, auction::order, eth},
     },
     app_data::AppDataHash,
-    contracts::alloy::GPv2Settlement,
+    contracts::bindings::GPv2Settlement,
     ethcontract::U256,
     ethrpc::alloy::conversions::IntoLegacy,
 };
diff --git a/crates/autopilot/src/infra/blockchain/contracts.rs b/crates/autopilot/src/infra/blockchain/contracts.rs
index c8c4f5e23f..789ea73f49 100644
--- a/crates/autopilot/src/infra/blockchain/contracts.rs
+++ b/crates/autopilot/src/infra/blockchain/contracts.rs
@@ -7,7 +7,6 @@ use {
         GPv2AllowListAuthentication,
         GPv2Settlement,
         HooksTrampoline,
-        InstanceExt,
         WETH9,
     },
     ethrpc::{
@@ -20,7 +19,7 @@ use {
 #[derive(Debug, Clone)]
 pub struct Contracts {
     settlement: GPv2Settlement::Instance,
-    signatures: contracts::alloy::support::Signatures::Instance,
+    signatures: contracts::bindings::Signatures::Instance,
     weth: WETH9::Instance,
     balances: Balances::Instance,
     chainalysis_oracle: Option<ChainalysisOracle::Instance>,
@@ -53,11 +52,11 @@ impl Contracts {
             web3.alloy.clone(),
         );
 
-        let signatures = contracts::alloy::support::Signatures::Instance::new(
+        let signatures = contracts::bindings::Signatures::Instance::new(
             addresses
                 .signatures
                 .map(IntoAlloy::into_alloy)
-                .or_else(|| contracts::alloy::support::Signatures::deployment_address(&chain.id()))
+                .or_else(|| contracts::bindings::Signatures::deployment_address(&chain.id()))
                 .unwrap(),
             web3.alloy.clone(),
         );
@@ -131,7 +130,7 @@ impl Contracts {
         &self.balances
     }
 
-    pub fn signatures(&self) -> &contracts::alloy::support::Signatures::Instance {
+    pub fn signatures(&self) -> &contracts::bindings::Signatures::Instance {
         &self.signatures
     }
 
diff --git a/crates/autopilot/src/run.rs b/crates/autopilot/src/run.rs
index 77e415bb78..5cdbe510ed 100644
--- a/crates/autopilot/src/run.rs
+++ b/crates/autopilot/src/run.rs
@@ -27,7 +27,8 @@ use {
     alloy::eips::BlockNumberOrTag,
     chain::Chain,
     clap::Parser,
-    contracts::bindings::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, InstanceExt, WETH9},
+    contracts::bindings::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, WETH9},
+    ethcontract::H160,
     ethrpc::{
         Web3,
         alloy::conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index 9ca3afdb52..14983b5857 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -148,6 +148,10 @@ impl Contract {
                     DEPLOYMENT_INFO.get(chain_id).map(|(addr, _)| *addr)
                 }
 
+                pub fn deployment_block(chain_id: &u64) -> Option<u64> {
+                    DEPLOYMENT_INFO.get(chain_id).map(|(_, block)| *block).flatten()
+                }
+
                 impl Instance {
                     pub fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
                         async move {
diff --git a/crates/contracts/Cargo.toml b/crates/contracts/Cargo.toml
index 02bfe431c2..4472682469 100644
--- a/crates/contracts/Cargo.toml
+++ b/crates/contracts/Cargo.toml
@@ -25,6 +25,7 @@ alloy = { workspace = true, features = ["sol-types", "json", "contract", "json-a
 paste = { workspace = true }
 ethcontract = { workspace = true }
 serde_json = { workspace = true }
+serde = { workspace = true }
 
 # [bin-dependencies]
 anyhow = { workspace = true }
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 5708d1290d..5b0a7a25d0 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -1,6 +1,9 @@
 use std::path::Path;
 
-use contracts_generate::{networks, Contract, Contracts};
+use contracts_generate::{
+    ARBITRUM_ONE, AVALANCHE, BASE, BNB, Contract, Contracts, GNOSIS, LENS, LINEA, MAINNET,
+    OPTIMISM, PLASMA, POLYGON, SEPOLIA, networks,
+};
 
 fn main() {
     // NOTE: This is a workaround for `rerun-if-changed` directives for
@@ -12,8 +15,6 @@ fn main() {
     // - https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
     println!("cargo:rerun-if-changed=build.rs");
 
-    use contracts_generate::*;
-
     Contracts::new()
         // 0x
         .add_contract(Contract::new("IZeroex").with_networks(networks![
@@ -29,6 +30,7 @@ fn main() {
         ]))
         // Misc
         .add_contract(Contract::new("ERC20Mintable"))
+        .add_contract(Contract::new("ERC20"))
         // GnosisSafe
         .add_contract(Contract::new("GnosisSafe"))
         .add_contract(Contract::new("GnosisSafeCompatibilityFallbackHandler"))
@@ -294,23 +296,25 @@ fn main() {
             POLYGON => ("0xBA12222222228d8Ba445958a75a0704d566BF2C8", 15832990),
             // Not available on Lens
         ]))
-        .add_contract(Contract::new("BalancerV3BatchRouter").with_networks(networks![
-            // <https://etherscan.io/tx/0x41cb8619fb92dd532eb09b0e81fd4ce1c6006a10924893f02909e36a317777f3>
-            MAINNET => ("0x136f1EFcC3f8f88516B9E94110D56FDBfB1778d1", 21339510),
-            // <https://gnosisscan.io/tx/0xeafddbace9f445266f851ef1d92928e3d01a4622a1a6780b41ac52d5872f12ab>
-            GNOSIS => ("0xe2fa4e1d17725e72dcdAfe943Ecf45dF4B9E285b", 37377506),
-            // <https://sepolia.etherscan.io/tx/0x95ed8e1aaaa7bdc5881f3c8fc5a4914a66639bee52987c3a1ea88545083b0681>
-            SEPOLIA => ("0xC85b652685567C1B074e8c0D4389f83a2E458b1C", 7219301),
-            // <https://arbiscan.io/tx/0xa7968c6bc0775208ffece789c6e5d09b0eea5f2c3ed2806e9bd94fb0b978ff0f>
-            ARBITRUM_ONE => ("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E", 297828544),
-            // <https://basescan.org/tx/0x47b81146714630ce50445bfa28872a36973acedf785317ca423498810ec8e76c>
-            BASE => ("0x85a80afee867aDf27B50BdB7b76DA70f1E853062", 25347205),
-            // <https://snowscan.xyz/tx/0x3bfaba7135ee2d67d98f20ee1aa4c8b7e81e47be64223376f3086bab429ac806>
-            AVALANCHE => ("0xc9b36096f5201ea332Db35d6D195774ea0D5988f", 59965747),
-            // <https://optimistic.etherscan.io/tx/0xf370aab0d652f3e0f7c34e1a53e1afd98e86c487138300b0939d4e54b0088b67>
-            OPTIMISM => ("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E", 133969588),
-            // Not available on Lens, Polygon, BNB
-        ]))
+        .add_contract(
+            Contract::new("BalancerV3BatchRouter").with_networks(networks![
+                // <https://etherscan.io/tx/0x41cb8619fb92dd532eb09b0e81fd4ce1c6006a10924893f02909e36a317777f3>
+                MAINNET => ("0x136f1EFcC3f8f88516B9E94110D56FDBfB1778d1", 21339510),
+                // <https://gnosisscan.io/tx/0xeafddbace9f445266f851ef1d92928e3d01a4622a1a6780b41ac52d5872f12ab>
+                GNOSIS => ("0xe2fa4e1d17725e72dcdAfe943Ecf45dF4B9E285b", 37377506),
+                // <https://sepolia.etherscan.io/tx/0x95ed8e1aaaa7bdc5881f3c8fc5a4914a66639bee52987c3a1ea88545083b0681>
+                SEPOLIA => ("0xC85b652685567C1B074e8c0D4389f83a2E458b1C", 7219301),
+                // <https://arbiscan.io/tx/0xa7968c6bc0775208ffece789c6e5d09b0eea5f2c3ed2806e9bd94fb0b978ff0f>
+                ARBITRUM_ONE => ("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E", 297828544),
+                // <https://basescan.org/tx/0x47b81146714630ce50445bfa28872a36973acedf785317ca423498810ec8e76c>
+                BASE => ("0x85a80afee867aDf27B50BdB7b76DA70f1E853062", 25347205),
+                // <https://snowscan.xyz/tx/0x3bfaba7135ee2d67d98f20ee1aa4c8b7e81e47be64223376f3086bab429ac806>
+                AVALANCHE => ("0xc9b36096f5201ea332Db35d6D195774ea0D5988f", 59965747),
+                // <https://optimistic.etherscan.io/tx/0xf370aab0d652f3e0f7c34e1a53e1afd98e86c487138300b0939d4e54b0088b67>
+                OPTIMISM => ("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E", 133969588),
+                // Not available on Lens, Polygon, BNB
+            ]),
+        )
         // UniV2
         .add_contract(Contract::new("BaoswapRouter").with_networks(networks![
             // https://gnosisscan.io/tx/0xdcbfa037f2c6c7456022df0632ec8d6a75d0f9a195238eec679d5d26895eb7b1
@@ -360,10 +364,12 @@ fn main() {
             // Not available on Base and Lens
         ]))
         .add_contract(Contract::new("ISwaprPair"))
-        .add_contract(Contract::new("TestnetUniswapV2Router02").with_networks(networks![
-            // <https://sepolia.etherscan.io/tx/0x2bf9a91a42d53e161897d9c581f798df9db6fb00587803dde7e7b8859118d821>
-            SEPOLIA => "0x86dcd3293C53Cf8EFd7303B57beb2a3F671dDE98",
-        ]))
+        .add_contract(
+            Contract::new("TestnetUniswapV2Router02").with_networks(networks![
+                // <https://sepolia.etherscan.io/tx/0x2bf9a91a42d53e161897d9c581f798df9db6fb00587803dde7e7b8859118d821>
+                SEPOLIA => "0x86dcd3293C53Cf8EFd7303B57beb2a3F671dDE98",
+            ]),
+        )
         // <https://docs.uniswap.org/contracts/v2/reference/smart-contracts/factory>
         .add_contract(Contract::new("UniswapV2Factory").with_networks(networks![
             // <https://etherscan.io/tx/0xc31d7e7e85cab1d38ce1b8ac17e821ccd47dbde00f9d57f2bd8613bff9428396>
@@ -425,18 +431,20 @@ fn main() {
             // Not listed on Gnosis and Sepolia chains
         ]))
         // <https://github.com/Uniswap/v3-periphery/blob/697c2474757ea89fec12a4e6db16a574fe259610/deploys.md>
-        .add_contract(Contract::new("UniswapV3SwapRouterV2").with_networks(networks![
-            ARBITRUM_ONE => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-            MAINNET => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-            POLYGON => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-            OPTIMISM => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
-            BASE => "0x2626664c2603336E57B271c5C0b26F421741e481",
-            AVALANCHE => "0xbb00FF08d01D300023C629E8fFfFcb65A5a578cE",
-            BNB => "0xB971eF87ede563556b2ED4b1C0b0019111Dd85d2",
-            LENS => "0x6ddD32cd941041D8b61df213B9f515A7D288Dc13",
-            LINEA => "0x3d4e44Eb1374240CE5F1B871ab261CD16335B76a",
-            // Not available on Gnosis Chain
-        ]))
+        .add_contract(
+            Contract::new("UniswapV3SwapRouterV2").with_networks(networks![
+                ARBITRUM_ONE => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+                MAINNET => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+                POLYGON => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+                OPTIMISM => "0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45",
+                BASE => "0x2626664c2603336E57B271c5C0b26F421741e481",
+                AVALANCHE => "0xbb00FF08d01D300023C629E8fFfFcb65A5a578cE",
+                BNB => "0xB971eF87ede563556b2ED4b1C0b0019111Dd85d2",
+                LENS => "0x6ddD32cd941041D8b61df213B9f515A7D288Dc13",
+                LINEA => "0x3d4e44Eb1374240CE5F1B871ab261CD16335B76a",
+                // Not available on Gnosis Chain
+            ]),
+        )
         // <https://github.com/Uniswap/v3-periphery/blob/697c2474757ea89fec12a4e6db16a574fe259610/deploys.md>
         .add_contract(Contract::new("IUniswapV3Factory").with_networks(networks![
             MAINNET => "0x1F98431c8aD98523631AE4a59f267346ea31F984",
@@ -517,10 +525,12 @@ fn main() {
             // Not available on Lens
         ]))
         // <https://liquorice.gitbook.io/liquorice-docs/links/smart-contracts>
-        .add_contract(Contract::new("LiquoriceSettlement").with_networks(networks![
-            MAINNET => "0x0448633eb8B0A42EfED924C42069E0DcF08fb552",
-            ARBITRUM_ONE => "0x0448633eb8B0A42EfED924C42069E0DcF08fb552",
-        ]))
+        .add_contract(
+            Contract::new("LiquoriceSettlement").with_networks(networks![
+                MAINNET => "0x0448633eb8B0A42EfED924C42069E0DcF08fb552",
+                ARBITRUM_ONE => "0x0448633eb8B0A42EfED924C42069E0DcF08fb552",
+            ]),
+        )
         .add_contract(Contract::new("FlashLoanRouter").with_networks(networks![
             MAINNET => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
             GNOSIS => "0x9da8b48441583a2b93e2ef8213aad0ec0b392c69",
@@ -561,32 +571,34 @@ fn main() {
             // <https://polygonscan.com/tx/0xe2a4d996de0d6a23108f701b37acba6c47ee34448bb51fec5c23f542a6f3ccc8>
             POLYGON => ("0x000000000022D473030F116dDEE9F6B43aC78BA3", 35701901),
         ]))
-        .add_contract(Contract::new("GPv2AllowListAuthentication").with_networks(networks![
-            // <https://etherscan.io/tx/0xb84bf720364f94c749f1ec1cdf0d4c44c70411b716459aaccfd24fc677013375>
-            MAINNET => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 12593263),
-            // <https://gnosisscan.io/tx/0x1a2d87a05a94bc6680a4faee31bbafbd74e9ddb63dd3941c717b5c609c08b957>
-            GNOSIS => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 16465099),
-            // <https://sepolia.etherscan.io/tx/0x73c54c75b3f382304f3adf33e3876c8999fb10df786d4a902733369251033cd1>
-            SEPOLIA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 4717469),
-            // <https://arbiscan.io/tx/0xe994adff141a2e72bd9dab3eb7b3480637013bdfb1aa42c62d9d6c90de091237>
-            ARBITRUM_ONE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 204702129),
-            // <https://basescan.org/tx/0x5497004d2a37c9eafd0bd1e5861a67d3a209c5b845724166e3dbca9527ee05ec>
-            BASE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 21407137),
-            // <https://snowscan.xyz/tx/0xa58fc76846917779d7bcbb7d34f4a2a44aab2b702ef983594e34e6972a0c626b>
-            AVALANCHE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 59891351),
-            // <https://bscscan.com/tx/0x8da639c62eb4a810573c178ed245184944d66c834122e3f88994ebf679b50e34>
-            BNB => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 48173639),
-            // <https://optimistic.etherscan.io/tx/0x5b6403b485e369ce524d04234807df782e6639e55a7c1d859f0a67925d9a5f49>
-            OPTIMISM => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 134254466),
-            // <https://polygonscan.com/tx/0x686e4bbcfd6ebae91f0fcc667407c831953629877ec622457916729de3d461c3>
-            POLYGON => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 45854728),
-            // <https://explorer.lens.xyz/tx/0x0730c21885153dcc9a25ab7abdc38309ec7c7a8db15b763fbbaf574d1e7ec498>
-            LENS => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 2612937),
-            // <https://lineascan.build/tx/0x6e5d2c4381320efdd21ccde1534560ded1b9ab07638776833faa22820c378155>
-            LINEA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 24333100),
-            // <https://plasmascan.to/tx/0xc2ac50ad302e402c4db1e956bd357af7d84e3684ad65e4fdee58abea092ac88c>
-            PLASMA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 3439709),
-        ]))
+        .add_contract(
+            Contract::new("GPv2AllowListAuthentication").with_networks(networks![
+                // <https://etherscan.io/tx/0xb84bf720364f94c749f1ec1cdf0d4c44c70411b716459aaccfd24fc677013375>
+                MAINNET => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 12593263),
+                // <https://gnosisscan.io/tx/0x1a2d87a05a94bc6680a4faee31bbafbd74e9ddb63dd3941c717b5c609c08b957>
+                GNOSIS => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 16465099),
+                // <https://sepolia.etherscan.io/tx/0x73c54c75b3f382304f3adf33e3876c8999fb10df786d4a902733369251033cd1>
+                SEPOLIA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 4717469),
+                // <https://arbiscan.io/tx/0xe994adff141a2e72bd9dab3eb7b3480637013bdfb1aa42c62d9d6c90de091237>
+                ARBITRUM_ONE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 204702129),
+                // <https://basescan.org/tx/0x5497004d2a37c9eafd0bd1e5861a67d3a209c5b845724166e3dbca9527ee05ec>
+                BASE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 21407137),
+                // <https://snowscan.xyz/tx/0xa58fc76846917779d7bcbb7d34f4a2a44aab2b702ef983594e34e6972a0c626b>
+                AVALANCHE => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 59891351),
+                // <https://bscscan.com/tx/0x8da639c62eb4a810573c178ed245184944d66c834122e3f88994ebf679b50e34>
+                BNB => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 48173639),
+                // <https://optimistic.etherscan.io/tx/0x5b6403b485e369ce524d04234807df782e6639e55a7c1d859f0a67925d9a5f49>
+                OPTIMISM => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 134254466),
+                // <https://polygonscan.com/tx/0x686e4bbcfd6ebae91f0fcc667407c831953629877ec622457916729de3d461c3>
+                POLYGON => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 45854728),
+                // <https://explorer.lens.xyz/tx/0x0730c21885153dcc9a25ab7abdc38309ec7c7a8db15b763fbbaf574d1e7ec498>
+                LENS => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 2612937),
+                // <https://lineascan.build/tx/0x6e5d2c4381320efdd21ccde1534560ded1b9ab07638776833faa22820c378155>
+                LINEA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 24333100),
+                // <https://plasmascan.to/tx/0xc2ac50ad302e402c4db1e956bd357af7d84e3684ad65e4fdee58abea092ac88c>
+                PLASMA => ("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE", 3439709),
+            ]),
+        )
         .add_contract(Contract::new("GPv2Settlement").with_networks(networks![
             // <https://etherscan.io/tx/0xf49f90aa5a268c40001d1227b76bb4dd8247f18361fcad9fffd4a7a44f1320d3>
             MAINNET => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 12593265),
@@ -629,7 +641,6 @@ fn main() {
             LINEA => "0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f",
             PLASMA => "0x6100E367285b01F48D07953803A2d8dCA5D19873",
         ]))
-        .add_contract(Contract::new("ERC20"))
         // cow_amm module
         .add_contract(Contract::new("CowAmm"))
         .add_contract(
@@ -702,6 +713,6 @@ fn main() {
             ARBITRUM_ONE => "0xcb8b5CD20BdCaea9a010aC1F8d835824F5C87A04",
             BASE => "0xc694a91e6b071bF030A18BD3053A7fE09B6DaE69",
         ]))
-        .write_formatted(Path::new("artifacts"), false, Path::new("src/bindings"))
+        .write_formatted(Path::new("artifacts"), true, Path::new("src/bindings"))
         .unwrap();
 }
diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index b39baad16f..d2a3259510 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::let_unit_value)]
 
 pub use ethcontract;
-pub mod alloy;
+// pub mod alloy;
 pub mod errors;
 use {
     anyhow::{Result, anyhow, bail},
@@ -37,52 +37,8 @@ pub fn deployment_block(contract: &Contract, chain_id: u64) -> Result<u64> {
 #[macro_use]
 mod macros;
 
+pub mod bindings;
 #[cfg(feature = "bin")]
 pub mod paths;
 pub mod vault;
 pub mod web3;
-
-#[cfg(test)]
-mod tests {
-    use {
-        super::*,
-        crate::alloy::networks::{ARBITRUM_ONE, GNOSIS, MAINNET, SEPOLIA},
-    };
-
-    #[test]
-    fn deployment_addresses() {
-        for network in &[MAINNET, GNOSIS, SEPOLIA, ARBITRUM_ONE] {
-            assert!(
-                alloy::BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory::deployment_address(network).is_some()
-            )
-        }
-        for network in &[MAINNET, ARBITRUM_ONE] {
-            assert!(
-                alloy::BalancerV2WeightedPool2TokensFactory::deployment_address(network).is_some()
-            );
-            assert!(
-                alloy::BalancerV2LiquidityBootstrappingPoolFactory::deployment_address(network)
-                    .is_some()
-            );
-        }
-
-        assert!(alloy::BalancerV2WeightedPoolFactory::deployment_address(&MAINNET).is_some());
-
-        for network in &[MAINNET, GNOSIS, ARBITRUM_ONE] {
-            assert!(alloy::BalancerV2StablePoolFactoryV2::deployment_address(network).is_some());
-        }
-    }
-
-    #[test]
-    fn deployment_information() {
-        assert!(alloy::BalancerV2WeightedPoolFactory::deployment_address(&MAINNET).is_some());
-        for network in &[MAINNET, ARBITRUM_ONE] {
-            assert!(
-                alloy::BalancerV2WeightedPool2TokensFactory::deployment_address(network).is_some()
-            );
-        }
-        for network in &[MAINNET, GNOSIS, ARBITRUM_ONE] {
-            assert!(alloy::BalancerV2StablePoolFactoryV2::deployment_address(network).is_some());
-        }
-    }
-}
diff --git a/crates/contracts/src/vault.rs b/crates/contracts/src/vault.rs
index af5c3d8f52..facd53061f 100644
--- a/crates/contracts/src/vault.rs
+++ b/crates/contracts/src/vault.rs
@@ -2,7 +2,7 @@
 //! contract.
 
 use {
-    crate::alloy::BalancerV2Authorizer,
+    crate::bindings::BalancerV2Authorizer,
     alloy::{primitives::Address, sol_types::SolCall},
 };
 
@@ -18,8 +18,8 @@ pub async fn grant_required_roles(
     vault: Address,
     vault_relayer: Address,
 ) -> Result<(), alloy::contract::Error> {
-    use crate::alloy::BalancerV2Vault::BalancerV2Vault::batchSwapCall;
-    use crate::alloy::BalancerV2Vault::BalancerV2Vault::manageUserBalanceCall;
+    use crate::bindings::BalancerV2Vault::BalancerV2Vault::batchSwapCall;
+    use crate::bindings::BalancerV2Vault::BalancerV2Vault::manageUserBalanceCall;
 
     authorizer
         .grantRoles(
@@ -41,9 +41,9 @@ mod tests {
     use alloy::primitives::b256;
 
     use super::*;
-    use crate::alloy::BalancerV2Vault;
-    use crate::alloy::BalancerV2Vault::BalancerV2Vault::batchSwapCall;
-    use crate::alloy::BalancerV2Vault::BalancerV2Vault::manageUserBalanceCall;
+    use crate::bindings::BalancerV2Vault;
+    use crate::bindings::BalancerV2Vault::BalancerV2Vault::batchSwapCall;
+    use crate::bindings::BalancerV2Vault::BalancerV2Vault::manageUserBalanceCall;
 
     #[test]
     fn role_ids() {
diff --git a/crates/cow-amm/src/amm.rs b/crates/cow-amm/src/amm.rs
index 3b5470f1a0..e6f848457a 100644
--- a/crates/cow-amm/src/amm.rs
+++ b/crates/cow-amm/src/amm.rs
@@ -2,7 +2,7 @@ use {
     alloy::primitives::{Address, TxHash, U256},
     anyhow::{Context, Result},
     app_data::AppDataHash,
-    contracts::alloy::cow_amm::{
+    contracts::bindings::{
         CowAmmLegacyHelper,
         CowAmmLegacyHelper::CowAmmLegacyHelper::orderReturn,
     },
diff --git a/crates/cow-amm/src/cache.rs b/crates/cow-amm/src/cache.rs
index 5a7966362f..cd53ed47f4 100644
--- a/crates/cow-amm/src/cache.rs
+++ b/crates/cow-amm/src/cache.rs
@@ -2,7 +2,7 @@ use {
     crate::{Amm, Metrics},
     alloy::{primitives::Address, rpc::types::Log},
     anyhow::Context,
-    contracts::alloy::cow_amm::{
+    contracts::bindings::{
         CowAmmLegacyHelper,
         CowAmmLegacyHelper::CowAmmLegacyHelper::CowAmmLegacyHelperEvents as CowAmmEvent,
     },
diff --git a/crates/cow-amm/src/factory.rs b/crates/cow-amm/src/factory.rs
index 54f6d7984b..c2383f59de 100644
--- a/crates/cow-amm/src/factory.rs
+++ b/crates/cow-amm/src/factory.rs
@@ -5,7 +5,7 @@ use {
         rpc::types::{Filter, FilterSet},
         sol_types::SolEvent,
     },
-    contracts::alloy::cow_amm::CowAmmLegacyHelper::{
+    contracts::bindings::CowAmmLegacyHelper::{
         CowAmmLegacyHelper,
         CowAmmLegacyHelper::CowAmmLegacyHelperEvents as CowAmmEvent,
     },
diff --git a/crates/cow-amm/src/lib.rs b/crates/cow-amm/src/lib.rs
index cc487f4b13..284da4224f 100644
--- a/crates/cow-amm/src/lib.rs
+++ b/crates/cow-amm/src/lib.rs
@@ -6,7 +6,7 @@ mod registry;
 
 pub use {
     amm::Amm,
-    contracts::alloy::cow_amm::CowAmmLegacyHelper::Instance as Helper,
+    contracts::bindings::CowAmmLegacyHelper::Instance as Helper,
     registry::Registry,
 };
 
@@ -36,7 +36,7 @@ pub mod gpv2_order {
             primitives::{B256, FixedBytes, Keccak256},
             sol_types::{SolStruct, SolValue},
         },
-        contracts::alloy::cow_amm::CowAmm,
+        contracts::bindings::CowAmm,
         ethrpc::alloy::conversions::IntoLegacy,
         model::{DomainSeparator, interaction::InteractionData, signature::hashed_eip712_message},
     };
diff --git a/crates/cow-amm/src/maintainers.rs b/crates/cow-amm/src/maintainers.rs
index bb93ea3438..d42b7d2da7 100644
--- a/crates/cow-amm/src/maintainers.rs
+++ b/crates/cow-amm/src/maintainers.rs
@@ -1,6 +1,6 @@
 use {
     crate::{Amm, cache::Storage},
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     ethcontract::futures::future::{join_all, select_ok},
     ethrpc::Web3,
     shared::maintenance::Maintaining,
diff --git a/crates/cow-amm/src/registry.rs b/crates/cow-amm/src/registry.rs
index 068347eb94..222eb50b53 100644
--- a/crates/cow-amm/src/registry.rs
+++ b/crates/cow-amm/src/registry.rs
@@ -1,7 +1,7 @@
 use {
     crate::{Amm, cache::Storage, factory::Factory, maintainers::EmptyPoolRemoval},
     alloy::primitives::Address,
-    contracts::alloy::cow_amm::CowAmmLegacyHelper,
+    contracts::bindings::CowAmmLegacyHelper,
     ethrpc::{Web3, block_stream::CurrentBlockWatcher},
     shared::{
         event_handling::{AlloyEventRetriever, EventHandler},
diff --git a/crates/driver/src/boundary/liquidity/balancer/v2/mod.rs b/crates/driver/src/boundary/liquidity/balancer/v2/mod.rs
index 9109983c11..98d229dfb6 100644
--- a/crates/driver/src/boundary/liquidity/balancer/v2/mod.rs
+++ b/crates/driver/src/boundary/liquidity/balancer/v2/mod.rs
@@ -8,7 +8,7 @@ use {
         infra::{self, blockchain::Ethereum},
     },
     anyhow::{Context, Result},
-    contracts::alloy::{
+    contracts::bindings::{
         BalancerV2ComposableStablePoolFactory,
         BalancerV2LiquidityBootstrappingPoolFactory,
         BalancerV2StablePoolFactoryV2,
diff --git a/crates/driver/src/boundary/liquidity/uniswap/v2.rs b/crates/driver/src/boundary/liquidity/uniswap/v2.rs
index a5fc63e9a8..6d8ab60026 100644
--- a/crates/driver/src/boundary/liquidity/uniswap/v2.rs
+++ b/crates/driver/src/boundary/liquidity/uniswap/v2.rs
@@ -8,7 +8,7 @@ use {
         infra::{self, blockchain::Ethereum},
     },
     async_trait::async_trait,
-    contracts::alloy::IUniswapLikeRouter,
+    contracts::bindings::IUniswapLikeRouter,
     ethrpc::{
         Web3,
         alloy::conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/driver/src/boundary/liquidity/zeroex.rs b/crates/driver/src/boundary/liquidity/zeroex.rs
index fdd128885d..1105f290f5 100644
--- a/crates/driver/src/boundary/liquidity/zeroex.rs
+++ b/crates/driver/src/boundary/liquidity/zeroex.rs
@@ -7,7 +7,6 @@ use {
         infra::{self, Ethereum},
     },
     anyhow::anyhow,
-    contracts::alloy::InstanceExt,
     ethrpc::block_stream::CurrentBlockWatcher,
     shared::{
         http_client::HttpClientFactory,
@@ -86,7 +85,7 @@ pub async fn collector(
     let eth = eth.with_metric_label("zeroex".into());
     let settlement = *eth.contracts().settlement().address();
     let web3 = eth.web3().clone();
-    let contract = contracts::alloy::IZeroex::Instance::deployed(&web3.alloy).await?;
+    let contract = contracts::bindings::IZeroex::Instance::deployed(&web3.alloy).await?;
     let http_client_factory = &HttpClientFactory::new(&shared::http_client::Arguments {
         http_timeout: config.http_timeout,
     });
diff --git a/crates/driver/src/domain/competition/solution/encoding.rs b/crates/driver/src/domain/competition/solution/encoding.rs
index f488d2c383..08039ddb4c 100644
--- a/crates/driver/src/domain/competition/solution/encoding.rs
+++ b/crates/driver/src/domain/competition/solution/encoding.rs
@@ -14,7 +14,7 @@ use {
     },
     allowance::Allowance,
     alloy::sol_types::SolCall,
-    contracts::alloy::{FlashLoanRouter::LoanRequest, WETH9},
+    contracts::bindings::{FlashLoanRouter::LoanRequest, WETH9},
     ethcontract::H160,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     itertools::Itertools,
@@ -305,7 +305,7 @@ fn encode_wrapper_settlement(
     let wrapper_data = encode_wrapper_data(&solution.wrappers);
 
     // Create wrappedSettleCall
-    let calldata = contracts::alloy::ICowWrapper::ICowWrapper::wrappedSettleCall {
+    let calldata = contracts::bindings::ICowWrapper::ICowWrapper::wrappedSettleCall {
         settleData: settle_calldata.into(),
         wrapperData: wrapper_data.into(),
     }
@@ -434,7 +434,7 @@ struct Flags {
 pub mod codec {
     use {
         crate::domain::{competition::order, eth},
-        contracts::alloy::GPv2Settlement,
+        contracts::bindings::GPv2Settlement,
         ethrpc::alloy::conversions::IntoAlloy,
     };
 
diff --git a/crates/driver/src/domain/cow_amm.rs b/crates/driver/src/domain/cow_amm.rs
index c60dcaaa72..87f55ecbde 100644
--- a/crates/driver/src/domain/cow_amm.rs
+++ b/crates/driver/src/domain/cow_amm.rs
@@ -1,7 +1,7 @@
 use {
     crate::domain::eth,
     alloy::{primitives::Address, providers::DynProvider},
-    contracts::alloy::cow_amm::CowAmmLegacyHelper,
+    contracts::bindings::CowAmmLegacyHelper,
     cow_amm::Amm,
     ethrpc::alloy::conversions::IntoAlloy,
     itertools::{
@@ -124,11 +124,10 @@ impl Cache {
     /// Fetches the factory address for the given AMM by calling the
     /// `FACTORY` function.
     async fn fetch_amm_factory_address(&self, amm_address: Address) -> anyhow::Result<Address> {
-        let factory_getter =
-            contracts::alloy::cow_amm::CowAmmFactoryGetter::CowAmmFactoryGetter::new(
-                amm_address,
-                self.web3.clone(),
-            );
+        let factory_getter = contracts::bindings::CowAmmFactoryGetter::CowAmmFactoryGetter::new(
+            amm_address,
+            self.web3.clone(),
+        );
         Ok(factory_getter.FACTORY().call().await?)
     }
 }
diff --git a/crates/driver/src/domain/liquidity/zeroex.rs b/crates/driver/src/domain/liquidity/zeroex.rs
index 93d8ac31ca..cc0de107de 100644
--- a/crates/driver/src/domain/liquidity/zeroex.rs
+++ b/crates/driver/src/domain/liquidity/zeroex.rs
@@ -1,7 +1,7 @@
 use {
     crate::domain::{eth, liquidity},
     anyhow::anyhow,
-    contracts::alloy::IZeroex,
+    contracts::bindings::IZeroex,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     primitive_types::{H160, H256, U256},
     std::sync::Arc,
diff --git a/crates/driver/src/infra/blockchain/contracts.rs b/crates/driver/src/infra/blockchain/contracts.rs
index d89a39b294..c8031193c8 100644
--- a/crates/driver/src/infra/blockchain/contracts.rs
+++ b/crates/driver/src/infra/blockchain/contracts.rs
@@ -1,13 +1,7 @@
 use {
     crate::domain::eth,
     chain::Chain,
-    contracts::alloy::{
-        BalancerV2Vault,
-        FlashLoanRouter,
-        GPv2Settlement,
-        WETH9,
-        support::Balances,
-    },
+    contracts::bindings::{BalancerV2Vault, Balances, FlashLoanRouter, GPv2Settlement, WETH9},
     ethrpc::{
         Web3,
         alloy::conversions::{IntoAlloy, IntoLegacy},
@@ -21,7 +15,7 @@ pub struct Contracts {
     settlement: GPv2Settlement::Instance,
     vault_relayer: eth::ContractAddress,
     vault: BalancerV2Vault::Instance,
-    signatures: contracts::alloy::support::Signatures::Instance,
+    signatures: contracts::bindings::Signatures::Instance,
     weth: WETH9::Instance,
 
     /// The domain separator for settlement contract used for signing orders.
@@ -74,11 +68,11 @@ impl Contracts {
                 .unwrap(),
             web3.alloy.clone(),
         );
-        let signatures = contracts::alloy::support::Signatures::Instance::new(
+        let signatures = contracts::bindings::Signatures::Instance::new(
             addresses
                 .signatures
                 .map(|addr| addr.0.into_alloy())
-                .or_else(|| contracts::alloy::support::Signatures::deployment_address(&chain.id()))
+                .or_else(|| contracts::bindings::Signatures::deployment_address(&chain.id()))
                 .unwrap(),
             web3.alloy.clone(),
         );
@@ -131,7 +125,7 @@ impl Contracts {
         &self.settlement
     }
 
-    pub fn signatures(&self) -> &contracts::alloy::support::Signatures::Instance {
+    pub fn signatures(&self) -> &contracts::bindings::Signatures::Instance {
         &self.signatures
     }
 
diff --git a/crates/driver/src/infra/blockchain/token.rs b/crates/driver/src/infra/blockchain/token.rs
index b9758000cc..816c26438a 100644
--- a/crates/driver/src/infra/blockchain/token.rs
+++ b/crates/driver/src/infra/blockchain/token.rs
@@ -11,13 +11,13 @@ use {
 ///
 /// https://eips.ethereum.org/EIPS/eip-20
 pub struct Erc20 {
-    token: contracts::alloy::ERC20::Instance,
+    token: contracts::bindings::ERC20::Instance,
 }
 
 impl Erc20 {
     pub(super) fn new(eth: &Ethereum, address: eth::TokenAddress) -> Self {
         Self {
-            token: contracts::alloy::ERC20::Instance::new(
+            token: contracts::bindings::ERC20::Instance::new(
                 address.0.0.into_alloy(),
                 eth.web3.alloy.clone(),
             ),
diff --git a/crates/driver/src/infra/liquidity/config.rs b/crates/driver/src/infra/liquidity/config.rs
index b2f64faa63..9d529d9ae7 100644
--- a/crates/driver/src/infra/liquidity/config.rs
+++ b/crates/driver/src/infra/liquidity/config.rs
@@ -2,7 +2,7 @@ use {
     crate::domain::eth::{self, ContractAddress},
     alloy::primitives::Address,
     chain::Chain,
-    contracts::alloy::BalancerV2Vault,
+    contracts::bindings::BalancerV2Vault,
     derive_more::Debug,
     ethrpc::alloy::conversions::IntoLegacy,
     hex_literal::hex,
@@ -64,7 +64,8 @@ impl UniswapV2 {
     pub fn uniswap_v2(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::alloy::UniswapV2Router02::deployment_address(&chain.id())?.into_legacy(),
+                contracts::bindings::UniswapV2Router02::deployment_address(&chain.id())?
+                    .into_legacy(),
             ),
             pool_code: UNISWAP_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -75,7 +76,8 @@ impl UniswapV2 {
     pub fn sushi_swap(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::alloy::SushiSwapRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::bindings::SushiSwapRouter::deployment_address(&chain.id())?
+                    .into_legacy(),
             ),
             pool_code: SUSHISWAP_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -86,7 +88,7 @@ impl UniswapV2 {
     pub fn honeyswap(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::alloy::BaoswapRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::bindings::BaoswapRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code: HONEYSWAP_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -97,7 +99,7 @@ impl UniswapV2 {
     pub fn baoswap(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::alloy::BaoswapRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::bindings::BaoswapRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code: BAOSWAP_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -113,7 +115,7 @@ impl UniswapV2 {
         .into();
         Some(Self {
             router: ContractAddress::from(
-                contracts::alloy::PancakeRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::bindings::PancakeRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code,
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -125,7 +127,7 @@ impl UniswapV2 {
     pub fn testnet_uniswapv2(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::alloy::TestnetUniswapV2Router02::deployment_address(&chain.id())?
+                contracts::bindings::TestnetUniswapV2Router02::deployment_address(&chain.id())?
                     .into_legacy(),
             ),
             pool_code: TESTNET_UNISWAP_INIT.into(),
@@ -153,7 +155,7 @@ impl Swapr {
     pub fn swapr(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::alloy::SwaprRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::bindings::SwaprRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code: SWAPR_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -192,7 +194,7 @@ impl UniswapV3 {
         max_pools_per_tick_query: usize,
     ) -> Option<Self> {
         Some(Self {
-            router: contracts::alloy::UniswapV3SwapRouterV2::deployment_address(&chain.id())?
+            router: contracts::bindings::UniswapV3SwapRouterV2::deployment_address(&chain.id())?
                 .into_legacy()
                 .into(),
             max_pools_to_initialize: 100,
@@ -259,33 +261,33 @@ impl BalancerV2 {
             weighted: address_for!(
                 chain,
                 [
-                    contracts::alloy::BalancerV2WeightedPoolFactory,
-                    contracts::alloy::BalancerV2WeightedPool2TokensFactory,
+                    contracts::bindings::BalancerV2WeightedPoolFactory,
+                    contracts::bindings::BalancerV2WeightedPool2TokensFactory,
                 ]
             ),
             weighted_v3plus: address_for!(
                 chain,
                 [
-                    contracts::alloy::BalancerV2WeightedPoolFactoryV3,
-                    contracts::alloy::BalancerV2WeightedPoolFactoryV4,
+                    contracts::bindings::BalancerV2WeightedPoolFactoryV3,
+                    contracts::bindings::BalancerV2WeightedPoolFactoryV4,
                 ]
             ),
-            stable: address_for!(chain, [contracts::alloy::BalancerV2StablePoolFactoryV2,]),
+            stable: address_for!(chain, [contracts::bindings::BalancerV2StablePoolFactoryV2,]),
             liquidity_bootstrapping: address_for!(
                 chain,
                 [
-                    contracts::alloy::BalancerV2LiquidityBootstrappingPoolFactory,
-                    contracts::alloy::BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory,
+                    contracts::bindings::BalancerV2LiquidityBootstrappingPoolFactory,
+                    contracts::bindings::BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory,
                 ]
             ),
             composable_stable: address_for!(
                 chain,
                 [
-                    contracts::alloy::BalancerV2ComposableStablePoolFactory,
-                    contracts::alloy::BalancerV2ComposableStablePoolFactoryV3,
-                    contracts::alloy::BalancerV2ComposableStablePoolFactoryV4,
-                    contracts::alloy::BalancerV2ComposableStablePoolFactoryV5,
-                    contracts::alloy::BalancerV2ComposableStablePoolFactoryV6,
+                    contracts::bindings::BalancerV2ComposableStablePoolFactory,
+                    contracts::bindings::BalancerV2ComposableStablePoolFactoryV3,
+                    contracts::bindings::BalancerV2ComposableStablePoolFactoryV4,
+                    contracts::bindings::BalancerV2ComposableStablePoolFactoryV5,
+                    contracts::bindings::BalancerV2ComposableStablePoolFactoryV6,
                 ]
             ),
             pool_deny_list: Vec::new(),
diff --git a/crates/driver/src/infra/notify/liquidity_sources/liquorice/notifier.rs b/crates/driver/src/infra/notify/liquidity_sources/liquorice/notifier.rs
index f951392ddf..484712d0c2 100644
--- a/crates/driver/src/infra/notify/liquidity_sources/liquorice/notifier.rs
+++ b/crates/driver/src/infra/notify/liquidity_sources/liquorice/notifier.rs
@@ -20,7 +20,7 @@ use {
     alloy::primitives::Address,
     anyhow::{Context, Result, anyhow},
     chrono::Utc,
-    contracts::alloy::LiquoriceSettlement,
+    contracts::bindings::LiquoriceSettlement,
 };
 
 const NOTIFICATION_SOURCE: &str = "cow_protocol";
@@ -89,7 +89,7 @@ mod utils {
             eth,
         },
         alloy::{primitives::Address, sol_types::SolCall},
-        contracts::alloy::LiquoriceSettlement,
+        contracts::bindings::LiquoriceSettlement,
         ethrpc::alloy::conversions::IntoAlloy,
         std::collections::HashSet,
     };
diff --git a/crates/driver/src/tests/setup/blockchain.rs b/crates/driver/src/tests/setup/blockchain.rs
index be5808b0ee..f3a414ef59 100644
--- a/crates/driver/src/tests/setup/blockchain.rs
+++ b/crates/driver/src/tests/setup/blockchain.rs
@@ -9,16 +9,17 @@ use {
         signers::local::{MnemonicBuilder, PrivateKeySigner},
         sol_types::SolCall,
     },
-    contracts::alloy::{
+    contracts::bindings::{
         BalancerV2Authorizer,
         BalancerV2Vault,
+        Balances,
         ERC20,
         ERC20Mintable,
         FlashLoanRouter,
         GPv2AllowListAuthentication::GPv2AllowListAuthentication,
         GPv2Settlement,
+        Signatures,
         WETH9,
-        support::{Balances, Signatures},
     },
     ethcontract::PrivateKey,
     ethrpc::{
@@ -42,7 +43,7 @@ use {
 pub struct Pair {
     token_a: &'static str,
     token_b: &'static str,
-    contract: contracts::alloy::IUniswapLikePair::Instance,
+    contract: contracts::bindings::IUniswapLikePair::Instance,
     pool: Pool,
 }
 
@@ -273,7 +274,7 @@ impl Blockchain {
         .await
         .unwrap();
 
-        let weth = contracts::alloy::WETH9::Instance::deploy_builder(web3.alloy.clone())
+        let weth = contracts::bindings::WETH9::Instance::deploy_builder(web3.alloy.clone())
             .from(main_trader_account.address().into_alloy())
             .deploy()
             .await
@@ -446,7 +447,7 @@ impl Blockchain {
             }
         }
         // Create the uniswap factory.
-        let contract_address = contracts::alloy::UniswapV2Factory::Instance::deploy_builder(
+        let contract_address = contracts::bindings::UniswapV2Factory::Instance::deploy_builder(
             web3.alloy.clone(),
             main_trader_account.address().into_alloy(),
         )
@@ -454,8 +455,10 @@ impl Blockchain {
         .deploy()
         .await
         .unwrap();
-        let uniswap_factory =
-            contracts::alloy::UniswapV2Factory::Instance::new(contract_address, web3.alloy.clone());
+        let uniswap_factory = contracts::bindings::UniswapV2Factory::Instance::new(
+            contract_address,
+            web3.alloy.clone(),
+        );
         // Create and fund a uniswap pair for each pool. Fund the settlement contract
         // with the same liquidity as the pool, to allow for internalized interactions.
         let mut pairs = Vec::new();
@@ -479,7 +482,7 @@ impl Blockchain {
                 .await
                 .unwrap();
             // Fund the pair and the settlement contract.
-            let pair = contracts::alloy::IUniswapLikePair::Instance::new(
+            let pair = contracts::bindings::IUniswapLikePair::Instance::new(
                 uniswap_factory
                     .getPair(token_a, token_b)
                     .call()
diff --git a/crates/driver/src/tests/setup/solver.rs b/crates/driver/src/tests/setup/solver.rs
index 31bfe5c864..9d765d58d6 100644
--- a/crates/driver/src/tests/setup/solver.rs
+++ b/crates/driver/src/tests/setup/solver.rs
@@ -14,7 +14,7 @@ use {
         tests::{hex_address, setup::blockchain::Trade},
     },
     const_hex::ToHexExt,
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     ethereum_types::H160,
     ethrpc::alloy::conversions::IntoLegacy,
     itertools::Itertools,
diff --git a/crates/e2e/src/setup/deploy.rs b/crates/e2e/src/setup/deploy.rs
index c5765e2e7c..64a6711825 100644
--- a/crates/e2e/src/setup/deploy.rs
+++ b/crates/e2e/src/setup/deploy.rs
@@ -1,17 +1,17 @@
 use {
-    contracts::alloy::{
+    contracts::bindings::{
         BalancerV2Authorizer,
         BalancerV2Vault,
+        Balances,
         CoWSwapEthFlow,
         FlashLoanRouter,
         GPv2AllowListAuthentication,
         GPv2Settlement,
         HooksTrampoline,
-        InstanceExt,
+        Signatures,
         UniswapV2Factory,
         UniswapV2Router02,
         WETH9,
-        support::{Balances, Signatures},
     },
     ethcontract::{Address, H256},
     ethrpc::alloy::{
diff --git a/crates/e2e/src/setup/onchain_components/mod.rs b/crates/e2e/src/setup/onchain_components/mod.rs
index c096973624..4b8d47cf97 100644
--- a/crates/e2e/src/setup/onchain_components/mod.rs
+++ b/crates/e2e/src/setup/onchain_components/mod.rs
@@ -8,10 +8,10 @@ use {
         signers::local::PrivateKeySigner,
     },
     app_data::Hook,
-    contracts::alloy::{
+    contracts::bindings::{
+        CowProtocolToken,
         ERC20Mintable,
         GPv2AllowListAuthentication::GPv2AllowListAuthentication,
-        test::CowProtocolToken,
     },
     core::panic,
     ethcontract::{
@@ -600,7 +600,7 @@ impl OnchainComponents {
     ///
     /// This can be used to modify the pool reserves during a test.
     pub async fn mint_token_to_weth_uni_v2_pool(&self, token: &MintableToken, amount: U256) {
-        let pair = contracts::alloy::IUniswapLikePair::Instance::new(
+        let pair = contracts::bindings::IUniswapLikePair::Instance::new(
             self.contracts
                 .uniswap_v2_factory
                 .getPair(*self.contracts.weth.address(), *token.address())
diff --git a/crates/e2e/src/setup/onchain_components/safe.rs b/crates/e2e/src/setup/onchain_components/safe.rs
index fd92cc71a9..218f7d97ab 100644
--- a/crates/e2e/src/setup/onchain_components/safe.rs
+++ b/crates/e2e/src/setup/onchain_components/safe.rs
@@ -5,7 +5,7 @@ use {
         providers::Provider,
         rpc::types::TransactionRequest,
     },
-    contracts::alloy::{
+    contracts::bindings::{
         GnosisSafe::{self, GnosisSafe::execTransactionCall},
         GnosisSafeCompatibilityFallbackHandler,
         GnosisSafeProxy,
@@ -182,8 +182,10 @@ impl Safe {
         to: alloy::primitives::Address,
         data: Vec<u8>,
         nonce: alloy::primitives::U256,
-    ) -> alloy::contract::CallBuilder<&contracts::alloy::Provider, PhantomData<execTransactionCall>>
-    {
+    ) -> alloy::contract::CallBuilder<
+        &alloy::providers::DynProvider,
+        PhantomData<execTransactionCall>,
+    > {
         let signature = self.sign({
             // `SafeTx` struct hash computation ported from the Safe Solidity code:
             // <https://etherscan.io/address/0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552#code#F1#L377>
diff --git a/crates/e2e/tests/e2e/banned_users.rs b/crates/e2e/tests/e2e/banned_users.rs
index abd741e855..0d043648c1 100644
--- a/crates/e2e/tests/e2e/banned_users.rs
+++ b/crates/e2e/tests/e2e/banned_users.rs
@@ -3,7 +3,7 @@ use {
         primitives::{Address, address},
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     e2e::setup::{
         OnchainComponents,
         Services,
diff --git a/crates/e2e/tests/e2e/cow_amm.rs b/crates/e2e/tests/e2e/cow_amm.rs
index 030d14066c..15e5447572 100644
--- a/crates/e2e/tests/e2e/cow_amm.rs
+++ b/crates/e2e/tests/e2e/cow_amm.rs
@@ -3,10 +3,7 @@ use {
         primitives::{Address, Bytes, FixedBytes, U256, address},
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
-    contracts::alloy::{
-        ERC20,
-        support::{Balances, Signatures},
-    },
+    contracts::bindings::{Balances, ERC20, Signatures},
     driver::domain::eth::NonZeroU256,
     e2e::setup::{
         DeployedContracts,
@@ -75,17 +72,16 @@ async fn cow_amm_jit(web3: Web3) {
 
     // set up cow_amm
     let oracle =
-        contracts::alloy::cow_amm::CowAmmUniswapV2PriceOracle::Instance::deploy(web3.alloy.clone())
+        contracts::bindings::CowAmmUniswapV2PriceOracle::Instance::deploy(web3.alloy.clone())
             .await
             .unwrap();
 
-    let cow_amm_factory =
-        contracts::alloy::cow_amm::CowAmmConstantProductFactory::Instance::deploy(
-            web3.alloy.clone(),
-            *onchain.contracts().gp_settlement.address(),
-        )
-        .await
-        .unwrap();
+    let cow_amm_factory = contracts::bindings::CowAmmConstantProductFactory::Instance::deploy(
+        web3.alloy.clone(),
+        *onchain.contracts().gp_settlement.address(),
+    )
+    .await
+    .unwrap();
 
     // Fund cow amm owner with 2_000 dai and allow factory take them
     dai.mint(cow_amm_owner.address(), to_wei(2_000)).await;
@@ -151,7 +147,7 @@ async fn cow_amm_jit(web3: Web3) {
         .send_and_watch()
         .await
         .unwrap();
-    let cow_amm = contracts::alloy::cow_amm::CowAmm::Instance::new(cow_amm, web3.alloy.clone());
+    let cow_amm = contracts::bindings::CowAmm::Instance::new(cow_amm, web3.alloy.clone());
 
     // Start system with the regular baseline solver as a quoter but a mock solver
     // for the actual solver competition. That way we can handcraft a solution
@@ -218,7 +214,7 @@ async fn cow_amm_jit(web3: Web3) {
     // oracle price => 100 WETH == 300000 DAI => 1 WETH == 3000 DAI
     // If this order gets settled around the oracle price it will receive plenty of
     // surplus.
-    let cow_amm_order = contracts::alloy::cow_amm::CowAmm::GPv2Order::Data {
+    let cow_amm_order = contracts::bindings::CowAmm::GPv2Order::Data {
         sellToken: *onchain.contracts().weth.address(),
         buyToken: *dai.address(),
         receiver: Default::default(),
@@ -241,7 +237,7 @@ async fn cow_amm_jit(web3: Web3) {
                 .unwrap(),
         ), // erc20
     };
-    let trading_params = contracts::alloy::cow_amm::CowAmm::ConstantProduct::TradingParams {
+    let trading_params = contracts::bindings::CowAmm::ConstantProduct::TradingParams {
         minTradedToken0: U256::ZERO,
         priceOracle: *oracle.address(),
         priceOracleData: Bytes::copy_from_slice(&oracle_data),
@@ -726,17 +722,16 @@ async fn cow_amm_opposite_direction(web3: Web3) {
 
     // Set up the CoW AMM as before
     let oracle =
-        contracts::alloy::cow_amm::CowAmmUniswapV2PriceOracle::Instance::deploy(web3.alloy.clone())
+        contracts::bindings::CowAmmUniswapV2PriceOracle::Instance::deploy(web3.alloy.clone())
             .await
             .unwrap();
 
-    let cow_amm_factory =
-        contracts::alloy::cow_amm::CowAmmConstantProductFactory::Instance::deploy(
-            web3.alloy.clone(),
-            *onchain.contracts().gp_settlement.address(),
-        )
-        .await
-        .unwrap();
+    let cow_amm_factory = contracts::bindings::CowAmmConstantProductFactory::Instance::deploy(
+        web3.alloy.clone(),
+        *onchain.contracts().gp_settlement.address(),
+    )
+    .await
+    .unwrap();
 
     // Fund the CoW AMM owner with DAI and WETH and approve the factory to transfer
     // them
@@ -814,8 +809,7 @@ async fn cow_amm_opposite_direction(web3: Web3) {
         .send_and_watch()
         .await
         .unwrap();
-    let cow_amm =
-        contracts::alloy::cow_amm::CowAmm::Instance::new(cow_amm_address, web3.alloy.clone());
+    let cow_amm = contracts::bindings::CowAmm::Instance::new(cow_amm_address, web3.alloy.clone());
 
     // Start system with the mocked solver. Baseline is still required for the
     // native price estimation.
@@ -874,7 +868,7 @@ async fn cow_amm_opposite_direction(web3: Web3) {
     let executed_amount = to_wei(230);
 
     // CoW AMM order remains the same (selling WETH for DAI)
-    let cow_amm_order = contracts::alloy::cow_amm::CowAmm::GPv2Order::Data {
+    let cow_amm_order = contracts::bindings::CowAmm::GPv2Order::Data {
         sellToken: *onchain.contracts().weth.address(),
         buyToken: *dai.address(),
         receiver: Default::default(),
@@ -897,7 +891,7 @@ async fn cow_amm_opposite_direction(web3: Web3) {
                 .unwrap(),
         ), // erc20
     };
-    let trading_params = contracts::alloy::cow_amm::CowAmm::ConstantProduct::TradingParams {
+    let trading_params = contracts::bindings::CowAmm::ConstantProduct::TradingParams {
         minTradedToken0: U256::ZERO,
         priceOracle: *oracle.address(),
         priceOracleData: Bytes::copy_from_slice(&oracle_data),
diff --git a/crates/e2e/tests/e2e/ethflow.rs b/crates/e2e/tests/e2e/ethflow.rs
index eb3d487539..ff9dacb737 100644
--- a/crates/e2e/tests/e2e/ethflow.rs
+++ b/crates/e2e/tests/e2e/ethflow.rs
@@ -5,7 +5,7 @@ use {
     },
     anyhow::bail,
     autopilot::database::onchain_order_events::ethflow_events::WRAP_ALL_SELECTOR,
-    contracts::alloy::{CoWSwapEthFlow, ERC20Mintable, WETH9},
+    contracts::bindings::{CoWSwapEthFlow, ERC20Mintable, WETH9},
     database::order_events::OrderEventLabel,
     e2e::setup::{
         ACCOUNT_ENDPOINT,
diff --git a/crates/e2e/tests/e2e/hooks.rs b/crates/e2e/tests/e2e/hooks.rs
index 7fc910c923..70d7018c31 100644
--- a/crates/e2e/tests/e2e/hooks.rs
+++ b/crates/e2e/tests/e2e/hooks.rs
@@ -301,7 +301,7 @@ async fn signature(web3: Web3) {
     let safe_address = safe_creation_builder.clone().call().await.unwrap();
     let safe = Safe::deployed(
         chain_id,
-        contracts::alloy::GnosisSafe::Instance::new(safe_address, web3.alloy.clone()),
+        contracts::bindings::GnosisSafe::Instance::new(safe_address, web3.alloy.clone()),
         trader.clone(),
     );
 
@@ -433,7 +433,7 @@ async fn partial_fills(web3: Web3) {
     let [solver] = onchain.make_solvers(to_wei(1)).await;
     let [trader] = onchain.make_accounts(to_wei(3)).await;
 
-    let counter = contracts::alloy::test::Counter::Instance::deploy(web3.alloy.clone())
+    let counter = contracts::bindings::Counter::Instance::deploy(web3.alloy.clone())
         .await
         .unwrap();
 
@@ -603,7 +603,7 @@ async fn quote_verification(web3: Web3) {
 
     let safe = Safe::deployed(
         chain_id,
-        contracts::alloy::GnosisSafe::Instance::new(safe_address, web3.alloy.clone()),
+        contracts::bindings::GnosisSafe::Instance::new(safe_address, web3.alloy.clone()),
         trader.clone(),
     );
 
diff --git a/crates/e2e/tests/e2e/limit_orders.rs b/crates/e2e/tests/e2e/limit_orders.rs
index 0b0051afb8..576a217879 100644
--- a/crates/e2e/tests/e2e/limit_orders.rs
+++ b/crates/e2e/tests/e2e/limit_orders.rs
@@ -5,7 +5,7 @@ use {
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
     bigdecimal::BigDecimal,
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     database::byte_array::ByteArray,
     driver::domain::eth::NonZeroU256,
     e2e::setup::{eth, *},
diff --git a/crates/e2e/tests/e2e/liquidity.rs b/crates/e2e/tests/e2e/liquidity.rs
index 1598e095f4..2d31177c01 100644
--- a/crates/e2e/tests/e2e/liquidity.rs
+++ b/crates/e2e/tests/e2e/liquidity.rs
@@ -4,7 +4,7 @@ use {
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
     chrono::{NaiveDateTime, Utc},
-    contracts::alloy::{ERC20, IZeroex, InstanceExt},
+    contracts::bindings::{ERC20, IZeroex},
     driver::domain::eth::H160,
     e2e::{
         api::zeroex::{Eip712TypedZeroExOrder, ZeroExApi},
diff --git a/crates/e2e/tests/e2e/liquidity_source_notification.rs b/crates/e2e/tests/e2e/liquidity_source_notification.rs
index 415b8d6b61..184d12957d 100644
--- a/crates/e2e/tests/e2e/liquidity_source_notification.rs
+++ b/crates/e2e/tests/e2e/liquidity_source_notification.rs
@@ -5,7 +5,7 @@ use {
         signers::{SignerSync, local::PrivateKeySigner},
     },
     chrono::Utc,
-    contracts::alloy::{ERC20, InstanceExt, LiquoriceSettlement},
+    contracts::bindings::{ERC20, LiquoriceSettlement},
     driver::infra,
     e2e::{
         api,
diff --git a/crates/e2e/tests/e2e/smart_contract_orders.rs b/crates/e2e/tests/e2e/smart_contract_orders.rs
index eb17c02e2e..e65abb32cc 100644
--- a/crates/e2e/tests/e2e/smart_contract_orders.rs
+++ b/crates/e2e/tests/e2e/smart_contract_orders.rs
@@ -157,7 +157,7 @@ async fn erc1271_gas_limit(web3: Web3) {
     let mut onchain = OnchainComponents::deploy(web3.clone()).await;
 
     let [solver] = onchain.make_solvers(to_wei(1)).await;
-    let trader = contracts::alloy::test::GasHog::Instance::deploy(web3.alloy.clone())
+    let trader = contracts::bindings::GasHog::Instance::deploy(web3.alloy.clone())
         .await
         .unwrap();
 
diff --git a/crates/e2e/tests/e2e/univ2.rs b/crates/e2e/tests/e2e/univ2.rs
index 27792283f4..dfe139157f 100644
--- a/crates/e2e/tests/e2e/univ2.rs
+++ b/crates/e2e/tests/e2e/univ2.rs
@@ -1,6 +1,6 @@
 use {
     ::alloy::primitives::U256,
-    contracts::alloy::GPv2Settlement,
+    contracts::bindings::GPv2Settlement,
     database::order_events::{OrderEvent, OrderEventLabel},
     e2e::setup::{eth, *},
     ethrpc::alloy::{
diff --git a/crates/e2e/tests/e2e/wrapper.rs b/crates/e2e/tests/e2e/wrapper.rs
index 322510f6c3..e338c4b90e 100644
--- a/crates/e2e/tests/e2e/wrapper.rs
+++ b/crates/e2e/tests/e2e/wrapper.rs
@@ -8,7 +8,7 @@ use {
         rpc::types::trace::geth::{CallConfig, GethDebugTracingOptions},
     },
     app_data::{AppDataHash, hash_full_app_data},
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     e2e::setup::*,
     ethrpc::alloy::{
         CallBuilderExt,
diff --git a/crates/orderbook/src/run.rs b/crates/orderbook/src/run.rs
index 884d7010bf..ef5ad10bcb 100644
--- a/crates/orderbook/src/run.rs
+++ b/crates/orderbook/src/run.rs
@@ -13,21 +13,14 @@ use {
     app_data::Validator,
     chain::Chain,
     clap::Parser,
-    contracts::alloy::{
+    contracts::bindings::{
         BalancerV2Vault,
+        Balances,
         ChainalysisOracle,
         GPv2Settlement,
         HooksTrampoline,
         IUniswapV3Factory,
-        InstanceExt,
         WETH9,
-        bindings::{
-            BalancerV2Vault,
-            Balances,
-            ChainalysisOracle,
-            HooksTrampoline,
-            IUniswapV3Factory,
-        },
     },
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt, StreamExt},
@@ -125,11 +118,10 @@ pub async fn run(args: Arguments) {
         .await
         .expect("Couldn't get vault relayer address");
     let signatures_contract = match args.shared.signatures_contract_address {
-        Some(address) => contracts::alloy::support::Signatures::Instance::new(
-            address.into_alloy(),
-            web3.alloy.clone(),
-        ),
-        None => contracts::alloy::support::Signatures::Instance::deployed(&web3.alloy)
+        Some(address) => {
+            contracts::bindings::Signatures::Instance::new(address.into_alloy(), web3.alloy.clone())
+        }
+        None => contracts::bindings::Signatures::Instance::deployed(&web3.alloy)
             .await
             .expect("load signatures contract"),
     };
diff --git a/crates/refunder/src/ethflow_order.rs b/crates/refunder/src/ethflow_order.rs
index 8e8feca870..73aeab3781 100644
--- a/crates/refunder/src/ethflow_order.rs
+++ b/crates/refunder/src/ethflow_order.rs
@@ -1,5 +1,5 @@
 use {
-    contracts::alloy::CoWSwapEthFlow,
+    contracts::bindings::CoWSwapEthFlow,
     database::{ethflow_orders::EthOrderData, orders::Order},
     ethcontract::{Bytes, H160, U256},
     ethrpc::alloy::conversions::IntoAlloy,
diff --git a/crates/refunder/src/lib.rs b/crates/refunder/src/lib.rs
index 640200df86..d130e11da0 100644
--- a/crates/refunder/src/lib.rs
+++ b/crates/refunder/src/lib.rs
@@ -6,7 +6,7 @@ pub mod submitter;
 use {
     crate::arguments::Arguments,
     clap::Parser,
-    contracts::alloy::CoWSwapEthFlow,
+    contracts::bindings::CoWSwapEthFlow,
     ethcontract::PrivateKey,
     observe::metrics::LivenessChecking,
     refund_service::RefundService,
diff --git a/crates/refunder/src/refund_service.rs b/crates/refunder/src/refund_service.rs
index 9e8a0aa354..77ca63caf1 100644
--- a/crates/refunder/src/refund_service.rs
+++ b/crates/refunder/src/refund_service.rs
@@ -6,7 +6,7 @@ use {
         primitives::{Address, Signature, address},
     },
     anyhow::{Context, Result, anyhow},
-    contracts::alloy::CoWSwapEthFlow,
+    contracts::bindings::CoWSwapEthFlow,
     database::{
         OrderUid,
         ethflow_orders::{EthOrderPlacement, read_order, refundable_orders},
diff --git a/crates/refunder/src/submitter.rs b/crates/refunder/src/submitter.rs
index c0cbcfa7a0..a65f112d34 100644
--- a/crates/refunder/src/submitter.rs
+++ b/crates/refunder/src/submitter.rs
@@ -11,7 +11,7 @@
 use {
     alloy::primitives::Address,
     anyhow::{Result, anyhow},
-    contracts::alloy::CoWSwapEthFlow::{self, EthFlowOrder},
+    contracts::bindings::CoWSwapEthFlow::{self, EthFlowOrder},
     database::OrderUid,
     ethcontract::U256,
     ethrpc::alloy::conversions::IntoLegacy,
diff --git a/crates/shared/src/account_balances/mod.rs b/crates/shared/src/account_balances/mod.rs
index bb751cb8f4..d05903dbe9 100644
--- a/crates/shared/src/account_balances/mod.rs
+++ b/crates/shared/src/account_balances/mod.rs
@@ -4,7 +4,7 @@ use {
         BalanceOverriding,
     },
     alloy::sol_types::{SolCall, SolType, sol_data},
-    contracts::alloy::{GPv2Settlement, support::Balances},
+    contracts::bindings::{Balances, GPv2Settlement},
     ethcontract::state_overrides::StateOverrides,
     ethrpc::{Web3, alloy::conversions::IntoAlloy, block_stream::CurrentBlockWatcher},
     model::{
diff --git a/crates/shared/src/account_balances/simulation.rs b/crates/shared/src/account_balances/simulation.rs
index e0319989cc..9372faf711 100644
--- a/crates/shared/src/account_balances/simulation.rs
+++ b/crates/shared/src/account_balances/simulation.rs
@@ -6,7 +6,7 @@ use {
     super::{BalanceFetching, Query, TransferSimulationError},
     crate::account_balances::BalanceSimulator,
     anyhow::Result,
-    contracts::alloy::{BalancerV2Vault::BalancerV2Vault, ERC20},
+    contracts::bindings::{BalancerV2Vault::BalancerV2Vault, ERC20},
     ethcontract::{H160, U256},
     ethrpc::{
         Web3,
@@ -184,7 +184,7 @@ mod tests {
         super::*,
         crate::price_estimation::trade_verifier::balance_overrides::DummyOverrider,
         alloy::primitives::address,
-        contracts::alloy::GPv2Settlement,
+        contracts::bindings::GPv2Settlement,
         ethrpc::Web3,
         model::order::SellTokenSource,
         std::sync::Arc,
@@ -198,7 +198,7 @@ mod tests {
             alloy::primitives::address!("0x9008d19f58aabd9ed0d60971565aa8510560ab41"),
             web3.alloy.clone(),
         );
-        let balances = contracts::alloy::support::Balances::Instance::new(
+        let balances = contracts::bindings::Balances::Instance::new(
             address!("3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
             web3.alloy.clone(),
         );
diff --git a/crates/shared/src/bad_token/token_owner_finder/mod.rs b/crates/shared/src/bad_token/token_owner_finder/mod.rs
index 3a9ea6f3d0..77aae68c62 100644
--- a/crates/shared/src/bad_token/token_owner_finder/mod.rs
+++ b/crates/shared/src/bad_token/token_owner_finder/mod.rs
@@ -31,12 +31,7 @@ use {
     },
     anyhow::{Context, Result},
     chain::Chain,
-    contracts::{
-        ERC20,
-        alloy::{BalancerV2Vault, ERC20, IUniswapV3Factory},
-        bindings::{BalancerV2Vault, ERC20, IUniswapV3Factory},
-        errors::EthcontractErrorType,
-    },
+    contracts::bindings::{BalancerV2Vault, ERC20, IUniswapV3Factory},
     ethcontract::U256,
     ethrpc::alloy::{
         conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/shared/src/bad_token/trace_call.rs b/crates/shared/src/bad_token/trace_call.rs
index 96a89a9037..a126d5e1f1 100644
--- a/crates/shared/src/bad_token/trace_call.rs
+++ b/crates/shared/src/bad_token/trace_call.rs
@@ -3,7 +3,7 @@ use {
     crate::{ethrpc::Web3, trace_many},
     alloy::sol_types::SolCall,
     anyhow::{Context, Result, bail, ensure},
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     ethcontract::{PrivateKey, jsonrpc::ErrorCode},
     ethrpc::alloy::conversions::IntoAlloy,
     model::interaction::InteractionData,
@@ -398,7 +398,7 @@ mod tests {
             sources::{BaselineSource, uniswap_v2},
         },
         chain::Chain,
-        contracts::alloy::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, InstanceExt},
+        contracts::bindings::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory},
         ethrpc::{Web3, alloy::conversions::IntoLegacy},
         hex_literal::hex,
         std::{env, time::Duration},
diff --git a/crates/shared/src/event_handling.rs b/crates/shared/src/event_handling.rs
index 90b36fd622..2a1416eed4 100644
--- a/crates/shared/src/event_handling.rs
+++ b/crates/shared/src/event_handling.rs
@@ -773,7 +773,7 @@ mod tests {
     use {
         super::*,
         alloy::eips::BlockNumberOrTag,
-        contracts::alloy::{GPv2Settlement, InstanceExt},
+        contracts::bindings::GPv2Settlement,
         ethcontract::{BlockNumber, H256},
         ethrpc::{Web3, block_stream::block_number_to_block_number_hash},
         std::str::FromStr,
@@ -786,7 +786,7 @@ mod tests {
             Filter::new().address(*self.address())
         }
 
-        fn provider(&self) -> &contracts::alloy::Provider {
+        fn provider(&self) -> &alloy::providers::DynProvider {
             self.provider()
         }
     }
diff --git a/crates/shared/src/order_validation.rs b/crates/shared/src/order_validation.rs
index ff567c338b..a38d55a592 100644
--- a/crates/shared/src/order_validation.rs
+++ b/crates/shared/src/order_validation.rs
@@ -22,7 +22,7 @@ use {
     anyhow::{Result, anyhow},
     app_data::{AppDataHash, Hook, Hooks, ValidatedAppData, Validator},
     async_trait::async_trait,
-    contracts::alloy::{HooksTrampoline, WETH9},
+    contracts::bindings::{HooksTrampoline, WETH9},
     ethcontract::{H160, H256, U256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     model::{
diff --git a/crates/shared/src/price_estimation/factory.rs b/crates/shared/src/price_estimation/factory.rs
index 40c8ee8400..485abad24e 100644
--- a/crates/shared/src/price_estimation/factory.rs
+++ b/crates/shared/src/price_estimation/factory.rs
@@ -28,7 +28,7 @@ use {
         token_info::TokenInfoFetching,
     },
     anyhow::{Context as _, Result},
-    contracts::alloy::WETH9,
+    contracts::bindings::WETH9,
     ethcontract::H160,
     ethrpc::{alloy::conversions::IntoLegacy, block_stream::CurrentBlockWatcher},
     gas_estimation::GasPriceEstimating,
diff --git a/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs b/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
index 94ad5a0712..9765c36484 100644
--- a/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
+++ b/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
@@ -2,7 +2,7 @@ use {
     super::Strategy,
     crate::tenderly_api::SimulationError,
     anyhow::Context,
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     ethcontract::{Address, H256, U256, state_overrides::StateOverride},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     maplit::hashmap,
diff --git a/crates/shared/src/price_estimation/trade_verifier/mod.rs b/crates/shared/src/price_estimation/trade_verifier/mod.rs
index 3b05ae5417..a15a827114 100644
--- a/crates/shared/src/price_estimation/trade_verifier/mod.rs
+++ b/crates/shared/src/price_estimation/trade_verifier/mod.rs
@@ -20,11 +20,7 @@ use {
     alloy::primitives::{Address, address},
     anyhow::{Context, Result, anyhow},
     bigdecimal::BigDecimal,
-    contracts::alloy::{
-        GPv2Settlement,
-        WETH9,
-        support::{AnyoneAuthenticator, Solver, Spardose, Trader},
-    },
+    contracts::bindings::{AnyoneAuthenticator, GPv2Settlement, Solver, Spardose, Trader, WETH9},
     ethcontract::{Bytes, H160, U256, state_overrides::StateOverride},
     ethrpc::{
         Web3,
diff --git a/crates/shared/src/signature_validator/mod.rs b/crates/shared/src/signature_validator/mod.rs
index a415ba3347..3fa7d6ec3b 100644
--- a/crates/shared/src/signature_validator/mod.rs
+++ b/crates/shared/src/signature_validator/mod.rs
@@ -4,7 +4,7 @@ use {
         BalanceOverriding,
     },
     alloy::primitives::FixedBytes,
-    contracts::alloy::GPv2Settlement,
+    contracts::bindings::GPv2Settlement,
     ethrpc::{Web3, alloy::conversions::IntoAlloy},
     hex_literal::hex,
     model::interaction::InteractionData,
@@ -96,7 +96,7 @@ pub fn check_erc1271_result(result: FixedBytes<4>) -> Result<(), SignatureValida
 /// Contracts required for signature verification simulation.
 pub struct Contracts {
     pub settlement: GPv2Settlement::Instance,
-    pub signatures: contracts::alloy::support::Signatures::Instance,
+    pub signatures: contracts::bindings::Signatures::Instance,
     pub vault_relayer: H160,
 }
 
diff --git a/crates/shared/src/signature_validator/simulation.rs b/crates/shared/src/signature_validator/simulation.rs
index 273e4da6a0..5c75ce971d 100644
--- a/crates/shared/src/signature_validator/simulation.rs
+++ b/crates/shared/src/signature_validator/simulation.rs
@@ -13,10 +13,10 @@ use {
         transports::RpcError,
     },
     anyhow::{Context, Result},
-    contracts::alloy::{
+    contracts::bindings::{
         ERC1271SignatureValidator::ERC1271SignatureValidator,
         GPv2Settlement,
-        support::Signatures,
+        Signatures,
     },
     ethcontract::state_overrides::StateOverrides,
     ethrpc::{
diff --git a/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs b/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
index f245fa28c4..6c4bd9fd5c 100644
--- a/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
+++ b/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
@@ -33,7 +33,7 @@ use {
     alloy::providers::DynProvider,
     anyhow::{Context, Result},
     clap::ValueEnum,
-    contracts::alloy::{
+    contracts::bindings::{
         BalancerV2ComposableStablePoolFactory,
         BalancerV2ComposableStablePoolFactoryV3,
         BalancerV2ComposableStablePoolFactoryV4,
@@ -47,7 +47,6 @@ use {
         BalancerV2WeightedPoolFactory,
         BalancerV2WeightedPoolFactoryV3,
         BalancerV2WeightedPoolFactoryV4,
-        InstanceExt,
     },
     ethcontract::{BlockId, H160, H256},
     ethrpc::block_stream::{BlockRetrieving, CurrentBlockWatcher},
diff --git a/crates/shared/src/sources/balancer_v2/pool_fetching/pool_storage.rs b/crates/shared/src/sources/balancer_v2/pool_fetching/pool_storage.rs
index a18de4f5a6..60f8822c1e 100644
--- a/crates/shared/src/sources/balancer_v2/pool_fetching/pool_storage.rs
+++ b/crates/shared/src/sources/balancer_v2/pool_fetching/pool_storage.rs
@@ -22,7 +22,7 @@ use {
     },
     alloy::rpc::types::Log,
     anyhow::{Context, Result},
-    contracts::alloy::BalancerV2BasePoolFactory::BalancerV2BasePoolFactory::{
+    contracts::bindings::BalancerV2BasePoolFactory::BalancerV2BasePoolFactory::{
         BalancerV2BasePoolFactoryEvents,
         PoolCreated,
     },
diff --git a/crates/shared/src/sources/balancer_v2/pool_fetching/registry.rs b/crates/shared/src/sources/balancer_v2/pool_fetching/registry.rs
index 78970a2701..37f212dea0 100644
--- a/crates/shared/src/sources/balancer_v2/pool_fetching/registry.rs
+++ b/crates/shared/src/sources/balancer_v2/pool_fetching/registry.rs
@@ -20,7 +20,7 @@ use {
     },
     anyhow::Result,
     contracts::{
-        alloy::BalancerV2BasePoolFactory::{self, BalancerV2BasePoolFactory::PoolCreated},
+        bindings::BalancerV2BasePoolFactory::{self, BalancerV2BasePoolFactory::PoolCreated},
         errors::EthcontractErrorType,
     },
     ethcontract::{BlockId, H256, errors::MethodError},
diff --git a/crates/shared/src/sources/balancer_v2/pools/common.rs b/crates/shared/src/sources/balancer_v2/pools/common.rs
index cc657846d6..b510e8306b 100644
--- a/crates/shared/src/sources/balancer_v2/pools/common.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/common.rs
@@ -10,7 +10,7 @@ use {
         token_info::TokenInfoFetching,
     },
     anyhow::{Context, Result, anyhow, ensure},
-    contracts::alloy::{BalancerV2BasePool, BalancerV2Vault},
+    contracts::bindings::{BalancerV2BasePool, BalancerV2Vault},
     ethcontract::{BlockId, H160, H256, U256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt as _, future::BoxFuture},
@@ -376,7 +376,7 @@ mod tests {
             transports::mock::Asserter,
         },
         anyhow::bail,
-        contracts::alloy::BalancerV2Vault,
+        contracts::bindings::BalancerV2Vault,
         ethcontract::U256,
         maplit::{btreemap, hashmap},
         mockall::predicate,
diff --git a/crates/shared/src/sources/balancer_v2/pools/composable_stable.rs b/crates/shared/src/sources/balancer_v2/pools/composable_stable.rs
index 258fbbdb2d..1c32506f8c 100644
--- a/crates/shared/src/sources/balancer_v2/pools/composable_stable.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/composable_stable.rs
@@ -7,7 +7,7 @@ use {
         swap::fixed_point::Bfp,
     },
     anyhow::Result,
-    contracts::alloy::{BalancerV2ComposableStablePool, BalancerV2ComposableStablePoolFactory},
+    contracts::bindings::{BalancerV2ComposableStablePool, BalancerV2ComposableStablePoolFactory},
     ethcontract::BlockId,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt as _, future::BoxFuture},
diff --git a/crates/shared/src/sources/balancer_v2/pools/liquidity_bootstrapping.rs b/crates/shared/src/sources/balancer_v2/pools/liquidity_bootstrapping.rs
index 8080ca3138..a45307f52e 100644
--- a/crates/shared/src/sources/balancer_v2/pools/liquidity_bootstrapping.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/liquidity_bootstrapping.rs
@@ -7,7 +7,7 @@ use {
         swap::fixed_point::Bfp,
     },
     anyhow::Result,
-    contracts::alloy::{
+    contracts::bindings::{
         BalancerV2LiquidityBootstrappingPool,
         BalancerV2LiquidityBootstrappingPoolFactory,
     },
diff --git a/crates/shared/src/sources/balancer_v2/pools/stable.rs b/crates/shared/src/sources/balancer_v2/pools/stable.rs
index b60f8b96df..1b846d155a 100644
--- a/crates/shared/src/sources/balancer_v2/pools/stable.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/stable.rs
@@ -10,7 +10,7 @@ use {
         },
     },
     anyhow::{Result, ensure},
-    contracts::alloy::{BalancerV2StablePool, BalancerV2StablePoolFactoryV2},
+    contracts::bindings::{BalancerV2StablePool, BalancerV2StablePoolFactoryV2},
     ethcontract::{BlockId, H160, U256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt as _, future::BoxFuture},
diff --git a/crates/shared/src/sources/balancer_v2/pools/weighted.rs b/crates/shared/src/sources/balancer_v2/pools/weighted.rs
index ff1c34f42d..a4dfab1715 100644
--- a/crates/shared/src/sources/balancer_v2/pools/weighted.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/weighted.rs
@@ -7,7 +7,7 @@ use {
         swap::fixed_point::Bfp,
     },
     anyhow::{Result, anyhow},
-    contracts::alloy::{
+    contracts::bindings::{
         BalancerV2WeightedPool,
         BalancerV2WeightedPoolFactory,
         BalancerV2WeightedPoolFactoryV3,
diff --git a/crates/shared/src/sources/swapr.rs b/crates/shared/src/sources/swapr.rs
index 28a81b3180..3edf853030 100644
--- a/crates/shared/src/sources/swapr.rs
+++ b/crates/shared/src/sources/swapr.rs
@@ -3,7 +3,7 @@
 use {
     crate::sources::uniswap_v2::pool_fetching::{DefaultPoolReader, Pool, PoolReading},
     anyhow::Result,
-    contracts::alloy::ISwaprPair,
+    contracts::bindings::ISwaprPair,
     ethcontract::BlockId,
     ethrpc::alloy::{conversions::IntoAlloy, errors::ignore_non_node_error},
     futures::{FutureExt as _, future::BoxFuture},
diff --git a/crates/shared/src/sources/uniswap_v2/mod.rs b/crates/shared/src/sources/uniswap_v2/mod.rs
index 71fd3c1b60..97539a0436 100644
--- a/crates/shared/src/sources/uniswap_v2/mod.rs
+++ b/crates/shared/src/sources/uniswap_v2/mod.rs
@@ -14,7 +14,7 @@ use {
         sources::{BaselineSource, swapr::SwaprPoolReader},
     },
     anyhow::{Context, Result},
-    contracts::alloy::IUniswapLikeRouter,
+    contracts::bindings::IUniswapLikeRouter,
     ethcontract::{H160, H256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     hex_literal::hex,
@@ -70,37 +70,39 @@ impl UniV2BaselineSourceParameters {
         match source {
             BS::None | BS::BalancerV2 | BS::ZeroEx | BS::UniswapV3 => None,
             BS::UniswapV2 => Some(Self {
-                router: contracts::alloy::UniswapV2Router02::deployment_address(&chain_id)
+                router: contracts::bindings::UniswapV2Router02::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: UNISWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
             }),
             BS::Honeyswap => Some(Self {
-                router: contracts::alloy::HoneyswapRouter::deployment_address(&chain_id)
+                router: contracts::bindings::HoneyswapRouter::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: HONEYSWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
             }),
             BS::SushiSwap => Some(Self {
-                router: contracts::alloy::SushiSwapRouter::deployment_address(&chain_id)
+                router: contracts::bindings::SushiSwapRouter::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: SUSHISWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
             }),
             BS::Swapr => Some(Self {
-                router: contracts::alloy::SwaprRouter::deployment_address(&chain_id)
+                router: contracts::bindings::SwaprRouter::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: SWAPR_INIT.into(),
                 pool_reading: PoolReadingStyle::Swapr,
             }),
             BS::TestnetUniswapV2 => Some(Self {
-                router: contracts::alloy::TestnetUniswapV2Router02::deployment_address(&chain_id)
-                    .map(IntoLegacy::into_legacy)?,
+                router: contracts::bindings::TestnetUniswapV2Router02::deployment_address(
+                    &chain_id,
+                )
+                .map(IntoLegacy::into_legacy)?,
                 init_code_digest: TESTNET_UNISWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
             }),
             BS::Baoswap => Some(Self {
-                router: contracts::alloy::BaoswapRouter::deployment_address(&chain_id)
+                router: contracts::bindings::BaoswapRouter::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: BAOSWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
@@ -110,7 +112,7 @@ impl UniV2BaselineSourceParameters {
 
     pub async fn into_source(&self, web3: &Web3) -> Result<UniV2BaselineSource> {
         let web3 = ethrpc::instrumented::instrument_with_label(web3, "uniswapV2".into());
-        let router = contracts::alloy::IUniswapLikeRouter::Instance::new(
+        let router = contracts::bindings::IUniswapLikeRouter::Instance::new(
             self.router.into_alloy(),
             web3.alloy.clone(),
         );
diff --git a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
index 5a1f77a388..f5de500869 100644
--- a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
@@ -4,7 +4,7 @@ use {
     anyhow::Result,
     cached::{Cached, TimedCache},
     contracts::{
-        alloy::{
+        bindings::{
             ERC20,
             IUniswapLikePair::{self, IUniswapLikePair::getReservesReturn},
         },
diff --git a/crates/shared/src/sources/uniswap_v3/event_fetching.rs b/crates/shared/src/sources/uniswap_v3/event_fetching.rs
index f7e4db3461..961eece31e 100644
--- a/crates/shared/src/sources/uniswap_v3/event_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v3/event_fetching.rs
@@ -8,7 +8,7 @@ use {
         sol_types::SolEvent,
     },
     anyhow::{Context, Result},
-    contracts::alloy::{
+    contracts::bindings::{
         UniswapV3Pool,
         UniswapV3Pool::UniswapV3Pool::{Burn, Mint, Swap, UniswapV3PoolEvents},
     },
diff --git a/crates/shared/src/sources/uniswap_v3/pool_fetching.rs b/crates/shared/src/sources/uniswap_v3/pool_fetching.rs
index 88873e2fc6..b3ccc3b3cc 100644
--- a/crates/shared/src/sources/uniswap_v3/pool_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v3/pool_fetching.rs
@@ -11,7 +11,7 @@ use {
     },
     alloy::rpc::types::Log,
     anyhow::{Context, Result},
-    contracts::alloy::UniswapV3Pool::UniswapV3Pool::{
+    contracts::bindings::UniswapV3Pool::UniswapV3Pool::{
         UniswapV3PoolEvents as AlloyUniswapV3PoolEvents,
         UniswapV3PoolEvents,
     },
@@ -523,7 +523,7 @@ mod tests {
     use {
         super::*,
         alloy::primitives::{U160, aliases::I24},
-        contracts::alloy::UniswapV3Pool::UniswapV3Pool::{Burn, Mint, Swap},
+        contracts::bindings::UniswapV3Pool::UniswapV3Pool::{Burn, Mint, Swap},
         ethrpc::alloy::conversions::IntoAlloy,
         serde_json::json,
         std::str::FromStr,
diff --git a/crates/shared/src/token_info.rs b/crates/shared/src/token_info.rs
index a47c389d37..d44d0c4b38 100644
--- a/crates/shared/src/token_info.rs
+++ b/crates/shared/src/token_info.rs
@@ -1,7 +1,7 @@
 use {
     anyhow::Result,
     async_trait::async_trait,
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     ethcontract::H160,
     ethrpc::{
         Web3,
diff --git a/crates/solver/src/interactions/allowances.rs b/crates/solver/src/interactions/allowances.rs
index b50211373e..5af5830e88 100644
--- a/crates/solver/src/interactions/allowances.rs
+++ b/crates/solver/src/interactions/allowances.rs
@@ -6,7 +6,7 @@ use {
     crate::interactions::Erc20ApproveInteraction,
     ::alloy::sol_types::SolCall,
     anyhow::{Context as _, Result, anyhow, ensure},
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     ethcontract::{H160, U256},
     ethrpc::{Web3, alloy::conversions::IntoAlloy},
     maplit::hashmap,
@@ -374,7 +374,7 @@ mod tests {
     }
 
     fn allowance_call_data(owner: H160, spender: H160) -> web3::types::Bytes {
-        contracts::alloy::ERC20::ERC20::allowanceCall {
+        contracts::bindings::ERC20::ERC20::allowanceCall {
             owner: owner.into_alloy(),
             spender: spender.into_alloy(),
         }
diff --git a/crates/solver/src/interactions/balancer_v2.rs b/crates/solver/src/interactions/balancer_v2.rs
index 4acbb9818c..0efdf02c34 100644
--- a/crates/solver/src/interactions/balancer_v2.rs
+++ b/crates/solver/src/interactions/balancer_v2.rs
@@ -3,7 +3,7 @@ use {
         primitives::{Address, U256},
         sol_types::SolCall,
     },
-    contracts::alloy::BalancerV2Vault::{BalancerV2Vault::swapCall, IVault},
+    contracts::bindings::BalancerV2Vault::{BalancerV2Vault::swapCall, IVault},
     ethcontract::{Bytes, H256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     shared::{
diff --git a/crates/solver/src/interactions/erc20.rs b/crates/solver/src/interactions/erc20.rs
index 0e41d5f12b..420ddf81ad 100644
--- a/crates/solver/src/interactions/erc20.rs
+++ b/crates/solver/src/interactions/erc20.rs
@@ -5,7 +5,7 @@ use {
         primitives::{Address, U256},
         sol_types::SolCall,
     },
-    contracts::alloy::ERC20,
+    contracts::bindings::ERC20,
     ethcontract::Bytes,
     ethrpc::alloy::conversions::IntoLegacy,
     shared::interaction::{EncodedInteraction, Interaction},
diff --git a/crates/solver/src/interactions/uniswap_v2.rs b/crates/solver/src/interactions/uniswap_v2.rs
index 02fcfa8359..ff7c062ca1 100644
--- a/crates/solver/src/interactions/uniswap_v2.rs
+++ b/crates/solver/src/interactions/uniswap_v2.rs
@@ -1,6 +1,6 @@
 use {
     alloy::{primitives::Address, sol_types::SolCall},
-    contracts::alloy::IUniswapLikeRouter,
+    contracts::bindings::IUniswapLikeRouter,
     ethcontract::Bytes,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     primitive_types::{H160, U256},
diff --git a/crates/solver/src/interactions/uniswap_v3.rs b/crates/solver/src/interactions/uniswap_v3.rs
index b97ac2b9a1..73ce85ea28 100644
--- a/crates/solver/src/interactions/uniswap_v3.rs
+++ b/crates/solver/src/interactions/uniswap_v3.rs
@@ -1,6 +1,6 @@
 use {
     alloy::{primitives::Address, sol_types::SolCall},
-    contracts::alloy::UniswapV3SwapRouterV2::{
+    contracts::bindings::UniswapV3SwapRouterV2::{
         IV3SwapRouter::ExactOutputSingleParams,
         UniswapV3SwapRouterV2::exactOutputSingleCall,
     },
diff --git a/crates/solver/src/interactions/weth.rs b/crates/solver/src/interactions/weth.rs
index 57f04d99b4..ddfd698025 100644
--- a/crates/solver/src/interactions/weth.rs
+++ b/crates/solver/src/interactions/weth.rs
@@ -1,7 +1,7 @@
 use {
     alloy::primitives::U256,
     anyhow::{Result, ensure},
-    contracts::alloy::WETH9,
+    contracts::bindings::WETH9,
     ethcontract::Bytes,
     ethrpc::alloy::conversions::IntoLegacy,
     shared::interaction::{EncodedInteraction, Interaction},
diff --git a/crates/solver/src/interactions/zeroex.rs b/crates/solver/src/interactions/zeroex.rs
index a93dcb7c46..310dbbac1f 100644
--- a/crates/solver/src/interactions/zeroex.rs
+++ b/crates/solver/src/interactions/zeroex.rs
@@ -1,5 +1,5 @@
 use {
-    contracts::alloy::IZeroex,
+    contracts::bindings::IZeroex,
     ethcontract::Bytes,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     shared::{
diff --git a/crates/solver/src/liquidity/balancer_v2.rs b/crates/solver/src/liquidity/balancer_v2.rs
index 60412e6e19..844a9e626f 100644
--- a/crates/solver/src/liquidity/balancer_v2.rs
+++ b/crates/solver/src/liquidity/balancer_v2.rs
@@ -228,7 +228,7 @@ mod tests {
     use {
         super::*,
         crate::interactions::allowances::{Approval, MockAllowanceManaging},
-        contracts::alloy::BalancerV2Vault,
+        contracts::bindings::BalancerV2Vault,
         maplit::{btreemap, hashmap, hashset},
         mockall::predicate::*,
         model::TokenPair,
diff --git a/crates/solver/src/liquidity/uniswap_v3.rs b/crates/solver/src/liquidity/uniswap_v3.rs
index a83622b2a9..7ca7c18711 100644
--- a/crates/solver/src/liquidity/uniswap_v3.rs
+++ b/crates/solver/src/liquidity/uniswap_v3.rs
@@ -11,7 +11,7 @@ use {
     },
     alloy::primitives::Address,
     anyhow::{Context, Result, ensure},
-    contracts::alloy::UniswapV3SwapRouterV2::IV3SwapRouter::ExactOutputSingleParams,
+    contracts::bindings::UniswapV3SwapRouterV2::IV3SwapRouter::ExactOutputSingleParams,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     model::TokenPair,
     num::{CheckedMul, rational::Ratio},
diff --git a/crates/solver/src/liquidity/zeroex.rs b/crates/solver/src/liquidity/zeroex.rs
index 31add35b9b..2443ff5c41 100644
--- a/crates/solver/src/liquidity/zeroex.rs
+++ b/crates/solver/src/liquidity/zeroex.rs
@@ -12,7 +12,7 @@ use {
     alloy::primitives::Address,
     anyhow::Result,
     arc_swap::ArcSwap,
-    contracts::alloy::IZeroex,
+    contracts::bindings::IZeroex,
     ethrpc::{
         alloy::conversions::IntoLegacy,
         block_stream::{CurrentBlockWatcher, into_stream},
diff --git a/crates/solver/src/settlement/settlement_encoder.rs b/crates/solver/src/settlement/settlement_encoder.rs
index a77863a1c7..d393001a1a 100644
--- a/crates/solver/src/settlement/settlement_encoder.rs
+++ b/crates/solver/src/settlement/settlement_encoder.rs
@@ -583,7 +583,7 @@ pub(crate) fn verify_executed_amount(order: &Order, executed: U256) -> Result<()
 pub mod tests {
     use {
         super::*,
-        contracts::alloy::WETH9,
+        contracts::bindings::WETH9,
         ethcontract::Bytes,
         ethrpc::alloy::conversions::IntoAlloy,
         maplit::hashmap,
diff --git a/crates/solvers/src/boundary/baseline.rs b/crates/solvers/src/boundary/baseline.rs
index ce14a95525..a7853e11a1 100644
--- a/crates/solvers/src/boundary/baseline.rs
+++ b/crates/solvers/src/boundary/baseline.rs
@@ -5,7 +5,7 @@ use {
         boundary,
         domain::{eth, liquidity, order, solver},
     },
-    contracts::alloy::UniswapV3QuoterV2,
+    contracts::bindings::UniswapV3QuoterV2,
     ethereum_types::{H160, U256},
     model::TokenPair,
     shared::baseline_solver::{self, BaseTokens, BaselineSolvable},
@@ -158,7 +158,7 @@ impl<'a> Solver<'a> {
 
 fn to_boundary_liquidity(
     liquidity: &[liquidity::Liquidity],
-    uni_v3_quoter_v2: Option<Arc<contracts::alloy::UniswapV3QuoterV2::Instance>>,
+    uni_v3_quoter_v2: Option<Arc<contracts::bindings::UniswapV3QuoterV2::Instance>>,
 ) -> HashMap<TokenPair, Vec<OnchainLiquidity>> {
     liquidity
         .iter()
diff --git a/crates/solvers/src/boundary/liquidity/concentrated.rs b/crates/solvers/src/boundary/liquidity/concentrated.rs
index 34c6640bc8..356d511293 100644
--- a/crates/solvers/src/boundary/liquidity/concentrated.rs
+++ b/crates/solvers/src/boundary/liquidity/concentrated.rs
@@ -1,7 +1,7 @@
 use {
     alloy::primitives::aliases::U24,
     contracts::{
-        alloy::UniswapV3QuoterV2::IQuoterV2::QuoteExactInputSingleParams,
+        bindings::UniswapV3QuoterV2::IQuoterV2::QuoteExactInputSingleParams,
         ethcontract::{H160, U256},
     },
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
@@ -12,7 +12,7 @@ use {
 
 #[derive(Debug)]
 pub struct Pool {
-    pub uni_v3_quoter_contract: Arc<contracts::alloy::UniswapV3QuoterV2::Instance>,
+    pub uni_v3_quoter_contract: Arc<contracts::bindings::UniswapV3QuoterV2::Instance>,
     pub address: H160,
     pub tokens: TokenPair,
     pub fee: U24,
diff --git a/crates/solvers/src/domain/solver.rs b/crates/solvers/src/domain/solver.rs
index 1c612b3cec..264eaffea0 100644
--- a/crates/solvers/src/domain/solver.rs
+++ b/crates/solvers/src/domain/solver.rs
@@ -18,7 +18,6 @@ use {
         },
         infra::metrics,
     },
-    contracts::alloy::InstanceExt,
     ethereum_types::U256,
     reqwest::Url,
     std::{cmp, collections::HashSet, sync::Arc},
@@ -72,7 +71,7 @@ struct Inner {
     native_token_price_estimation_amount: eth::U256,
 
     /// If provided, the solver can rely on Uniswap V3 LPs
-    uni_v3_quoter_v2: Option<Arc<contracts::alloy::UniswapV3QuoterV2::Instance>>,
+    uni_v3_quoter_v2: Option<Arc<contracts::bindings::UniswapV3QuoterV2::Instance>>,
 }
 
 impl Solver {
@@ -81,7 +80,7 @@ impl Solver {
         let uni_v3_quoter_v2 = match config.uni_v3_node_url {
             Some(url) => {
                 let web3 = ethrpc::web3(Default::default(), Default::default(), &url, "baseline");
-                contracts::alloy::UniswapV3QuoterV2::Instance::deployed(&web3.alloy)
+                contracts::bindings::UniswapV3QuoterV2::Instance::deployed(&web3.alloy)
                     .await
                     .map(Arc::new)
                     .inspect_err(|err| {
diff --git a/crates/solvers/src/infra/contracts.rs b/crates/solvers/src/infra/contracts.rs
index 0b159ca085..9078baf04a 100644
--- a/crates/solvers/src/infra/contracts.rs
+++ b/crates/solvers/src/infra/contracts.rs
@@ -1,7 +1,7 @@
 use {
     crate::domain::eth,
     chain::Chain,
-    contracts::alloy::WETH9,
+    contracts::bindings::WETH9,
     ethrpc::alloy::conversions::IntoLegacy,
 };
 

From f32040dd7315869771c0d19e0f709154a11dfdf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Mon, 3 Nov 2025 17:40:45 +0000
Subject: [PATCH 18/36] modules

---
 crates/contracts-generate/src/lib.rs | 77 +++++++++++++++++++++++--
 crates/contracts/build.rs            | 86 ++++++++++++++--------------
 2 files changed, 117 insertions(+), 46 deletions(-)

diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index 14983b5857..d7b733f767 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -30,13 +30,70 @@ const MOD_HEADER: &'static str = r#"#![allow(unused_imports, unused_attributes,
     //! These files may be overwritten by the codegen system at any time.
     "#;
 
-pub struct Contracts {
+pub struct Module {
     pub contracts: Vec<Contract>,
+    submodules: Vec<Submodule>,
 }
 
-impl Contracts {
+impl Module {
     pub fn new() -> Self {
-        Self { contracts: vec![] }
+        Self {
+            contracts: vec![],
+            submodules: vec![],
+        }
+    }
+
+    pub fn add_contract(mut self, contract: Contract) -> Self {
+        self.contracts.push(contract);
+        self
+    }
+
+    pub fn add_submodule(mut self, module: Submodule) -> Self {
+        self.submodules.push(module);
+        self
+    }
+
+    pub fn write_formatted(
+        self,
+        bindings_folder: &Path,
+        all_derives: bool,
+        output_folder: &Path,
+    ) -> eyre::Result<()> {
+        std::fs::create_dir_all(&output_folder)?;
+
+        let mut mod_file = String::from(MOD_HEADER);
+        for submodule in self.submodules {
+            write_mod_name(&mut mod_file, &submodule.name)?;
+            submodule.write_formatted(bindings_folder, all_derives, &output_folder)?;
+        }
+
+        for contract in self.contracts {
+            let name = contract.name.clone();
+            contract.write_formatted(bindings_folder, all_derives, &output_folder)?;
+            write_mod_name(&mut mod_file, &name)?;
+        }
+
+        let file: syn::File = syn::parse_file(&mod_file)?;
+        let formatted = prettyplease::unparse(&file);
+        std::fs::write(output_folder.join("mod.rs"), formatted)?;
+
+        Ok(())
+    }
+}
+
+pub struct Submodule {
+    pub name: String,
+    pub contracts: Vec<Contract>,
+    submodules: Vec<Submodule>,
+}
+
+impl Submodule {
+    pub fn new<S: ToString>(name: S) -> Self {
+        Self {
+            name: name.to_string(),
+            contracts: vec![],
+            submodules: vec![],
+        }
     }
 
     pub fn add_contract(mut self, contract: Contract) -> Self {
@@ -44,17 +101,29 @@ impl Contracts {
         self
     }
 
+    pub fn add_submodule(mut self, module: Submodule) -> Self {
+        self.submodules.push(module);
+        self
+    }
+
     pub fn write_formatted(
         self,
         bindings_folder: &Path,
         all_derives: bool,
         output_folder: &Path,
     ) -> eyre::Result<()> {
+        let output_folder = output_folder.join(self.name);
+        std::fs::create_dir_all(&output_folder)?;
+
         let mut mod_file = String::from(MOD_HEADER);
+        for submodule in self.submodules {
+            write_mod_name(&mut mod_file, &submodule.name)?;
+            submodule.write_formatted(bindings_folder, all_derives, &output_folder)?;
+        }
 
         for contract in self.contracts {
             let name = contract.name.clone();
-            contract.write_formatted(bindings_folder, all_derives, output_folder)?;
+            contract.write_formatted(bindings_folder, all_derives, &output_folder)?;
             write_mod_name(&mut mod_file, &name)?;
         }
 
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 5b0a7a25d0..b25dba21ac 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -1,8 +1,8 @@
 use std::path::Path;
 
 use contracts_generate::{
-    ARBITRUM_ONE, AVALANCHE, BASE, BNB, Contract, Contracts, GNOSIS, LENS, LINEA, MAINNET,
-    OPTIMISM, PLASMA, POLYGON, SEPOLIA, networks,
+    ARBITRUM_ONE, AVALANCHE, BASE, BNB, Contract, GNOSIS, LENS, LINEA, MAINNET, Module, OPTIMISM,
+    PLASMA, POLYGON, SEPOLIA, Submodule, networks,
 };
 
 fn main() {
@@ -15,7 +15,7 @@ fn main() {
     // - https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
     println!("cargo:rerun-if-changed=build.rs");
 
-    Contracts::new()
+    Module::new()
         // 0x
         .add_contract(Contract::new("IZeroex").with_networks(networks![
             MAINNET => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
@@ -661,45 +661,6 @@ fn main() {
         ]))
         .add_contract(Contract::new("CowAmmUniswapV2PriceOracle"))
         .add_contract(Contract::new("CowAmmFactoryGetter"))
-        // support module
-        // Support contracts used for trade and token simulations.
-        .add_contract(Contract::new("AnyoneAuthenticator"))
-        .add_contract(Contract::new("Solver"))
-        .add_contract(Contract::new("Spardose"))
-        .add_contract(Contract::new("Trader"))
-        // Support contract used for solver fee simulations in the gnosis/solvers repo.
-        .add_contract(Contract::new("Swapper"))
-        .add_contract(Contract::new("Signatures").with_networks(networks![
-            MAINNET => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            ARBITRUM_ONE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            BASE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            AVALANCHE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            BNB => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            OPTIMISM => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            POLYGON => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            LENS => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            GNOSIS => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            SEPOLIA => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-            // built with evm=London, because deployment reverts on Linea otherwise
-            LINEA => "0xf6E57e72F7dB3D9A51a8B4c149C00475b94A37e4",
-            PLASMA => "0x8262d639c38470F38d2eff15926F7071c28057Af",
-        ]))
-        // Support contracts used for various order simulations.
-        .add_contract(Contract::new("Balances").with_networks(networks![
-            MAINNET => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            ARBITRUM_ONE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            BASE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            AVALANCHE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            BNB => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            OPTIMISM => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            POLYGON => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            LENS => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            GNOSIS => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            SEPOLIA => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            PLASMA => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
-            // built with evm=London, because deployment reverts on Linea otherwise
-            LINEA => "0x361350f708f7c0c63c8a505226592c3e5d1faa29",
-        ]))
         // test module
         // Test Contract for using up a specified amount of gas.
         .add_contract(Contract::new("GasHog"))
@@ -713,6 +674,47 @@ fn main() {
             ARBITRUM_ONE => "0xcb8b5CD20BdCaea9a010aC1F8d835824F5C87A04",
             BASE => "0xc694a91e6b071bF030A18BD3053A7fE09B6DaE69",
         ]))
+        .add_submodule(
+            Submodule::new("support") // support module
+                // Support contracts used for trade and token simulations.
+                .add_contract(Contract::new("AnyoneAuthenticator"))
+                .add_contract(Contract::new("Solver"))
+                .add_contract(Contract::new("Spardose"))
+                .add_contract(Contract::new("Trader"))
+                // Support contract used for solver fee simulations in the gnosis/solvers repo.
+                .add_contract(Contract::new("Swapper"))
+                .add_contract(Contract::new("Signatures").with_networks(networks![
+                    MAINNET => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    ARBITRUM_ONE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    BASE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    AVALANCHE => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    BNB => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    OPTIMISM => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    POLYGON => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    LENS => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    GNOSIS => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    SEPOLIA => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                    // built with evm=London, because deployment reverts on Linea otherwise
+                    LINEA => "0xf6E57e72F7dB3D9A51a8B4c149C00475b94A37e4",
+                    PLASMA => "0x8262d639c38470F38d2eff15926F7071c28057Af",
+                ]))
+                // Support contracts used for various order simulations.
+                .add_contract(Contract::new("Balances").with_networks(networks![
+                    MAINNET => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    ARBITRUM_ONE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    BASE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    AVALANCHE => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    BNB => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    OPTIMISM => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    POLYGON => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    LENS => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    GNOSIS => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    SEPOLIA => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    PLASMA => "0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b",
+                    // built with evm=London, because deployment reverts on Linea otherwise
+                    LINEA => "0x361350f708f7c0c63c8a505226592c3e5d1faa29",
+                ])),
+        )
         .write_formatted(Path::new("artifacts"), true, Path::new("src/bindings"))
         .unwrap();
 }

From b811309133d2a7fec31abf00cf7302c7a99473f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Mon, 3 Nov 2025 17:48:54 +0000
Subject: [PATCH 19/36] almost there

---
 crates/contracts/build.rs     |  69 +--
 crates/contracts/src/alloy.rs | 976 ----------------------------------
 crates/contracts/src/lib.rs   |   3 +-
 3 files changed, 37 insertions(+), 1011 deletions(-)
 delete mode 100644 crates/contracts/src/alloy.rs

diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index b25dba21ac..5c40dd6030 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -641,39 +641,42 @@ fn main() {
             LINEA => "0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f",
             PLASMA => "0x6100E367285b01F48D07953803A2d8dCA5D19873",
         ]))
-        // cow_amm module
-        .add_contract(Contract::new("CowAmm"))
-        .add_contract(
-            Contract::new("CowAmmConstantProductFactory").with_networks(networks![
-                // <https://etherscan.io/tx/0xf37fc438ddacb00c28305bd7dea3b79091cd5be3405a2b445717d9faf946fa50>
-                MAINNET => ("0x40664207e3375FB4b733d4743CE9b159331fd034", 19861952),
-                // <https://gnosisscan.io/tx/0x4121efab4ad58ae7ad73b50448cccae0de92905e181648e5e08de3d6d9c66083>
-                GNOSIS => ("0xdb1cba3a87f2db53b6e1e6af48e28ed877592ec0", 33874317),
-                // <https://sepolia.etherscan.io/tx/0x5e6af00c670eb421b96e78fd2e3b9df573b19e6e0ea77d8003e47cdde384b048>
-                SEPOLIA => ("0xb808e8183e3a72d196457d127c7fd4befa0d7fd3", 5874562),
-            ]),
+        .add_submodule(
+            Submodule::new("cow_amm")
+                .add_contract(Contract::new("CowAmm"))
+                .add_contract(Contract::new("CowAmmConstantProductFactory").with_networks(
+                    networks![
+                        // <https://etherscan.io/tx/0xf37fc438ddacb00c28305bd7dea3b79091cd5be3405a2b445717d9faf946fa50>
+                        MAINNET => ("0x40664207e3375FB4b733d4743CE9b159331fd034", 19861952),
+                        // <https://gnosisscan.io/tx/0x4121efab4ad58ae7ad73b50448cccae0de92905e181648e5e08de3d6d9c66083>
+                        GNOSIS => ("0xdb1cba3a87f2db53b6e1e6af48e28ed877592ec0", 33874317),
+                        // <https://sepolia.etherscan.io/tx/0x5e6af00c670eb421b96e78fd2e3b9df573b19e6e0ea77d8003e47cdde384b048>
+                        SEPOLIA => ("0xb808e8183e3a72d196457d127c7fd4befa0d7fd3", 5874562),
+                    ],
+                ))
+                .add_contract(Contract::new("CowAmmLegacyHelper").with_networks(networks![
+                    // <https://etherscan.io/tx/0x07f0ce50fb9cd30e69799a63ae9100869a3c653d62ea3ba49d2e5e1282f42b63>
+                    MAINNET => ("0x3705ceee5eaa561e3157cf92641ce28c45a3999c", 20332745),
+                    // <https://gnosisscan.io/tx/0x09e56c7173ab1e1c5d02bc2832799422ebca6d9a40e5bae77f6ca908696bfebf>
+                    GNOSIS => ("0xd9ec06b001957498ab1bc716145515d1d0e30ffb", 35026999),
+                ]))
+                .add_contract(Contract::new("CowAmmUniswapV2PriceOracle"))
+                .add_contract(Contract::new("CowAmmFactoryGetter")),
+        )
+        .add_submodule(
+            Submodule::new("test") // Test Contract for using up a specified amount of gas.
+                .add_contract(Contract::new("GasHog"))
+                // Test Contract for incrementing arbitrary counters.
+                .add_contract(Contract::new("Counter"))
+                // Token with support for `permit` (for pre-interaction tests)
+                .add_contract(Contract::new("CowProtocolToken").with_networks(networks![
+                    MAINNET => "0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB",
+                    GNOSIS => "0x177127622c4A00F3d409B75571e12cB3c8973d3c",
+                    SEPOLIA => "0x0625aFB445C3B6B7B929342a04A22599fd5dBB59",
+                    ARBITRUM_ONE => "0xcb8b5CD20BdCaea9a010aC1F8d835824F5C87A04",
+                    BASE => "0xc694a91e6b071bF030A18BD3053A7fE09B6DaE69",
+                ])),
         )
-        .add_contract(Contract::new("CowAmmLegacyHelper").with_networks(networks![
-            // <https://etherscan.io/tx/0x07f0ce50fb9cd30e69799a63ae9100869a3c653d62ea3ba49d2e5e1282f42b63>
-            MAINNET => ("0x3705ceee5eaa561e3157cf92641ce28c45a3999c", 20332745),
-            // <https://gnosisscan.io/tx/0x09e56c7173ab1e1c5d02bc2832799422ebca6d9a40e5bae77f6ca908696bfebf>
-            GNOSIS => ("0xd9ec06b001957498ab1bc716145515d1d0e30ffb", 35026999),
-        ]))
-        .add_contract(Contract::new("CowAmmUniswapV2PriceOracle"))
-        .add_contract(Contract::new("CowAmmFactoryGetter"))
-        // test module
-        // Test Contract for using up a specified amount of gas.
-        .add_contract(Contract::new("GasHog"))
-        // Test Contract for incrementing arbitrary counters.
-        .add_contract(Contract::new("Counter"))
-        // Token with support for `permit` (for pre-interaction tests)
-        .add_contract(Contract::new("CowProtocolToken").with_networks(networks![
-            MAINNET => "0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB",
-            GNOSIS => "0x177127622c4A00F3d409B75571e12cB3c8973d3c",
-            SEPOLIA => "0x0625aFB445C3B6B7B929342a04A22599fd5dBB59",
-            ARBITRUM_ONE => "0xcb8b5CD20BdCaea9a010aC1F8d835824F5C87A04",
-            BASE => "0xc694a91e6b071bF030A18BD3053A7fE09B6DaE69",
-        ]))
         .add_submodule(
             Submodule::new("support") // support module
                 // Support contracts used for trade and token simulations.
@@ -715,6 +718,6 @@ fn main() {
                     LINEA => "0x361350f708f7c0c63c8a505226592c3e5d1faa29",
                 ])),
         )
-        .write_formatted(Path::new("artifacts"), true, Path::new("src/bindings"))
+        .write_formatted(Path::new("artifacts"), true, Path::new("src/alloy"))
         .unwrap();
 }
diff --git a/crates/contracts/src/alloy.rs b/crates/contracts/src/alloy.rs
deleted file mode 100644
index a0b4a9c0ea..0000000000
--- a/crates/contracts/src/alloy.rs
+++ /dev/null
@@ -1,976 +0,0 @@
-pub mod networks {
-    pub const MAINNET: u64 = 1;
-    pub const GNOSIS: u64 = 100;
-    pub const SEPOLIA: u64 = 11155111;
-    pub const ARBITRUM_ONE: u64 = 42161;
-    pub const BASE: u64 = 8453;
-    pub const POLYGON: u64 = 137;
-    pub const AVALANCHE: u64 = 43114;
-    pub const BNB: u64 = 56;
-    pub const OPTIMISM: u64 = 10;
-    pub const LENS: u64 = 232;
-    pub const LINEA: u64 = 59144;
-    pub const PLASMA: u64 = 9745;
-}
-
-crate::bindings!(
-    IZeroex,
-    crate::deployments! {
-        MAINNET => address!("0xdef1c0ded9bec7f1a1670819833240f027b25eff"),
-        SEPOLIA => address!("0xdef1c0ded9bec7f1a1670819833240f027b25eff"),
-        ARBITRUM_ONE => address!("0xdef1c0ded9bec7f1a1670819833240f027b25eff"),
-        BASE => address!("0xdef1c0ded9bec7f1a1670819833240f027b25eff"),
-        AVALANCHE => address!("0xdef1c0ded9bec7f1a1670819833240f027b25eff"),
-        BNB => address!("0xdef1c0ded9bec7f1a1670819833240f027b25eff"),
-        OPTIMISM => address!("0xdef1abe32c034e558cdd535791643c58a13acc10"),
-        POLYGON => address!("0xdef1c0ded9bec7f1a1670819833240f027b25eff"),
-        // Not available on Lens
-    }
-);
-
-crate::bindings!(ERC20Mintable);
-
-crate::bindings!(GnosisSafe);
-crate::bindings!(GnosisSafeCompatibilityFallbackHandler);
-crate::bindings!(GnosisSafeProxy);
-crate::bindings!(GnosisSafeProxyFactory);
-
-crate::bindings!(BalancerV2Authorizer);
-crate::bindings!(BalancerV2BasePool);
-crate::bindings!(BalancerV2BasePoolFactory);
-crate::bindings!(BalancerV2WeightedPool);
-crate::bindings!(BalancerV2StablePool);
-crate::bindings!(BalancerV2ComposableStablePool);
-crate::bindings!(BalancerV2LiquidityBootstrappingPool);
-crate::bindings!(
-    BalancerV2WeightedPoolFactory,
-    // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x0f9bb3624c185b4e107eaf9176170d2dc9cb1c48d0f070ed18416864b3202792>
-        MAINNET => (address!("0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9"), 12272147)
-        // Not available on Sepolia (only version ≥ 4)
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    BalancerV2WeightedPoolFactoryV3,
-    // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x39f357b78c03954f0bcee2288bf3b223f454816c141ef20399a7bf38057254c4>
-        MAINNET => (address!("0x5Dd94Da3644DDD055fcf6B3E1aa310Bb7801EB8b"), 16520627),
-        // <https://gnosisscan.io/tx/0x2ac3d873b6f43de6dd77525c7e5b68a8fc3a1dee40303e1b6a680b0285b26091>
-        GNOSIS => (address!("0xC128a9954e6c874eA3d62ce62B468bA073093F25"), 26226256),
-        // <https://snowscan.xyz/tx/0xdf2c77743cc9287df2022cd6c5f9209ecfecde07371717ab0427d96042a88640>
-        AVALANCHE => (address!("0x94f68b54191F62f781Fe8298A8A5Fa3ed772d227"), 26389236),
-        // <https://optimistic.etherscan.io/tx/0xc5e79fb00b9a8e2c89b136aae0be098e58f8e832ede13e8079213a75c9cd9c08>
-        OPTIMISM => (address!("0xA0DAbEBAAd1b243BBb243f933013d560819eB66f"), 72832703),
-        // <https://polygonscan.com/tx/0x2bc079c0e725f43670898b474afedf38462feee72ef8e874a1efcec0736672fc>
-        POLYGON => (address!("0x82e4cFaef85b1B6299935340c964C942280327f4"), 39036828),
-        // <https://bscscan.com/tx/0x91107b9581e18ec0a4a575d4713bdd7b1fc08656c35522d216307930aa4de7b6>
-        BNB => (address!("0x6e4cF292C5349c79cCd66349c3Ed56357dD11B46"), 25474982),
-        // Not available on Sepolia (only version ≥ 4)
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    BalancerV2WeightedPoolFactoryV4,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0xa5e6d73befaacc6fff0a4b99fd4eaee58f49949bcfb8262d91c78f24667fbfc9>
-        MAINNET => (address!("0x897888115Ada5773E02aA29F775430BFB5F34c51"), 16878323),
-        // <https://gnosisscan.io/tx/0xcb6768bd92add227d46668357291e1d67c864769d353f9f0041c59ad2a3b21bf>
-        GNOSIS => (address!("0x6CaD2ea22BFA7F4C14Aae92E47F510Cd5C509bc7"), 27055829),
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#pool-factories>
-        // <https://sepolia.etherscan.io/tx/0x7dd392b586f1cdecfc635e7dd40ee1444a7836772811e59321fd4873ecfdf3eb>
-        SEPOLIA => (address!("0x7920BFa1b2041911b354747CA7A6cDD2dfC50Cfd"), 3424893),
-        // <https://arbiscan.io/tx/0x167fe7eb776d1be36b21402d8ae120088c393e28ae7ca0bd1defac84e0f2848b>
-        ARBITRUM_ONE => (address!("0xc7E5ED1054A24Ef31D827E6F86caA58B3Bc168d7"), 72222060),
-        // <https://basescan.org/tx/0x0732d3a45a3233a134d6e0e72a00ca7a971d82cdc51f71477892ac517bf0d4c9>
-        BASE => (address!("0x4C32a8a8fDa4E24139B51b456B42290f51d6A1c4"), 1204869),
-        // <https://snowscan.xyz/tx/0xa3fc8aab3b9baba3905045a53e52a47daafe79d4aa26d4fef5c51f3840aa55fa>
-        AVALANCHE => (address!("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a"), 27739006),
-        // <https://optimistic.etherscan.io/tx/0xad915050179db368e43703f3ee1ec55ff5e5e5e0268c15f8839c9f360caf7b0b>
-        OPTIMISM => (address!("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a"), 82737545),
-        // <https://polygonscan.com/tx/0x65e6b13231c2c5656357005a9e419ad6697178ae74eda1ea7522ecdafcf77136>
-        POLYGON => (address!("0xFc8a407Bba312ac761D8BFe04CE1201904842B76"), 40611103),
-        // <https://bscscan.com/tx/0xc7fada60761e3240332c4cbd169633f1828b2a15de23f0148db9d121afebbb4b>
-        BNB => (address!("0x230a59F4d9ADc147480f03B0D3fFfeCd56c3289a"), 26665331),
-        // Not available on Base and Lens
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
-    }
-);
-crate::bindings!(
-    BalancerV2WeightedPool2TokensFactory,
-    // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0xa5e6d73befaacc6fff0a4b99fd4eaee58f49949bcfb8262d91c78f24667fbfc9>
-        MAINNET => (address!("0xa5bf2ddf098bb0ef6d120c98217dd6b141c74ee0"), 12349891),
-        ARBITRUM_ONE => (address!("0xCF0a32Bbef8F064969F21f7e02328FB577382018"), 222864),
-        // <https://optimistic.etherscan.io/tx/0xd5754950d47179d822ea976a8b2af82ffa80e992cf0660b02c0c218359cc8987>
-        OPTIMISM => (address!("0xdAE7e32ADc5d490a43cCba1f0c736033F2b4eFca"), 7005512),
-        // <https://polygonscan.com/tx/0xb8ac851249cc95bc0943ef0732d28bbd53b0b36c7dd808372666acd8c5f26e1c>
-        POLYGON => (address!("0x8E9aa87E45e92bad84D5F8DD1bff34Fb92637dE9"), 15832998),
-        // Not available on Sepolia, Base, Avalanche, BNB and Lens
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
-    }
-);
-crate::bindings!(
-    BalancerV2StablePoolFactoryV2,
-    // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0xef36451947ebd97b72278face57a53806e90071f4c902259db2db41d0c9a143d>
-        MAINNET => (address!("0x8df6efec5547e31b0eb7d1291b511ff8a2bf987c"), 14934936),
-        // <https://gnosisscan.io/tx/0xe062237f0c8583375b10cf514d091781bfcd52d9ababbd324180770a5efbc6b1>
-        GNOSIS => (address!("0xf23b4DB826DbA14c0e857029dfF076b1c0264843"), 25415344),
-        ARBITRUM_ONE => (address!("0xEF44D6786b2b4d544b7850Fe67CE6381626Bf2D6"), 14244664),
-        // <https://optimistic.etherscan.io/tx/0xcf9f0bd731ded0e513708200df28ac11d17246fb53fc852cddedf590e41c9c03>
-        OPTIMISM => (address!("0xeb151668006CD04DAdD098AFd0a82e78F77076c3"), 11088891),
-        // <https://polygonscan.com/tx/0xa2c41d014791888a29a9491204446c1b9b2f5dee3f3eb31ad03f290259067b44>
-        POLYGON => (address!("0xcA96C4f198d343E251b1a01F3EBA061ef3DA73C1"), 29371951),
-        // Not available on Sepolia, Base, Avalanche, BNB and Lens
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
-    }
-);
-crate::bindings!(
-    BalancerV2LiquidityBootstrappingPoolFactory,
-    // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x665ac1c7c5290d70154d9dfc1d91dc2562b143aaa9e8a77aa13e7053e4fe9b7c>
-        MAINNET => (address!("0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE"), 12871780),
-        ARBITRUM_ONE => (address!("0x142B9666a0a3A30477b052962ddA81547E7029ab"), 222870),
-        // <https://polygonscan.com/tx/0xd9b5b9a9e6ea17a87f85574e93577e3646c9c2f9c8f38644f936949e6c853288>
-        POLYGON => (address!("0x751A0bC0e3f75b38e01Cf25bFCE7fF36DE1C87DE"), 17116402),
-        // Not available on Sepolia, Base, Avalanche, BNB, Optimism and Lens
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
-    }
-);
-crate::bindings!(
-    BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory,
-    // <https://docs.balancer.fi/reference/contracts/deployment-addresses/mainnet.html#ungrouped-active-current-contracts>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x298381e567ff6643d9b32e8e7e9ff0f04a80929dce3e004f6fa1a0104b2b69c3>
-        MAINNET => (address!("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e"), 13730248),
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/gnosis.html#ungrouped-active-current-contracts>
-        // <https://gnosis.blockscout.com/tx/0xbd56fefdb27e4ff1c0852e405f78311d6bc2befabaf6c87a405ab19de8c1506a>
-        GNOSIS => (address!("0x85a80afee867aDf27B50BdB7b76DA70f1E853062"), 25415236),
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#ungrouped-active-current-contracts>
-        // <https://sepolia.etherscan.io/tx/0xe0e8feb509a8aa8a1eaa0b0c4b34395ff2fd880fb854fbeeccc0af1826e395c9>
-        SEPOLIA => (address!("0x45fFd460cC6642B8D8Fb12373DFd77Ceb0f4932B"), 25415236),
-        ARBITRUM_ONE => (address!("0x1802953277FD955f9a254B80Aa0582f193cF1d77"), 4859669),
-        // <https://basescan.org/tx/0x0529de9dbe772f4b4f48da93ae2c2d2c46e3d3221ced9e0c4063a7a5bc47e874>
-        BASE => (address!("0x0c6052254551EAe3ECac77B01DFcf1025418828f"), 1206531),
-        // <https://snowscan.xyz/tx/0x33a75d83436ae9fcda4b4986713417bf3dc80d9ceb8d2541817846b1ac579d9f>
-        AVALANCHE => (address!("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e"), 26386552),
-        // <https://bscscan.com/tx/0x8b964b97e6091bd41c93002c558d49adc26b8b31d2b30f3a33babbbbe8c55f47>
-        BNB => (address!("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD"), 22691243),
-        // <https://optimistic.etherscan.io/tx/0x14fb43f051eebdec645abf0125e52348dc875b0887b689f8db026d75f9c78dda>
-        OPTIMISM => (address!("0xf302f9F50958c5593770FDf4d4812309fF77414f"), 7005915),
-        // <https://polygonscan.com/tx/0x125bc007a86d771f8dc8f5fa1017de6e5a11162a458a72f25814503404bbeb0b>
-        POLYGON => (address!("0x41B953164995c11C81DA73D212ED8Af25741b7Ac"), 22067480),
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    BalancerV2ComposableStablePoolFactory,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x3b9e93ae050e59b3ca3657958ca30d1fd13fbc43208f8f0aa01ae992294f9961>
-        MAINNET => (address!("0xf9ac7B9dF2b3454E841110CcE5550bD5AC6f875F"), 15485885),
-        ARBITRUM_ONE => (address!("0xaEb406b0E430BF5Ea2Dc0B9Fe62E4E53f74B3a33"), 23227044),
-        // <https://bscscan.com/tx/0x6c6e1c72c91c75714f698049f1c7b66d8f2baced54e0dd2522dfadff27b5ccf1>
-        BNB => (address!("0xf302f9F50958c5593770FDf4d4812309fF77414f"), 22691193),
-        // <https://optimistic.etherscan.io/tx/0xad2f330ad865dc7955376a3d9733486b38c53ba0d4757ad4e1b63b105401c506>
-        OPTIMISM => (address!("0xf145caFB67081895EE80eB7c04A30Cf87f07b745"), 22182522),
-        // <https://polygonscan.com/tx/0xe5d908be686056f1519663a407167c088924f60d29c799ec74438b9de891989e>
-        POLYGON => (address!("0x136FD06Fa01eCF624C7F2B3CB15742c1339dC2c4"), 32774224),
-        // Not available on Sepolia, Gnosis Chain, Base, Avalanche and Lens
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
-    }
-);
-crate::bindings!(
-    BalancerV2ComposableStablePoolFactoryV3,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0xd8c9ba758cb318beb0c9525b7621280a22b6dfe02cf725a3ece0718598f260ef>
-        MAINNET => (address!("0xdba127fBc23fb20F5929C546af220A991b5C6e01"), 16580899),
-        // <https://gnosisscan.io/tx/0x2abd7c865f8ab432b340f7de897192c677ffa254908fdec14091e0cd06962963>
-        GNOSIS => (address!("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD"), 26365805),
-        ARBITRUM_ONE => (address!("0x1c99324EDC771c82A0DCCB780CC7DDA0045E50e7"), 58948370),
-        // <https://bscscan.com/tx/0xfe0c47c2b124a059d11704c1bd1815dcc554834ae0c2d11c433946226015619f>
-        BNB => (address!("0xacAaC3e6D6Df918Bf3c809DFC7d42de0e4a72d4C"), 25475700),
-        // <https://optimistic.etherscan.io/tx/0x2bb1c3fbf1f370c6e20ecda36b555de1a4426340908055c4274823e31f92210e>
-        OPTIMISM => (address!("0xe2E901AB09f37884BA31622dF3Ca7FC19AA443Be"), 72832821),
-        // <https://polygonscan.com/tx/0xb189a45eac7ea59c0bb638b5ae6c4c93f9877f31ce826e96b792a9154e7a32a7>
-        POLYGON => (address!("0x7bc6C0E73EDAa66eF3F6E2f27b0EE8661834c6C9"), 39037615),
-        // Not available on Sepolia (only version ≥ 4) and on Base (only version ≥ 5)
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html>
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    BalancerV2ComposableStablePoolFactoryV4,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x3b61da162f3414c376cfe8b38d57ca6ba3c40b24446029ddab1187f4ae7c2bd7>
-        MAINNET => (address!("0xfADa0f4547AB2de89D1304A668C39B3E09Aa7c76"), 16878679),
-        // <https://gnosisscan.io/tx/0x2739416da7e44add08bdfb5e4e5a29ca981383b97162748887efcc5c1241b2f1>
-        GNOSIS => (address!("0xD87F44Df0159DC78029AB9CA7D7e57E7249F5ACD"), 27056416),
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#deprecated-contracts>
-        // <https://sepolia.etherscan.io/tx/0x9313a59ad9a95f2518076cbf4d0dc5f312e0b013a43a7ea4821cae2aa7a50aa2>
-        SEPOLIA => (address!("0xA3fd20E29358c056B727657E83DFd139abBC9924"), 3425277),
-        ARBITRUM_ONE => (address!("0x2498A2B0d6462d2260EAC50aE1C3e03F4829BA95"), 72235860),
-        // <https://snowscan.xyz/tx/0x7b396102e767ec5f2bc06fb2c9d7fb704d0ddc537c04f28cb538c6de7cc4261e>
-        AVALANCHE => (address!("0x3B1eb8EB7b43882b385aB30533D9A2BeF9052a98"), 29221425),
-        // <https://bscscan.com/tx/0x2819b490b5e04e27d66476730411df8e572bc33038aa869a370ecfa852de0cbf>
-        BNB => (address!("0x1802953277FD955f9a254B80Aa0582f193cF1d77"), 26666380),
-        // <https://optimistic.etherscan.io/tx/0x5d6c515442188eb4af83524618333c0fbdab0df809af01c4e7a9e380f1841199>
-        OPTIMISM => (address!("0x1802953277FD955f9a254B80Aa0582f193cF1d77"), 82748180),
-        // <https://polygonscan.com/tx/0x2cea6a0683e67ebdb7d4a1cf1ad303126c5f228f05f8c9e2ccafdb1f5a024376>
-        POLYGON => (address!("0x6Ab5549bBd766A43aFb687776ad8466F8b42f777"), 40613553),
-        // Not available on Base and Lens
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/base.html>
-    }
-);
-crate::bindings!(
-    BalancerV2ComposableStablePoolFactoryV5,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x1fc28221925959c0713d04d9f9159255927ebb94b7fa76e4795db0e365643c07>
-        MAINNET => (address!("0xDB8d758BCb971e482B2C45f7F8a7740283A1bd3A"), 17672478),
-        // <https://gnosisscan.io/tx/0xcbf18b5a0d1f1fca9b30d08ab77d8554567c3bffa7efdd3add273073d20bb1e2>
-        GNOSIS => (address!("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7"), 28900564),
-        // <https://docs.balancer.fi/reference/contracts/deployment-addresses/sepolia.html#ungrouped-active-current-contracts>
-        // <https://sepolia.etherscan.io/tx/0x2c155dde7c480929991dd2a3344d9fdd20252f235370d46d0887b151dc0416bd>
-        SEPOLIA => (address!("0xa523f47A933D5020b23629dDf689695AA94612Dc"), 3872211),
-        ARBITRUM_ONE => (address!("0xA8920455934Da4D853faac1f94Fe7bEf72943eF1"), 110212282),
-        // <https://basescan.org/tx/0x1d291ba796b0397d73581b17695cf0e53e61551e419c43d11d81198b00c2bfd3>
-        BASE => (address!("0x8df317a729fcaA260306d7de28888932cb579b88"), 1204710),
-        // <https://snowscan.xyz/tx/0x000659feb0831fc511f5c2ad12f3b2d466152b753c805fcb06e848701fd1b4b7>
-        AVALANCHE => (address!("0xE42FFA682A26EF8F25891db4882932711D42e467"), 32478827),
-        // <https://bscscan.com/tx/0x5bdfed936f82800e80543d5212cb287dceebb52c29133838acbe7e148bf1a447>
-        BNB => (address!("0x4fb47126Fa83A8734991E41B942Ac29A3266C968"), 29877945),
-        // <https://optimistic.etherscan.io/tx/0xa141b35dbbb18154e2452b1ae6ab7d82a6555724a878b5fccff40e18c8ae3484>
-        OPTIMISM => (address!("0x043A2daD730d585C44FB79D2614F295D2d625412"), 106752707),
-        // <https://polygonscan.com/tx/0xa3d9a1cf00eaca469d6f9ec2fb836bbbfdfbc3b0eeadc07619bb9e695bfdecb8>
-        POLYGON => (address!("0xe2fa4e1d17725e72dcdAfe943Ecf45dF4B9E285b"), 44961548),
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    BalancerV2ComposableStablePoolFactoryV6,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x4149cadfe5d3431205d9819fca44ed7a4c2b101adc51adc75cc4586dee237be8>
-        MAINNET => (address!("0x5B42eC6D40f7B7965BE5308c70e2603c0281C1E9"), 19314764),
-        // <https://gnosisscan.io/tx/0xc3fc1fb96712a0659b7e9e5f406f63bdf5cbd5df9e04f0372c28f75785036791>
-        GNOSIS => (address!("0x47B489bf5836f83ABD928C316F8e39bC0587B020"), 32650879),
-        // <https://sepolia.etherscan.io/tx/0x53aa3587002469b758e2bb87135d9599fd06e7be944fe61c7f82045c45328566>
-        SEPOLIA => (address!("0x05503B3aDE04aCA81c8D6F88eCB73Ba156982D2B"), 5369821),
-        // <https://arbiscan.io/tx/0xfa1e7642e135fb32dc14c990b851e5e7a0ac7a463e3a60c5003ae4142396f45e>
-        ARBITRUM_ONE => (address!("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7"), 184805448),
-        // <https://basescan.org/tx/0x5d3342faf0368b939daa93247536afa26cc72c83de52ba7711ae1b8646688467>
-        BASE => (address!("0x956CCab09898C0AF2aCa5e6C229c3aD4E93d9288"), 11099703),
-        // <https://snowscan.xyz/tx/0x246248ad396826dbfbdc5360cb9cbbdb3a672efa08cc745d1670900888c58c7b>
-        AVALANCHE => (address!("0xb9F8AB3ED3F3aCBa64Bc6cd2DcA74B7F38fD7B88"), 42186350),
-        // <https://bscscan.com/tx/0x6784ab50138c7488bc14d4d9beb6a9e1ddc209a45f0a96b4ee98a7db84167dea>
-        BNB => (address!("0x6B5dA774890Db7B7b96C6f44e6a4b0F657399E2e"), 36485719),
-        // <https://optimistic.etherscan.io/tx/0xa38b696479f35a9751ca8b1f0ddeb160188b3146113975b8c2b657c2fe7d7fd2>
-        OPTIMISM => (address!("0x4bdCc2fb18AEb9e2d281b0278D946445070EAda7"), 116694338),
-        // <https://polygonscan.com/tx/0x7b9678ad538b1cd3f3a03e63455e7d49a1bc716ea42310fbf99df4bf93ecfdfa>
-        POLYGON => (address!("0xEAedc32a51c510d35ebC11088fD5fF2b47aACF2E"), 53996258),
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    // Balancer addresses can be obtained from:
-    // <https://github.com/balancer/balancer-subgraph-v2/blob/master/networks.yaml>
-    BalancerV2Vault,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x28c44bb10d469cbd42accf97bd00b73eabbace138e9d44593e851231fbed1cb7>
-        MAINNET => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 12272146),
-        // <https://gnosisscan.io/tx/0x21947751661e1b9197492f22779af1f5175b71dc7057869e5a8593141d40edf1>
-        GNOSIS => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 24821598),
-        // <https://sepolia.etherscan.io/tx/0xb22509c6725dd69a975ecb96a0c594901eeee6a279cc66d9d5191022a7039ee6>
-        SEPOLIA => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 3418831),
-        // <https://arbiscan.io/tx/0xe2c3826bd7b15ef8d338038769fe6140a44f1957a36b0f27ab321ab6c68d5a8e>
-        ARBITRUM_ONE => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 222832),
-        // <https://basescan.org/tx/0x0dc2e3d436424f2f038774805116896d31828c0bf3795a6901337bdec4e0dff6>
-        BASE => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 1196036),
-        // <https://snowscan.xyz/tx/0xc49af0372feb032e0edbba6988410304566b1fd65546c01ced620ac3c934120f>
-        AVALANCHE => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 26386141),
-        // <https://bscscan.com/tx/0x1de8caa6c54ff9a25600e26d80865d84c9cc4d33c2b98611240529ee7de5cd74>
-        BNB => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 22691002),
-        // <https://optimistic.etherscan.io/tx/0xa03cb990595df9eed6c5db17a09468cab534aed5f5589a06c0bb3d19dd2f7ce9>
-        OPTIMISM => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 7003431),
-        // <https://polygonscan.com/tx/0x66f275a2ed102a5b679c0894ced62c4ebcb2a65336d086a916eb83bd1fe5c8d2>
-        POLYGON => (address!("0xBA12222222228d8Ba445958a75a0704d566BF2C8"), 15832990),
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    BalancerV3BatchRouter,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x41cb8619fb92dd532eb09b0e81fd4ce1c6006a10924893f02909e36a317777f3>
-        MAINNET => (address!("0x136f1EFcC3f8f88516B9E94110D56FDBfB1778d1"), 21339510),
-        // <https://gnosisscan.io/tx/0xeafddbace9f445266f851ef1d92928e3d01a4622a1a6780b41ac52d5872f12ab>
-        GNOSIS => (address!("0xe2fa4e1d17725e72dcdAfe943Ecf45dF4B9E285b"), 37377506),
-        // <https://sepolia.etherscan.io/tx/0x95ed8e1aaaa7bdc5881f3c8fc5a4914a66639bee52987c3a1ea88545083b0681>
-        SEPOLIA => (address!("0xC85b652685567C1B074e8c0D4389f83a2E458b1C"), 7219301),
-        // <https://arbiscan.io/tx/0xa7968c6bc0775208ffece789c6e5d09b0eea5f2c3ed2806e9bd94fb0b978ff0f>
-        ARBITRUM_ONE => (address!("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E"), 297828544),
-        // <https://basescan.org/tx/0x47b81146714630ce50445bfa28872a36973acedf785317ca423498810ec8e76c>
-        BASE => (address!("0x85a80afee867aDf27B50BdB7b76DA70f1E853062"), 25347205),
-        // <https://snowscan.xyz/tx/0x3bfaba7135ee2d67d98f20ee1aa4c8b7e81e47be64223376f3086bab429ac806>
-        AVALANCHE => (address!("0xc9b36096f5201ea332Db35d6D195774ea0D5988f"), 59965747),
-        // <https://optimistic.etherscan.io/tx/0xf370aab0d652f3e0f7c34e1a53e1afd98e86c487138300b0939d4e54b0088b67>
-        OPTIMISM => (address!("0xaD89051bEd8d96f045E8912aE1672c6C0bF8a85E"), 133969588),
-        // Not available on Lens, Polygon, BNB
-    }
-);
-
-// UniV2
-crate::bindings!(
-    BaoswapRouter,
-    crate::deployments! {
-       // https://gnosisscan.io/tx/0xdcbfa037f2c6c7456022df0632ec8d6a75d0f9a195238eec679d5d26895eb7b1
-       GNOSIS => (address!("0x6093AeBAC87d62b1A5a4cEec91204e35020E38bE"))
-    }
-);
-crate::bindings!(
-    HoneyswapRouter,
-    crate::deployments! {
-        GNOSIS => (address!("0x1C232F01118CB8B424793ae03F870aa7D0ac7f77"))
-    }
-);
-crate::bindings!(
-    PancakeRouter,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x6e441248a9835ca10a3c29a19f2e1ed61d2e35f3ecb3a5b9e4ee170d62a22d16>
-        MAINNET => (address!("0xEfF92A263d31888d860bD50809A8D171709b7b1c")),
-        // <https://arbiscan.io/tx/0x4a2da73cbfcaafb0347e4525307a095e38bf7532435cb0327d1f5ee2ee15a011>
-        ARBITRUM_ONE => (address!("0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb")),
-        // <https://basescan.org/tx/0xda322aef5776698ac6da56be1ffaa0f9994a983cdeb9f2aeaba47437809ae6ef>
-        BASE => (address!("0x8cFe327CEc66d1C090Dd72bd0FF11d690C33a2Eb")),
-        // <https://bscscan.com/tx/0x1bfbff8411ed44e609d911476b0d35a28284545b690902806ea0a7ff0453e931>
-        BNB => (address!("0x10ED43C718714eb63d5aA57B78B54704E256024E"))
-    }
-);
-crate::bindings!(
-    SushiSwapRouter,
-    // <https://docs.sushi.com/contracts/cpamm>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x4ff39eceee7ba9a63736eae38be69b10347975ff5fa4d9b85743a51e1c384094>
-        MAINNET => (address!("0xd9e1ce17f2641f24ae83637ab66a2cca9c378b9f")),
-        // <https://gnosisscan.io/tx/0x8b45ccbc2afd0132ef8b636064e0e745ff93b53942a56e320bb930666dd0fb18>
-        GNOSIS => (address!("0x1b02da8cb0d097eb8d57a175b88c7d8b47997506")),
-        // <https://arbiscan.io/tx/0x40b22402bcac46330149ac9848f8bddd02b0a1e79d4a71934655a634051be1a1>
-        ARBITRUM_ONE => (address!("0x1b02da8cb0d097eb8d57a175b88c7d8b47997506")),
-        // <https://basescan.org/tx/0xbb673c483292e03d202e95a023048b8bda459bf12402e7688f7e10be8b4dc67d>
-        BASE => (address!("0x6bded42c6da8fbf0d2ba55b2fa120c5e0c8d7891")),
-        // <https://snowtrace.io/tx/0x8185bcd3cc8544f8767e5270c4d7eb1e9b170fc0532fc4f0d7e7a1018e1f13ba>
-        AVALANCHE => (address!("0x1b02da8cb0d097eb8d57a175b88c7d8b47997506")),
-        // <https://bscscan.com/tx/0xf22f827ae797390f6e478b0a11aa6e92d6da527f47130ef70d313ff0e0b2a83f>
-        BNB => (address!("0x1b02da8cb0d097eb8d57a175b88c7d8b47997506")),
-        // <https://optimistic.etherscan.io/tx/0x88be6cc83f5bfccb8196db351866bac5c99ab8f7b451ea9975319ba05c3bf8f7>
-        OPTIMISM => (address!("0x2abf469074dc0b54d793850807e6eb5faf2625b1")),
-        // <https://polygonscan.com/tx/0x3dcf8fc780ae6fbe40b1ae57927a8fb405f54cbe89d0021a781a100d2086e5ba>
-        POLYGON => (address!("0x1b02da8cb0d097eb8d57a175b88c7d8b47997506")),
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    SwaprRouter,
-    // <https://swapr.gitbook.io/swapr/contracts>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x3f4ccc676637906db24caf043c89dafce959321c02266c6a4ab706fcec79a5f7>
-        MAINNET => address!("0xb9960d9bca016e9748be75dd52f02188b9d0829f"),
-        // <https://gnosisscan.io/tx/0x0406e774caced468b8f84d7c7ed9b6e9c324601af38f44e385aecf7a7d01feb4>
-        GNOSIS => address!("0xE43e60736b1cb4a75ad25240E2f9a62Bff65c0C0"),
-        // <https://arbiscan.io/tx/0x09771774fc138775472910f6bb0f2e03ff74e1e32a658e9c3e4d8f59f6431ba8>
-        ARBITRUM_ONE => address!("0x530476d5583724A89c8841eB6Da76E7Af4C0F17E"),
-        // Not available on Base and Lens
-    }
-);
-crate::bindings!(ISwaprPair);
-crate::bindings!(
-    TestnetUniswapV2Router02,
-    crate::deployments! {
-        // <https://sepolia.etherscan.io/tx/0x2bf9a91a42d53e161897d9c581f798df9db6fb00587803dde7e7b8859118d821>
-        SEPOLIA => address!("0x86dcd3293C53Cf8EFd7303B57beb2a3F671dDE98"),
-    }
-);
-crate::bindings!(
-    UniswapV2Factory,
-    // <https://docs.uniswap.org/contracts/v2/reference/smart-contracts/factory>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0xc31d7e7e85cab1d38ce1b8ac17e821ccd47dbde00f9d57f2bd8613bff9428396>
-        MAINNET => address!("0x5C69bEe701ef814a2B6a3EDD4B1652CB9cc5aA6f"),
-        // <https://gnosisscan.io/tx/0x446de52c460bed3f49a4342eab247bb4b2fe2993962c284fb9bc14a983c7a3d4>
-        GNOSIS => address!("0xA818b4F111Ccac7AA31D0BCc0806d64F2E0737D7"),
-        // <https://arbiscan.io/tx/0x83b597d54496c0b64d66a3b9a65c312e406262511c908f702ef06755d13ab2f3>
-        ARBITRUM_ONE => address!("0xf1D7CC64Fb4452F05c498126312eBE29f30Fbcf9"),
-        // <https://basescan.org/tx/0x3c94031f81d9afe3beeb8fbcf4dcf1bd5b5688b86081d94e3d0231514dc00d31>
-        BASE => address!("0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6"),
-        // <https://sepolia.etherscan.io/tx/0x0a5e26b22f6b470857957a1d5a92ad4a7d3c5e7cf254ddd80edfe23df70eae71>
-        SEPOLIA => address!("0xF62c03E08ada871A0bEb309762E260a7a6a880E6"),
-        // <https://snowtrace.io/tx/0xd06a069b11fc0c998b404c5736957cc16c71cf1f7dbf8a7d4244c84036ea6edd>
-        AVALANCHE => address!("0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C"),
-        // <https://bscscan.com/tx/0x7305a4bddc54eee158f245a09526969697ac1a9f56d090b124ebfc85ff71a5cf>
-        BNB => address!("0x8909Dc15e40173Ff4699343b6eB8132c65e18eC6"),
-        // <https://optimistic.etherscan.io/tx/0xf7227dcbbfa4ea2bb2634f2a1f364a64b028f9e9e393974fea8d435cd097c72e>
-        OPTIMISM => address!("0x0c3c1c532F1e39EdF36BE9Fe0bE1410313E074Bf"),
-        // <https://polygonscan.com/tx/0x712ac56155a301fca4b7a761e232233f41a104865a74b1a59293835da355292a>
-        POLYGON => address!("0x9e5A52f57b3038F1B8EeE45F28b3C1967e22799C"),
-        // Not available on Lens
-    }
-);
-crate::bindings!(
-    UniswapV2Router02,
-    // <https://docs.uniswap.org/contracts/v2/reference/smart-contracts/router-02>
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x4fc1580e7f66c58b7c26881cce0aab9c3509afe6e507527f30566fbf8039bcd0>
-        MAINNET => address!("0x7a250d5630B4cF539739dF2C5dAcb4c659F2488D"),
-        // <https://gnosisscan.io/tx/0xfcc495cdb313b48bbb0cd0a25cb2e8fd512eb8fb0b15f75947a9d5668e47a918>
-        GNOSIS => address!("0x1C232F01118CB8B424793ae03F870aa7D0ac7f77"),
-        // <https://arbiscan.io/tx/0x630cd9d56a85e1bac7795d254fef861304a6838e28869badef19f19defb48ba6>
-        ARBITRUM_ONE => address!("0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24"),
-        // <https://basescan.org/tx/0x039224ce16ebe5574f51da761acbdfbd21099d6230c39fcd8ff566bbfd6a50a9>
-        BASE => address!("0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24"),
-        // <https://sepolia.etherscan.io/tx/0x92674b51681d2e99e71e03bd387bc0f0e79f2412302b49ed5626d1fa2311bab9>
-        SEPOLIA => address!("0xeE567Fe1712Faf6149d80dA1E6934E354124CfE3"),
-        // <https://snowtrace.io/tx/0x7372f1eedf9d32fb4185d486911f44542723dae766eea04bc3f14724bae9552e>
-        AVALANCHE => address!("0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24"),
-        // <https://bscscan.com/tx/0x9e940f846abea7dcc1f0bd5c261f405c104628c855346f8cac966f52905ee0fa>
-        BNB => address!("0x4752ba5dbc23f44d87826276bf6fd6b1c372ad24"),
-        // <https://optimistic.etherscan.io/tx/0x2dcb9a76100e5be49e89085b87bd447b1966a9d823d5985e1a8197834c60e6bd>
-        OPTIMISM => address!("0x4A7b5Da61326A6379179b40d00F57E5bbDC962c2"),
-        // <https://polygonscan.com/tx/0x66186e0cacd2f6b3ad2eae586bd331daafd0572eb80bf71be694181858198025>
-        POLYGON => address!("0xedf6066a2b290C185783862C7F4776A2C8077AD1"),
-        // Not available on Lens
-    }
-);
-crate::bindings!(IUniswapLikeRouter);
-crate::bindings!(IUniswapLikePair);
-crate::bindings!(UniswapV3Pool);
-crate::bindings!(
-    UniswapV3QuoterV2,
-    crate::deployments! {
-        // <https://docs.uniswap.org/contracts/v3/reference/deployments/>
-        MAINNET => address!("0x61fFE014bA17989E743c5F6cB21bF9697530B21e"),
-        ARBITRUM_ONE => address!("0x61fFE014bA17989E743c5F6cB21bF9697530B21e"),
-        BASE => address!("0x3d4e44Eb1374240CE5F1B871ab261CD16335B76a"),
-        AVALANCHE => address!("0xbe0F5544EC67e9B3b2D979aaA43f18Fd87E6257F"),
-        BNB => address!("0x78D78E420Da98ad378D7799bE8f4AF69033EB077"),
-        OPTIMISM => address!("0x61fFE014bA17989E743c5F6cB21bF9697530B21e"),
-        POLYGON => address!("0x61fFE014bA17989E743c5F6cB21bF9697530B21e"),
-        LENS => address!("0x1eEA2B790Dc527c5a4cd3d4f3ae8A2DDB65B2af1"),
-        LINEA => address!("0x42bE4D6527829FeFA1493e1fb9F3676d2425C3C1"),
-        // Not listed on Gnosis and Sepolia chains
-    }
-);
-crate::bindings!(
-    UniswapV3SwapRouterV2,
-    crate::deployments! {
-        // <https://github.com/Uniswap/v3-periphery/blob/697c2474757ea89fec12a4e6db16a574fe259610/deploys.md>
-        ARBITRUM_ONE => address!("0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45"),
-        MAINNET => address!("0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45"),
-        POLYGON => address!("0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45"),
-        OPTIMISM => address!("0x68b3465833fb72A70ecDF485E0e4C7bD8665Fc45"),
-        BASE => address!("0x2626664c2603336E57B271c5C0b26F421741e481"),
-        AVALANCHE => address!("0xbb00FF08d01D300023C629E8fFfFcb65A5a578cE"),
-        BNB => address!("0xB971eF87ede563556b2ED4b1C0b0019111Dd85d2"),
-        LENS => address!("0x6ddD32cd941041D8b61df213B9f515A7D288Dc13"),
-        LINEA => address!("0x3d4e44Eb1374240CE5F1B871ab261CD16335B76a"),
-        // Not available on Gnosis Chain
-    }
-);
-crate::bindings!(
-    IUniswapV3Factory,
-    crate::deployments! {
-        // <https://github.com/Uniswap/v3-periphery/blob/697c2474757ea89fec12a4e6db16a574fe259610/deploys.md>
-        MAINNET => address!( "0x1F98431c8aD98523631AE4a59f267346ea31F984"),
-        SEPOLIA => address!( "0x1F98431c8aD98523631AE4a59f267346ea31F984"),
-        ARBITRUM_ONE => address!( "0x1F98431c8aD98523631AE4a59f267346ea31F984"),
-        BASE => address!( "0x33128a8fC17869897dcE68Ed026d694621f6FDfD"),
-        AVALANCHE => address!( "0x740b1c1de25031C31FF4fC9A62f554A55cdC1baD"),
-        BNB => address!( "0xdB1d10011AD0Ff90774D0C6Bb92e5C5c8b4461F7"),
-        OPTIMISM => address!( "0x1F98431c8aD98523631AE4a59f267346ea31F984"),
-        POLYGON => address!( "0x1F98431c8aD98523631AE4a59f267346ea31F984"),
-        // not official
-        LENS => address!( "0xc3A5b857Ba82a2586A45a8B59ECc3AA50Bc3D0e3"),
-        LINEA => address!("0x31FAfd4889FA1269F7a13A66eE0fB458f27D72A9"),
-        // Not available on Gnosis Chain
-    }
-);
-
-crate::bindings!(
-    HooksTrampoline,
-    // <https://github.com/cowprotocol/hooks-trampoline/blob/993427166ade6c65875b932f853776299290ac4b/networks.json>
-    crate::deployments! {
-        MAINNET  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        // Gnosis is using the old instance of the hook trampoline since it's hardcoded in gnosis pay rebalance integration.
-        GNOSIS  => address!("0x01DcB88678aedD0C4cC9552B20F4718550250574"),
-        SEPOLIA  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        ARBITRUM_ONE  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        BASE  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        AVALANCHE  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        BNB  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        OPTIMISM  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        POLYGON  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        LENS  => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-        // compiled with an older, linea-compatible evm version
-        LINEA => address!("0xeFcf0d30DB41Ae0b136c5E3B4340dFeE2D099Ada"),
-        PLASMA => address!("0x60Bf78233f48eC42eE3F101b9a05eC7878728006"),
-    }
-);
-
-crate::bindings!(
-    CoWSwapEthFlow,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x0247e3c15f59a52b099f192265f1c1e6227f48a280717b3eefd7a5d9d0c051a1>
-        MAINNET => (address!("0x40a50cf069e992aa4536211b23f286ef88752187"), 16169866),
-        // <https://gnosisscan.io/tx/0x6280e079f454fbb5de3c52beddd64ca2b5be0a4b3ec74edfd5f47e118347d4fb>
-        GNOSIS => (address!("0x40a50cf069e992aa4536211b23f286ef88752187"), 25414331),
-        // <https://github.com/cowprotocol/ethflowcontract/blob/v1.1.0-artifacts/networks.prod.json#L11-L14>
-        // <https://sepolia.etherscan.io/tx/0x558a7608a770b5c4f68fffa9b02e7908a40f61b557b435ea768a4c62cb79ae25>
-        SEPOLIA => (address!("0x0b7795E18767259CC253a2dF471db34c72B49516"), 4718739),
-        // <https://arbiscan.io/tx/0xa4066ca77bbe1f21776b4c26315ead3b1c054b35814b49e0c35afcbff23e1b8d>
-        ARBITRUM_ONE => (address!("0x6DFE75B5ddce1ADE279D4fa6BD6AeF3cBb6f49dB"), 204747458),
-        // <https://basescan.org/tx/0xc3555c4b065867cbf34382438e1bbaf8ee39eaf10fb0c70940c8955962e76e2c>
-        BASE => (address!("0x3C3eA1829891BC9bEC3d06A81d5d169e52a415e3"), 21490258),
-        // <https://snowscan.xyz/tx/0x71a2ed9754247210786effa3269bc6eb68b7521b5052ac9f205af7ac364f608f>
-        AVALANCHE => (address!("0x04501b9b1d52e67f6862d157e00d13419d2d6e95"), 60496408),
-        // <https://bscscan.com/tx/0x959a60a42d36e0efd247b3cf19ed9d6da503d01bce6f87ed31e5e5921111222e>
-        BNB => (address!("0x04501b9b1d52e67f6862d157e00d13419d2d6e95"), 48411237),
-        // <https://optimistic.etherscan.io/tx/0x0644f10f7ae5448240fc592ad21abf4dabac473a9d80904af5f7865f2d6509e2>
-        OPTIMISM => (address!("0x04501b9b1d52e67f6862d157e00d13419d2d6e95"), 134607215),
-        // <https://polygonscan.com/tx/0xc3781c19674d97623d13afc938fca94d53583f4051020512100e84fecd230f91>
-        POLYGON => (address!("0x04501b9b1d52e67f6862d157e00d13419d2d6e95"), 71296258),
-        // <https://explorer.lens.xyz/tx/0xc59b5ffadb40158f9390b1d77f19346dbe9214b27f26346dfa2990ad379a1a32>
-        LENS => (address!("0xFb337f8a725A142f65fb9ff4902d41cc901de222"), 3007173),
-        // <https://lineascan.build/tx/0x0e20a4e0bbce2e28b89b7dcfc4dd4dfb48f5b0b8473b3b5bdeb1bf9f09943485>
-        LINEA => (address!("0x04501b9b1d52e67f6862d157e00d13419d2d6e95"), 24522097),
-        // <https://plasmascan.to/tx/0xda72b111ac2a7d182bf3c884373882add6f4c78f6d4bdae7efcae143be716b38>
-        PLASMA => (address!("0x04501b9b1d52e67f6862d157e00d13419d2d6e95"), 3521855),
-    }
-);
-crate::bindings!(CoWSwapOnchainOrders);
-crate::bindings!(ERC1271SignatureValidator);
-
-// Used in the gnosis/solvers repo for the balancer solver
-crate::bindings!(
-    BalancerQueries,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0x30799534f3a0ab8c7fa492b88b56e9354152ffaddad15415184a3926c0dd9b09>
-        MAINNET => (address!("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5"), 15188261),
-        // <https://arbiscan.io/tx/0x710d93aab52b6c10197eab20f9d6db1af3931f9890233d8832268291ef2f54b3>
-        ARBITRUM_ONE => (address!("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5"), 18238624),
-        // <https://optimistic.etherscan.io/tx/0xf3b2aaf3e12c7de0987dc99a26242b227b9bc055342dda2e013dab0657d6f9f1>
-        OPTIMISM => (address!("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5"), 15288107),
-        // <https://basescan.org/tx/0x425d04ee79511c17d06cd96fe1df9e0727f7e7d46b31f36ecaa044ada6a0d29a>
-        BASE => (address!("0x300Ab2038EAc391f26D9F895dc61F8F66a548833"), 1205869),
-        // <https://gnosisscan.io/tx/0x5beb3051d393aac24cb236dc850c644f345af65c4927030bd1033403e2f2e503>
-        GNOSIS => (address!("0x0F3e0c4218b7b0108a3643cFe9D3ec0d4F57c54e"), 24821845),
-        // <https://polygonscan.com/tx/0x0b74f5c230f9b7df8c7a7f0d1ebd5e6c3fab51a67a9bcc8f05c350180041682e>
-        POLYGON => (address!("0xE39B5e3B6D74016b2F6A9673D7d7493B6DF549d5"), 30988035),
-        // <https://snowtrace.io/tx/0xf484e1efde47209bad5f72642bcb8d8e2a4092a5036434724ffa2d039e93a1bf?chainid=43114>
-        AVALANCHE => (address!("0xC128468b7Ce63eA702C1f104D55A2566b13D3ABD"), 26387068),
-        // Not available on Lens
-    }
-);
-
-crate::bindings!(
-    LiquoriceSettlement,
-    crate::deployments! {
-        // <https://liquorice.gitbook.io/liquorice-docs/links/smart-contracts>
-        MAINNET => address!("0x0448633eb8B0A42EfED924C42069E0DcF08fb552"),
-        ARBITRUM_ONE => address!("0x0448633eb8B0A42EfED924C42069E0DcF08fb552"),
-    }
-);
-
-crate::bindings!(
-    FlashLoanRouter,
-    crate::deployments! {
-        MAINNET => address!("0x9da8b48441583a2b93e2ef8213aad0ec0b392c69"),
-        GNOSIS => address!("0x9da8b48441583a2b93e2ef8213aad0ec0b392c69"),
-        SEPOLIA => address!("0x9da8b48441583a2b93e2ef8213aad0ec0b392c69"),
-        ARBITRUM_ONE => address!("0x9da8b48441583a2b93e2ef8213aad0ec0b392c69"),
-        BASE => address!("0x9da8b48441583a2b93e2ef8213aad0ec0b392c69"),
-        POLYGON => address!("0x9da8b48441583a2b93e2ef8213aad0ec0b392c69"),
-        AVALANCHE => address!("0x9da8b48441583a2b93e2ef8213aad0ec0b392c69"),
-    }
-);
-
-crate::bindings!(ICowWrapper);
-
-// Only used in <github.com/gnosis/solvers>
-crate::bindings!(
-    Permit2,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0xf2f1fe96c16ee674bb7fcee166be52465a418927d124f5f1d231b36eae65d377>
-        MAINNET => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 15986406),
-        // <https://gnosisscan.io/tx/0x3ba511410edc92cafe94bd100e25adb37981499d17947a3d64c8523fbfd31864>
-        GNOSIS => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 27338672),
-        // <https://sepolia.etherscan.io/tx/0x363df5deeead44d8fd38425f3986e3e81946a6c59d8b68fe33926cc700713173>
-        SEPOLIA => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 2356287),
-        // <https://arbiscan.io/tx/0xe244dafca8211ed6fb123efaa5075b7d5813749718412ca435c872afd0e2ea82>
-        ARBITRUM_ONE => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 38692735),
-        // <https://basescan.org/tx/0x26fbdea9a47ba8e21676bc6b6a72a19dded1a0c270e96d5236886ca9c5000d3f>
-        BASE => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 1425180),
-        // <https://snowscan.xyz/tx/0x38fd76c2165d920c7e006defd67eeeb0069bf93e41741eec3bbb83d196610a56>
-        AVALANCHE => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 28844415),
-        // <https://bscscan.com/tx/0xb038ec7b72db4207e0c0d5433e1cabc41b4e4f9b9cac577173b3188fc508a6c3>
-        BNB => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 25343783),
-        // <https://optimistic.etherscan.io/tx/0xf0a51e0d0579ef8cc7965f5797bd7665ddac14d4d2141423676b8862f7668352>
-        OPTIMISM => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 38854427),
-        // <https://polygonscan.com/tx/0xe2a4d996de0d6a23108f701b37acba6c47ee34448bb51fec5c23f542a6f3ccc8>
-        POLYGON => (address!("0x000000000022D473030F116dDEE9F6B43aC78BA3"), 35701901),
-    }
-);
-
-crate::bindings!(
-    GPv2AllowListAuthentication,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0xb84bf720364f94c749f1ec1cdf0d4c44c70411b716459aaccfd24fc677013375>
-        MAINNET => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 12593263),
-        // <https://gnosisscan.io/tx/0x1a2d87a05a94bc6680a4faee31bbafbd74e9ddb63dd3941c717b5c609c08b957>
-        GNOSIS => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 16465099),
-        // <https://sepolia.etherscan.io/tx/0x73c54c75b3f382304f3adf33e3876c8999fb10df786d4a902733369251033cd1>
-        SEPOLIA => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 4717469),
-        // <https://arbiscan.io/tx/0xe994adff141a2e72bd9dab3eb7b3480637013bdfb1aa42c62d9d6c90de091237>
-        ARBITRUM_ONE => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 204702129),
-        // <https://basescan.org/tx/0x5497004d2a37c9eafd0bd1e5861a67d3a209c5b845724166e3dbca9527ee05ec>
-        BASE => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 21407137),
-        // <https://snowscan.xyz/tx/0xa58fc76846917779d7bcbb7d34f4a2a44aab2b702ef983594e34e6972a0c626b>
-        AVALANCHE => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 59891351),
-        // <https://bscscan.com/tx/0x8da639c62eb4a810573c178ed245184944d66c834122e3f88994ebf679b50e34>
-        BNB => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 48173639),
-        // <https://optimistic.etherscan.io/tx/0x5b6403b485e369ce524d04234807df782e6639e55a7c1d859f0a67925d9a5f49>
-        OPTIMISM => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 134254466),
-        // <https://polygonscan.com/tx/0x686e4bbcfd6ebae91f0fcc667407c831953629877ec622457916729de3d461c3>
-        POLYGON => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 45854728),
-        // <https://explorer.lens.xyz/tx/0x0730c21885153dcc9a25ab7abdc38309ec7c7a8db15b763fbbaf574d1e7ec498>
-        LENS => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 2612937),
-        // <https://lineascan.build/tx/0x6e5d2c4381320efdd21ccde1534560ded1b9ab07638776833faa22820c378155>
-        LINEA => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 24333100),
-        // <https://plasmascan.to/tx/0xc2ac50ad302e402c4db1e956bd357af7d84e3684ad65e4fdee58abea092ac88c>
-        PLASMA => (address!("0x2c4c28DDBdAc9C5E7055b4C863b72eA0149D8aFE"), 3439709),
-    }
-);
-
-crate::bindings!(
-    GPv2Settlement,
-    crate::deployments! {
-        // <https://etherscan.io/tx/0xf49f90aa5a268c40001d1227b76bb4dd8247f18361fcad9fffd4a7a44f1320d3>
-        MAINNET => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 12593265),
-        // <https://blockscout.com/xdai/mainnet/tx/0x9ddc538f89cd8433f4a19bc4de0de27e7c68a1d04a14b327185e4bba9af87133>
-        GNOSIS => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 16465100),
-        // <https://sepolia.etherscan.io/tx/0x6bba22a00ffcff6bca79aced546e18d2a5a4f4e484a4e4dbafab13daf42f718d>
-        SEPOLIA => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 4717488),
-        // <https://arbiscan.io/tx/0x240486f35ebf42ea69b2b3f1569d587c18c87f98c0ec997bef7d18182ca4c38c>
-        ARBITRUM_ONE => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 204704802),
-        // <https://basescan.org/tx/0x00a3c4e2dc4241465208beeba27e90a9ce3159ad4f41581c4c3a1ef02d6e37cb>
-        BASE => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 21407238),
-        // <https://snowscan.xyz/tx/0x374b84f0ea6bc554abc3ffdc3fbce4374fefc76f2bd25e324ce95a62cafcc142>
-        AVALANCHE => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 59891356),
-        // <https://bscscan.com/tx/0x9e0c16a655ceadcb95ba2de3bf59d2b3a3d10cce7bdf52aa5520164b58ffd969>
-        BNB => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 48173641),
-        // <https://optimistic.etherscan.io/tx/0xd1bbd68ee6b0eecf6f883e148284fc4fb4c960299b75004dfddd5135246cd5eb>
-        OPTIMISM => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 134254624),
-        // <https://polygonscan.com/tx/0x0e24d3a2a8530eaad5ae62e54e64d57665a77ce3970227d20c1b77da315cbbf6>
-        POLYGON => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 45859743),
-        // <https://explorer.lens.xyz/tx/0x01584b767dda7b115394b93dbcfecadfe589862ae3f7957846a2db82f2f5c703>
-        LENS => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 2621745),
-        // <https://lineascan.build/tx/0x6e5d2c4381320efdd21ccde1534560ded1b9ab07638776833faa22820c378155>
-        LINEA => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 24333100),
-        // <https://plasmascan.to/tx/0xf16bd6f307dce94ab252d8dd8266ab30091879fb3d631cbcf3d0ffddf9e6ad05?chainid=9745>
-        PLASMA => (address!("0x9008D19f58AAbD9eD0D60971565AA8510560ab41"), 3439711),
-    }
-);
-
-crate::bindings!(
-    WETH9,
-    crate::deployments! {
-        // Note: the WETH address must be consistent with the one used by the ETH-flow
-        // contract
-        MAINNET => address!("0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"),
-        GNOSIS => address!("0xe91D153E0b41518A2Ce8Dd3D7944Fa863463a97d"),
-        SEPOLIA => address!("0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14"),
-        ARBITRUM_ONE => address!("0x82aF49447D8a07e3bd95BD0d56f35241523fBab1"),
-        BASE => address!("0x4200000000000000000000000000000000000006"),
-        AVALANCHE => address!("0xB31f66AA3C1e785363F0875A1B74E27b85FD66c7"),
-        BNB => address!("0xbb4CdB9CBd36B01bD1cBaEBF2De08d9173bc095c"),
-        OPTIMISM => address!("0x4200000000000000000000000000000000000006"),
-        POLYGON => address!("0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270"),
-        LENS => address!("0x6bDc36E20D267Ff0dd6097799f82e78907105e2F"),
-        LINEA => address!("0xe5d7c2a44ffddf6b295a15c148167daaaf5cf34f"),
-        PLASMA => address!("0x6100E367285b01F48D07953803A2d8dCA5D19873"),
-    }
-);
-
-crate::bindings!(ERC20);
-
-pub mod cow_amm {
-    crate::bindings!(CowAmm);
-    crate::bindings!(
-        CowAmmConstantProductFactory,
-        crate::deployments! {
-            // <https://etherscan.io/tx/0xf37fc438ddacb00c28305bd7dea3b79091cd5be3405a2b445717d9faf946fa50>
-            MAINNET => (address!("0x40664207e3375FB4b733d4743CE9b159331fd034"), 19861952),
-            // <https://gnosisscan.io/tx/0x4121efab4ad58ae7ad73b50448cccae0de92905e181648e5e08de3d6d9c66083>
-            GNOSIS => (address!("0xdb1cba3a87f2db53b6e1e6af48e28ed877592ec0"), 33874317),
-            // <https://sepolia.etherscan.io/tx/0x5e6af00c670eb421b96e78fd2e3b9df573b19e6e0ea77d8003e47cdde384b048>
-            SEPOLIA => (address!("0xb808e8183e3a72d196457d127c7fd4befa0d7fd3"), 5874562),
-        }
-    );
-    crate::bindings!(
-        CowAmmLegacyHelper,
-        crate::deployments! {
-            // <https://etherscan.io/tx/0x07f0ce50fb9cd30e69799a63ae9100869a3c653d62ea3ba49d2e5e1282f42b63>
-            MAINNET => (address!("0x3705ceee5eaa561e3157cf92641ce28c45a3999c"), 20332745),
-            // <https://gnosisscan.io/tx/0x09e56c7173ab1e1c5d02bc2832799422ebca6d9a40e5bae77f6ca908696bfebf>
-            GNOSIS => (address!("0xd9ec06b001957498ab1bc716145515d1d0e30ffb"), 35026999),
-        }
-    );
-    crate::bindings!(CowAmmUniswapV2PriceOracle);
-    crate::bindings!(CowAmmFactoryGetter);
-}
-
-pub mod support {
-    // Support contracts used for trade and token simulations.
-    crate::bindings!(AnyoneAuthenticator);
-    crate::bindings!(Solver);
-    crate::bindings!(Spardose);
-    crate::bindings!(Trader);
-    // Support contract used for solver fee simulations in the gnosis/solvers repo.
-    crate::bindings!(Swapper);
-    crate::bindings!(
-        Signatures,
-        crate::deployments! {
-            MAINNET => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            ARBITRUM_ONE => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            BASE => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            AVALANCHE => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            BNB => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            OPTIMISM => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            POLYGON => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            LENS => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            GNOSIS => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            SEPOLIA => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-            // built with evm=London, because deployment reverts on Linea otherwise
-            LINEA => address!("0xf6E57e72F7dB3D9A51a8B4c149C00475b94A37e4"),
-            PLASMA => address!("0x8262d639c38470F38d2eff15926F7071c28057Af"),
-        }
-    );
-    // Support contracts used for various order simulations.
-    crate::bindings!(
-        Balances,
-        crate::deployments! {
-            MAINNET => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            ARBITRUM_ONE => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            BASE => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            AVALANCHE => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            BNB => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            OPTIMISM => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            POLYGON => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            LENS => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            GNOSIS => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            SEPOLIA => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            PLASMA => address!("0x3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
-            // built with evm=London, because deployment reverts on Linea otherwise
-            LINEA => address!("0x361350f708f7c0c63c8a505226592c3e5d1faa29"),
-        }
-    );
-}
-
-pub mod test {
-    // Test Contract for using up a specified amount of gas.
-    crate::bindings!(GasHog);
-    // Test Contract for incrementing arbitrary counters.
-    crate::bindings!(Counter);
-    // Token with support for `permit` (for pre-interaction tests)
-    crate::bindings!(
-        CowProtocolToken,
-        crate::deployments! {
-            MAINNET => address!("0xDEf1CA1fb7FBcDC777520aa7f396b4E015F497aB"),
-            GNOSIS => address!("0x177127622c4A00F3d409B75571e12cB3c8973d3c"),
-            SEPOLIA => address!("0x0625aFB445C3B6B7B929342a04A22599fd5dBB59"),
-            ARBITRUM_ONE => address!("0xcb8b5CD20BdCaea9a010aC1F8d835824F5C87A04"),
-            BASE => address!("0xc694a91e6b071bF030A18BD3053A7fE09B6DaE69"),
-        }
-    );
-}
-
-pub use alloy::providers::DynProvider as Provider;
-
-/// Extension trait to attach some useful functions to the contract instance.
-pub trait InstanceExt: Sized {
-    /// Crates a contract instance at the expected address for the current
-    /// network.
-    fn deployed(
-        provider: &Provider,
-    ) -> impl std::future::Future<Output = anyhow::Result<Self>> + Send;
-}
-
-/// Build a `HashMap<u64, (Address, Option<u64>)>` from entries like:
-/// `CHAIN_ID => address!("0x…")`                // block = None
-/// `CHAIN_ID => (address!("0x…"), 12_345_678)`  // block = Some(…)
-#[macro_export]
-macro_rules! deployments {
-    (@acc $m:ident; ) => {};
-
-    // Tuple form with trailing comma: CHAIN => (addr, block),
-    (@acc $m:ident; $chain:expr => ( $addr:expr, $block:expr ), $($rest:tt)* ) => {
-        $m.insert($chain, ($addr, Some($block)));
-        $crate::deployments!(@acc $m; $($rest)*);
-    };
-
-    // Address-only form with trailing comma: CHAIN => addr,
-    (@acc $m:ident; $chain:expr => $addr:expr, $($rest:tt)* ) => {
-        $m.insert($chain, ($addr, None::<u64>));
-        $crate::deployments!(@acc $m; $($rest)*);
-    };
-
-    // Tuple form without trailing comma (last entry).
-    (@acc $m:ident; $chain:expr => ( $addr:expr, $block:expr ) ) => {
-        $m.insert($chain, ($addr, Some($block)));
-    };
-
-    // Address-only form without trailing comma (last entry).
-    (@acc $m:ident; $chain:expr => $addr:expr ) => {
-        $m.insert($chain, ($addr, None::<u64>));
-    };
-
-    ( $($rest:tt)* ) => {{
-        let mut m = ::std::collections::HashMap::new();
-        $crate::deployments!(@acc m; $($rest)*);
-        m
-    }};
-}
-
-#[macro_export]
-macro_rules! bindings {
-    ($contract:ident $(, $deployment_info:expr)?) => {
-        paste::paste! {
-            // Generate the main bindings in a private module. That allows
-            // us to re-export all items in our own module while also adding
-            // some items ourselves.
-            #[expect(non_snake_case)]
-            mod [<$contract Private>] {
-                alloy::sol!(
-                    #[allow(missing_docs, clippy::too_many_arguments)]
-                    #[sol(rpc, all_derives)]
-                    $contract,
-                    concat!("./artifacts/", stringify!($contract), ".json"),
-                );
-            }
-
-            #[expect(non_snake_case)]
-            pub mod $contract {
-                use alloy::providers::DynProvider;
-
-                pub use super::[<$contract Private>]::*;
-                pub type Instance = $contract::[<$contract Instance>]<DynProvider>;
-
-                $(
-                use {
-                    std::sync::LazyLock,
-                    anyhow::Result,
-                    std::collections::HashMap,
-                    alloy::{
-                        providers::Provider,
-                        primitives::{address, Address},
-                    },
-                    anyhow::Context,
-                    $crate::alloy::networks::*,
-                };
-
-                static DEPLOYMENT_INFO: LazyLock<HashMap<u64, (Address, Option<u64>)>> = LazyLock::new(|| {
-                    $deployment_info
-                });
-
-                /// Returns the contract's deployment block (if one exists) for the given chain.
-                pub fn deployment_block(chain_id: &u64) -> Option<u64> {
-                    DEPLOYMENT_INFO.get(chain_id).map(|(_, block)| *block).flatten()
-                }
-
-                /// Returns the contract's deployment address (if one exists) for the given chain.
-                pub fn deployment_address(chain_id: &u64) -> Option<alloy::primitives::Address> {
-                    DEPLOYMENT_INFO.get(chain_id).map(|(addr, _)| *addr)
-                }
-
-                impl $crate::alloy::InstanceExt for Instance {
-                    fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
-                        async move {
-                            let chain_id = provider
-                                .get_chain_id()
-                                .await
-                                .context("could not fetch current chain id")?;
-
-                            let (address, _deployed_block) = *DEPLOYMENT_INFO
-                                .get(&chain_id)
-                                .with_context(|| format!("no deployment info for chain {chain_id:?}"))?;
-
-                            Ok(Instance::new(
-                                address,
-                                provider.clone(),
-                            ))
-                        }
-                    }
-                }
-                )*
-            }
-        }
-    };
-}
-
-#[cfg(test)]
-mod tests {
-    use super::networks::*;
-    use super::*;
-
-    #[test]
-    fn test_has_address() {
-        assert!(BaoswapRouter::deployment_address(&GNOSIS).is_some());
-        assert!(HoneyswapRouter::deployment_address(&GNOSIS).is_some());
-
-        for chain_id in &[MAINNET, ARBITRUM_ONE, BASE, BNB] {
-            assert!(PancakeRouter::deployment_address(chain_id).is_some());
-        }
-
-        for chain_id in &[
-            MAINNET,
-            GNOSIS,
-            ARBITRUM_ONE,
-            BASE,
-            AVALANCHE,
-            BNB,
-            OPTIMISM,
-            POLYGON,
-        ] {
-            assert!(SushiSwapRouter::deployment_address(chain_id).is_some());
-        }
-
-        for chain_id in &[MAINNET, GNOSIS, ARBITRUM_ONE] {
-            assert!(SwaprRouter::deployment_address(chain_id).is_some());
-        }
-
-        assert!(TestnetUniswapV2Router02::deployment_address(&SEPOLIA).is_some());
-
-        for chain_id in &[
-            MAINNET,
-            GNOSIS,
-            ARBITRUM_ONE,
-            BASE,
-            SEPOLIA,
-            AVALANCHE,
-            BNB,
-            OPTIMISM,
-            POLYGON,
-        ] {
-            assert!(UniswapV2Factory::deployment_address(chain_id).is_some());
-            assert!(UniswapV2Router02::deployment_address(chain_id).is_some());
-        }
-    }
-}
diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index d2a3259510..561ddf8211 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::let_unit_value)]
 
 pub use ethcontract;
-// pub mod alloy;
+pub mod alloy;
 pub mod errors;
 use {
     anyhow::{Result, anyhow, bail},
@@ -37,7 +37,6 @@ pub fn deployment_block(contract: &Contract, chain_id: u64) -> Result<u64> {
 #[macro_use]
 mod macros;
 
-pub mod bindings;
 #[cfg(feature = "bin")]
 pub mod paths;
 pub mod vault;

From d9a44862566b633230f033caca583db9145a18d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Mon, 3 Nov 2025 17:50:03 +0000
Subject: [PATCH 20/36] Revert "wip"

This reverts commit 9f08facba208fb9cdd29d2cc699fb39de9c1c840.
---
 Cargo.lock                                    |  1 -
 .../src/boundary/events/settlement.rs         |  4 +-
 .../ethflow_events/event_retriever.rs         |  2 +-
 .../database/ethflow_events/event_storing.rs  |  2 +-
 crates/autopilot/src/database/events.rs       |  2 +-
 .../onchain_order_events/ethflow_events.rs    |  4 +-
 .../onchain_order_events/event_retriever.rs   |  4 +-
 .../src/database/onchain_order_events/mod.rs  | 16 +++----
 .../src/domain/settlement/transaction/mod.rs  |  4 +-
 .../settlement/transaction/tokenized.rs       |  2 +-
 .../src/infra/blockchain/contracts.rs         |  9 ++--
 crates/autopilot/src/run.rs                   |  3 +-
 crates/contracts-generate/src/lib.rs          |  4 --
 crates/contracts/Cargo.toml                   |  1 -
 crates/contracts/build.rs                     |  1 -
 crates/contracts/src/lib.rs                   | 45 +++++++++++++++++
 crates/contracts/src/vault.rs                 | 12 ++---
 crates/cow-amm/src/amm.rs                     |  2 +-
 crates/cow-amm/src/cache.rs                   |  2 +-
 crates/cow-amm/src/factory.rs                 |  2 +-
 crates/cow-amm/src/lib.rs                     |  4 +-
 crates/cow-amm/src/maintainers.rs             |  2 +-
 crates/cow-amm/src/registry.rs                |  2 +-
 .../src/boundary/liquidity/balancer/v2/mod.rs |  2 +-
 .../src/boundary/liquidity/uniswap/v2.rs      |  2 +-
 .../driver/src/boundary/liquidity/zeroex.rs   |  3 +-
 .../domain/competition/solution/encoding.rs   |  6 +--
 crates/driver/src/domain/cow_amm.rs           | 11 +++--
 crates/driver/src/domain/liquidity/zeroex.rs  |  2 +-
 .../driver/src/infra/blockchain/contracts.rs  | 16 +++++--
 crates/driver/src/infra/blockchain/token.rs   |  4 +-
 crates/driver/src/infra/liquidity/config.rs   | 44 ++++++++---------
 .../liquidity_sources/liquorice/notifier.rs   |  4 +-
 crates/driver/src/tests/setup/blockchain.rs   | 19 ++++----
 crates/driver/src/tests/setup/solver.rs       |  2 +-
 crates/e2e/src/setup/deploy.rs                |  6 +--
 .../e2e/src/setup/onchain_components/mod.rs   |  6 +--
 .../e2e/src/setup/onchain_components/safe.rs  |  8 ++--
 crates/e2e/tests/e2e/banned_users.rs          |  2 +-
 crates/e2e/tests/e2e/cow_amm.rs               | 48 +++++++++++--------
 crates/e2e/tests/e2e/ethflow.rs               |  2 +-
 crates/e2e/tests/e2e/hooks.rs                 |  6 +--
 crates/e2e/tests/e2e/limit_orders.rs          |  2 +-
 crates/e2e/tests/e2e/liquidity.rs             |  2 +-
 .../e2e/liquidity_source_notification.rs      |  2 +-
 crates/e2e/tests/e2e/smart_contract_orders.rs |  2 +-
 crates/e2e/tests/e2e/univ2.rs                 |  2 +-
 crates/e2e/tests/e2e/wrapper.rs               |  2 +-
 crates/orderbook/src/run.rs                   | 20 +++++---
 crates/refunder/src/ethflow_order.rs          |  2 +-
 crates/refunder/src/lib.rs                    |  2 +-
 crates/refunder/src/refund_service.rs         |  2 +-
 crates/refunder/src/submitter.rs              |  2 +-
 crates/shared/src/account_balances/mod.rs     |  2 +-
 .../shared/src/account_balances/simulation.rs |  6 +--
 .../src/bad_token/token_owner_finder/mod.rs   |  7 ++-
 crates/shared/src/bad_token/trace_call.rs     |  4 +-
 crates/shared/src/event_handling.rs           |  4 +-
 crates/shared/src/order_validation.rs         |  2 +-
 crates/shared/src/price_estimation/factory.rs |  2 +-
 .../balance_overrides/detector.rs             |  2 +-
 .../price_estimation/trade_verifier/mod.rs    |  6 ++-
 crates/shared/src/signature_validator/mod.rs  |  4 +-
 .../src/signature_validator/simulation.rs     |  4 +-
 .../sources/balancer_v2/pool_fetching/mod.rs  |  3 +-
 .../balancer_v2/pool_fetching/pool_storage.rs |  2 +-
 .../balancer_v2/pool_fetching/registry.rs     |  2 +-
 .../src/sources/balancer_v2/pools/common.rs   |  4 +-
 .../balancer_v2/pools/composable_stable.rs    |  2 +-
 .../pools/liquidity_bootstrapping.rs          |  2 +-
 .../src/sources/balancer_v2/pools/stable.rs   |  2 +-
 .../src/sources/balancer_v2/pools/weighted.rs |  2 +-
 crates/shared/src/sources/swapr.rs            |  2 +-
 crates/shared/src/sources/uniswap_v2/mod.rs   | 20 ++++----
 .../src/sources/uniswap_v2/pool_fetching.rs   |  2 +-
 .../src/sources/uniswap_v3/event_fetching.rs  |  2 +-
 .../src/sources/uniswap_v3/pool_fetching.rs   |  4 +-
 crates/shared/src/token_info.rs               |  2 +-
 crates/solver/src/interactions/allowances.rs  |  4 +-
 crates/solver/src/interactions/balancer_v2.rs |  2 +-
 crates/solver/src/interactions/erc20.rs       |  2 +-
 crates/solver/src/interactions/uniswap_v2.rs  |  2 +-
 crates/solver/src/interactions/uniswap_v3.rs  |  2 +-
 crates/solver/src/interactions/weth.rs        |  2 +-
 crates/solver/src/interactions/zeroex.rs      |  2 +-
 crates/solver/src/liquidity/balancer_v2.rs    |  2 +-
 crates/solver/src/liquidity/uniswap_v3.rs     |  2 +-
 crates/solver/src/liquidity/zeroex.rs         |  2 +-
 .../src/settlement/settlement_encoder.rs      |  3 +-
 crates/solvers/src/boundary/baseline.rs       |  4 +-
 .../src/boundary/liquidity/concentrated.rs    |  4 +-
 crates/solvers/src/domain/solver.rs           |  5 +-
 crates/solvers/src/infra/contracts.rs         |  2 +-
 93 files changed, 279 insertions(+), 218 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 37878d6ce5..0d9606e020 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2411,7 +2411,6 @@ dependencies = [
  "ethcontract",
  "ethcontract-generate",
  "paste",
- "serde",
  "serde_json",
  "tracing",
  "tracing-subscriber",
diff --git a/crates/autopilot/src/boundary/events/settlement.rs b/crates/autopilot/src/boundary/events/settlement.rs
index ebb9c84dc6..1520b67b21 100644
--- a/crates/autopilot/src/boundary/events/settlement.rs
+++ b/crates/autopilot/src/boundary/events/settlement.rs
@@ -5,7 +5,7 @@ use {
         rpc::types::{Filter, Log},
     },
     anyhow::Result,
-    contracts::bindings::GPv2Settlement::GPv2Settlement::GPv2SettlementEvents,
+    contracts::alloy::GPv2Settlement::GPv2Settlement::GPv2SettlementEvents,
     ethrpc::{AlloyProvider, block_stream::RangeInclusive},
     shared::event_handling::{AlloyEventRetrieving, EventStoring},
 };
@@ -28,7 +28,7 @@ impl AlloyEventRetrieving for GPv2SettlementContract {
         Filter::new().address(self.address)
     }
 
-    fn provider(&self) -> &alloy::providers::DynProvider {
+    fn provider(&self) -> &contracts::alloy::Provider {
         &self.provider
     }
 }
diff --git a/crates/autopilot/src/database/ethflow_events/event_retriever.rs b/crates/autopilot/src/database/ethflow_events/event_retriever.rs
index b5dc58d697..41ad7a25e1 100644
--- a/crates/autopilot/src/database/ethflow_events/event_retriever.rs
+++ b/crates/autopilot/src/database/ethflow_events/event_retriever.rs
@@ -29,7 +29,7 @@ impl EthFlowRefundRetriever {
 impl AlloyEventRetrieving for EthFlowRefundRetriever {
     type Event = CoWSwapEthFlow::CoWSwapEthFlowEvents;
 
-    fn provider(&self) -> &alloy::providers::DynProvider {
+    fn provider(&self) -> &contracts::alloy::Provider {
         &self.web3.alloy
     }
 
diff --git a/crates/autopilot/src/database/ethflow_events/event_storing.rs b/crates/autopilot/src/database/ethflow_events/event_storing.rs
index 93369cc1ab..d9046a9e3d 100644
--- a/crates/autopilot/src/database/ethflow_events/event_storing.rs
+++ b/crates/autopilot/src/database/ethflow_events/event_storing.rs
@@ -4,7 +4,7 @@ use {
     crate::database::{Postgres, events::bytes_to_order_uid},
     alloy::rpc::types::Log,
     anyhow::Result,
-    contracts::bindings::CoWSwapEthFlow::CoWSwapEthFlow::CoWSwapEthFlowEvents,
+    contracts::alloy::CoWSwapEthFlow::CoWSwapEthFlow::CoWSwapEthFlowEvents,
     database::ethflow_orders::Refund,
     ethrpc::block_stream::RangeInclusive,
     shared::event_handling::EventStoring,
diff --git a/crates/autopilot/src/database/events.rs b/crates/autopilot/src/database/events.rs
index f18f902f6f..47138a673b 100644
--- a/crates/autopilot/src/database/events.rs
+++ b/crates/autopilot/src/database/events.rs
@@ -1,7 +1,7 @@
 use {
     alloy::rpc::types::Log,
     anyhow::{Context, Result},
-    contracts::bindings::GPv2Settlement::GPv2Settlement::{self, GPv2SettlementEvents},
+    contracts::alloy::GPv2Settlement::GPv2Settlement::{self, GPv2SettlementEvents},
     database::{
         OrderUid,
         PgTransaction,
diff --git a/crates/autopilot/src/database/onchain_order_events/ethflow_events.rs b/crates/autopilot/src/database/onchain_order_events/ethflow_events.rs
index 27fb795688..9dd67203b7 100644
--- a/crates/autopilot/src/database/onchain_order_events/ethflow_events.rs
+++ b/crates/autopilot/src/database/onchain_order_events/ethflow_events.rs
@@ -3,7 +3,7 @@ use {
     crate::database::events::log_to_event_index,
     alloy::{eips::BlockNumberOrTag, rpc::types::Log},
     anyhow::{Context, Result, anyhow},
-    contracts::bindings::{
+    contracts::alloy::{
         CoWSwapOnchainOrders::CoWSwapOnchainOrders::{
             CoWSwapOnchainOrdersEvents as ContractEvent,
             OrderPlacement as ContractOrderPlacement,
@@ -293,7 +293,7 @@ mod test {
     use {
         super::*,
         alloy::primitives::{Address, U256},
-        contracts::bindings::CoWSwapOnchainOrders,
+        contracts::alloy::CoWSwapOnchainOrders,
         model::order::{BuyTokenDestination, OrderKind, SellTokenSource},
     };
 
diff --git a/crates/autopilot/src/database/onchain_order_events/event_retriever.rs b/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
index b40f38aded..ed99df97bf 100644
--- a/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
+++ b/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
@@ -4,7 +4,7 @@ use {
         rpc::types::{Filter, FilterSet},
         sol_types::SolEvent,
     },
-    contracts::bindings::CoWSwapOnchainOrders,
+    contracts::alloy::CoWSwapOnchainOrders,
     shared::{ethrpc::Web3, event_handling::AlloyEventRetrieving},
 };
 
@@ -42,7 +42,7 @@ impl AlloyEventRetrieving for CoWSwapOnchainOrdersContract {
             ]))
     }
 
-    fn provider(&self) -> &alloy::providers::DynProvider {
+    fn provider(&self) -> &contracts::alloy::Provider {
         &self.web3.alloy
     }
 }
diff --git a/crates/autopilot/src/database/onchain_order_events/mod.rs b/crates/autopilot/src/database/onchain_order_events/mod.rs
index 5f5a6cb4f6..0f6840b334 100644
--- a/crates/autopilot/src/database/onchain_order_events/mod.rs
+++ b/crates/autopilot/src/database/onchain_order_events/mod.rs
@@ -12,7 +12,7 @@ use {
     anyhow::{Context, Result, anyhow, bail},
     app_data::AppDataHash,
     chrono::{TimeZone, Utc},
-    contracts::bindings::{
+    contracts::alloy::{
         CoWSwapOnchainOrders::CoWSwapOnchainOrders::{
             CoWSwapOnchainOrdersEvents as ContractEvent,
             OrderInvalidation,
@@ -784,7 +784,7 @@ mod test {
         super::*,
         crate::database::Config,
         alloy::primitives::U256,
-        contracts::bindings::CoWSwapOnchainOrders,
+        contracts::alloy::{CoWSwapOnchainOrders, InstanceExt},
         database::{byte_array::ByteArray, onchain_broadcasted_orders::OnchainOrderPlacement},
         ethcontract::H160,
         ethrpc::Web3,
@@ -954,7 +954,7 @@ mod test {
 
         let order_placement = ContractOrderPlacement {
             sender,
-            order: contracts::bindings::CoWSwapOnchainOrders::GPv2Order::Data {
+            order: contracts::alloy::CoWSwapOnchainOrders::GPv2Order::Data {
                 sellToken: sell_token,
                 buyToken: buy_token,
                 receiver,
@@ -969,7 +969,7 @@ mod test {
                 buyTokenBalance: BuyTokenDestination::ERC20.into(),
             },
             signature:
-                contracts::bindings::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
+                contracts::alloy::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
                     scheme: 0,
                     data: owner.0.into(),
                 },
@@ -1065,7 +1065,7 @@ mod test {
         };
         let order_placement = ContractOrderPlacement {
             sender,
-            order: contracts::bindings::CoWSwapOnchainOrders::GPv2Order::Data {
+            order: contracts::alloy::CoWSwapOnchainOrders::GPv2Order::Data {
                 sellToken: sell_token,
                 buyToken: buy_token,
                 receiver,
@@ -1080,7 +1080,7 @@ mod test {
                 buyTokenBalance: BuyTokenDestination::ERC20.into(),
             },
             signature:
-                contracts::bindings::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
+                contracts::alloy::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
                     scheme: 0,
                     data: owner.0.into(),
                 },
@@ -1166,7 +1166,7 @@ mod test {
         let owner = Address::from([6; 20]);
         let order_placement = ContractOrderPlacement {
             sender,
-            order: contracts::bindings::CoWSwapOnchainOrders::GPv2Order::Data {
+            order: contracts::alloy::CoWSwapOnchainOrders::GPv2Order::Data {
                 sellToken: sell_token,
                 buyToken: buy_token,
                 receiver,
@@ -1181,7 +1181,7 @@ mod test {
                 buyTokenBalance: BuyTokenDestination::ERC20.into(),
             },
             signature:
-                contracts::bindings::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
+                contracts::alloy::CoWSwapOnchainOrders::ICoWSwapOnchainOrders::OnchainSignature {
                     scheme: 0,
                     data: owner.0.into(),
                 },
diff --git a/crates/autopilot/src/domain/settlement/transaction/mod.rs b/crates/autopilot/src/domain/settlement/transaction/mod.rs
index 81a4bf9370..c1a673c4b4 100644
--- a/crates/autopilot/src/domain/settlement/transaction/mod.rs
+++ b/crates/autopilot/src/domain/settlement/transaction/mod.rs
@@ -4,7 +4,7 @@ use {
         domain::{self, auction::order, eth},
     },
     alloy::sol_types::SolCall,
-    contracts::bindings::{GPv2AllowListAuthentication, GPv2Settlement},
+    contracts::alloy::{GPv2AllowListAuthentication, GPv2Settlement},
     ethcontract::BlockId,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     std::collections::HashSet,
@@ -76,7 +76,7 @@ impl Transaction {
         // Find trace call to settlement contract
         let (calldata, callers) = find_settlement_trace_and_callers(&transaction.trace_calls, settlement_contract)
             .map(|(trace, path)| (trace.input.clone(), path.clone()))
-            // All transactions emitting settlement events should have a /settle call,
+            // All transactions emitting settlement events should have a /settle call, 
             // otherwise it's an execution client bug
             .ok_or(Error::MissingCalldata)?;
 
diff --git a/crates/autopilot/src/domain/settlement/transaction/tokenized.rs b/crates/autopilot/src/domain/settlement/transaction/tokenized.rs
index a6cfb016b6..a6c6b249cc 100644
--- a/crates/autopilot/src/domain/settlement/transaction/tokenized.rs
+++ b/crates/autopilot/src/domain/settlement/transaction/tokenized.rs
@@ -4,7 +4,7 @@ use {
         domain::{self, auction::order, eth},
     },
     app_data::AppDataHash,
-    contracts::bindings::GPv2Settlement,
+    contracts::alloy::GPv2Settlement,
     ethcontract::U256,
     ethrpc::alloy::conversions::IntoLegacy,
 };
diff --git a/crates/autopilot/src/infra/blockchain/contracts.rs b/crates/autopilot/src/infra/blockchain/contracts.rs
index 789ea73f49..c8c4f5e23f 100644
--- a/crates/autopilot/src/infra/blockchain/contracts.rs
+++ b/crates/autopilot/src/infra/blockchain/contracts.rs
@@ -7,6 +7,7 @@ use {
         GPv2AllowListAuthentication,
         GPv2Settlement,
         HooksTrampoline,
+        InstanceExt,
         WETH9,
     },
     ethrpc::{
@@ -19,7 +20,7 @@ use {
 #[derive(Debug, Clone)]
 pub struct Contracts {
     settlement: GPv2Settlement::Instance,
-    signatures: contracts::bindings::Signatures::Instance,
+    signatures: contracts::alloy::support::Signatures::Instance,
     weth: WETH9::Instance,
     balances: Balances::Instance,
     chainalysis_oracle: Option<ChainalysisOracle::Instance>,
@@ -52,11 +53,11 @@ impl Contracts {
             web3.alloy.clone(),
         );
 
-        let signatures = contracts::bindings::Signatures::Instance::new(
+        let signatures = contracts::alloy::support::Signatures::Instance::new(
             addresses
                 .signatures
                 .map(IntoAlloy::into_alloy)
-                .or_else(|| contracts::bindings::Signatures::deployment_address(&chain.id()))
+                .or_else(|| contracts::alloy::support::Signatures::deployment_address(&chain.id()))
                 .unwrap(),
             web3.alloy.clone(),
         );
@@ -130,7 +131,7 @@ impl Contracts {
         &self.balances
     }
 
-    pub fn signatures(&self) -> &contracts::bindings::Signatures::Instance {
+    pub fn signatures(&self) -> &contracts::alloy::support::Signatures::Instance {
         &self.signatures
     }
 
diff --git a/crates/autopilot/src/run.rs b/crates/autopilot/src/run.rs
index 5cdbe510ed..77e415bb78 100644
--- a/crates/autopilot/src/run.rs
+++ b/crates/autopilot/src/run.rs
@@ -27,8 +27,7 @@ use {
     alloy::eips::BlockNumberOrTag,
     chain::Chain,
     clap::Parser,
-    contracts::bindings::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, WETH9},
-    ethcontract::H160,
+    contracts::bindings::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, InstanceExt, WETH9},
     ethrpc::{
         Web3,
         alloy::conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index d7b733f767..d415f47fe5 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -217,10 +217,6 @@ impl Contract {
                     DEPLOYMENT_INFO.get(chain_id).map(|(addr, _)| *addr)
                 }
 
-                pub fn deployment_block(chain_id: &u64) -> Option<u64> {
-                    DEPLOYMENT_INFO.get(chain_id).map(|(_, block)| *block).flatten()
-                }
-
                 impl Instance {
                     pub fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
                         async move {
diff --git a/crates/contracts/Cargo.toml b/crates/contracts/Cargo.toml
index 4472682469..02bfe431c2 100644
--- a/crates/contracts/Cargo.toml
+++ b/crates/contracts/Cargo.toml
@@ -25,7 +25,6 @@ alloy = { workspace = true, features = ["sol-types", "json", "contract", "json-a
 paste = { workspace = true }
 ethcontract = { workspace = true }
 serde_json = { workspace = true }
-serde = { workspace = true }
 
 # [bin-dependencies]
 anyhow = { workspace = true }
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 5c40dd6030..2d10e0f6b1 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -30,7 +30,6 @@ fn main() {
         ]))
         // Misc
         .add_contract(Contract::new("ERC20Mintable"))
-        .add_contract(Contract::new("ERC20"))
         // GnosisSafe
         .add_contract(Contract::new("GnosisSafe"))
         .add_contract(Contract::new("GnosisSafeCompatibilityFallbackHandler"))
diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index 561ddf8211..b39baad16f 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -41,3 +41,48 @@ mod macros;
 pub mod paths;
 pub mod vault;
 pub mod web3;
+
+#[cfg(test)]
+mod tests {
+    use {
+        super::*,
+        crate::alloy::networks::{ARBITRUM_ONE, GNOSIS, MAINNET, SEPOLIA},
+    };
+
+    #[test]
+    fn deployment_addresses() {
+        for network in &[MAINNET, GNOSIS, SEPOLIA, ARBITRUM_ONE] {
+            assert!(
+                alloy::BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory::deployment_address(network).is_some()
+            )
+        }
+        for network in &[MAINNET, ARBITRUM_ONE] {
+            assert!(
+                alloy::BalancerV2WeightedPool2TokensFactory::deployment_address(network).is_some()
+            );
+            assert!(
+                alloy::BalancerV2LiquidityBootstrappingPoolFactory::deployment_address(network)
+                    .is_some()
+            );
+        }
+
+        assert!(alloy::BalancerV2WeightedPoolFactory::deployment_address(&MAINNET).is_some());
+
+        for network in &[MAINNET, GNOSIS, ARBITRUM_ONE] {
+            assert!(alloy::BalancerV2StablePoolFactoryV2::deployment_address(network).is_some());
+        }
+    }
+
+    #[test]
+    fn deployment_information() {
+        assert!(alloy::BalancerV2WeightedPoolFactory::deployment_address(&MAINNET).is_some());
+        for network in &[MAINNET, ARBITRUM_ONE] {
+            assert!(
+                alloy::BalancerV2WeightedPool2TokensFactory::deployment_address(network).is_some()
+            );
+        }
+        for network in &[MAINNET, GNOSIS, ARBITRUM_ONE] {
+            assert!(alloy::BalancerV2StablePoolFactoryV2::deployment_address(network).is_some());
+        }
+    }
+}
diff --git a/crates/contracts/src/vault.rs b/crates/contracts/src/vault.rs
index facd53061f..af5c3d8f52 100644
--- a/crates/contracts/src/vault.rs
+++ b/crates/contracts/src/vault.rs
@@ -2,7 +2,7 @@
 //! contract.
 
 use {
-    crate::bindings::BalancerV2Authorizer,
+    crate::alloy::BalancerV2Authorizer,
     alloy::{primitives::Address, sol_types::SolCall},
 };
 
@@ -18,8 +18,8 @@ pub async fn grant_required_roles(
     vault: Address,
     vault_relayer: Address,
 ) -> Result<(), alloy::contract::Error> {
-    use crate::bindings::BalancerV2Vault::BalancerV2Vault::batchSwapCall;
-    use crate::bindings::BalancerV2Vault::BalancerV2Vault::manageUserBalanceCall;
+    use crate::alloy::BalancerV2Vault::BalancerV2Vault::batchSwapCall;
+    use crate::alloy::BalancerV2Vault::BalancerV2Vault::manageUserBalanceCall;
 
     authorizer
         .grantRoles(
@@ -41,9 +41,9 @@ mod tests {
     use alloy::primitives::b256;
 
     use super::*;
-    use crate::bindings::BalancerV2Vault;
-    use crate::bindings::BalancerV2Vault::BalancerV2Vault::batchSwapCall;
-    use crate::bindings::BalancerV2Vault::BalancerV2Vault::manageUserBalanceCall;
+    use crate::alloy::BalancerV2Vault;
+    use crate::alloy::BalancerV2Vault::BalancerV2Vault::batchSwapCall;
+    use crate::alloy::BalancerV2Vault::BalancerV2Vault::manageUserBalanceCall;
 
     #[test]
     fn role_ids() {
diff --git a/crates/cow-amm/src/amm.rs b/crates/cow-amm/src/amm.rs
index e7dd8937f6..f1f3702d39 100644
--- a/crates/cow-amm/src/amm.rs
+++ b/crates/cow-amm/src/amm.rs
@@ -2,7 +2,7 @@ use {
     alloy::primitives::{Address, TxHash, U256},
     anyhow::{Context, Result},
     app_data::AppDataHash,
-    contracts::bindings::{
+    contracts::alloy::cow_amm::{
         CowAmmLegacyHelper,
         CowAmmLegacyHelper::CowAmmLegacyHelper::orderReturn,
     },
diff --git a/crates/cow-amm/src/cache.rs b/crates/cow-amm/src/cache.rs
index 6169323a45..02c1ebe709 100644
--- a/crates/cow-amm/src/cache.rs
+++ b/crates/cow-amm/src/cache.rs
@@ -2,7 +2,7 @@ use {
     crate::{Amm, Metrics},
     alloy::{primitives::Address, rpc::types::Log},
     anyhow::Context,
-    contracts::bindings::{
+    contracts::alloy::cow_amm::{
         CowAmmLegacyHelper,
         CowAmmLegacyHelper::CowAmmLegacyHelper::CowAmmLegacyHelperEvents as CowAmmEvent,
     },
diff --git a/crates/cow-amm/src/factory.rs b/crates/cow-amm/src/factory.rs
index c2383f59de..54f6d7984b 100644
--- a/crates/cow-amm/src/factory.rs
+++ b/crates/cow-amm/src/factory.rs
@@ -5,7 +5,7 @@ use {
         rpc::types::{Filter, FilterSet},
         sol_types::SolEvent,
     },
-    contracts::bindings::CowAmmLegacyHelper::{
+    contracts::alloy::cow_amm::CowAmmLegacyHelper::{
         CowAmmLegacyHelper,
         CowAmmLegacyHelper::CowAmmLegacyHelperEvents as CowAmmEvent,
     },
diff --git a/crates/cow-amm/src/lib.rs b/crates/cow-amm/src/lib.rs
index 9e27b2086b..9bc740c528 100644
--- a/crates/cow-amm/src/lib.rs
+++ b/crates/cow-amm/src/lib.rs
@@ -6,7 +6,7 @@ mod registry;
 
 pub use {
     amm::Amm,
-    contracts::bindings::CowAmmLegacyHelper::Instance as Helper,
+    contracts::alloy::cow_amm::CowAmmLegacyHelper::Instance as Helper,
     registry::Registry,
 };
 
@@ -36,7 +36,7 @@ pub mod gpv2_order {
             primitives::{B256, FixedBytes, Keccak256},
             sol_types::{SolStruct, SolValue},
         },
-        contracts::bindings::CowAmm,
+        contracts::alloy::cow_amm::CowAmm,
         ethrpc::alloy::conversions::IntoLegacy,
         model::{DomainSeparator, interaction::InteractionData, signature::hashed_eip712_message},
     };
diff --git a/crates/cow-amm/src/maintainers.rs b/crates/cow-amm/src/maintainers.rs
index d42b7d2da7..bb93ea3438 100644
--- a/crates/cow-amm/src/maintainers.rs
+++ b/crates/cow-amm/src/maintainers.rs
@@ -1,6 +1,6 @@
 use {
     crate::{Amm, cache::Storage},
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::futures::future::{join_all, select_ok},
     ethrpc::Web3,
     shared::maintenance::Maintaining,
diff --git a/crates/cow-amm/src/registry.rs b/crates/cow-amm/src/registry.rs
index 222eb50b53..068347eb94 100644
--- a/crates/cow-amm/src/registry.rs
+++ b/crates/cow-amm/src/registry.rs
@@ -1,7 +1,7 @@
 use {
     crate::{Amm, cache::Storage, factory::Factory, maintainers::EmptyPoolRemoval},
     alloy::primitives::Address,
-    contracts::bindings::CowAmmLegacyHelper,
+    contracts::alloy::cow_amm::CowAmmLegacyHelper,
     ethrpc::{Web3, block_stream::CurrentBlockWatcher},
     shared::{
         event_handling::{AlloyEventRetriever, EventHandler},
diff --git a/crates/driver/src/boundary/liquidity/balancer/v2/mod.rs b/crates/driver/src/boundary/liquidity/balancer/v2/mod.rs
index 98d229dfb6..9109983c11 100644
--- a/crates/driver/src/boundary/liquidity/balancer/v2/mod.rs
+++ b/crates/driver/src/boundary/liquidity/balancer/v2/mod.rs
@@ -8,7 +8,7 @@ use {
         infra::{self, blockchain::Ethereum},
     },
     anyhow::{Context, Result},
-    contracts::bindings::{
+    contracts::alloy::{
         BalancerV2ComposableStablePoolFactory,
         BalancerV2LiquidityBootstrappingPoolFactory,
         BalancerV2StablePoolFactoryV2,
diff --git a/crates/driver/src/boundary/liquidity/uniswap/v2.rs b/crates/driver/src/boundary/liquidity/uniswap/v2.rs
index 6d8ab60026..a5fc63e9a8 100644
--- a/crates/driver/src/boundary/liquidity/uniswap/v2.rs
+++ b/crates/driver/src/boundary/liquidity/uniswap/v2.rs
@@ -8,7 +8,7 @@ use {
         infra::{self, blockchain::Ethereum},
     },
     async_trait::async_trait,
-    contracts::bindings::IUniswapLikeRouter,
+    contracts::alloy::IUniswapLikeRouter,
     ethrpc::{
         Web3,
         alloy::conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/driver/src/boundary/liquidity/zeroex.rs b/crates/driver/src/boundary/liquidity/zeroex.rs
index 1105f290f5..fdd128885d 100644
--- a/crates/driver/src/boundary/liquidity/zeroex.rs
+++ b/crates/driver/src/boundary/liquidity/zeroex.rs
@@ -7,6 +7,7 @@ use {
         infra::{self, Ethereum},
     },
     anyhow::anyhow,
+    contracts::alloy::InstanceExt,
     ethrpc::block_stream::CurrentBlockWatcher,
     shared::{
         http_client::HttpClientFactory,
@@ -85,7 +86,7 @@ pub async fn collector(
     let eth = eth.with_metric_label("zeroex".into());
     let settlement = *eth.contracts().settlement().address();
     let web3 = eth.web3().clone();
-    let contract = contracts::bindings::IZeroex::Instance::deployed(&web3.alloy).await?;
+    let contract = contracts::alloy::IZeroex::Instance::deployed(&web3.alloy).await?;
     let http_client_factory = &HttpClientFactory::new(&shared::http_client::Arguments {
         http_timeout: config.http_timeout,
     });
diff --git a/crates/driver/src/domain/competition/solution/encoding.rs b/crates/driver/src/domain/competition/solution/encoding.rs
index 08039ddb4c..f488d2c383 100644
--- a/crates/driver/src/domain/competition/solution/encoding.rs
+++ b/crates/driver/src/domain/competition/solution/encoding.rs
@@ -14,7 +14,7 @@ use {
     },
     allowance::Allowance,
     alloy::sol_types::SolCall,
-    contracts::bindings::{FlashLoanRouter::LoanRequest, WETH9},
+    contracts::alloy::{FlashLoanRouter::LoanRequest, WETH9},
     ethcontract::H160,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     itertools::Itertools,
@@ -305,7 +305,7 @@ fn encode_wrapper_settlement(
     let wrapper_data = encode_wrapper_data(&solution.wrappers);
 
     // Create wrappedSettleCall
-    let calldata = contracts::bindings::ICowWrapper::ICowWrapper::wrappedSettleCall {
+    let calldata = contracts::alloy::ICowWrapper::ICowWrapper::wrappedSettleCall {
         settleData: settle_calldata.into(),
         wrapperData: wrapper_data.into(),
     }
@@ -434,7 +434,7 @@ struct Flags {
 pub mod codec {
     use {
         crate::domain::{competition::order, eth},
-        contracts::bindings::GPv2Settlement,
+        contracts::alloy::GPv2Settlement,
         ethrpc::alloy::conversions::IntoAlloy,
     };
 
diff --git a/crates/driver/src/domain/cow_amm.rs b/crates/driver/src/domain/cow_amm.rs
index 87f55ecbde..c60dcaaa72 100644
--- a/crates/driver/src/domain/cow_amm.rs
+++ b/crates/driver/src/domain/cow_amm.rs
@@ -1,7 +1,7 @@
 use {
     crate::domain::eth,
     alloy::{primitives::Address, providers::DynProvider},
-    contracts::bindings::CowAmmLegacyHelper,
+    contracts::alloy::cow_amm::CowAmmLegacyHelper,
     cow_amm::Amm,
     ethrpc::alloy::conversions::IntoAlloy,
     itertools::{
@@ -124,10 +124,11 @@ impl Cache {
     /// Fetches the factory address for the given AMM by calling the
     /// `FACTORY` function.
     async fn fetch_amm_factory_address(&self, amm_address: Address) -> anyhow::Result<Address> {
-        let factory_getter = contracts::bindings::CowAmmFactoryGetter::CowAmmFactoryGetter::new(
-            amm_address,
-            self.web3.clone(),
-        );
+        let factory_getter =
+            contracts::alloy::cow_amm::CowAmmFactoryGetter::CowAmmFactoryGetter::new(
+                amm_address,
+                self.web3.clone(),
+            );
         Ok(factory_getter.FACTORY().call().await?)
     }
 }
diff --git a/crates/driver/src/domain/liquidity/zeroex.rs b/crates/driver/src/domain/liquidity/zeroex.rs
index cc0de107de..93d8ac31ca 100644
--- a/crates/driver/src/domain/liquidity/zeroex.rs
+++ b/crates/driver/src/domain/liquidity/zeroex.rs
@@ -1,7 +1,7 @@
 use {
     crate::domain::{eth, liquidity},
     anyhow::anyhow,
-    contracts::bindings::IZeroex,
+    contracts::alloy::IZeroex,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     primitive_types::{H160, H256, U256},
     std::sync::Arc,
diff --git a/crates/driver/src/infra/blockchain/contracts.rs b/crates/driver/src/infra/blockchain/contracts.rs
index c8031193c8..d89a39b294 100644
--- a/crates/driver/src/infra/blockchain/contracts.rs
+++ b/crates/driver/src/infra/blockchain/contracts.rs
@@ -1,7 +1,13 @@
 use {
     crate::domain::eth,
     chain::Chain,
-    contracts::bindings::{BalancerV2Vault, Balances, FlashLoanRouter, GPv2Settlement, WETH9},
+    contracts::alloy::{
+        BalancerV2Vault,
+        FlashLoanRouter,
+        GPv2Settlement,
+        WETH9,
+        support::Balances,
+    },
     ethrpc::{
         Web3,
         alloy::conversions::{IntoAlloy, IntoLegacy},
@@ -15,7 +21,7 @@ pub struct Contracts {
     settlement: GPv2Settlement::Instance,
     vault_relayer: eth::ContractAddress,
     vault: BalancerV2Vault::Instance,
-    signatures: contracts::bindings::Signatures::Instance,
+    signatures: contracts::alloy::support::Signatures::Instance,
     weth: WETH9::Instance,
 
     /// The domain separator for settlement contract used for signing orders.
@@ -68,11 +74,11 @@ impl Contracts {
                 .unwrap(),
             web3.alloy.clone(),
         );
-        let signatures = contracts::bindings::Signatures::Instance::new(
+        let signatures = contracts::alloy::support::Signatures::Instance::new(
             addresses
                 .signatures
                 .map(|addr| addr.0.into_alloy())
-                .or_else(|| contracts::bindings::Signatures::deployment_address(&chain.id()))
+                .or_else(|| contracts::alloy::support::Signatures::deployment_address(&chain.id()))
                 .unwrap(),
             web3.alloy.clone(),
         );
@@ -125,7 +131,7 @@ impl Contracts {
         &self.settlement
     }
 
-    pub fn signatures(&self) -> &contracts::bindings::Signatures::Instance {
+    pub fn signatures(&self) -> &contracts::alloy::support::Signatures::Instance {
         &self.signatures
     }
 
diff --git a/crates/driver/src/infra/blockchain/token.rs b/crates/driver/src/infra/blockchain/token.rs
index 816c26438a..b9758000cc 100644
--- a/crates/driver/src/infra/blockchain/token.rs
+++ b/crates/driver/src/infra/blockchain/token.rs
@@ -11,13 +11,13 @@ use {
 ///
 /// https://eips.ethereum.org/EIPS/eip-20
 pub struct Erc20 {
-    token: contracts::bindings::ERC20::Instance,
+    token: contracts::alloy::ERC20::Instance,
 }
 
 impl Erc20 {
     pub(super) fn new(eth: &Ethereum, address: eth::TokenAddress) -> Self {
         Self {
-            token: contracts::bindings::ERC20::Instance::new(
+            token: contracts::alloy::ERC20::Instance::new(
                 address.0.0.into_alloy(),
                 eth.web3.alloy.clone(),
             ),
diff --git a/crates/driver/src/infra/liquidity/config.rs b/crates/driver/src/infra/liquidity/config.rs
index 9d529d9ae7..b2f64faa63 100644
--- a/crates/driver/src/infra/liquidity/config.rs
+++ b/crates/driver/src/infra/liquidity/config.rs
@@ -2,7 +2,7 @@ use {
     crate::domain::eth::{self, ContractAddress},
     alloy::primitives::Address,
     chain::Chain,
-    contracts::bindings::BalancerV2Vault,
+    contracts::alloy::BalancerV2Vault,
     derive_more::Debug,
     ethrpc::alloy::conversions::IntoLegacy,
     hex_literal::hex,
@@ -64,8 +64,7 @@ impl UniswapV2 {
     pub fn uniswap_v2(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::bindings::UniswapV2Router02::deployment_address(&chain.id())?
-                    .into_legacy(),
+                contracts::alloy::UniswapV2Router02::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code: UNISWAP_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -76,8 +75,7 @@ impl UniswapV2 {
     pub fn sushi_swap(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::bindings::SushiSwapRouter::deployment_address(&chain.id())?
-                    .into_legacy(),
+                contracts::alloy::SushiSwapRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code: SUSHISWAP_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -88,7 +86,7 @@ impl UniswapV2 {
     pub fn honeyswap(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::bindings::BaoswapRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::alloy::BaoswapRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code: HONEYSWAP_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -99,7 +97,7 @@ impl UniswapV2 {
     pub fn baoswap(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::bindings::BaoswapRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::alloy::BaoswapRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code: BAOSWAP_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -115,7 +113,7 @@ impl UniswapV2 {
         .into();
         Some(Self {
             router: ContractAddress::from(
-                contracts::bindings::PancakeRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::alloy::PancakeRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code,
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -127,7 +125,7 @@ impl UniswapV2 {
     pub fn testnet_uniswapv2(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::bindings::TestnetUniswapV2Router02::deployment_address(&chain.id())?
+                contracts::alloy::TestnetUniswapV2Router02::deployment_address(&chain.id())?
                     .into_legacy(),
             ),
             pool_code: TESTNET_UNISWAP_INIT.into(),
@@ -155,7 +153,7 @@ impl Swapr {
     pub fn swapr(chain: Chain) -> Option<Self> {
         Some(Self {
             router: ContractAddress::from(
-                contracts::bindings::SwaprRouter::deployment_address(&chain.id())?.into_legacy(),
+                contracts::alloy::SwaprRouter::deployment_address(&chain.id())?.into_legacy(),
             ),
             pool_code: SWAPR_INIT.into(),
             missing_pool_cache_time: Duration::from_secs(60 * 60),
@@ -194,7 +192,7 @@ impl UniswapV3 {
         max_pools_per_tick_query: usize,
     ) -> Option<Self> {
         Some(Self {
-            router: contracts::bindings::UniswapV3SwapRouterV2::deployment_address(&chain.id())?
+            router: contracts::alloy::UniswapV3SwapRouterV2::deployment_address(&chain.id())?
                 .into_legacy()
                 .into(),
             max_pools_to_initialize: 100,
@@ -261,33 +259,33 @@ impl BalancerV2 {
             weighted: address_for!(
                 chain,
                 [
-                    contracts::bindings::BalancerV2WeightedPoolFactory,
-                    contracts::bindings::BalancerV2WeightedPool2TokensFactory,
+                    contracts::alloy::BalancerV2WeightedPoolFactory,
+                    contracts::alloy::BalancerV2WeightedPool2TokensFactory,
                 ]
             ),
             weighted_v3plus: address_for!(
                 chain,
                 [
-                    contracts::bindings::BalancerV2WeightedPoolFactoryV3,
-                    contracts::bindings::BalancerV2WeightedPoolFactoryV4,
+                    contracts::alloy::BalancerV2WeightedPoolFactoryV3,
+                    contracts::alloy::BalancerV2WeightedPoolFactoryV4,
                 ]
             ),
-            stable: address_for!(chain, [contracts::bindings::BalancerV2StablePoolFactoryV2,]),
+            stable: address_for!(chain, [contracts::alloy::BalancerV2StablePoolFactoryV2,]),
             liquidity_bootstrapping: address_for!(
                 chain,
                 [
-                    contracts::bindings::BalancerV2LiquidityBootstrappingPoolFactory,
-                    contracts::bindings::BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory,
+                    contracts::alloy::BalancerV2LiquidityBootstrappingPoolFactory,
+                    contracts::alloy::BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory,
                 ]
             ),
             composable_stable: address_for!(
                 chain,
                 [
-                    contracts::bindings::BalancerV2ComposableStablePoolFactory,
-                    contracts::bindings::BalancerV2ComposableStablePoolFactoryV3,
-                    contracts::bindings::BalancerV2ComposableStablePoolFactoryV4,
-                    contracts::bindings::BalancerV2ComposableStablePoolFactoryV5,
-                    contracts::bindings::BalancerV2ComposableStablePoolFactoryV6,
+                    contracts::alloy::BalancerV2ComposableStablePoolFactory,
+                    contracts::alloy::BalancerV2ComposableStablePoolFactoryV3,
+                    contracts::alloy::BalancerV2ComposableStablePoolFactoryV4,
+                    contracts::alloy::BalancerV2ComposableStablePoolFactoryV5,
+                    contracts::alloy::BalancerV2ComposableStablePoolFactoryV6,
                 ]
             ),
             pool_deny_list: Vec::new(),
diff --git a/crates/driver/src/infra/notify/liquidity_sources/liquorice/notifier.rs b/crates/driver/src/infra/notify/liquidity_sources/liquorice/notifier.rs
index 484712d0c2..f951392ddf 100644
--- a/crates/driver/src/infra/notify/liquidity_sources/liquorice/notifier.rs
+++ b/crates/driver/src/infra/notify/liquidity_sources/liquorice/notifier.rs
@@ -20,7 +20,7 @@ use {
     alloy::primitives::Address,
     anyhow::{Context, Result, anyhow},
     chrono::Utc,
-    contracts::bindings::LiquoriceSettlement,
+    contracts::alloy::LiquoriceSettlement,
 };
 
 const NOTIFICATION_SOURCE: &str = "cow_protocol";
@@ -89,7 +89,7 @@ mod utils {
             eth,
         },
         alloy::{primitives::Address, sol_types::SolCall},
-        contracts::bindings::LiquoriceSettlement,
+        contracts::alloy::LiquoriceSettlement,
         ethrpc::alloy::conversions::IntoAlloy,
         std::collections::HashSet,
     };
diff --git a/crates/driver/src/tests/setup/blockchain.rs b/crates/driver/src/tests/setup/blockchain.rs
index f3a414ef59..be5808b0ee 100644
--- a/crates/driver/src/tests/setup/blockchain.rs
+++ b/crates/driver/src/tests/setup/blockchain.rs
@@ -9,17 +9,16 @@ use {
         signers::local::{MnemonicBuilder, PrivateKeySigner},
         sol_types::SolCall,
     },
-    contracts::bindings::{
+    contracts::alloy::{
         BalancerV2Authorizer,
         BalancerV2Vault,
-        Balances,
         ERC20,
         ERC20Mintable,
         FlashLoanRouter,
         GPv2AllowListAuthentication::GPv2AllowListAuthentication,
         GPv2Settlement,
-        Signatures,
         WETH9,
+        support::{Balances, Signatures},
     },
     ethcontract::PrivateKey,
     ethrpc::{
@@ -43,7 +42,7 @@ use {
 pub struct Pair {
     token_a: &'static str,
     token_b: &'static str,
-    contract: contracts::bindings::IUniswapLikePair::Instance,
+    contract: contracts::alloy::IUniswapLikePair::Instance,
     pool: Pool,
 }
 
@@ -274,7 +273,7 @@ impl Blockchain {
         .await
         .unwrap();
 
-        let weth = contracts::bindings::WETH9::Instance::deploy_builder(web3.alloy.clone())
+        let weth = contracts::alloy::WETH9::Instance::deploy_builder(web3.alloy.clone())
             .from(main_trader_account.address().into_alloy())
             .deploy()
             .await
@@ -447,7 +446,7 @@ impl Blockchain {
             }
         }
         // Create the uniswap factory.
-        let contract_address = contracts::bindings::UniswapV2Factory::Instance::deploy_builder(
+        let contract_address = contracts::alloy::UniswapV2Factory::Instance::deploy_builder(
             web3.alloy.clone(),
             main_trader_account.address().into_alloy(),
         )
@@ -455,10 +454,8 @@ impl Blockchain {
         .deploy()
         .await
         .unwrap();
-        let uniswap_factory = contracts::bindings::UniswapV2Factory::Instance::new(
-            contract_address,
-            web3.alloy.clone(),
-        );
+        let uniswap_factory =
+            contracts::alloy::UniswapV2Factory::Instance::new(contract_address, web3.alloy.clone());
         // Create and fund a uniswap pair for each pool. Fund the settlement contract
         // with the same liquidity as the pool, to allow for internalized interactions.
         let mut pairs = Vec::new();
@@ -482,7 +479,7 @@ impl Blockchain {
                 .await
                 .unwrap();
             // Fund the pair and the settlement contract.
-            let pair = contracts::bindings::IUniswapLikePair::Instance::new(
+            let pair = contracts::alloy::IUniswapLikePair::Instance::new(
                 uniswap_factory
                     .getPair(token_a, token_b)
                     .call()
diff --git a/crates/driver/src/tests/setup/solver.rs b/crates/driver/src/tests/setup/solver.rs
index f7450dda31..f110bab83e 100644
--- a/crates/driver/src/tests/setup/solver.rs
+++ b/crates/driver/src/tests/setup/solver.rs
@@ -14,7 +14,7 @@ use {
         tests::{hex_address, setup::blockchain::Trade},
     },
     const_hex::ToHexExt,
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     ethereum_types::H160,
     ethrpc::alloy::conversions::IntoLegacy,
     itertools::Itertools,
diff --git a/crates/e2e/src/setup/deploy.rs b/crates/e2e/src/setup/deploy.rs
index 64a6711825..c5765e2e7c 100644
--- a/crates/e2e/src/setup/deploy.rs
+++ b/crates/e2e/src/setup/deploy.rs
@@ -1,17 +1,17 @@
 use {
-    contracts::bindings::{
+    contracts::alloy::{
         BalancerV2Authorizer,
         BalancerV2Vault,
-        Balances,
         CoWSwapEthFlow,
         FlashLoanRouter,
         GPv2AllowListAuthentication,
         GPv2Settlement,
         HooksTrampoline,
-        Signatures,
+        InstanceExt,
         UniswapV2Factory,
         UniswapV2Router02,
         WETH9,
+        support::{Balances, Signatures},
     },
     ethcontract::{Address, H256},
     ethrpc::alloy::{
diff --git a/crates/e2e/src/setup/onchain_components/mod.rs b/crates/e2e/src/setup/onchain_components/mod.rs
index 8954bf8f9d..9eac7591fa 100644
--- a/crates/e2e/src/setup/onchain_components/mod.rs
+++ b/crates/e2e/src/setup/onchain_components/mod.rs
@@ -8,10 +8,10 @@ use {
         signers::local::PrivateKeySigner,
     },
     app_data::Hook,
-    contracts::bindings::{
-        CowProtocolToken,
+    contracts::alloy::{
         ERC20Mintable,
         GPv2AllowListAuthentication::GPv2AllowListAuthentication,
+        test::CowProtocolToken,
     },
     core::panic,
     ethcontract::{
@@ -600,7 +600,7 @@ impl OnchainComponents {
     ///
     /// This can be used to modify the pool reserves during a test.
     pub async fn mint_token_to_weth_uni_v2_pool(&self, token: &MintableToken, amount: U256) {
-        let pair = contracts::bindings::IUniswapLikePair::Instance::new(
+        let pair = contracts::alloy::IUniswapLikePair::Instance::new(
             self.contracts
                 .uniswap_v2_factory
                 .getPair(*self.contracts.weth.address(), *token.address())
diff --git a/crates/e2e/src/setup/onchain_components/safe.rs b/crates/e2e/src/setup/onchain_components/safe.rs
index 218f7d97ab..fd92cc71a9 100644
--- a/crates/e2e/src/setup/onchain_components/safe.rs
+++ b/crates/e2e/src/setup/onchain_components/safe.rs
@@ -5,7 +5,7 @@ use {
         providers::Provider,
         rpc::types::TransactionRequest,
     },
-    contracts::bindings::{
+    contracts::alloy::{
         GnosisSafe::{self, GnosisSafe::execTransactionCall},
         GnosisSafeCompatibilityFallbackHandler,
         GnosisSafeProxy,
@@ -182,10 +182,8 @@ impl Safe {
         to: alloy::primitives::Address,
         data: Vec<u8>,
         nonce: alloy::primitives::U256,
-    ) -> alloy::contract::CallBuilder<
-        &alloy::providers::DynProvider,
-        PhantomData<execTransactionCall>,
-    > {
+    ) -> alloy::contract::CallBuilder<&contracts::alloy::Provider, PhantomData<execTransactionCall>>
+    {
         let signature = self.sign({
             // `SafeTx` struct hash computation ported from the Safe Solidity code:
             // <https://etherscan.io/address/0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552#code#F1#L377>
diff --git a/crates/e2e/tests/e2e/banned_users.rs b/crates/e2e/tests/e2e/banned_users.rs
index 0d043648c1..abd741e855 100644
--- a/crates/e2e/tests/e2e/banned_users.rs
+++ b/crates/e2e/tests/e2e/banned_users.rs
@@ -3,7 +3,7 @@ use {
         primitives::{Address, address},
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     e2e::setup::{
         OnchainComponents,
         Services,
diff --git a/crates/e2e/tests/e2e/cow_amm.rs b/crates/e2e/tests/e2e/cow_amm.rs
index 6aab89947e..259f742867 100644
--- a/crates/e2e/tests/e2e/cow_amm.rs
+++ b/crates/e2e/tests/e2e/cow_amm.rs
@@ -3,7 +3,10 @@ use {
         primitives::{Address, Bytes, FixedBytes, U256, address},
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
-    contracts::bindings::{Balances, ERC20, Signatures},
+    contracts::alloy::{
+        ERC20,
+        support::{Balances, Signatures},
+    },
     driver::domain::eth::NonZeroU256,
     e2e::setup::{
         DeployedContracts,
@@ -72,16 +75,17 @@ async fn cow_amm_jit(web3: Web3) {
 
     // set up cow_amm
     let oracle =
-        contracts::bindings::CowAmmUniswapV2PriceOracle::Instance::deploy(web3.alloy.clone())
+        contracts::alloy::cow_amm::CowAmmUniswapV2PriceOracle::Instance::deploy(web3.alloy.clone())
             .await
             .unwrap();
 
-    let cow_amm_factory = contracts::bindings::CowAmmConstantProductFactory::Instance::deploy(
-        web3.alloy.clone(),
-        *onchain.contracts().gp_settlement.address(),
-    )
-    .await
-    .unwrap();
+    let cow_amm_factory =
+        contracts::alloy::cow_amm::CowAmmConstantProductFactory::Instance::deploy(
+            web3.alloy.clone(),
+            *onchain.contracts().gp_settlement.address(),
+        )
+        .await
+        .unwrap();
 
     // Fund cow amm owner with 2_000 dai and allow factory take them
     dai.mint(cow_amm_owner.address(), to_wei(2_000)).await;
@@ -147,7 +151,7 @@ async fn cow_amm_jit(web3: Web3) {
         .send_and_watch()
         .await
         .unwrap();
-    let cow_amm = contracts::bindings::CowAmm::Instance::new(cow_amm, web3.alloy.clone());
+    let cow_amm = contracts::alloy::cow_amm::CowAmm::Instance::new(cow_amm, web3.alloy.clone());
 
     // Start system with the regular baseline solver as a quoter but a mock solver
     // for the actual solver competition. That way we can handcraft a solution
@@ -214,7 +218,7 @@ async fn cow_amm_jit(web3: Web3) {
     // oracle price => 100 WETH == 300000 DAI => 1 WETH == 3000 DAI
     // If this order gets settled around the oracle price it will receive plenty of
     // surplus.
-    let cow_amm_order = contracts::bindings::CowAmm::GPv2Order::Data {
+    let cow_amm_order = contracts::alloy::cow_amm::CowAmm::GPv2Order::Data {
         sellToken: *onchain.contracts().weth.address(),
         buyToken: *dai.address(),
         receiver: Default::default(),
@@ -237,7 +241,7 @@ async fn cow_amm_jit(web3: Web3) {
                 .unwrap(),
         ), // erc20
     };
-    let trading_params = contracts::bindings::CowAmm::ConstantProduct::TradingParams {
+    let trading_params = contracts::alloy::cow_amm::CowAmm::ConstantProduct::TradingParams {
         minTradedToken0: U256::ZERO,
         priceOracle: *oracle.address(),
         priceOracleData: Bytes::copy_from_slice(&oracle_data),
@@ -722,16 +726,17 @@ async fn cow_amm_opposite_direction(web3: Web3) {
 
     // Set up the CoW AMM as before
     let oracle =
-        contracts::bindings::CowAmmUniswapV2PriceOracle::Instance::deploy(web3.alloy.clone())
+        contracts::alloy::cow_amm::CowAmmUniswapV2PriceOracle::Instance::deploy(web3.alloy.clone())
             .await
             .unwrap();
 
-    let cow_amm_factory = contracts::bindings::CowAmmConstantProductFactory::Instance::deploy(
-        web3.alloy.clone(),
-        *onchain.contracts().gp_settlement.address(),
-    )
-    .await
-    .unwrap();
+    let cow_amm_factory =
+        contracts::alloy::cow_amm::CowAmmConstantProductFactory::Instance::deploy(
+            web3.alloy.clone(),
+            *onchain.contracts().gp_settlement.address(),
+        )
+        .await
+        .unwrap();
 
     // Fund the CoW AMM owner with DAI and WETH and approve the factory to transfer
     // them
@@ -809,7 +814,8 @@ async fn cow_amm_opposite_direction(web3: Web3) {
         .send_and_watch()
         .await
         .unwrap();
-    let cow_amm = contracts::bindings::CowAmm::Instance::new(cow_amm_address, web3.alloy.clone());
+    let cow_amm =
+        contracts::alloy::cow_amm::CowAmm::Instance::new(cow_amm_address, web3.alloy.clone());
 
     // Start system with the mocked solver. Baseline is still required for the
     // native price estimation.
@@ -868,7 +874,7 @@ async fn cow_amm_opposite_direction(web3: Web3) {
     let executed_amount = to_wei(230);
 
     // CoW AMM order remains the same (selling WETH for DAI)
-    let cow_amm_order = contracts::bindings::CowAmm::GPv2Order::Data {
+    let cow_amm_order = contracts::alloy::cow_amm::CowAmm::GPv2Order::Data {
         sellToken: *onchain.contracts().weth.address(),
         buyToken: *dai.address(),
         receiver: Default::default(),
@@ -891,7 +897,7 @@ async fn cow_amm_opposite_direction(web3: Web3) {
                 .unwrap(),
         ), // erc20
     };
-    let trading_params = contracts::bindings::CowAmm::ConstantProduct::TradingParams {
+    let trading_params = contracts::alloy::cow_amm::CowAmm::ConstantProduct::TradingParams {
         minTradedToken0: U256::ZERO,
         priceOracle: *oracle.address(),
         priceOracleData: Bytes::copy_from_slice(&oracle_data),
diff --git a/crates/e2e/tests/e2e/ethflow.rs b/crates/e2e/tests/e2e/ethflow.rs
index f317937412..f9a0319e03 100644
--- a/crates/e2e/tests/e2e/ethflow.rs
+++ b/crates/e2e/tests/e2e/ethflow.rs
@@ -5,7 +5,7 @@ use {
     },
     anyhow::bail,
     autopilot::database::onchain_order_events::ethflow_events::WRAP_ALL_SELECTOR,
-    contracts::bindings::{CoWSwapEthFlow, ERC20Mintable, WETH9},
+    contracts::alloy::{CoWSwapEthFlow, ERC20Mintable, WETH9},
     database::order_events::OrderEventLabel,
     e2e::setup::{
         ACCOUNT_ENDPOINT,
diff --git a/crates/e2e/tests/e2e/hooks.rs b/crates/e2e/tests/e2e/hooks.rs
index 51118b3203..d0006408c7 100644
--- a/crates/e2e/tests/e2e/hooks.rs
+++ b/crates/e2e/tests/e2e/hooks.rs
@@ -301,7 +301,7 @@ async fn signature(web3: Web3) {
     let safe_address = safe_creation_builder.clone().call().await.unwrap();
     let safe = Safe::deployed(
         chain_id,
-        contracts::bindings::GnosisSafe::Instance::new(safe_address, web3.alloy.clone()),
+        contracts::alloy::GnosisSafe::Instance::new(safe_address, web3.alloy.clone()),
         trader.clone(),
     );
 
@@ -432,7 +432,7 @@ async fn partial_fills(web3: Web3) {
     let [solver] = onchain.make_solvers(to_wei(1)).await;
     let [trader] = onchain.make_accounts(to_wei(3)).await;
 
-    let counter = contracts::bindings::Counter::Instance::deploy(web3.alloy.clone())
+    let counter = contracts::alloy::test::Counter::Instance::deploy(web3.alloy.clone())
         .await
         .unwrap();
 
@@ -602,7 +602,7 @@ async fn quote_verification(web3: Web3) {
 
     let safe = Safe::deployed(
         chain_id,
-        contracts::bindings::GnosisSafe::Instance::new(safe_address, web3.alloy.clone()),
+        contracts::alloy::GnosisSafe::Instance::new(safe_address, web3.alloy.clone()),
         trader.clone(),
     );
 
diff --git a/crates/e2e/tests/e2e/limit_orders.rs b/crates/e2e/tests/e2e/limit_orders.rs
index 576a217879..0b0051afb8 100644
--- a/crates/e2e/tests/e2e/limit_orders.rs
+++ b/crates/e2e/tests/e2e/limit_orders.rs
@@ -5,7 +5,7 @@ use {
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
     bigdecimal::BigDecimal,
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     database::byte_array::ByteArray,
     driver::domain::eth::NonZeroU256,
     e2e::setup::{eth, *},
diff --git a/crates/e2e/tests/e2e/liquidity.rs b/crates/e2e/tests/e2e/liquidity.rs
index 2d31177c01..1598e095f4 100644
--- a/crates/e2e/tests/e2e/liquidity.rs
+++ b/crates/e2e/tests/e2e/liquidity.rs
@@ -4,7 +4,7 @@ use {
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
     chrono::{NaiveDateTime, Utc},
-    contracts::bindings::{ERC20, IZeroex},
+    contracts::alloy::{ERC20, IZeroex, InstanceExt},
     driver::domain::eth::H160,
     e2e::{
         api::zeroex::{Eip712TypedZeroExOrder, ZeroExApi},
diff --git a/crates/e2e/tests/e2e/liquidity_source_notification.rs b/crates/e2e/tests/e2e/liquidity_source_notification.rs
index 184d12957d..415b8d6b61 100644
--- a/crates/e2e/tests/e2e/liquidity_source_notification.rs
+++ b/crates/e2e/tests/e2e/liquidity_source_notification.rs
@@ -5,7 +5,7 @@ use {
         signers::{SignerSync, local::PrivateKeySigner},
     },
     chrono::Utc,
-    contracts::bindings::{ERC20, LiquoriceSettlement},
+    contracts::alloy::{ERC20, InstanceExt, LiquoriceSettlement},
     driver::infra,
     e2e::{
         api,
diff --git a/crates/e2e/tests/e2e/smart_contract_orders.rs b/crates/e2e/tests/e2e/smart_contract_orders.rs
index e65abb32cc..eb17c02e2e 100644
--- a/crates/e2e/tests/e2e/smart_contract_orders.rs
+++ b/crates/e2e/tests/e2e/smart_contract_orders.rs
@@ -157,7 +157,7 @@ async fn erc1271_gas_limit(web3: Web3) {
     let mut onchain = OnchainComponents::deploy(web3.clone()).await;
 
     let [solver] = onchain.make_solvers(to_wei(1)).await;
-    let trader = contracts::bindings::GasHog::Instance::deploy(web3.alloy.clone())
+    let trader = contracts::alloy::test::GasHog::Instance::deploy(web3.alloy.clone())
         .await
         .unwrap();
 
diff --git a/crates/e2e/tests/e2e/univ2.rs b/crates/e2e/tests/e2e/univ2.rs
index dfe139157f..27792283f4 100644
--- a/crates/e2e/tests/e2e/univ2.rs
+++ b/crates/e2e/tests/e2e/univ2.rs
@@ -1,6 +1,6 @@
 use {
     ::alloy::primitives::U256,
-    contracts::bindings::GPv2Settlement,
+    contracts::alloy::GPv2Settlement,
     database::order_events::{OrderEvent, OrderEventLabel},
     e2e::setup::{eth, *},
     ethrpc::alloy::{
diff --git a/crates/e2e/tests/e2e/wrapper.rs b/crates/e2e/tests/e2e/wrapper.rs
index e338c4b90e..322510f6c3 100644
--- a/crates/e2e/tests/e2e/wrapper.rs
+++ b/crates/e2e/tests/e2e/wrapper.rs
@@ -8,7 +8,7 @@ use {
         rpc::types::trace::geth::{CallConfig, GethDebugTracingOptions},
     },
     app_data::{AppDataHash, hash_full_app_data},
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     e2e::setup::*,
     ethrpc::alloy::{
         CallBuilderExt,
diff --git a/crates/orderbook/src/run.rs b/crates/orderbook/src/run.rs
index ef5ad10bcb..884d7010bf 100644
--- a/crates/orderbook/src/run.rs
+++ b/crates/orderbook/src/run.rs
@@ -13,14 +13,21 @@ use {
     app_data::Validator,
     chain::Chain,
     clap::Parser,
-    contracts::bindings::{
+    contracts::alloy::{
         BalancerV2Vault,
-        Balances,
         ChainalysisOracle,
         GPv2Settlement,
         HooksTrampoline,
         IUniswapV3Factory,
+        InstanceExt,
         WETH9,
+        bindings::{
+            BalancerV2Vault,
+            Balances,
+            ChainalysisOracle,
+            HooksTrampoline,
+            IUniswapV3Factory,
+        },
     },
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt, StreamExt},
@@ -118,10 +125,11 @@ pub async fn run(args: Arguments) {
         .await
         .expect("Couldn't get vault relayer address");
     let signatures_contract = match args.shared.signatures_contract_address {
-        Some(address) => {
-            contracts::bindings::Signatures::Instance::new(address.into_alloy(), web3.alloy.clone())
-        }
-        None => contracts::bindings::Signatures::Instance::deployed(&web3.alloy)
+        Some(address) => contracts::alloy::support::Signatures::Instance::new(
+            address.into_alloy(),
+            web3.alloy.clone(),
+        ),
+        None => contracts::alloy::support::Signatures::Instance::deployed(&web3.alloy)
             .await
             .expect("load signatures contract"),
     };
diff --git a/crates/refunder/src/ethflow_order.rs b/crates/refunder/src/ethflow_order.rs
index 73aeab3781..8e8feca870 100644
--- a/crates/refunder/src/ethflow_order.rs
+++ b/crates/refunder/src/ethflow_order.rs
@@ -1,5 +1,5 @@
 use {
-    contracts::bindings::CoWSwapEthFlow,
+    contracts::alloy::CoWSwapEthFlow,
     database::{ethflow_orders::EthOrderData, orders::Order},
     ethcontract::{Bytes, H160, U256},
     ethrpc::alloy::conversions::IntoAlloy,
diff --git a/crates/refunder/src/lib.rs b/crates/refunder/src/lib.rs
index d130e11da0..640200df86 100644
--- a/crates/refunder/src/lib.rs
+++ b/crates/refunder/src/lib.rs
@@ -6,7 +6,7 @@ pub mod submitter;
 use {
     crate::arguments::Arguments,
     clap::Parser,
-    contracts::bindings::CoWSwapEthFlow,
+    contracts::alloy::CoWSwapEthFlow,
     ethcontract::PrivateKey,
     observe::metrics::LivenessChecking,
     refund_service::RefundService,
diff --git a/crates/refunder/src/refund_service.rs b/crates/refunder/src/refund_service.rs
index 77ca63caf1..9e8a0aa354 100644
--- a/crates/refunder/src/refund_service.rs
+++ b/crates/refunder/src/refund_service.rs
@@ -6,7 +6,7 @@ use {
         primitives::{Address, Signature, address},
     },
     anyhow::{Context, Result, anyhow},
-    contracts::bindings::CoWSwapEthFlow,
+    contracts::alloy::CoWSwapEthFlow,
     database::{
         OrderUid,
         ethflow_orders::{EthOrderPlacement, read_order, refundable_orders},
diff --git a/crates/refunder/src/submitter.rs b/crates/refunder/src/submitter.rs
index a65f112d34..c0cbcfa7a0 100644
--- a/crates/refunder/src/submitter.rs
+++ b/crates/refunder/src/submitter.rs
@@ -11,7 +11,7 @@
 use {
     alloy::primitives::Address,
     anyhow::{Result, anyhow},
-    contracts::bindings::CoWSwapEthFlow::{self, EthFlowOrder},
+    contracts::alloy::CoWSwapEthFlow::{self, EthFlowOrder},
     database::OrderUid,
     ethcontract::U256,
     ethrpc::alloy::conversions::IntoLegacy,
diff --git a/crates/shared/src/account_balances/mod.rs b/crates/shared/src/account_balances/mod.rs
index 699cb222a8..e28f05fb71 100644
--- a/crates/shared/src/account_balances/mod.rs
+++ b/crates/shared/src/account_balances/mod.rs
@@ -4,7 +4,7 @@ use {
         BalanceOverriding,
     },
     alloy::sol_types::{SolCall, SolType, sol_data},
-    contracts::bindings::{Balances, GPv2Settlement},
+    contracts::alloy::{GPv2Settlement, support::Balances},
     ethcontract::state_overrides::StateOverrides,
     ethrpc::{Web3, alloy::conversions::IntoAlloy, block_stream::CurrentBlockWatcher},
     model::{
diff --git a/crates/shared/src/account_balances/simulation.rs b/crates/shared/src/account_balances/simulation.rs
index 9372faf711..e0319989cc 100644
--- a/crates/shared/src/account_balances/simulation.rs
+++ b/crates/shared/src/account_balances/simulation.rs
@@ -6,7 +6,7 @@ use {
     super::{BalanceFetching, Query, TransferSimulationError},
     crate::account_balances::BalanceSimulator,
     anyhow::Result,
-    contracts::bindings::{BalancerV2Vault::BalancerV2Vault, ERC20},
+    contracts::alloy::{BalancerV2Vault::BalancerV2Vault, ERC20},
     ethcontract::{H160, U256},
     ethrpc::{
         Web3,
@@ -184,7 +184,7 @@ mod tests {
         super::*,
         crate::price_estimation::trade_verifier::balance_overrides::DummyOverrider,
         alloy::primitives::address,
-        contracts::bindings::GPv2Settlement,
+        contracts::alloy::GPv2Settlement,
         ethrpc::Web3,
         model::order::SellTokenSource,
         std::sync::Arc,
@@ -198,7 +198,7 @@ mod tests {
             alloy::primitives::address!("0x9008d19f58aabd9ed0d60971565aa8510560ab41"),
             web3.alloy.clone(),
         );
-        let balances = contracts::bindings::Balances::Instance::new(
+        let balances = contracts::alloy::support::Balances::Instance::new(
             address!("3e8C6De9510e7ECad902D005DE3Ab52f35cF4f1b"),
             web3.alloy.clone(),
         );
diff --git a/crates/shared/src/bad_token/token_owner_finder/mod.rs b/crates/shared/src/bad_token/token_owner_finder/mod.rs
index 77aae68c62..3a9ea6f3d0 100644
--- a/crates/shared/src/bad_token/token_owner_finder/mod.rs
+++ b/crates/shared/src/bad_token/token_owner_finder/mod.rs
@@ -31,7 +31,12 @@ use {
     },
     anyhow::{Context, Result},
     chain::Chain,
-    contracts::bindings::{BalancerV2Vault, ERC20, IUniswapV3Factory},
+    contracts::{
+        ERC20,
+        alloy::{BalancerV2Vault, ERC20, IUniswapV3Factory},
+        bindings::{BalancerV2Vault, ERC20, IUniswapV3Factory},
+        errors::EthcontractErrorType,
+    },
     ethcontract::U256,
     ethrpc::alloy::{
         conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/shared/src/bad_token/trace_call.rs b/crates/shared/src/bad_token/trace_call.rs
index 16a6049756..0389da800c 100644
--- a/crates/shared/src/bad_token/trace_call.rs
+++ b/crates/shared/src/bad_token/trace_call.rs
@@ -3,7 +3,7 @@ use {
     crate::{ethrpc::Web3, trace_many},
     alloy::sol_types::SolCall,
     anyhow::{Context, Result, bail, ensure},
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::{PrivateKey, jsonrpc::ErrorCode},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     model::interaction::InteractionData,
@@ -398,7 +398,7 @@ mod tests {
             sources::{BaselineSource, uniswap_v2},
         },
         chain::Chain,
-        contracts::bindings::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory},
+        contracts::alloy::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, InstanceExt},
         ethrpc::{Web3, alloy::conversions::IntoLegacy},
         hex_literal::hex,
         std::{env, time::Duration},
diff --git a/crates/shared/src/event_handling.rs b/crates/shared/src/event_handling.rs
index 2a1416eed4..90b36fd622 100644
--- a/crates/shared/src/event_handling.rs
+++ b/crates/shared/src/event_handling.rs
@@ -773,7 +773,7 @@ mod tests {
     use {
         super::*,
         alloy::eips::BlockNumberOrTag,
-        contracts::bindings::GPv2Settlement,
+        contracts::alloy::{GPv2Settlement, InstanceExt},
         ethcontract::{BlockNumber, H256},
         ethrpc::{Web3, block_stream::block_number_to_block_number_hash},
         std::str::FromStr,
@@ -786,7 +786,7 @@ mod tests {
             Filter::new().address(*self.address())
         }
 
-        fn provider(&self) -> &alloy::providers::DynProvider {
+        fn provider(&self) -> &contracts::alloy::Provider {
             self.provider()
         }
     }
diff --git a/crates/shared/src/order_validation.rs b/crates/shared/src/order_validation.rs
index 8068de67f7..5a55059181 100644
--- a/crates/shared/src/order_validation.rs
+++ b/crates/shared/src/order_validation.rs
@@ -22,7 +22,7 @@ use {
     anyhow::{Result, anyhow},
     app_data::{AppDataHash, Hook, Hooks, ValidatedAppData, Validator},
     async_trait::async_trait,
-    contracts::bindings::{HooksTrampoline, WETH9},
+    contracts::alloy::{HooksTrampoline, WETH9},
     ethcontract::{H160, H256, U256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     model::{
diff --git a/crates/shared/src/price_estimation/factory.rs b/crates/shared/src/price_estimation/factory.rs
index 117076dfd9..bf702f125f 100644
--- a/crates/shared/src/price_estimation/factory.rs
+++ b/crates/shared/src/price_estimation/factory.rs
@@ -28,7 +28,7 @@ use {
         token_info::TokenInfoFetching,
     },
     anyhow::{Context as _, Result},
-    contracts::bindings::WETH9,
+    contracts::alloy::WETH9,
     ethcontract::H160,
     ethrpc::{alloy::conversions::IntoLegacy, block_stream::CurrentBlockWatcher},
     gas_estimation::GasPriceEstimating,
diff --git a/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs b/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
index 9765c36484..94ad5a0712 100644
--- a/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
+++ b/crates/shared/src/price_estimation/trade_verifier/balance_overrides/detector.rs
@@ -2,7 +2,7 @@ use {
     super::Strategy,
     crate::tenderly_api::SimulationError,
     anyhow::Context,
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::{Address, H256, U256, state_overrides::StateOverride},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     maplit::hashmap,
diff --git a/crates/shared/src/price_estimation/trade_verifier/mod.rs b/crates/shared/src/price_estimation/trade_verifier/mod.rs
index a15a827114..3b05ae5417 100644
--- a/crates/shared/src/price_estimation/trade_verifier/mod.rs
+++ b/crates/shared/src/price_estimation/trade_verifier/mod.rs
@@ -20,7 +20,11 @@ use {
     alloy::primitives::{Address, address},
     anyhow::{Context, Result, anyhow},
     bigdecimal::BigDecimal,
-    contracts::bindings::{AnyoneAuthenticator, GPv2Settlement, Solver, Spardose, Trader, WETH9},
+    contracts::alloy::{
+        GPv2Settlement,
+        WETH9,
+        support::{AnyoneAuthenticator, Solver, Spardose, Trader},
+    },
     ethcontract::{Bytes, H160, U256, state_overrides::StateOverride},
     ethrpc::{
         Web3,
diff --git a/crates/shared/src/signature_validator/mod.rs b/crates/shared/src/signature_validator/mod.rs
index 3fa7d6ec3b..a415ba3347 100644
--- a/crates/shared/src/signature_validator/mod.rs
+++ b/crates/shared/src/signature_validator/mod.rs
@@ -4,7 +4,7 @@ use {
         BalanceOverriding,
     },
     alloy::primitives::FixedBytes,
-    contracts::bindings::GPv2Settlement,
+    contracts::alloy::GPv2Settlement,
     ethrpc::{Web3, alloy::conversions::IntoAlloy},
     hex_literal::hex,
     model::interaction::InteractionData,
@@ -96,7 +96,7 @@ pub fn check_erc1271_result(result: FixedBytes<4>) -> Result<(), SignatureValida
 /// Contracts required for signature verification simulation.
 pub struct Contracts {
     pub settlement: GPv2Settlement::Instance,
-    pub signatures: contracts::bindings::Signatures::Instance,
+    pub signatures: contracts::alloy::support::Signatures::Instance,
     pub vault_relayer: H160,
 }
 
diff --git a/crates/shared/src/signature_validator/simulation.rs b/crates/shared/src/signature_validator/simulation.rs
index 9f14f10972..4b1c56817f 100644
--- a/crates/shared/src/signature_validator/simulation.rs
+++ b/crates/shared/src/signature_validator/simulation.rs
@@ -13,10 +13,10 @@ use {
         transports::RpcError,
     },
     anyhow::{Context, Result},
-    contracts::bindings::{
+    contracts::alloy::{
         ERC1271SignatureValidator::ERC1271SignatureValidator,
         GPv2Settlement,
-        Signatures,
+        support::Signatures,
     },
     ethcontract::state_overrides::StateOverrides,
     ethrpc::{
diff --git a/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs b/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
index 6c4bd9fd5c..f245fa28c4 100644
--- a/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
+++ b/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
@@ -33,7 +33,7 @@ use {
     alloy::providers::DynProvider,
     anyhow::{Context, Result},
     clap::ValueEnum,
-    contracts::bindings::{
+    contracts::alloy::{
         BalancerV2ComposableStablePoolFactory,
         BalancerV2ComposableStablePoolFactoryV3,
         BalancerV2ComposableStablePoolFactoryV4,
@@ -47,6 +47,7 @@ use {
         BalancerV2WeightedPoolFactory,
         BalancerV2WeightedPoolFactoryV3,
         BalancerV2WeightedPoolFactoryV4,
+        InstanceExt,
     },
     ethcontract::{BlockId, H160, H256},
     ethrpc::block_stream::{BlockRetrieving, CurrentBlockWatcher},
diff --git a/crates/shared/src/sources/balancer_v2/pool_fetching/pool_storage.rs b/crates/shared/src/sources/balancer_v2/pool_fetching/pool_storage.rs
index 60f8822c1e..a18de4f5a6 100644
--- a/crates/shared/src/sources/balancer_v2/pool_fetching/pool_storage.rs
+++ b/crates/shared/src/sources/balancer_v2/pool_fetching/pool_storage.rs
@@ -22,7 +22,7 @@ use {
     },
     alloy::rpc::types::Log,
     anyhow::{Context, Result},
-    contracts::bindings::BalancerV2BasePoolFactory::BalancerV2BasePoolFactory::{
+    contracts::alloy::BalancerV2BasePoolFactory::BalancerV2BasePoolFactory::{
         BalancerV2BasePoolFactoryEvents,
         PoolCreated,
     },
diff --git a/crates/shared/src/sources/balancer_v2/pool_fetching/registry.rs b/crates/shared/src/sources/balancer_v2/pool_fetching/registry.rs
index 37f212dea0..78970a2701 100644
--- a/crates/shared/src/sources/balancer_v2/pool_fetching/registry.rs
+++ b/crates/shared/src/sources/balancer_v2/pool_fetching/registry.rs
@@ -20,7 +20,7 @@ use {
     },
     anyhow::Result,
     contracts::{
-        bindings::BalancerV2BasePoolFactory::{self, BalancerV2BasePoolFactory::PoolCreated},
+        alloy::BalancerV2BasePoolFactory::{self, BalancerV2BasePoolFactory::PoolCreated},
         errors::EthcontractErrorType,
     },
     ethcontract::{BlockId, H256, errors::MethodError},
diff --git a/crates/shared/src/sources/balancer_v2/pools/common.rs b/crates/shared/src/sources/balancer_v2/pools/common.rs
index b510e8306b..cc657846d6 100644
--- a/crates/shared/src/sources/balancer_v2/pools/common.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/common.rs
@@ -10,7 +10,7 @@ use {
         token_info::TokenInfoFetching,
     },
     anyhow::{Context, Result, anyhow, ensure},
-    contracts::bindings::{BalancerV2BasePool, BalancerV2Vault},
+    contracts::alloy::{BalancerV2BasePool, BalancerV2Vault},
     ethcontract::{BlockId, H160, H256, U256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt as _, future::BoxFuture},
@@ -376,7 +376,7 @@ mod tests {
             transports::mock::Asserter,
         },
         anyhow::bail,
-        contracts::bindings::BalancerV2Vault,
+        contracts::alloy::BalancerV2Vault,
         ethcontract::U256,
         maplit::{btreemap, hashmap},
         mockall::predicate,
diff --git a/crates/shared/src/sources/balancer_v2/pools/composable_stable.rs b/crates/shared/src/sources/balancer_v2/pools/composable_stable.rs
index 1c32506f8c..258fbbdb2d 100644
--- a/crates/shared/src/sources/balancer_v2/pools/composable_stable.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/composable_stable.rs
@@ -7,7 +7,7 @@ use {
         swap::fixed_point::Bfp,
     },
     anyhow::Result,
-    contracts::bindings::{BalancerV2ComposableStablePool, BalancerV2ComposableStablePoolFactory},
+    contracts::alloy::{BalancerV2ComposableStablePool, BalancerV2ComposableStablePoolFactory},
     ethcontract::BlockId,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt as _, future::BoxFuture},
diff --git a/crates/shared/src/sources/balancer_v2/pools/liquidity_bootstrapping.rs b/crates/shared/src/sources/balancer_v2/pools/liquidity_bootstrapping.rs
index a45307f52e..8080ca3138 100644
--- a/crates/shared/src/sources/balancer_v2/pools/liquidity_bootstrapping.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/liquidity_bootstrapping.rs
@@ -7,7 +7,7 @@ use {
         swap::fixed_point::Bfp,
     },
     anyhow::Result,
-    contracts::bindings::{
+    contracts::alloy::{
         BalancerV2LiquidityBootstrappingPool,
         BalancerV2LiquidityBootstrappingPoolFactory,
     },
diff --git a/crates/shared/src/sources/balancer_v2/pools/stable.rs b/crates/shared/src/sources/balancer_v2/pools/stable.rs
index 1b846d155a..b60f8b96df 100644
--- a/crates/shared/src/sources/balancer_v2/pools/stable.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/stable.rs
@@ -10,7 +10,7 @@ use {
         },
     },
     anyhow::{Result, ensure},
-    contracts::bindings::{BalancerV2StablePool, BalancerV2StablePoolFactoryV2},
+    contracts::alloy::{BalancerV2StablePool, BalancerV2StablePoolFactoryV2},
     ethcontract::{BlockId, H160, U256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt as _, future::BoxFuture},
diff --git a/crates/shared/src/sources/balancer_v2/pools/weighted.rs b/crates/shared/src/sources/balancer_v2/pools/weighted.rs
index a4dfab1715..ff1c34f42d 100644
--- a/crates/shared/src/sources/balancer_v2/pools/weighted.rs
+++ b/crates/shared/src/sources/balancer_v2/pools/weighted.rs
@@ -7,7 +7,7 @@ use {
         swap::fixed_point::Bfp,
     },
     anyhow::{Result, anyhow},
-    contracts::bindings::{
+    contracts::alloy::{
         BalancerV2WeightedPool,
         BalancerV2WeightedPoolFactory,
         BalancerV2WeightedPoolFactoryV3,
diff --git a/crates/shared/src/sources/swapr.rs b/crates/shared/src/sources/swapr.rs
index 3edf853030..28a81b3180 100644
--- a/crates/shared/src/sources/swapr.rs
+++ b/crates/shared/src/sources/swapr.rs
@@ -3,7 +3,7 @@
 use {
     crate::sources::uniswap_v2::pool_fetching::{DefaultPoolReader, Pool, PoolReading},
     anyhow::Result,
-    contracts::bindings::ISwaprPair,
+    contracts::alloy::ISwaprPair,
     ethcontract::BlockId,
     ethrpc::alloy::{conversions::IntoAlloy, errors::ignore_non_node_error},
     futures::{FutureExt as _, future::BoxFuture},
diff --git a/crates/shared/src/sources/uniswap_v2/mod.rs b/crates/shared/src/sources/uniswap_v2/mod.rs
index 97539a0436..71fd3c1b60 100644
--- a/crates/shared/src/sources/uniswap_v2/mod.rs
+++ b/crates/shared/src/sources/uniswap_v2/mod.rs
@@ -14,7 +14,7 @@ use {
         sources::{BaselineSource, swapr::SwaprPoolReader},
     },
     anyhow::{Context, Result},
-    contracts::bindings::IUniswapLikeRouter,
+    contracts::alloy::IUniswapLikeRouter,
     ethcontract::{H160, H256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     hex_literal::hex,
@@ -70,39 +70,37 @@ impl UniV2BaselineSourceParameters {
         match source {
             BS::None | BS::BalancerV2 | BS::ZeroEx | BS::UniswapV3 => None,
             BS::UniswapV2 => Some(Self {
-                router: contracts::bindings::UniswapV2Router02::deployment_address(&chain_id)
+                router: contracts::alloy::UniswapV2Router02::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: UNISWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
             }),
             BS::Honeyswap => Some(Self {
-                router: contracts::bindings::HoneyswapRouter::deployment_address(&chain_id)
+                router: contracts::alloy::HoneyswapRouter::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: HONEYSWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
             }),
             BS::SushiSwap => Some(Self {
-                router: contracts::bindings::SushiSwapRouter::deployment_address(&chain_id)
+                router: contracts::alloy::SushiSwapRouter::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: SUSHISWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
             }),
             BS::Swapr => Some(Self {
-                router: contracts::bindings::SwaprRouter::deployment_address(&chain_id)
+                router: contracts::alloy::SwaprRouter::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: SWAPR_INIT.into(),
                 pool_reading: PoolReadingStyle::Swapr,
             }),
             BS::TestnetUniswapV2 => Some(Self {
-                router: contracts::bindings::TestnetUniswapV2Router02::deployment_address(
-                    &chain_id,
-                )
-                .map(IntoLegacy::into_legacy)?,
+                router: contracts::alloy::TestnetUniswapV2Router02::deployment_address(&chain_id)
+                    .map(IntoLegacy::into_legacy)?,
                 init_code_digest: TESTNET_UNISWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
             }),
             BS::Baoswap => Some(Self {
-                router: contracts::bindings::BaoswapRouter::deployment_address(&chain_id)
+                router: contracts::alloy::BaoswapRouter::deployment_address(&chain_id)
                     .map(IntoLegacy::into_legacy)?,
                 init_code_digest: BAOSWAP_INIT.into(),
                 pool_reading: PoolReadingStyle::Default,
@@ -112,7 +110,7 @@ impl UniV2BaselineSourceParameters {
 
     pub async fn into_source(&self, web3: &Web3) -> Result<UniV2BaselineSource> {
         let web3 = ethrpc::instrumented::instrument_with_label(web3, "uniswapV2".into());
-        let router = contracts::bindings::IUniswapLikeRouter::Instance::new(
+        let router = contracts::alloy::IUniswapLikeRouter::Instance::new(
             self.router.into_alloy(),
             web3.alloy.clone(),
         );
diff --git a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
index f5de500869..5a1f77a388 100644
--- a/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v2/pool_fetching.rs
@@ -4,7 +4,7 @@ use {
     anyhow::Result,
     cached::{Cached, TimedCache},
     contracts::{
-        bindings::{
+        alloy::{
             ERC20,
             IUniswapLikePair::{self, IUniswapLikePair::getReservesReturn},
         },
diff --git a/crates/shared/src/sources/uniswap_v3/event_fetching.rs b/crates/shared/src/sources/uniswap_v3/event_fetching.rs
index 961eece31e..f7e4db3461 100644
--- a/crates/shared/src/sources/uniswap_v3/event_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v3/event_fetching.rs
@@ -8,7 +8,7 @@ use {
         sol_types::SolEvent,
     },
     anyhow::{Context, Result},
-    contracts::bindings::{
+    contracts::alloy::{
         UniswapV3Pool,
         UniswapV3Pool::UniswapV3Pool::{Burn, Mint, Swap, UniswapV3PoolEvents},
     },
diff --git a/crates/shared/src/sources/uniswap_v3/pool_fetching.rs b/crates/shared/src/sources/uniswap_v3/pool_fetching.rs
index b3ccc3b3cc..88873e2fc6 100644
--- a/crates/shared/src/sources/uniswap_v3/pool_fetching.rs
+++ b/crates/shared/src/sources/uniswap_v3/pool_fetching.rs
@@ -11,7 +11,7 @@ use {
     },
     alloy::rpc::types::Log,
     anyhow::{Context, Result},
-    contracts::bindings::UniswapV3Pool::UniswapV3Pool::{
+    contracts::alloy::UniswapV3Pool::UniswapV3Pool::{
         UniswapV3PoolEvents as AlloyUniswapV3PoolEvents,
         UniswapV3PoolEvents,
     },
@@ -523,7 +523,7 @@ mod tests {
     use {
         super::*,
         alloy::primitives::{U160, aliases::I24},
-        contracts::bindings::UniswapV3Pool::UniswapV3Pool::{Burn, Mint, Swap},
+        contracts::alloy::UniswapV3Pool::UniswapV3Pool::{Burn, Mint, Swap},
         ethrpc::alloy::conversions::IntoAlloy,
         serde_json::json,
         std::str::FromStr,
diff --git a/crates/shared/src/token_info.rs b/crates/shared/src/token_info.rs
index d44d0c4b38..a47c389d37 100644
--- a/crates/shared/src/token_info.rs
+++ b/crates/shared/src/token_info.rs
@@ -1,7 +1,7 @@
 use {
     anyhow::Result,
     async_trait::async_trait,
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::H160,
     ethrpc::{
         Web3,
diff --git a/crates/solver/src/interactions/allowances.rs b/crates/solver/src/interactions/allowances.rs
index 5af5830e88..b50211373e 100644
--- a/crates/solver/src/interactions/allowances.rs
+++ b/crates/solver/src/interactions/allowances.rs
@@ -6,7 +6,7 @@ use {
     crate::interactions::Erc20ApproveInteraction,
     ::alloy::sol_types::SolCall,
     anyhow::{Context as _, Result, anyhow, ensure},
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::{H160, U256},
     ethrpc::{Web3, alloy::conversions::IntoAlloy},
     maplit::hashmap,
@@ -374,7 +374,7 @@ mod tests {
     }
 
     fn allowance_call_data(owner: H160, spender: H160) -> web3::types::Bytes {
-        contracts::bindings::ERC20::ERC20::allowanceCall {
+        contracts::alloy::ERC20::ERC20::allowanceCall {
             owner: owner.into_alloy(),
             spender: spender.into_alloy(),
         }
diff --git a/crates/solver/src/interactions/balancer_v2.rs b/crates/solver/src/interactions/balancer_v2.rs
index 0efdf02c34..4acbb9818c 100644
--- a/crates/solver/src/interactions/balancer_v2.rs
+++ b/crates/solver/src/interactions/balancer_v2.rs
@@ -3,7 +3,7 @@ use {
         primitives::{Address, U256},
         sol_types::SolCall,
     },
-    contracts::bindings::BalancerV2Vault::{BalancerV2Vault::swapCall, IVault},
+    contracts::alloy::BalancerV2Vault::{BalancerV2Vault::swapCall, IVault},
     ethcontract::{Bytes, H256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     shared::{
diff --git a/crates/solver/src/interactions/erc20.rs b/crates/solver/src/interactions/erc20.rs
index 420ddf81ad..0e41d5f12b 100644
--- a/crates/solver/src/interactions/erc20.rs
+++ b/crates/solver/src/interactions/erc20.rs
@@ -5,7 +5,7 @@ use {
         primitives::{Address, U256},
         sol_types::SolCall,
     },
-    contracts::bindings::ERC20,
+    contracts::alloy::ERC20,
     ethcontract::Bytes,
     ethrpc::alloy::conversions::IntoLegacy,
     shared::interaction::{EncodedInteraction, Interaction},
diff --git a/crates/solver/src/interactions/uniswap_v2.rs b/crates/solver/src/interactions/uniswap_v2.rs
index ff7c062ca1..02fcfa8359 100644
--- a/crates/solver/src/interactions/uniswap_v2.rs
+++ b/crates/solver/src/interactions/uniswap_v2.rs
@@ -1,6 +1,6 @@
 use {
     alloy::{primitives::Address, sol_types::SolCall},
-    contracts::bindings::IUniswapLikeRouter,
+    contracts::alloy::IUniswapLikeRouter,
     ethcontract::Bytes,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     primitive_types::{H160, U256},
diff --git a/crates/solver/src/interactions/uniswap_v3.rs b/crates/solver/src/interactions/uniswap_v3.rs
index 73ce85ea28..b97ac2b9a1 100644
--- a/crates/solver/src/interactions/uniswap_v3.rs
+++ b/crates/solver/src/interactions/uniswap_v3.rs
@@ -1,6 +1,6 @@
 use {
     alloy::{primitives::Address, sol_types::SolCall},
-    contracts::bindings::UniswapV3SwapRouterV2::{
+    contracts::alloy::UniswapV3SwapRouterV2::{
         IV3SwapRouter::ExactOutputSingleParams,
         UniswapV3SwapRouterV2::exactOutputSingleCall,
     },
diff --git a/crates/solver/src/interactions/weth.rs b/crates/solver/src/interactions/weth.rs
index ddfd698025..57f04d99b4 100644
--- a/crates/solver/src/interactions/weth.rs
+++ b/crates/solver/src/interactions/weth.rs
@@ -1,7 +1,7 @@
 use {
     alloy::primitives::U256,
     anyhow::{Result, ensure},
-    contracts::bindings::WETH9,
+    contracts::alloy::WETH9,
     ethcontract::Bytes,
     ethrpc::alloy::conversions::IntoLegacy,
     shared::interaction::{EncodedInteraction, Interaction},
diff --git a/crates/solver/src/interactions/zeroex.rs b/crates/solver/src/interactions/zeroex.rs
index 310dbbac1f..a93dcb7c46 100644
--- a/crates/solver/src/interactions/zeroex.rs
+++ b/crates/solver/src/interactions/zeroex.rs
@@ -1,5 +1,5 @@
 use {
-    contracts::bindings::IZeroex,
+    contracts::alloy::IZeroex,
     ethcontract::Bytes,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     shared::{
diff --git a/crates/solver/src/liquidity/balancer_v2.rs b/crates/solver/src/liquidity/balancer_v2.rs
index 844a9e626f..60412e6e19 100644
--- a/crates/solver/src/liquidity/balancer_v2.rs
+++ b/crates/solver/src/liquidity/balancer_v2.rs
@@ -228,7 +228,7 @@ mod tests {
     use {
         super::*,
         crate::interactions::allowances::{Approval, MockAllowanceManaging},
-        contracts::bindings::BalancerV2Vault,
+        contracts::alloy::BalancerV2Vault,
         maplit::{btreemap, hashmap, hashset},
         mockall::predicate::*,
         model::TokenPair,
diff --git a/crates/solver/src/liquidity/uniswap_v3.rs b/crates/solver/src/liquidity/uniswap_v3.rs
index 7ca7c18711..a83622b2a9 100644
--- a/crates/solver/src/liquidity/uniswap_v3.rs
+++ b/crates/solver/src/liquidity/uniswap_v3.rs
@@ -11,7 +11,7 @@ use {
     },
     alloy::primitives::Address,
     anyhow::{Context, Result, ensure},
-    contracts::bindings::UniswapV3SwapRouterV2::IV3SwapRouter::ExactOutputSingleParams,
+    contracts::alloy::UniswapV3SwapRouterV2::IV3SwapRouter::ExactOutputSingleParams,
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     model::TokenPair,
     num::{CheckedMul, rational::Ratio},
diff --git a/crates/solver/src/liquidity/zeroex.rs b/crates/solver/src/liquidity/zeroex.rs
index 2443ff5c41..31add35b9b 100644
--- a/crates/solver/src/liquidity/zeroex.rs
+++ b/crates/solver/src/liquidity/zeroex.rs
@@ -12,7 +12,7 @@ use {
     alloy::primitives::Address,
     anyhow::Result,
     arc_swap::ArcSwap,
-    contracts::bindings::IZeroex,
+    contracts::alloy::IZeroex,
     ethrpc::{
         alloy::conversions::IntoLegacy,
         block_stream::{CurrentBlockWatcher, into_stream},
diff --git a/crates/solver/src/settlement/settlement_encoder.rs b/crates/solver/src/settlement/settlement_encoder.rs
index c02d69d713..20fd3dcc9a 100644
--- a/crates/solver/src/settlement/settlement_encoder.rs
+++ b/crates/solver/src/settlement/settlement_encoder.rs
@@ -583,8 +583,7 @@ pub(crate) fn verify_executed_amount(order: &Order, executed: U256) -> Result<()
 pub mod tests {
     use {
         super::*,
-        alloy::primitives::Address,
-        contracts::bindings::WETH9,
+        contracts::alloy::WETH9,
         ethcontract::Bytes,
         ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
         maplit::hashmap,
diff --git a/crates/solvers/src/boundary/baseline.rs b/crates/solvers/src/boundary/baseline.rs
index a7853e11a1..ce14a95525 100644
--- a/crates/solvers/src/boundary/baseline.rs
+++ b/crates/solvers/src/boundary/baseline.rs
@@ -5,7 +5,7 @@ use {
         boundary,
         domain::{eth, liquidity, order, solver},
     },
-    contracts::bindings::UniswapV3QuoterV2,
+    contracts::alloy::UniswapV3QuoterV2,
     ethereum_types::{H160, U256},
     model::TokenPair,
     shared::baseline_solver::{self, BaseTokens, BaselineSolvable},
@@ -158,7 +158,7 @@ impl<'a> Solver<'a> {
 
 fn to_boundary_liquidity(
     liquidity: &[liquidity::Liquidity],
-    uni_v3_quoter_v2: Option<Arc<contracts::bindings::UniswapV3QuoterV2::Instance>>,
+    uni_v3_quoter_v2: Option<Arc<contracts::alloy::UniswapV3QuoterV2::Instance>>,
 ) -> HashMap<TokenPair, Vec<OnchainLiquidity>> {
     liquidity
         .iter()
diff --git a/crates/solvers/src/boundary/liquidity/concentrated.rs b/crates/solvers/src/boundary/liquidity/concentrated.rs
index 356d511293..34c6640bc8 100644
--- a/crates/solvers/src/boundary/liquidity/concentrated.rs
+++ b/crates/solvers/src/boundary/liquidity/concentrated.rs
@@ -1,7 +1,7 @@
 use {
     alloy::primitives::aliases::U24,
     contracts::{
-        bindings::UniswapV3QuoterV2::IQuoterV2::QuoteExactInputSingleParams,
+        alloy::UniswapV3QuoterV2::IQuoterV2::QuoteExactInputSingleParams,
         ethcontract::{H160, U256},
     },
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
@@ -12,7 +12,7 @@ use {
 
 #[derive(Debug)]
 pub struct Pool {
-    pub uni_v3_quoter_contract: Arc<contracts::bindings::UniswapV3QuoterV2::Instance>,
+    pub uni_v3_quoter_contract: Arc<contracts::alloy::UniswapV3QuoterV2::Instance>,
     pub address: H160,
     pub tokens: TokenPair,
     pub fee: U24,
diff --git a/crates/solvers/src/domain/solver.rs b/crates/solvers/src/domain/solver.rs
index 264eaffea0..1c612b3cec 100644
--- a/crates/solvers/src/domain/solver.rs
+++ b/crates/solvers/src/domain/solver.rs
@@ -18,6 +18,7 @@ use {
         },
         infra::metrics,
     },
+    contracts::alloy::InstanceExt,
     ethereum_types::U256,
     reqwest::Url,
     std::{cmp, collections::HashSet, sync::Arc},
@@ -71,7 +72,7 @@ struct Inner {
     native_token_price_estimation_amount: eth::U256,
 
     /// If provided, the solver can rely on Uniswap V3 LPs
-    uni_v3_quoter_v2: Option<Arc<contracts::bindings::UniswapV3QuoterV2::Instance>>,
+    uni_v3_quoter_v2: Option<Arc<contracts::alloy::UniswapV3QuoterV2::Instance>>,
 }
 
 impl Solver {
@@ -80,7 +81,7 @@ impl Solver {
         let uni_v3_quoter_v2 = match config.uni_v3_node_url {
             Some(url) => {
                 let web3 = ethrpc::web3(Default::default(), Default::default(), &url, "baseline");
-                contracts::bindings::UniswapV3QuoterV2::Instance::deployed(&web3.alloy)
+                contracts::alloy::UniswapV3QuoterV2::Instance::deployed(&web3.alloy)
                     .await
                     .map(Arc::new)
                     .inspect_err(|err| {
diff --git a/crates/solvers/src/infra/contracts.rs b/crates/solvers/src/infra/contracts.rs
index 9078baf04a..0b159ca085 100644
--- a/crates/solvers/src/infra/contracts.rs
+++ b/crates/solvers/src/infra/contracts.rs
@@ -1,7 +1,7 @@
 use {
     crate::domain::eth,
     chain::Chain,
-    contracts::bindings::WETH9,
+    contracts::alloy::WETH9,
     ethrpc::alloy::conversions::IntoLegacy,
 };
 

From 33b6570fbaf98b330160110c9a159044366eba60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Mon, 3 Nov 2025 18:57:16 +0000
Subject: [PATCH 21/36] should be ok

---
 Cargo.lock                                               | 1 +
 crates/autopilot/src/boundary/events/settlement.rs       | 2 +-
 .../src/database/ethflow_events/event_retriever.rs       | 4 ++--
 .../src/database/onchain_order_events/event_retriever.rs | 2 +-
 .../autopilot/src/database/onchain_order_events/mod.rs   | 2 +-
 crates/autopilot/src/infra/blockchain/contracts.rs       | 5 ++---
 crates/autopilot/src/run.rs                              | 3 ++-
 crates/contracts-generate/src/lib.rs                     | 5 +++++
 crates/contracts/.gitignore                              | 2 +-
 crates/contracts/Cargo.toml                              | 3 ++-
 crates/contracts/build.rs                                | 1 +
 crates/cow-amm/src/lib.rs                                | 1 -
 crates/driver/src/boundary/liquidity/zeroex.rs           | 1 -
 crates/e2e/src/setup/deploy.rs                           | 1 -
 crates/e2e/src/setup/onchain_components/safe.rs          | 6 ++++--
 crates/e2e/tests/e2e/liquidity.rs                        | 2 +-
 crates/e2e/tests/e2e/liquidity_source_notification.rs    | 2 +-
 crates/order-validation/src/banned.rs                    | 2 +-
 crates/orderbook/src/run.rs                              | 9 +--------
 .../shared/src/bad_token/token_owner_finder/liquidity.rs | 2 +-
 crates/shared/src/bad_token/token_owner_finder/mod.rs    | 7 +------
 crates/shared/src/bad_token/trace_call.rs                | 2 +-
 crates/shared/src/event_handling.rs                      | 4 ++--
 .../shared/src/sources/balancer_v2/pool_fetching/mod.rs  | 1 -
 crates/solvers/src/domain/solver.rs                      | 1 -
 25 files changed, 32 insertions(+), 39 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 0d9606e020..37878d6ce5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2411,6 +2411,7 @@ dependencies = [
  "ethcontract",
  "ethcontract-generate",
  "paste",
+ "serde",
  "serde_json",
  "tracing",
  "tracing-subscriber",
diff --git a/crates/autopilot/src/boundary/events/settlement.rs b/crates/autopilot/src/boundary/events/settlement.rs
index 1520b67b21..e58ea68ce9 100644
--- a/crates/autopilot/src/boundary/events/settlement.rs
+++ b/crates/autopilot/src/boundary/events/settlement.rs
@@ -28,7 +28,7 @@ impl AlloyEventRetrieving for GPv2SettlementContract {
         Filter::new().address(self.address)
     }
 
-    fn provider(&self) -> &contracts::alloy::Provider {
+    fn provider(&self) -> &alloy::providers::DynProvider {
         &self.provider
     }
 }
diff --git a/crates/autopilot/src/database/ethflow_events/event_retriever.rs b/crates/autopilot/src/database/ethflow_events/event_retriever.rs
index 41ad7a25e1..aa7ae2e83a 100644
--- a/crates/autopilot/src/database/ethflow_events/event_retriever.rs
+++ b/crates/autopilot/src/database/ethflow_events/event_retriever.rs
@@ -7,7 +7,7 @@ use {
         rpc::types::{Filter, FilterSet},
         sol_types::SolEvent,
     },
-    contracts::bindings::CoWSwapEthFlow::CoWSwapEthFlow,
+    contracts::alloy::CoWSwapEthFlow::CoWSwapEthFlow,
     shared::{ethrpc::Web3, event_handling::AlloyEventRetrieving},
 };
 
@@ -29,7 +29,7 @@ impl EthFlowRefundRetriever {
 impl AlloyEventRetrieving for EthFlowRefundRetriever {
     type Event = CoWSwapEthFlow::CoWSwapEthFlowEvents;
 
-    fn provider(&self) -> &contracts::alloy::Provider {
+    fn provider(&self) -> &alloy::providers::DynProvider {
         &self.web3.alloy
     }
 
diff --git a/crates/autopilot/src/database/onchain_order_events/event_retriever.rs b/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
index ed99df97bf..bde093e170 100644
--- a/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
+++ b/crates/autopilot/src/database/onchain_order_events/event_retriever.rs
@@ -42,7 +42,7 @@ impl AlloyEventRetrieving for CoWSwapOnchainOrdersContract {
             ]))
     }
 
-    fn provider(&self) -> &contracts::alloy::Provider {
+    fn provider(&self) -> &alloy::providers::DynProvider {
         &self.web3.alloy
     }
 }
diff --git a/crates/autopilot/src/database/onchain_order_events/mod.rs b/crates/autopilot/src/database/onchain_order_events/mod.rs
index 0f6840b334..6e7df3ad63 100644
--- a/crates/autopilot/src/database/onchain_order_events/mod.rs
+++ b/crates/autopilot/src/database/onchain_order_events/mod.rs
@@ -784,7 +784,7 @@ mod test {
         super::*,
         crate::database::Config,
         alloy::primitives::U256,
-        contracts::alloy::{CoWSwapOnchainOrders, InstanceExt},
+        contracts::alloy::CoWSwapOnchainOrders,
         database::{byte_array::ByteArray, onchain_broadcasted_orders::OnchainOrderPlacement},
         ethcontract::H160,
         ethrpc::Web3,
diff --git a/crates/autopilot/src/infra/blockchain/contracts.rs b/crates/autopilot/src/infra/blockchain/contracts.rs
index c8c4f5e23f..11dd601f51 100644
--- a/crates/autopilot/src/infra/blockchain/contracts.rs
+++ b/crates/autopilot/src/infra/blockchain/contracts.rs
@@ -1,14 +1,13 @@
 use {
     crate::domain,
     chain::Chain,
-    contracts::bindings::{
-        Balances,
+    contracts::alloy::{
         ChainalysisOracle,
         GPv2AllowListAuthentication,
         GPv2Settlement,
         HooksTrampoline,
-        InstanceExt,
         WETH9,
+        support::Balances,
     },
     ethrpc::{
         Web3,
diff --git a/crates/autopilot/src/run.rs b/crates/autopilot/src/run.rs
index 77e415bb78..2699a1b768 100644
--- a/crates/autopilot/src/run.rs
+++ b/crates/autopilot/src/run.rs
@@ -27,7 +27,8 @@ use {
     alloy::eips::BlockNumberOrTag,
     chain::Chain,
     clap::Parser,
-    contracts::bindings::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, InstanceExt, WETH9},
+    contracts::alloy::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, WETH9},
+    ethcontract::H160,
     ethrpc::{
         Web3,
         alloy::conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index d415f47fe5..b10264aca8 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -217,6 +217,11 @@ impl Contract {
                     DEPLOYMENT_INFO.get(chain_id).map(|(addr, _)| *addr)
                 }
 
+                /// Returns the contract's deployment block (if one exists) for the given chain.
+                pub fn deployment_block(chain_id: &u64) -> Option<u64> {
+                    DEPLOYMENT_INFO.get(chain_id).map(|(_, block)| *block).flatten()
+                }
+
                 impl Instance {
                     pub fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
                         async move {
diff --git a/crates/contracts/.gitignore b/crates/contracts/.gitignore
index b69411a661..aca7132973 100644
--- a/crates/contracts/.gitignore
+++ b/crates/contracts/.gitignore
@@ -1 +1 @@
-src/bindings
+src/alloy
diff --git a/crates/contracts/Cargo.toml b/crates/contracts/Cargo.toml
index 02bfe431c2..28d3154f9e 100644
--- a/crates/contracts/Cargo.toml
+++ b/crates/contracts/Cargo.toml
@@ -22,8 +22,9 @@ bin = [
 
 [dependencies]
 alloy = { workspace = true, features = ["sol-types", "json", "contract", "json-abi"] }
-paste = { workspace = true }
 ethcontract = { workspace = true }
+paste = { workspace = true }
+serde = { workspace = true }
 serde_json = { workspace = true }
 
 # [bin-dependencies]
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 2d10e0f6b1..4ebfe55cf2 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -29,6 +29,7 @@ fn main() {
             // Not available on Lens
         ]))
         // Misc
+        .add_contract(Contract::new("ERC20"))
         .add_contract(Contract::new("ERC20Mintable"))
         // GnosisSafe
         .add_contract(Contract::new("GnosisSafe"))
diff --git a/crates/cow-amm/src/lib.rs b/crates/cow-amm/src/lib.rs
index 9bc740c528..f494451017 100644
--- a/crates/cow-amm/src/lib.rs
+++ b/crates/cow-amm/src/lib.rs
@@ -37,7 +37,6 @@ pub mod gpv2_order {
             sol_types::{SolStruct, SolValue},
         },
         contracts::alloy::cow_amm::CowAmm,
-        ethrpc::alloy::conversions::IntoLegacy,
         model::{DomainSeparator, interaction::InteractionData, signature::hashed_eip712_message},
     };
 
diff --git a/crates/driver/src/boundary/liquidity/zeroex.rs b/crates/driver/src/boundary/liquidity/zeroex.rs
index fdd128885d..0376d4a60f 100644
--- a/crates/driver/src/boundary/liquidity/zeroex.rs
+++ b/crates/driver/src/boundary/liquidity/zeroex.rs
@@ -7,7 +7,6 @@ use {
         infra::{self, Ethereum},
     },
     anyhow::anyhow,
-    contracts::alloy::InstanceExt,
     ethrpc::block_stream::CurrentBlockWatcher,
     shared::{
         http_client::HttpClientFactory,
diff --git a/crates/e2e/src/setup/deploy.rs b/crates/e2e/src/setup/deploy.rs
index c5765e2e7c..85cb82dfb7 100644
--- a/crates/e2e/src/setup/deploy.rs
+++ b/crates/e2e/src/setup/deploy.rs
@@ -7,7 +7,6 @@ use {
         GPv2AllowListAuthentication,
         GPv2Settlement,
         HooksTrampoline,
-        InstanceExt,
         UniswapV2Factory,
         UniswapV2Router02,
         WETH9,
diff --git a/crates/e2e/src/setup/onchain_components/safe.rs b/crates/e2e/src/setup/onchain_components/safe.rs
index fd92cc71a9..5ac9f76343 100644
--- a/crates/e2e/src/setup/onchain_components/safe.rs
+++ b/crates/e2e/src/setup/onchain_components/safe.rs
@@ -182,8 +182,10 @@ impl Safe {
         to: alloy::primitives::Address,
         data: Vec<u8>,
         nonce: alloy::primitives::U256,
-    ) -> alloy::contract::CallBuilder<&contracts::alloy::Provider, PhantomData<execTransactionCall>>
-    {
+    ) -> alloy::contract::CallBuilder<
+        &alloy::providers::DynProvider,
+        PhantomData<execTransactionCall>,
+    > {
         let signature = self.sign({
             // `SafeTx` struct hash computation ported from the Safe Solidity code:
             // <https://etherscan.io/address/0xd9Db270c1B5E3Bd161E8c8503c55cEABeE709552#code#F1#L377>
diff --git a/crates/e2e/tests/e2e/liquidity.rs b/crates/e2e/tests/e2e/liquidity.rs
index 1598e095f4..31942b586d 100644
--- a/crates/e2e/tests/e2e/liquidity.rs
+++ b/crates/e2e/tests/e2e/liquidity.rs
@@ -4,7 +4,7 @@ use {
         providers::ext::{AnvilApi, ImpersonateConfig},
     },
     chrono::{NaiveDateTime, Utc},
-    contracts::alloy::{ERC20, IZeroex, InstanceExt},
+    contracts::alloy::{ERC20, IZeroex},
     driver::domain::eth::H160,
     e2e::{
         api::zeroex::{Eip712TypedZeroExOrder, ZeroExApi},
diff --git a/crates/e2e/tests/e2e/liquidity_source_notification.rs b/crates/e2e/tests/e2e/liquidity_source_notification.rs
index 415b8d6b61..4c4791f9c5 100644
--- a/crates/e2e/tests/e2e/liquidity_source_notification.rs
+++ b/crates/e2e/tests/e2e/liquidity_source_notification.rs
@@ -5,7 +5,7 @@ use {
         signers::{SignerSync, local::PrivateKeySigner},
     },
     chrono::Utc,
-    contracts::alloy::{ERC20, InstanceExt, LiquoriceSettlement},
+    contracts::alloy::{ERC20, LiquoriceSettlement},
     driver::infra,
     e2e::{
         api,
diff --git a/crates/order-validation/src/banned.rs b/crates/order-validation/src/banned.rs
index 8b2e5b5d37..f7c27eb8d7 100644
--- a/crates/order-validation/src/banned.rs
+++ b/crates/order-validation/src/banned.rs
@@ -6,7 +6,7 @@
 
 use {
     alloy::primitives::Address,
-    contracts::bindings::ChainalysisOracle,
+    contracts::alloy::ChainalysisOracle,
     futures::future::join_all,
     moka::sync::Cache,
     std::{
diff --git a/crates/orderbook/src/run.rs b/crates/orderbook/src/run.rs
index 884d7010bf..3bb961b9ab 100644
--- a/crates/orderbook/src/run.rs
+++ b/crates/orderbook/src/run.rs
@@ -19,15 +19,8 @@ use {
         GPv2Settlement,
         HooksTrampoline,
         IUniswapV3Factory,
-        InstanceExt,
         WETH9,
-        bindings::{
-            BalancerV2Vault,
-            Balances,
-            ChainalysisOracle,
-            HooksTrampoline,
-            IUniswapV3Factory,
-        },
+        support::Balances,
     },
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     futures::{FutureExt, StreamExt},
diff --git a/crates/shared/src/bad_token/token_owner_finder/liquidity.rs b/crates/shared/src/bad_token/token_owner_finder/liquidity.rs
index a70cfc5c05..85ba7220f8 100644
--- a/crates/shared/src/bad_token/token_owner_finder/liquidity.rs
+++ b/crates/shared/src/bad_token/token_owner_finder/liquidity.rs
@@ -5,7 +5,7 @@ use {
     crate::sources::{uniswap_v2::pair_provider::PairProvider, uniswap_v3_pair_provider},
     alloy::eips::BlockNumberOrTag,
     anyhow::Result,
-    contracts::bindings::{BalancerV2Vault, IUniswapV3Factory},
+    contracts::alloy::{BalancerV2Vault, IUniswapV3Factory},
     ethcontract::H160,
     ethrpc::alloy::conversions::IntoLegacy,
     model::TokenPair,
diff --git a/crates/shared/src/bad_token/token_owner_finder/mod.rs b/crates/shared/src/bad_token/token_owner_finder/mod.rs
index 3a9ea6f3d0..9282789fb3 100644
--- a/crates/shared/src/bad_token/token_owner_finder/mod.rs
+++ b/crates/shared/src/bad_token/token_owner_finder/mod.rs
@@ -31,12 +31,7 @@ use {
     },
     anyhow::{Context, Result},
     chain::Chain,
-    contracts::{
-        ERC20,
-        alloy::{BalancerV2Vault, ERC20, IUniswapV3Factory},
-        bindings::{BalancerV2Vault, ERC20, IUniswapV3Factory},
-        errors::EthcontractErrorType,
-    },
+    contracts::alloy::{BalancerV2Vault, ERC20, IUniswapV3Factory},
     ethcontract::U256,
     ethrpc::alloy::{
         conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/shared/src/bad_token/trace_call.rs b/crates/shared/src/bad_token/trace_call.rs
index 0389da800c..c04b2f8f9a 100644
--- a/crates/shared/src/bad_token/trace_call.rs
+++ b/crates/shared/src/bad_token/trace_call.rs
@@ -398,7 +398,7 @@ mod tests {
             sources::{BaselineSource, uniswap_v2},
         },
         chain::Chain,
-        contracts::alloy::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory, InstanceExt},
+        contracts::alloy::{BalancerV2Vault, GPv2Settlement, IUniswapV3Factory},
         ethrpc::{Web3, alloy::conversions::IntoLegacy},
         hex_literal::hex,
         std::{env, time::Duration},
diff --git a/crates/shared/src/event_handling.rs b/crates/shared/src/event_handling.rs
index 90b36fd622..63e3280215 100644
--- a/crates/shared/src/event_handling.rs
+++ b/crates/shared/src/event_handling.rs
@@ -773,7 +773,7 @@ mod tests {
     use {
         super::*,
         alloy::eips::BlockNumberOrTag,
-        contracts::alloy::{GPv2Settlement, InstanceExt},
+        contracts::alloy::GPv2Settlement,
         ethcontract::{BlockNumber, H256},
         ethrpc::{Web3, block_stream::block_number_to_block_number_hash},
         std::str::FromStr,
@@ -786,7 +786,7 @@ mod tests {
             Filter::new().address(*self.address())
         }
 
-        fn provider(&self) -> &contracts::alloy::Provider {
+        fn provider(&self) -> &alloy::providers::DynProvider {
             self.provider()
         }
     }
diff --git a/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs b/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
index f245fa28c4..dc743db799 100644
--- a/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
+++ b/crates/shared/src/sources/balancer_v2/pool_fetching/mod.rs
@@ -47,7 +47,6 @@ use {
         BalancerV2WeightedPoolFactory,
         BalancerV2WeightedPoolFactoryV3,
         BalancerV2WeightedPoolFactoryV4,
-        InstanceExt,
     },
     ethcontract::{BlockId, H160, H256},
     ethrpc::block_stream::{BlockRetrieving, CurrentBlockWatcher},
diff --git a/crates/solvers/src/domain/solver.rs b/crates/solvers/src/domain/solver.rs
index 1c612b3cec..1946b9c6e4 100644
--- a/crates/solvers/src/domain/solver.rs
+++ b/crates/solvers/src/domain/solver.rs
@@ -18,7 +18,6 @@ use {
         },
         infra::metrics,
     },
-    contracts::alloy::InstanceExt,
     ethereum_types::U256,
     reqwest::Url,
     std::{cmp, collections::HashSet, sync::Arc},

From 7e17ee911fd5108d845852f9f8c962476846bb45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 4 Nov 2025 09:19:44 +0000
Subject: [PATCH 22/36] fmt fix

---
 crates/contracts/src/lib.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index b39baad16f..475e70931a 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -1,7 +1,10 @@
 #![allow(clippy::let_unit_value)]
 
-pub use ethcontract;
+// This module get's auto-generated by the contracts build.rs
+#[rustfmt::skip]
 pub mod alloy;
+
+pub use ethcontract;
 pub mod errors;
 use {
     anyhow::{Result, anyhow, bail},

From 691ecb628b2779ed4c80ea5571579a777df13543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 4 Nov 2025 10:18:56 +0000
Subject: [PATCH 23/36] Further fixes and simplifications

---
 crates/contracts-generate/src/lib.rs          | 48 +++++------
 crates/contracts/build.rs                     |  9 ++-
 crates/contracts/src/lib.rs                   | 81 +------------------
 crates/contracts/src/macros.rs                |  6 --
 .../src/settlement/settlement_encoder.rs      |  1 +
 .../src/boundary/liquidity/concentrated.rs    |  6 +-
 .../src/boundary/liquidity/limit_order.rs     |  4 +-
 7 files changed, 38 insertions(+), 117 deletions(-)
 delete mode 100644 crates/contracts/src/macros.rs

diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index b10264aca8..460b4abebd 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -23,26 +23,20 @@ pub const LENS: u64 = 232;
 pub const LINEA: u64 = 59144;
 pub const PLASMA: u64 = 9745;
 
-const MOD_HEADER: &'static str = r#"#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all, non_snake_case)]
+const MOD_HEADER: &str = r#"#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all, non_snake_case)]
     //! This module contains the sol! generated bindings for solidity contracts.
     //! This is autogenerated code.
     //! Do not manually edit these files.
     //! These files may be overwritten by the codegen system at any time.
     "#;
 
+#[derive(Default)]
 pub struct Module {
     pub contracts: Vec<Contract>,
     submodules: Vec<Submodule>,
 }
 
 impl Module {
-    pub fn new() -> Self {
-        Self {
-            contracts: vec![],
-            submodules: vec![],
-        }
-    }
-
     pub fn add_contract(mut self, contract: Contract) -> Self {
         self.contracts.push(contract);
         self
@@ -53,29 +47,33 @@ impl Module {
         self
     }
 
-    pub fn write_formatted(
+    pub fn write_formatted<P1, P2>(
         self,
-        bindings_folder: &Path,
+        bindings_folder: P1,
         all_derives: bool,
-        output_folder: &Path,
-    ) -> eyre::Result<()> {
+        output_folder: P2,
+    ) -> eyre::Result<()>
+    where
+        P1: AsRef<Path>,
+        P2: AsRef<Path>,
+    {
         std::fs::create_dir_all(&output_folder)?;
 
         let mut mod_file = String::from(MOD_HEADER);
         for submodule in self.submodules {
             write_mod_name(&mut mod_file, &submodule.name)?;
-            submodule.write_formatted(bindings_folder, all_derives, &output_folder)?;
+            submodule.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
         }
 
         for contract in self.contracts {
             let name = contract.name.clone();
-            contract.write_formatted(bindings_folder, all_derives, &output_folder)?;
+            contract.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
             write_mod_name(&mut mod_file, &name)?;
         }
 
         let file: syn::File = syn::parse_file(&mod_file)?;
         let formatted = prettyplease::unparse(&file);
-        std::fs::write(output_folder.join("mod.rs"), formatted)?;
+        std::fs::write(output_folder.as_ref().join("mod.rs"), formatted)?;
 
         Ok(())
     }
@@ -106,24 +104,28 @@ impl Submodule {
         self
     }
 
-    pub fn write_formatted(
+    pub fn write_formatted<P1, P2>(
         self,
-        bindings_folder: &Path,
+        bindings_folder: P1,
         all_derives: bool,
-        output_folder: &Path,
-    ) -> eyre::Result<()> {
-        let output_folder = output_folder.join(self.name);
+        output_folder: P2,
+    ) -> eyre::Result<()>
+    where
+        P1: AsRef<Path>,
+        P2: AsRef<Path>,
+    {
+        let output_folder = output_folder.as_ref().join(self.name);
         std::fs::create_dir_all(&output_folder)?;
 
         let mut mod_file = String::from(MOD_HEADER);
         for submodule in self.submodules {
             write_mod_name(&mut mod_file, &submodule.name)?;
-            submodule.write_formatted(bindings_folder, all_derives, &output_folder)?;
+            submodule.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
         }
 
         for contract in self.contracts {
             let name = contract.name.clone();
-            contract.write_formatted(bindings_folder, all_derives, &output_folder)?;
+            contract.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
             write_mod_name(&mut mod_file, &name)?;
         }
 
@@ -280,7 +282,7 @@ impl Contract {
         let name = self.name.clone();
         let token_stream = self.generate(bindings_folder, all_derives)?;
         let mut buffer = String::new();
-        write!(buffer, "{}", token_stream.to_string())?;
+        write!(buffer, "{}", token_stream)?;
         let file: syn::File = syn::parse_file(&buffer)?;
         let formatted = prettyplease::unparse(&file);
         std::fs::write(
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 4ebfe55cf2..694b9a7e9e 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -15,7 +15,12 @@ fn main() {
     // - https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
     println!("cargo:rerun-if-changed=build.rs");
 
-    Module::new()
+    // Path to the directory containing the vendored contract artifacts.
+    let vendored_bindings = Path::new(env!("CARGO_MANIFEST_DIR"))
+        .join("src")
+        .join("alloy");
+
+    Module::default()
         // 0x
         .add_contract(Contract::new("IZeroex").with_networks(networks![
             MAINNET => "0xdef1c0ded9bec7f1a1670819833240f027b25eff",
@@ -718,6 +723,6 @@ fn main() {
                     LINEA => "0x361350f708f7c0c63c8a505226592c3e5d1faa29",
                 ])),
         )
-        .write_formatted(Path::new("artifacts"), true, Path::new("src/alloy"))
+        .write_formatted(Path::new("artifacts"), true, vendored_bindings)
         .unwrap();
 }
diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index 475e70931a..d3e51eb59b 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -4,88 +4,9 @@
 #[rustfmt::skip]
 pub mod alloy;
 
-pub use ethcontract;
 pub mod errors;
-use {
-    anyhow::{Result, anyhow, bail},
-    ethcontract::{
-        Contract,
-        common::{DeploymentInformation, contract::Network},
-    },
-};
-
-pub fn deployment(contract: &Contract, chain_id: u64) -> Result<&Network> {
-    contract
-        .networks
-        .get(&chain_id.to_string())
-        // Note that we are conflating network IDs with chain IDs. In general
-        // they cannot be considered the same, but for the networks that we
-        // support (xDAI, Görli and Mainnet) they are.
-        .ok_or_else(|| anyhow!("missing {} deployment for {}", contract.name, chain_id))
-}
-
-pub fn deployment_block(contract: &Contract, chain_id: u64) -> Result<u64> {
-    let deployment_info = deployment(contract, chain_id)?
-        .deployment_information
-        .ok_or_else(|| anyhow!("missing deployment information for {}", contract.name))?;
-
-    match deployment_info {
-        DeploymentInformation::BlockNumber(block) => Ok(block),
-        DeploymentInformation::TransactionHash(tx) => {
-            bail!("missing deployment block number for {}", tx)
-        }
-    }
-}
-
-#[macro_use]
-mod macros;
 
 #[cfg(feature = "bin")]
 pub mod paths;
 pub mod vault;
-pub mod web3;
-
-#[cfg(test)]
-mod tests {
-    use {
-        super::*,
-        crate::alloy::networks::{ARBITRUM_ONE, GNOSIS, MAINNET, SEPOLIA},
-    };
-
-    #[test]
-    fn deployment_addresses() {
-        for network in &[MAINNET, GNOSIS, SEPOLIA, ARBITRUM_ONE] {
-            assert!(
-                alloy::BalancerV2NoProtocolFeeLiquidityBootstrappingPoolFactory::deployment_address(network).is_some()
-            )
-        }
-        for network in &[MAINNET, ARBITRUM_ONE] {
-            assert!(
-                alloy::BalancerV2WeightedPool2TokensFactory::deployment_address(network).is_some()
-            );
-            assert!(
-                alloy::BalancerV2LiquidityBootstrappingPoolFactory::deployment_address(network)
-                    .is_some()
-            );
-        }
-
-        assert!(alloy::BalancerV2WeightedPoolFactory::deployment_address(&MAINNET).is_some());
-
-        for network in &[MAINNET, GNOSIS, ARBITRUM_ONE] {
-            assert!(alloy::BalancerV2StablePoolFactoryV2::deployment_address(network).is_some());
-        }
-    }
-
-    #[test]
-    fn deployment_information() {
-        assert!(alloy::BalancerV2WeightedPoolFactory::deployment_address(&MAINNET).is_some());
-        for network in &[MAINNET, ARBITRUM_ONE] {
-            assert!(
-                alloy::BalancerV2WeightedPool2TokensFactory::deployment_address(network).is_some()
-            );
-        }
-        for network in &[MAINNET, GNOSIS, ARBITRUM_ONE] {
-            assert!(alloy::BalancerV2StablePoolFactoryV2::deployment_address(network).is_some());
-        }
-    }
-}
+// pub mod web3;
diff --git a/crates/contracts/src/macros.rs b/crates/contracts/src/macros.rs
deleted file mode 100644
index 1fcf2ec4cf..0000000000
--- a/crates/contracts/src/macros.rs
+++ /dev/null
@@ -1,6 +0,0 @@
-#[macro_export]
-macro_rules! dummy_contract {
-    ($contract:ty, $addr:expr_2021) => {
-        <$contract>::at(&$crate::web3::dummy(), $addr.into())
-    };
-}
diff --git a/crates/solver/src/settlement/settlement_encoder.rs b/crates/solver/src/settlement/settlement_encoder.rs
index 20fd3dcc9a..d67569274c 100644
--- a/crates/solver/src/settlement/settlement_encoder.rs
+++ b/crates/solver/src/settlement/settlement_encoder.rs
@@ -583,6 +583,7 @@ pub(crate) fn verify_executed_amount(order: &Order, executed: U256) -> Result<()
 pub mod tests {
     use {
         super::*,
+        alloy::primitives::Address,
         contracts::alloy::WETH9,
         ethcontract::Bytes,
         ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
diff --git a/crates/solvers/src/boundary/liquidity/concentrated.rs b/crates/solvers/src/boundary/liquidity/concentrated.rs
index 34c6640bc8..bc54657b8e 100644
--- a/crates/solvers/src/boundary/liquidity/concentrated.rs
+++ b/crates/solvers/src/boundary/liquidity/concentrated.rs
@@ -1,9 +1,7 @@
 use {
     alloy::primitives::aliases::U24,
-    contracts::{
-        alloy::UniswapV3QuoterV2::IQuoterV2::QuoteExactInputSingleParams,
-        ethcontract::{H160, U256},
-    },
+    contracts::alloy::UniswapV3QuoterV2::IQuoterV2::QuoteExactInputSingleParams,
+    ethcontract::{H160, U256},
     ethrpc::alloy::conversions::{IntoAlloy, IntoLegacy},
     model::TokenPair,
     shared::baseline_solver::BaselineSolvable,
diff --git a/crates/solvers/src/boundary/liquidity/limit_order.rs b/crates/solvers/src/boundary/liquidity/limit_order.rs
index 892729859f..8e5858c1d5 100644
--- a/crates/solvers/src/boundary/liquidity/limit_order.rs
+++ b/crates/solvers/src/boundary/liquidity/limit_order.rs
@@ -1,6 +1,6 @@
 use {
     crate::domain::liquidity::limit_order::LimitOrder,
-    contracts::ethcontract::{H160, U256},
+    ethcontract::{H160, U256},
     shared::{baseline_solver::BaselineSolvable, price_estimation::gas::GAS_PER_ZEROEX_ORDER},
 };
 
@@ -50,7 +50,7 @@ mod tests {
     use {
         super::*,
         crate::domain::{eth, liquidity::limit_order::TakerAmount},
-        contracts::ethcontract::U256,
+        ethcontract::U256,
         shared::addr,
     };
 

From e1b4ef7ae011273c82e774922230d1a3cdc1e3ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 4 Nov 2025 10:19:21 +0000
Subject: [PATCH 24/36] more simplifications

---
 crates/contracts/src/lib.rs  |  1 -
 crates/contracts/src/web3.rs | 44 ------------------------------------
 2 files changed, 45 deletions(-)
 delete mode 100644 crates/contracts/src/web3.rs

diff --git a/crates/contracts/src/lib.rs b/crates/contracts/src/lib.rs
index d3e51eb59b..1384ddc024 100644
--- a/crates/contracts/src/lib.rs
+++ b/crates/contracts/src/lib.rs
@@ -9,4 +9,3 @@ pub mod errors;
 #[cfg(feature = "bin")]
 pub mod paths;
 pub mod vault;
-// pub mod web3;
diff --git a/crates/contracts/src/web3.rs b/crates/contracts/src/web3.rs
deleted file mode 100644
index e73ab5ed69..0000000000
--- a/crates/contracts/src/web3.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-//! This module provides a "dummy" implementation of a [`web3::Transport`]. The
-//! reason is that [`ethcontract`] generated bindings require a `web3` instance
-//! in order to construct contract instances. This is annoying when trying to
-//! use the generated bindings for just encoding contract function calls, where
-//! connection to a node is not needed at all.
-
-use ethcontract::{
-    futures,
-    json::Value,
-    jsonrpc::Call as RpcCall,
-    web3::{self, BatchTransport, RequestId, Transport, Web3},
-};
-
-/// A dummy [`web3::Transport`] implementation that always panics.
-#[derive(Clone, Debug)]
-pub struct DummyTransport;
-
-impl Transport for DummyTransport {
-    type Out = futures::future::Pending<web3::Result<Value>>;
-
-    fn prepare(&self, _method: &str, _params: Vec<Value>) -> (web3::RequestId, RpcCall) {
-        unimplemented!()
-    }
-
-    fn send(&self, _id: web3::RequestId, _request: RpcCall) -> Self::Out {
-        unimplemented!()
-    }
-}
-
-impl BatchTransport for DummyTransport {
-    type Batch = futures::future::Pending<web3::Result<Vec<web3::Result<Value>>>>;
-
-    fn send_batch<T>(&self, _requests: T) -> Self::Batch
-    where
-        T: IntoIterator<Item = (RequestId, RpcCall)>,
-    {
-        unimplemented!()
-    }
-}
-
-/// Creates a [`web3::Web3`] instance with a [`DummyTransport`].
-pub fn dummy() -> Web3<DummyTransport> {
-    Web3::new(DummyTransport)
-}

From d7c325ed544643885cd37b030814b50bda17985d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 4 Nov 2025 10:45:25 +0000
Subject: [PATCH 25/36] fix doctest build

---
 crates/contracts-generate/src/lib.rs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index 460b4abebd..7e21c78890 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -336,6 +336,7 @@ fn write_mod_name(contents: &mut String, name: &str) -> eyre::Result<()> {
 ///
 /// Example, without blocks:
 /// ```no_run
+/// # use crate::networks;
 /// networks! {
 ///     MAINNET => "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 ///     SEPOLIA => "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14",
@@ -344,6 +345,7 @@ fn write_mod_name(contents: &mut String, name: &str) -> eyre::Result<()> {
 ///
 /// Example, with blocks:
 /// ```no_run
+/// # use crate::networks;
 /// networks! {
 ///     MAINNET => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 12593265),
 ///     SEPOLIA => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 4717488),

From 9d276848ab74a3e5d883fd2d85dc6d1ff712c951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 4 Nov 2025 11:15:12 +0000
Subject: [PATCH 26/36] fix doc compilation

---
 crates/contracts-generate/src/lib.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index 7e21c78890..83afad5f19 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -336,20 +336,28 @@ fn write_mod_name(contents: &mut String, name: &str) -> eyre::Result<()> {
 ///
 /// Example, without blocks:
 /// ```no_run
-/// # use crate::networks;
+/// # #[macro_use] extern crate contracts_generate;
+/// # use contracts_generate::{MAINNET, SEPOLIA};
+/// # fn main() {
+/// # let _: [(_, (_, Option<u64>)); _] =
 /// networks! {
 ///     MAINNET => "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
 ///     SEPOLIA => "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14",
-/// }
+/// };
+/// # }
 /// ```
 ///
 /// Example, with blocks:
 /// ```no_run
-/// # use crate::networks;
+/// # #[macro_use] extern crate contracts_generate;
+/// # use contracts_generate::{MAINNET, SEPOLIA};
+/// # fn main() {
+/// # let _: [(_, (_, Option<u64>)); _] =
 /// networks! {
 ///     MAINNET => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 12593265),
 ///     SEPOLIA => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 4717488),
-/// }
+/// };
+/// # }
 /// ```
 #[macro_export]
 macro_rules! networks {

From f4381f75bfda3c2756ed87c9411cf037d542fa7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 4 Nov 2025 11:35:15 +0000
Subject: [PATCH 27/36] deps manicure

---
 Cargo.lock                           | 110 +++++++++++++--------------
 crates/contracts-generate/Cargo.toml |  16 ++--
 2 files changed, 59 insertions(+), 67 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 37878d6ce5..7ac4ef352f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -133,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9b151e38e42f1586a01369ec52a6934702731d07e8509a7307331b09f6c46dc"
+checksum = "3abecb92ba478a285fbf5689100dbafe4003ded4a09bf4b5ef62cca87cd4f79e"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -159,9 +159,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e2d5e8668ef6215efdb7dcca6f22277b4e483a5650e05f5de22b2350971f4b8"
+checksum = "2e864d4f11d1fb8d3ac2fd8f3a15f1ee46d55ec6d116b342ed1b2cb737f25894"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -263,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5434834adaf64fa20a6fb90877bc1d33214c41b055cc49f82189c98614368cc"
+checksum = "07d9a64522a0db6ebcc4ff9c904e329e77dd737c2c25d30f1bdc32ca6c6ce334"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -297,9 +297,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7c69f6c9c68a1287c9d5ff903d0010726934de0dac10989be37b75a29190d55"
+checksum = "f87b774478fcc616993e97659697f3e3c7988fdad598e46ee0ed11209cd0d8ee"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -312,9 +312,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf2ae05219e73e0979cb2cf55612aafbab191d130f203079805eaf881cca58"
+checksum = "d5d6ed73d440bae8f27771b7cd507fa8f10f19ddf0b8f67e7622a52e0dbf798e"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -338,9 +338,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e58f4f345cef483eab7374f2b6056973c7419ffe8ad35e994b7a7f5d8e0c7ba4"
+checksum = "219dccd2cf753a43bd9b0fbb7771a16927ffdb56e43e3a15755bef1a74d614aa"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -381,9 +381,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de2597751539b1cc8fe4204e5325f9a9ed83fcacfb212018dfcfa7877e76de21"
+checksum = "f0ef8cbc2b68e2512acf04b2d296c05c98a661bc460462add6414528f4ff3d9b"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -423,9 +423,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06e45a68423e732900a0c824b8e22237db461b79d2e472dd68b7547c16104427"
+checksum = "be028fb1c6c173f5765d0baa3580a11d69826ea89fe00ee5c9d7eddb2c3509cd"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -467,9 +467,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edf8eb8be597cfa8c312934d2566ec4516f066d69164f9212d7a148979fdcfd8"
+checksum = "2a0f67d1e655ed93efca217213340d21cce982333cc44a1d918af9150952ef66"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -490,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "339af7336571dd39ae3a15bde08ae6a647e62f75350bd415832640268af92c06"
+checksum = "fe106e50522980bc9e7cc9016f445531edf1a53e0fdba904c833b98c6fdff3f0"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-anvil",
@@ -506,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83d98fb386a462e143f5efa64350860af39950c49e7c0cbdba419c16793116ef"
+checksum = "c1cf94d581b3aa13ebacb90ea52e0179985b7c20d8a522319e7d40768d56667a"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -518,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbde0801a32d21c5f111f037bee7e22874836fba7add34ed4a6919932dd7cf23"
+checksum = "425e14ee32eb8b7edd6a2247fe0ed640785e6eba75af27db27f1e6220c15ef0d"
 dependencies = [
  "alloy-consensus-any",
  "alloy-rpc-types-eth",
@@ -529,9 +529,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-debug"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388cf910e66bd4f309a81ef746dcf8f9bca2226e3577890a8d56c5839225cf46"
+checksum = "f69c12784cdf1059936249a6e705ec03bf8cea1a12181ed5cea9ca2be9cca684"
 dependencies = [
  "alloy-primitives",
  "derive_more 2.0.1",
@@ -541,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "605ec375d91073851f566a3082548af69a28dca831b27a8be7c1b4c49f5c6ca2"
+checksum = "aabc17f0eac3f747eeddebc768c8e30763d6f6c53188f5335a935dedc57ddfbd"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -559,9 +559,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "361cd87ead4ba7659bda8127902eda92d17fa7ceb18aba1676f7be10f7222487"
+checksum = "0185f68a0f8391ab996d335a887087d7ccdbc97952efab3516f6307d456ba2cd"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -580,9 +580,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de4e95fb0572b97b17751d0fdf5cdc42b0050f9dd9459eddd1bf2e2fbfed0a33"
+checksum = "d31a6766c8f91d18d07a36b57f55efd981752df619d30b395a92332a8b28ea05"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -594,9 +594,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64600fc6c312b7e0ba76f73a381059af044f4f21f43e07f51f1fa76c868fe302"
+checksum = "596cfa360922ba9af901cc7370c68640e4f72adb6df0ab064de32f21fec498d7"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -605,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5772858492b26f780468ae693405f895d6a27dea6e3eab2c36b6217de47c2647"
+checksum = "7f06333680d04370c8ed3a6b0eccff384e422c3d8e6b19e61fedc3a9f0ab7743"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -731,12 +731,11 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025a940182bddaeb594c26fe3728525ae262d0806fe6a4befdf5d7bc13d54bce"
+checksum = "55bbdcee53e4e3857b5ddbc2986ebe9c2ab5f352ec285cb0da04c1e8f2ca9c18"
 dependencies = [
  "alloy-json-rpc",
- "alloy-primitives",
  "auto_impl",
  "base64 0.22.1",
  "derive_more 2.0.1",
@@ -755,9 +754,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3b5064d1e1e1aabc918b5954e7fb8154c39e77ec6903a581b973198b26628fa"
+checksum = "793967215109b4a334047c810ed6db5e873ad3ea07f65cc02202bd4b810d9615"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -770,9 +769,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d47962f3f1d9276646485458dc842b4e35675f42111c9d814ae4711c664c8300"
+checksum = "15e182e5ae0c4858bb87df23ebfe31018d7e51fe1a264b8a8a2b26932cb04861"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -790,9 +789,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9476a36a34e2fb51b6746d009c53d309a186a825aa95435407f0e07149f4ad2d"
+checksum = "32e9dc891c80d6216003d4b04f0a7463015d0873d36e4ac2ec0bcc9196aa4ea7"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
@@ -824,11 +823,10 @@ dependencies = [
 
 [[package]]
 name = "alloy-tx-macros"
-version = "1.0.41"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8e52276fdb553d3c11563afad2898f4085165e4093604afe3d78b69afbf408f"
+checksum = "ab54221eccefa254ce9f65b079c097b1796e48c21c7ce358230f8988d75392fb"
 dependencies = [
- "alloy-primitives",
  "darling 0.21.3",
  "proc-macro2",
  "quote",
@@ -2422,8 +2420,6 @@ dependencies = [
 name = "contracts-generate"
 version = "0.1.0"
 dependencies = [
- "alloy-dyn-abi",
- "alloy-json-abi",
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
  "eyre",
@@ -3546,7 +3542,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "forge-sol-macro-gen"
 version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#3a417e590e8fbb4229b6905b40a6610626252c6e"
+source = "git+https://github.com/foundry-rs/foundry#f377a234b395e01969e7810d763024509ee13467"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
@@ -3589,7 +3585,7 @@ dependencies = [
 [[package]]
 name = "foundry-common"
 version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#3a417e590e8fbb4229b6905b40a6610626252c6e"
+source = "git+https://github.com/foundry-rs/foundry#f377a234b395e01969e7810d763024509ee13467"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -3645,7 +3641,7 @@ dependencies = [
 [[package]]
 name = "foundry-common-fmt"
 version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#3a417e590e8fbb4229b6905b40a6610626252c6e"
+source = "git+https://github.com/foundry-rs/foundry#f377a234b395e01969e7810d763024509ee13467"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -4356,7 +4352,7 @@ dependencies = [
  "tokio",
  "tokio-rustls 0.26.4",
  "tower-service",
- "webpki-roots 1.0.3",
+ "webpki-roots 1.0.4",
 ]
 
 [[package]]
@@ -9147,14 +9143,14 @@ version = "0.26.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
 dependencies = [
- "webpki-roots 1.0.3",
+ "webpki-roots 1.0.4",
 ]
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32b130c0d2d49f8b6889abc456e795e82525204f27c42cf767cf0d7734e089b8"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
 dependencies = [
  "rustls-pki-types",
 ]
diff --git a/crates/contracts-generate/Cargo.toml b/crates/contracts-generate/Cargo.toml
index 8761d1b212..af7cdc5996 100644
--- a/crates/contracts-generate/Cargo.toml
+++ b/crates/contracts-generate/Cargo.toml
@@ -4,19 +4,15 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-walkdir = {workspace = true}
+alloy-sol-macro-expander = {workspace = true}
+alloy-sol-macro-input = {workspace = true}
+eyre = {workspace = true}
 forge-sol-macro-gen = {workspace = true}
-
-alloy-json-abi = {workspace = true}
-alloy-dyn-abi = {workspace = true}
-# alloy = {workspace = true}
-quote = {workspace = true}
-syn = {workspace = true}
 prettyplease = {workspace = true}
-eyre = {workspace = true}
 proc-macro2 = {workspace = true}
-alloy-sol-macro-input = {workspace = true}
-alloy-sol-macro-expander = {workspace = true}
+quote = {workspace = true}
+syn = {workspace = true}
+walkdir = {workspace = true}
 
 [lints]
 workspace = true

From dada99d46594261bd8ed8187882b89c768a5f9c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 4 Nov 2025 13:26:56 +0000
Subject: [PATCH 28/36] check artifacts on build.rs

---
 crates/contracts/build.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 694b9a7e9e..fa7fd58e6a 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -14,6 +14,7 @@ fn main() {
     // - https://github.com/rust-lang/cargo/issues/6003
     // - https://doc.rust-lang.org/cargo/reference/build-scripts.html#cargorerun-if-changedpath
     println!("cargo:rerun-if-changed=build.rs");
+    println!("cargo:rerun-if-changed=artifacts/");
 
     // Path to the directory containing the vendored contract artifacts.
     let vendored_bindings = Path::new(env!("CARGO_MANIFEST_DIR"))

From 2a5a46f09ec320ced237c8fccb211faf58f9398d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 4 Nov 2025 13:30:10 +0000
Subject: [PATCH 29/36] clean main toml

---
 Cargo.toml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 5954153c37..072f406e63 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -99,13 +99,8 @@ tower-http = "0.4"
 tracing-opentelemetry = "0.31"
 tracing-serde = "0.2"
 vergen = "8"
-
-foundry-compilers = "0.19.5"
 walkdir = "2.5.0"
-
 forge-sol-macro-gen = {git = "https://github.com/foundry-rs/foundry", version = "1.4.1"}
-alloy-json-abi = "1.4.1"
-alloy-dyn-abi = "1.4.1"
 quote = "1.0.41"
 syn = "2.0.108"
 prettyplease = "0.2.37"

From c5c5816382a4f0fbd1d37e233b354d198bf1f057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Wed, 5 Nov 2025 12:03:56 +0000
Subject: [PATCH 30/36] wip

---
 Cargo.lock                           | 120 +++++++++----------
 Cargo.toml                           |   5 +-
 crates/contracts-generate/Cargo.toml |   2 +-
 crates/contracts-generate/src/lib.rs | 169 +++++++++++++++++----------
 crates/contracts/.gitignore          |   1 +
 crates/contracts/build.rs            |   5 +-
 6 files changed, 172 insertions(+), 130 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 7ac4ef352f..0ae8f68607 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -133,9 +133,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3abecb92ba478a285fbf5689100dbafe4003ded4a09bf4b5ef62cca87cd4f79e"
+checksum = "90d103d3e440ad6f703dd71a5b58a6abd24834563bde8a5fabe706e00242f810"
 dependencies = [
  "alloy-eips",
  "alloy-primitives",
@@ -159,9 +159,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-consensus-any"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e864d4f11d1fb8d3ac2fd8f3a15f1ee46d55ec6d116b342ed1b2cb737f25894"
+checksum = "48ead76c8c84ab3a50c31c56bc2c748c2d64357ad2131c32f9b10ab790a25e1a"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -263,9 +263,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-eips"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07d9a64522a0db6ebcc4ff9c904e329e77dd737c2c25d30f1bdc32ca6c6ce334"
+checksum = "7bdbec74583d0067798d77afa43d58f00d93035335d7ceaa5d3f93857d461bb9"
 dependencies = [
  "alloy-eip2124",
  "alloy-eip2930",
@@ -297,9 +297,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-json-rpc"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f87b774478fcc616993e97659697f3e3c7988fdad598e46ee0ed11209cd0d8ee"
+checksum = "31b67c5a702121e618217f7a86f314918acb2622276d0273490e2d4534490bc0"
 dependencies = [
  "alloy-primitives",
  "alloy-sol-types",
@@ -312,9 +312,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5d6ed73d440bae8f27771b7cd507fa8f10f19ddf0b8f67e7622a52e0dbf798e"
+checksum = "612296e6b723470bb1101420a73c63dfd535aa9bf738ce09951aedbd4ab7292e"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -338,9 +338,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-network-primitives"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "219dccd2cf753a43bd9b0fbb7771a16927ffdb56e43e3a15755bef1a74d614aa"
+checksum = "a0e7918396eecd69d9c907046ec8a93fb09b89e2f325d5e7ea9c4e3929aa0dd2"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -381,9 +381,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-provider"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0ef8cbc2b68e2512acf04b2d296c05c98a661bc460462add6414528f4ff3d9b"
+checksum = "55c1313a527a2e464d067c031f3c2ec073754ef615cc0eabca702fd0fe35729c"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -423,9 +423,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-pubsub"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be028fb1c6c173f5765d0baa3580a11d69826ea89fe00ee5c9d7eddb2c3509cd"
+checksum = "810766eeed6b10ffa11815682b3f37afc5019809e3b470b23555297d5770ce63"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -467,9 +467,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-client"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0f67d1e655ed93efca217213340d21cce982333cc44a1d918af9150952ef66"
+checksum = "45f802228273056528dfd6cc8845cc91a7c7e0c6fc1a66d19e8673743dacdc7e"
 dependencies = [
  "alloy-json-rpc",
  "alloy-primitives",
@@ -490,9 +490,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe106e50522980bc9e7cc9016f445531edf1a53e0fdba904c833b98c6fdff3f0"
+checksum = "33ff3df608dcabd6bdd197827ff2b8faaa6cefe0c462f7dc5e74108666a01f56"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-anvil",
@@ -506,9 +506,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-anvil"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cf94d581b3aa13ebacb90ea52e0179985b7c20d8a522319e7d40768d56667a"
+checksum = "ac2bc988d7455e02dfb53460e1caa61f932b3f8452e12424e68ba8dcf60bba90"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -518,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-any"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "425e14ee32eb8b7edd6a2247fe0ed640785e6eba75af27db27f1e6220c15ef0d"
+checksum = "cdbf6d1766ca41e90ac21c4bc5cbc5e9e965978a25873c3f90b3992d905db4cb"
 dependencies = [
  "alloy-consensus-any",
  "alloy-rpc-types-eth",
@@ -529,9 +529,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-debug"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f69c12784cdf1059936249a6e705ec03bf8cea1a12181ed5cea9ca2be9cca684"
+checksum = "977698b458738369ba5ca645d2cdb4d51ba07a81db37306ff85322853161ea3a"
 dependencies = [
  "alloy-primitives",
  "derive_more 2.0.1",
@@ -541,9 +541,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-engine"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aabc17f0eac3f747eeddebc768c8e30763d6f6c53188f5335a935dedc57ddfbd"
+checksum = "07da696cc7fbfead4b1dda8afe408685cae80975cbb024f843ba74d9639cd0d3"
 dependencies = [
  "alloy-consensus",
  "alloy-eips",
@@ -559,9 +559,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-eth"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0185f68a0f8391ab996d335a887087d7ccdbc97952efab3516f6307d456ba2cd"
+checksum = "a15e4831b71eea9d20126a411c1c09facf1d01d5cac84fd51d532d3c429cfc26"
 dependencies = [
  "alloy-consensus",
  "alloy-consensus-any",
@@ -580,9 +580,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-rpc-types-trace"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d31a6766c8f91d18d07a36b57f55efd981752df619d30b395a92332a8b28ea05"
+checksum = "fb0c800e2ce80829fca1491b3f9063c29092850dc6cf19249d5f678f0ce71bb0"
 dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-eth",
@@ -594,9 +594,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-serde"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "596cfa360922ba9af901cc7370c68640e4f72adb6df0ab064de32f21fec498d7"
+checksum = "751d1887f7d202514a82c5b3caf28ee8bd4a2ad9549e4f498b6f0bff99b52add"
 dependencies = [
  "alloy-primitives",
  "serde",
@@ -605,9 +605,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-signer"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f06333680d04370c8ed3a6b0eccff384e422c3d8e6b19e61fedc3a9f0ab7743"
+checksum = "9cf0b42ffbf558badfecf1dde0c3c5ed91f29bb7e97876d0bed008c3d5d67171"
 dependencies = [
  "alloy-primitives",
  "async-trait",
@@ -731,9 +731,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55bbdcee53e4e3857b5ddbc2986ebe9c2ab5f352ec285cb0da04c1e8f2ca9c18"
+checksum = "71b3deee699d6f271eab587624a9fa84d02d0755db7a95a043d52a6488d16ebe"
 dependencies = [
  "alloy-json-rpc",
  "auto_impl",
@@ -754,9 +754,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-http"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793967215109b4a334047c810ed6db5e873ad3ea07f65cc02202bd4b810d9615"
+checksum = "1720bd2ba8fe7e65138aca43bb0f680e4e0bcbd3ca39bf9d3035c9d7d2757f24"
 dependencies = [
  "alloy-json-rpc",
  "alloy-transport",
@@ -769,9 +769,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ipc"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e182e5ae0c4858bb87df23ebfe31018d7e51fe1a264b8a8a2b26932cb04861"
+checksum = "ea89c214c7ddd2bcad100da929d6b642bbfed85788caf3b1be473abacd3111f9"
 dependencies = [
  "alloy-json-rpc",
  "alloy-pubsub",
@@ -789,15 +789,15 @@ dependencies = [
 
 [[package]]
 name = "alloy-transport-ws"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32e9dc891c80d6216003d4b04f0a7463015d0873d36e4ac2ec0bcc9196aa4ea7"
+checksum = "571aadf0afce0d515a28b2c6352662a39cb9f48b4eeff9a5c34557d6ea126730"
 dependencies = [
  "alloy-pubsub",
  "alloy-transport",
  "futures",
  "http 1.1.0",
- "rustls 0.23.34",
+ "rustls 0.23.35",
  "serde_json",
  "tokio",
  "tokio-tungstenite",
@@ -823,9 +823,9 @@ dependencies = [
 
 [[package]]
 name = "alloy-tx-macros"
-version = "1.0.42"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab54221eccefa254ce9f65b079c097b1796e48c21c7ce358230f8988d75392fb"
+checksum = "cd7ce8ed34106acd6e21942022b6a15be6454c2c3ead4d76811d3bdcd63cf771"
 dependencies = [
  "darling 0.21.3",
  "proc-macro2",
@@ -2422,7 +2422,7 @@ version = "0.1.0"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
- "eyre",
+ "anyhow",
  "forge-sol-macro-gen",
  "prettyplease",
  "proc-macro2",
@@ -3542,7 +3542,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "forge-sol-macro-gen"
 version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#f377a234b395e01969e7810d763024509ee13467"
+source = "git+https://github.com/foundry-rs/foundry#806792b21fd5ae9b9d2480b37a8a616ad09b544e"
 dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
@@ -3585,7 +3585,7 @@ dependencies = [
 [[package]]
 name = "foundry-common"
 version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#f377a234b395e01969e7810d763024509ee13467"
+source = "git+https://github.com/foundry-rs/foundry#806792b21fd5ae9b9d2480b37a8a616ad09b544e"
 dependencies = [
  "alloy-chains",
  "alloy-consensus",
@@ -3641,7 +3641,7 @@ dependencies = [
 [[package]]
 name = "foundry-common-fmt"
 version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#f377a234b395e01969e7810d763024509ee13467"
+source = "git+https://github.com/foundry-rs/foundry#806792b21fd5ae9b9d2480b37a8a616ad09b544e"
 dependencies = [
  "alloy-consensus",
  "alloy-dyn-abi",
@@ -4346,7 +4346,7 @@ dependencies = [
  "http 1.1.0",
  "hyper 1.6.0",
  "hyper-util",
- "rustls 0.23.34",
+ "rustls 0.23.35",
  "rustls-native-certs 0.8.0",
  "rustls-pki-types",
  "tokio",
@@ -6161,7 +6161,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash",
- "rustls 0.23.34",
+ "rustls 0.23.35",
  "socket2 0.5.10",
  "thiserror 2.0.12",
  "tokio",
@@ -6179,7 +6179,7 @@ dependencies = [
  "rand 0.8.5",
  "ring",
  "rustc-hash",
- "rustls 0.23.34",
+ "rustls 0.23.35",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.12",
@@ -6523,7 +6523,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "quinn",
- "rustls 0.23.34",
+ "rustls 0.23.35",
  "rustls-native-certs 0.8.0",
  "rustls-pemfile 2.2.0",
  "rustls-pki-types",
@@ -6940,9 +6940,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.34"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "once_cell",
  "ring",
@@ -8410,7 +8410,7 @@ version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
- "rustls 0.23.34",
+ "rustls 0.23.35",
  "tokio",
 ]
 
@@ -8446,7 +8446,7 @@ checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.23.34",
+ "rustls 0.23.35",
  "rustls-pki-types",
  "tokio",
  "tokio-rustls 0.26.4",
@@ -8747,7 +8747,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.9.1",
- "rustls 0.23.34",
+ "rustls 0.23.35",
  "rustls-pki-types",
  "sha1",
  "thiserror 2.0.12",
diff --git a/Cargo.toml b/Cargo.toml
index 072f406e63..883a06288b 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [workspace]
 resolver = "3"
-members = [ "crates/*"]
+members = ["crates/*"]
 
 [workspace.dependencies]
 alloy = { version = "1.0.41", default-features = false }
@@ -19,7 +19,7 @@ mimalloc = "0.1.43"
 ethcontract-generate = { git = "https://github.com/cowprotocol/ethcontract-rs", rev = "8e112a88988040cde6110379ee6d1be768a13244", default-features = false }
 ethcontract-mock = { git = "https://github.com/cowprotocol/ethcontract-rs", rev = "8e112a88988040cde6110379ee6d1be768a13244", default-features = false }
 ethereum-types = "0.14.1"
-flate2 = "1.0.30"
+flate2 = "1.1.5"
 futures = "0.3.30"
 gas-estimation = { git = "https://github.com/cowprotocol/gas-estimation", tag = "v0.7.3", features = ["web3_", "tokio_"] }
 const-hex = "1.17.0"
@@ -105,7 +105,6 @@ quote = "1.0.41"
 syn = "2.0.108"
 prettyplease = "0.2.37"
 contracts-generate = {path = "crates/contracts-generate"}
-eyre = "0.6.12"
 proc-macro2 = "1.0.103"
 alloy-sol-macro-input = "1.4.1"
 alloy-sol-macro-expander = "1.4.1"
diff --git a/crates/contracts-generate/Cargo.toml b/crates/contracts-generate/Cargo.toml
index af7cdc5996..39add27119 100644
--- a/crates/contracts-generate/Cargo.toml
+++ b/crates/contracts-generate/Cargo.toml
@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+anyhow = { workspace = true }
 alloy-sol-macro-expander = {workspace = true}
 alloy-sol-macro-input = {workspace = true}
-eyre = {workspace = true}
 forge-sol-macro-gen = {workspace = true}
 prettyplease = {workspace = true}
 proc-macro2 = {workspace = true}
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index 83afad5f19..4cb50db41b 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -2,7 +2,7 @@ use {
     alloy_sol_macro_expander::expand::expand,
     alloy_sol_macro_input::{SolInput, SolInputKind},
     forge_sol_macro_gen::SolMacroGen,
-    quote::format_ident,
+    quote::{ToTokens, format_ident},
     std::{
         collections::HashMap,
         fmt::Write,
@@ -10,18 +10,20 @@ use {
     },
 };
 
-pub const MAINNET: u64 = 1;
-pub const GNOSIS: u64 = 100;
-pub const SEPOLIA: u64 = 11155111;
-pub const ARBITRUM_ONE: u64 = 42161;
-pub const BASE: u64 = 8453;
-pub const POLYGON: u64 = 137;
-pub const AVALANCHE: u64 = 43114;
-pub const BNB: u64 = 56;
-pub const OPTIMISM: u64 = 10;
-pub const LENS: u64 = 232;
-pub const LINEA: u64 = 59144;
-pub const PLASMA: u64 = 9745;
+pub mod networks {
+    pub const MAINNET: u64 = 1;
+    pub const GNOSIS: u64 = 100;
+    pub const SEPOLIA: u64 = 11155111;
+    pub const ARBITRUM_ONE: u64 = 42161;
+    pub const BASE: u64 = 8453;
+    pub const POLYGON: u64 = 137;
+    pub const AVALANCHE: u64 = 43114;
+    pub const BNB: u64 = 56;
+    pub const OPTIMISM: u64 = 10;
+    pub const LENS: u64 = 232;
+    pub const LINEA: u64 = 59144;
+    pub const PLASMA: u64 = 9745;
+}
 
 const MOD_HEADER: &str = r#"#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all, non_snake_case)]
     //! This module contains the sol! generated bindings for solidity contracts.
@@ -52,7 +54,7 @@ impl Module {
         bindings_folder: P1,
         all_derives: bool,
         output_folder: P2,
-    ) -> eyre::Result<()>
+    ) -> anyhow::Result<()>
     where
         P1: AsRef<Path>,
         P2: AsRef<Path>,
@@ -109,7 +111,7 @@ impl Submodule {
         bindings_folder: P1,
         all_derives: bool,
         output_folder: P2,
-    ) -> eyre::Result<()>
+    ) -> anyhow::Result<()>
     where
         P1: AsRef<Path>,
         P2: AsRef<Path>,
@@ -170,29 +172,24 @@ impl Contract {
         self,
         bindings_folder: P,
         all_derives: bool,
-    ) -> eyre::Result<proc_macro2::TokenStream> {
+    ) -> anyhow::Result<proc_macro2::TokenStream> {
         let bindings_path = self.bindings_path(bindings_folder.as_ref());
         let mut macrogen = SolMacroGen::new(bindings_path, self.name.clone());
         generate_binding(&mut macrogen, all_derives)?;
+        let mut expansion = macrogen
+            .expansion
+            .expect("if the expansion failed, it should have errored earlier");
 
         let module_name_ident = format_ident!("{}", self.name);
         let instance_name_ident = format_ident!("{}Instance", self.name);
-
-        let network_entries = self.networks.iter().map(|(id, (address, block_number))| {
-            let block_expr = match block_number {
-                Some(block) => quote::quote! { Some(#block) },
-                None => quote::quote! { None },
-            };
-            quote::quote! {
-                (#id, (::alloy::primitives::address!(#address), #block_expr))
-            }
-        });
-
         let instance = quote::quote! {
             pub type Instance = #module_name_ident :: #instance_name_ident<::alloy::providers::DynProvider>;
         };
+        expansion.extend(instance);
 
-        let deployment_info = if self.networks.is_empty() {
+        let no_networks = self.networks.is_empty();
+        let networks = self.networks.into_iter().map(NetworkArm::from);
+        let deployment_info = if no_networks {
             proc_macro2::TokenStream::new()
         } else {
             quote::quote! {
@@ -208,20 +205,27 @@ impl Contract {
                     },
                 };
 
-                static DEPLOYMENT_INFO: LazyLock<HashMap<u64, (Address, Option<u64>)>> = LazyLock::new(|| {
-                    ::std::collections::HashMap::from([
-                        #(#network_entries),*
-                    ])
-                });
+                pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
+                    match chain_id {
+                        #( #networks ,)*
+                        _ => None
+                    }
+                }
 
                 /// Returns the contract's deployment address (if one exists) for the given chain.
-                pub fn deployment_address(chain_id: &u64) -> Option<alloy::primitives::Address> {
-                    DEPLOYMENT_INFO.get(chain_id).map(|(addr, _)| *addr)
+                pub const fn deployment_address(chain_id: &u64) -> Option<::alloy::primitives::Address> {
+                    match deployment_info(*chain_id) {
+                        Some((address, _)) => Some(address),
+                        None => None,
+                    }
                 }
 
                 /// Returns the contract's deployment block (if one exists) for the given chain.
-                pub fn deployment_block(chain_id: &u64) -> Option<u64> {
-                    DEPLOYMENT_INFO.get(chain_id).map(|(_, block)| *block).flatten()
+                pub const fn deployment_block(chain_id: &u64) -> Option<u64> {
+                    match deployment_info(*chain_id) {
+                        Some((_, block)) => block,
+                        None => None,
+                    }
                 }
 
                 impl Instance {
@@ -232,8 +236,7 @@ impl Contract {
                                 .await
                                 .context("could not fetch current chain id")?;
 
-                            let (address, _deployed_block) = *DEPLOYMENT_INFO
-                                .get(&chain_id)
+                            let (address, _deployed_block) = deployment_info(chain_id)
                                 .with_context(|| format!("no deployment info for chain {chain_id:?}"))?;
 
                             Ok(Instance::new(
@@ -242,28 +245,9 @@ impl Contract {
                             ))
                         }
                     }
-
-                    pub fn deployed_block(&self) -> impl Future<Output = Result<Option<u64>>> + Send {
-                        async move {
-                            let chain_id = self
-                                .provider()
-                                .get_chain_id()
-                                .await
-                                .context("could not fetch current chain id")?;
-                            if let Some((_address, deployed_block)) = DEPLOYMENT_INFO.get(&chain_id) {
-                                return Ok(*deployed_block);
-                            }
-                            Ok(None)
-                        }
-                    }
                 }
             }
         };
-
-        let mut expansion = macrogen
-            .expansion
-            .expect("if the expansion failed, it should have errored earlier");
-        expansion.extend(instance);
         expansion.extend(deployment_info);
 
         Ok(expansion)
@@ -274,7 +258,7 @@ impl Contract {
         bindings_folder: P1,
         all_derives: bool,
         output_folder: P2,
-    ) -> eyre::Result<()>
+    ) -> anyhow::Result<()>
     where
         P1: AsRef<Path>,
         P2: AsRef<Path>,
@@ -293,8 +277,12 @@ impl Contract {
     }
 }
 
-fn generate_binding(instance: &mut SolMacroGen, all_derives: bool) -> eyre::Result<()> {
-    let input = instance.get_sol_input()?.normalize_json()?;
+fn generate_binding(instance: &mut SolMacroGen, all_derives: bool) -> anyhow::Result<()> {
+    let input = instance
+        .get_sol_input()
+        .map_err(|err| anyhow::anyhow!("{:?}", err))?
+        .normalize_json()
+        .map_err(|err| anyhow::anyhow!("{:?}", err))?;
     let SolInput {
         attrs: _,
         path: _,
@@ -323,7 +311,7 @@ fn generate_binding(instance: &mut SolMacroGen, all_derives: bool) -> eyre::Resu
     Ok(())
 }
 
-fn write_mod_name(contents: &mut String, name: &str) -> eyre::Result<()> {
+fn write_mod_name(contents: &mut String, name: &str) -> anyhow::Result<()> {
     if syn::parse_str::<syn::ItemMod>(&format!("pub mod {name};")).is_ok() {
         write!(contents, "pub mod {name};")?;
     } else {
@@ -332,6 +320,63 @@ fn write_mod_name(contents: &mut String, name: &str) -> eyre::Result<()> {
     Ok(())
 }
 
+/// Wrapper to avoid destructuring the vector of tuples into three iterators.
+///
+/// The following code:
+/// ```ignore
+/// // We need to "destructure" the iterator into several due to
+/// let chain_ids = self.networks.iter().map(|n| n.0);
+/// let addresses = self.networks.iter().map(|n| n.1.0.clone());
+/// let blocks = self.networks.iter().map(|n| match n.1.1 {
+///     Some(block) => quote::quote! {Some (#block)},
+///     None => quote::quote! {None},
+/// });
+/// // ...
+/// quote::quote! {
+///     pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
+///         match chain_id {
+///             #(#chain_id => Some((::alloy::primitives::address!(#address), #block_number)),)*
+///             _ => None
+///         }
+///     }
+/// }
+/// ```
+///
+/// Becomes:
+/// ```ignore
+/// let networks = self.networks.into_iter().map(NetworkArm::from);
+/// // ...
+/// quote::quote! {
+///     pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
+///         match chain_id {
+///             #( #networks ,)*
+///             _ => None
+///         }
+///     }
+/// }
+/// ```
+struct NetworkArm(u64, (String, Option<u64>));
+
+impl ToTokens for NetworkArm {
+    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+        let chain_id = self.0;
+        let address = &self.1.0;
+        let block_number = match self.1.1 {
+            Some(block) => quote::quote! {Some (#block)},
+            None => quote::quote! {None},
+        };
+        tokens.extend(quote::quote! {
+           #chain_id => Some((::alloy::primitives::address!(#address), #block_number))
+        });
+    }
+}
+
+impl From<(u64, (String, Option<u64>))> for NetworkArm {
+    fn from((chain_id, info): (u64, (String, Option<u64>))) -> Self {
+        Self(chain_id, info)
+    }
+}
+
 /// Declare a network tuple with an optional block number.
 ///
 /// Example, without blocks:
diff --git a/crates/contracts/.gitignore b/crates/contracts/.gitignore
index aca7132973..1884d50914 100644
--- a/crates/contracts/.gitignore
+++ b/crates/contracts/.gitignore
@@ -1 +1,2 @@
+# Generated by build.rs, will contain the contract bindings
 src/alloy
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index fa7fd58e6a..a3a23cf5dd 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -1,9 +1,6 @@
 use std::path::Path;
 
-use contracts_generate::{
-    ARBITRUM_ONE, AVALANCHE, BASE, BNB, Contract, GNOSIS, LENS, LINEA, MAINNET, Module, OPTIMISM,
-    PLASMA, POLYGON, SEPOLIA, Submodule, networks,
-};
+use contracts_generate::{Contract, Module, Submodule, networks, networks::*};
 
 fn main() {
     // NOTE: This is a workaround for `rerun-if-changed` directives for

From c244ac5500137614ad32ad03aa26b9f79ff70a36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Wed, 5 Nov 2025 14:38:03 +0000
Subject: [PATCH 31/36] reduce dep surface

---
 Cargo.lock                                    | 1673 +----------------
 Cargo.toml                                    |    1 -
 crates/contracts-generate/Cargo.toml          |    3 +-
 crates/contracts-generate/src/lib.rs          |    4 +-
 .../contracts-generate/src/sol_macro_gen.rs   |   40 +
 5 files changed, 93 insertions(+), 1628 deletions(-)
 create mode 100644 crates/contracts-generate/src/sol_macro_gen.rs

diff --git a/Cargo.lock b/Cargo.lock
index 0ae8f68607..b5ae08af77 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,7 +54,7 @@ dependencies = [
  "getrandom 0.2.15",
  "once_cell",
  "version_check",
- "zerocopy 0.7.34",
+ "zerocopy",
 ]
 
 [[package]]
@@ -127,7 +127,6 @@ checksum = "5674914c2cfdb866c21cb0c09d82374ee39a1395cf512e7515f4c014083b3fff"
 dependencies = [
  "alloy-primitives",
  "num_enum",
- "serde",
  "strum",
 ]
 
@@ -215,10 +214,7 @@ dependencies = [
  "alloy-primitives",
  "alloy-sol-type-parser",
  "alloy-sol-types",
- "arbitrary",
- "derive_more 2.0.1",
  "itoa",
- "proptest",
  "serde",
  "serde_json",
  "winnow 0.7.11",
@@ -256,7 +252,6 @@ checksum = "9d4769c6ffddca380b0070d71c8b7f30bed375543fe76bb2f74ec0acf4b7cd16"
 dependencies = [
  "alloy-primitives",
  "alloy-rlp",
- "k256",
  "serde",
  "thiserror 2.0.12",
 ]
@@ -356,13 +351,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "355bf68a433e0fd7f7d33d5a9fc2583fde70bf5c530f63b80845f8da5505cf28"
 dependencies = [
  "alloy-rlp",
- "arbitrary",
  "bytes",
  "cfg-if",
  "const-hex",
  "derive_more 2.0.1",
  "foldhash 0.2.0",
- "getrandom 0.3.3",
  "hashbrown 0.16.0",
  "indexmap 2.10.0",
  "itoa",
@@ -370,7 +363,6 @@ dependencies = [
  "keccak-asm",
  "paste",
  "proptest",
- "proptest-derive",
  "rand 0.9.1",
  "ruint",
  "rustc-hash",
@@ -421,28 +413,6 @@ dependencies = [
  "wasmtimer",
 ]
 
-[[package]]
-name = "alloy-pubsub"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "810766eeed6b10ffa11815682b3f37afc5019809e3b470b23555297d5770ce63"
-dependencies = [
- "alloy-json-rpc",
- "alloy-primitives",
- "alloy-transport",
- "auto_impl",
- "bimap",
- "futures",
- "parking_lot",
- "serde",
- "serde_json",
- "tokio",
- "tokio-stream",
- "tower 0.5.2",
- "tracing",
- "wasmtimer",
-]
-
 [[package]]
 name = "alloy-rlp"
 version = "0.3.12"
@@ -497,7 +467,6 @@ dependencies = [
  "alloy-primitives",
  "alloy-rpc-types-anvil",
  "alloy-rpc-types-debug",
- "alloy-rpc-types-engine",
  "alloy-rpc-types-eth",
  "alloy-rpc-types-trace",
  "alloy-serde",
@@ -539,24 +508,6 @@ dependencies = [
  "serde_with",
 ]
 
-[[package]]
-name = "alloy-rpc-types-engine"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07da696cc7fbfead4b1dda8afe408685cae80975cbb024f843ba74d9639cd0d3"
-dependencies = [
- "alloy-consensus",
- "alloy-eips",
- "alloy-primitives",
- "alloy-rlp",
- "alloy-serde",
- "derive_more 2.0.1",
- "jsonwebtoken",
- "rand 0.8.5",
- "serde",
- "strum",
-]
-
 [[package]]
 name = "alloy-rpc-types-eth"
 version = "1.1.0"
@@ -767,44 +718,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "alloy-transport-ipc"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea89c214c7ddd2bcad100da929d6b642bbfed85788caf3b1be473abacd3111f9"
-dependencies = [
- "alloy-json-rpc",
- "alloy-pubsub",
- "alloy-transport",
- "bytes",
- "futures",
- "interprocess",
- "pin-project",
- "serde",
- "serde_json",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "alloy-transport-ws"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "571aadf0afce0d515a28b2c6352662a39cb9f48b4eeff9a5c34557d6ea126730"
-dependencies = [
- "alloy-pubsub",
- "alloy-transport",
- "futures",
- "http 1.1.0",
- "rustls 0.23.35",
- "serde_json",
- "tokio",
- "tokio-tungstenite",
- "tracing",
- "ws_stream_wasm",
-]
-
 [[package]]
 name = "alloy-trie"
 version = "0.9.0"
@@ -848,17 +761,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "annotate-snippets"
-version = "0.12.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025c7edcdffa4ccc5c0905f472a0ae3759378cfbef88ef518a3575e19ae3aebd"
-dependencies = [
- "anstyle",
- "memchr",
- "unicode-width 0.2.2",
-]
-
 [[package]]
 name = "anstream"
 version = "0.6.21"
@@ -931,65 +833,12 @@ dependencies = [
  "tiny-keccak",
 ]
 
-[[package]]
-name = "arbitrary"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
-dependencies = [
- "derive_arbitrary",
-]
-
 [[package]]
 name = "arc-swap"
 version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
-[[package]]
-name = "ark-bls12-381"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3df4dcc01ff89867cd86b0da835f23c3f02738353aaee7dde7495af71363b8d5"
-dependencies = [
- "ark-ec",
- "ark-ff 0.5.0",
- "ark-serialize 0.5.0",
- "ark-std 0.5.0",
-]
-
-[[package]]
-name = "ark-bn254"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d69eab57e8d2663efa5c63135b2af4f396d66424f88954c21104125ab6b3e6bc"
-dependencies = [
- "ark-ec",
- "ark-ff 0.5.0",
- "ark-std 0.5.0",
-]
-
-[[package]]
-name = "ark-ec"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
-dependencies = [
- "ahash 0.8.11",
- "ark-ff 0.5.0",
- "ark-poly",
- "ark-serialize 0.5.0",
- "ark-std 0.5.0",
- "educe",
- "fnv",
- "hashbrown 0.15.4",
- "itertools 0.13.0",
- "num-bigint",
- "num-integer",
- "num-traits",
- "zeroize",
-]
-
 [[package]]
 name = "ark-ff"
 version = "0.3.0"
@@ -1116,21 +965,6 @@ dependencies = [
  "syn 2.0.108",
 ]
 
-[[package]]
-name = "ark-poly"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
-dependencies = [
- "ahash 0.8.11",
- "ark-ff 0.5.0",
- "ark-serialize 0.5.0",
- "ark-std 0.5.0",
- "educe",
- "fnv",
- "hashbrown 0.15.4",
-]
-
 [[package]]
 name = "ark-serialize"
 version = "0.3.0"
@@ -1158,24 +992,12 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
 dependencies = [
- "ark-serialize-derive",
  "ark-std 0.5.0",
  "arrayvec",
  "digest 0.10.7",
  "num-bigint",
 ]
 
-[[package]]
-name = "ark-serialize-derive"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "ark-std"
 version = "0.3.0"
@@ -1206,12 +1028,6 @@ dependencies = [
  "rand 0.8.5",
 ]
 
-[[package]]
-name = "arrayref"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -1278,17 +1094,6 @@ dependencies = [
  "syn 2.0.108",
 ]
 
-[[package]]
-name = "async_io_stream"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c"
-dependencies = [
- "futures",
- "pharos",
- "rustc_version 0.4.0",
-]
-
 [[package]]
 name = "atoi"
 version = "2.0.0"
@@ -1315,16 +1120,6 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "aurora-engine-modexp"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "518bc5745a6264b5fd7b09dffb9667e400ee9e2bbe18555fac75e1fe9afa0df9"
-dependencies = [
- "hex",
- "num",
-]
-
 [[package]]
 name = "auto_impl"
 version = "1.3.0"
@@ -1712,11 +1507,11 @@ dependencies = [
  "http-body 0.4.6",
  "http-body 1.0.0",
  "hyper 0.14.29",
- "hyper-rustls 0.24.2",
+ "hyper-rustls",
  "once_cell",
  "pin-project-lite",
  "pin-utils",
- "rustls 0.21.12",
+ "rustls",
  "tokio",
  "tracing",
 ]
@@ -1910,12 +1705,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "bimap"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7"
-
 [[package]]
 name = "bit-set"
 version = "0.8.0"
@@ -2019,12 +1808,6 @@ dependencies = [
  "syn_derive",
 ]
 
-[[package]]
-name = "boxcar"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f64beae40a84da1b4b26ff2761a5b895c12adc41dc25aaee1c4f2bbfe97a6e"
-
 [[package]]
 name = "bs58"
 version = "0.5.1"
@@ -2176,33 +1959,6 @@ dependencies = [
  "windows-link 0.1.3",
 ]
 
-[[package]]
-name = "ciborium"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
-dependencies = [
- "ciborium-io",
- "ciborium-ll",
- "serde",
-]
-
-[[package]]
-name = "ciborium-io"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
-
-[[package]]
-name = "ciborium-ll"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
-dependencies = [
- "ciborium-io",
- "half",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.6"
@@ -2223,9 +1979,6 @@ dependencies = [
  "anstyle",
  "clap_lex",
  "strsim",
- "terminal_size",
- "unicase",
- "unicode-width 0.1.14",
 ]
 
 [[package]]
@@ -2303,17 +2056,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
-[[package]]
-name = "comfy-table"
-version = "7.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b03b7db8e0b4b2fdad6c551e634134e99ec000e5c8c3b6856c65e8bbaded7a3b"
-dependencies = [
- "crossterm",
- "unicode-segmentation",
- "unicode-width 0.2.2",
-]
-
 [[package]]
 name = "concurrent-queue"
 version = "2.5.0"
@@ -2423,7 +2165,6 @@ dependencies = [
  "alloy-sol-macro-expander",
  "alloy-sol-macro-input",
  "anyhow",
- "forge-sol-macro-gen",
  "prettyplease",
  "proc-macro2",
  "quote",
@@ -2446,15 +2187,6 @@ dependencies = [
  "unicode-segmentation",
 ]
 
-[[package]]
-name = "convert_case"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb402b8d4c85569410425650ce3eddc7d698ed96d39a73f941b08fb63082f1e7"
-dependencies = [
- "unicode-segmentation",
-]
-
 [[package]]
 name = "cookie"
 version = "0.17.0"
@@ -2575,16 +2307,6 @@ dependencies = [
  "crossbeam-utils",
 ]
 
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
 [[package]]
 name = "crossbeam-epoch"
 version = "0.9.18"
@@ -2609,29 +2331,6 @@ version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
-[[package]]
-name = "crossterm"
-version = "0.29.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
-dependencies = [
- "bitflags 2.10.0",
- "crossterm_winapi",
- "document-features",
- "parking_lot",
- "rustix 1.1.2",
- "winapi",
-]
-
-[[package]]
-name = "crossterm_winapi"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "crunchy"
 version = "0.2.2"
@@ -2850,28 +2549,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "derive-where"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef941ded77d15ca19b40374869ac6000af1c9f2a4c0f3d4c70926287e6364a8f"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
-[[package]]
-name = "derive_arbitrary"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "derive_more"
 version = "0.99.17"
@@ -2922,7 +2599,6 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bda628edc44c4bb645fbe0f758797143e4e07926f7ebf4e9bdfbd3d2ce621df3"
 dependencies = [
- "convert_case 0.7.1",
  "proc-macro2",
  "quote",
  "syn 2.0.108",
@@ -2957,52 +2633,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "dirs"
-version = "6.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e"
-dependencies = [
- "dirs-sys",
-]
-
-[[package]]
-name = "dirs-sys"
-version = "0.5.0"
+name = "dotenvy"
+version = "0.15.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
-dependencies = [
- "libc",
- "option-ext",
- "redox_users",
- "windows-sys 0.59.0",
-]
+checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
 
 [[package]]
-name = "doctest-file"
-version = "1.0.0"
+name = "downcast"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac81fa3e28d21450aa4d2ac065992ba96a1d7303efbce51a95f4fd175b67562"
-
-[[package]]
-name = "document-features"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4b8a88685455ed29a21542a33abd9cb6510b6b129abadabdcef0f4c55bc8f61"
-dependencies = [
- "litrs",
-]
-
-[[package]]
-name = "dotenvy"
-version = "0.15.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b"
-
-[[package]]
-name = "downcast"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
+checksum = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
 
 [[package]]
 name = "driver"
@@ -3071,12 +2711,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
 
-[[package]]
-name = "dyn-clone"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
-
 [[package]]
 name = "e2e"
 version = "1.0.0"
@@ -3415,16 +3049,6 @@ dependencies = [
  "pin-project-lite",
 ]
 
-[[package]]
-name = "eyre"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cd915d99f24784cdc19fd37ef22b97e3ff0ae756c7e492e9fbfe897d61e2aec"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
 [[package]]
 name = "fastrand"
 version = "2.1.0"
@@ -3482,7 +3106,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
 dependencies = [
  "crc32fast",
- "libz-rs-sys",
  "miniz_oxide 0.8.9",
 ]
 
@@ -3539,22 +3162,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
-[[package]]
-name = "forge-sol-macro-gen"
-version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#806792b21fd5ae9b9d2480b37a8a616ad09b544e"
-dependencies = [
- "alloy-sol-macro-expander",
- "alloy-sol-macro-input",
- "eyre",
- "foundry-common",
- "heck 0.5.0",
- "prettyplease",
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -3564,195 +3171,6 @@ dependencies = [
  "percent-encoding",
 ]
 
-[[package]]
-name = "foundry-block-explorers"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff814624bb21bfe43b70fb736ab39527b405d04cdc94d90b7e182fba28b25ec7"
-dependencies = [
- "alloy-chains",
- "alloy-json-abi",
- "alloy-primitives",
- "foundry-compilers",
- "reqwest 0.12.12",
- "semver 1.0.23",
- "serde",
- "serde_json",
- "thiserror 2.0.12",
- "tracing",
-]
-
-[[package]]
-name = "foundry-common"
-version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#806792b21fd5ae9b9d2480b37a8a616ad09b544e"
-dependencies = [
- "alloy-chains",
- "alloy-consensus",
- "alloy-dyn-abi",
- "alloy-eips",
- "alloy-json-abi",
- "alloy-json-rpc",
- "alloy-network",
- "alloy-primitives",
- "alloy-provider",
- "alloy-pubsub",
- "alloy-rpc-client",
- "alloy-rpc-types",
- "alloy-serde",
- "alloy-sol-types",
- "alloy-transport",
- "alloy-transport-http",
- "alloy-transport-ipc",
- "alloy-transport-ws",
- "anstream",
- "anstyle",
- "chrono",
- "ciborium",
- "clap",
- "comfy-table",
- "dunce",
- "eyre",
- "flate2",
- "foundry-block-explorers",
- "foundry-common-fmt",
- "foundry-compilers",
- "itertools 0.14.0",
- "jiff",
- "num-format",
- "path-slash",
- "regex",
- "reqwest 0.12.12",
- "revm",
- "semver 1.0.23",
- "serde",
- "serde_json",
- "solar-compiler",
- "thiserror 2.0.12",
- "tokio",
- "tower 0.5.2",
- "tracing",
- "url",
- "vergen",
- "walkdir",
- "yansi",
-]
-
-[[package]]
-name = "foundry-common-fmt"
-version = "1.4.4"
-source = "git+https://github.com/foundry-rs/foundry#806792b21fd5ae9b9d2480b37a8a616ad09b544e"
-dependencies = [
- "alloy-consensus",
- "alloy-dyn-abi",
- "alloy-network",
- "alloy-primitives",
- "alloy-rpc-types",
- "alloy-serde",
- "chrono",
- "eyre",
- "revm",
- "serde",
- "serde_json",
- "yansi",
-]
-
-[[package]]
-name = "foundry-compilers"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5767bfd01a240b57e6eb540e233b248d2ecb554d60b7936574cd077c0bd4c15e"
-dependencies = [
- "alloy-json-abi",
- "alloy-primitives",
- "auto_impl",
- "derive_more 2.0.1",
- "dyn-clone",
- "foundry-compilers-artifacts",
- "foundry-compilers-core",
- "itertools 0.14.0",
- "path-slash",
- "rayon",
- "semver 1.0.23",
- "serde",
- "serde_json",
- "sha2",
- "solar-compiler",
- "svm-rs",
- "svm-rs-builds",
- "thiserror 2.0.12",
- "tracing",
- "winnow 0.7.11",
- "yansi",
-]
-
-[[package]]
-name = "foundry-compilers-artifacts"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b35da40bb333baff6f4533431c050a94857a4d1a379365085da403938fc9edf"
-dependencies = [
- "foundry-compilers-artifacts-solc",
- "foundry-compilers-artifacts-vyper",
-]
-
-[[package]]
-name = "foundry-compilers-artifacts-solc"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eff50fa9f518e96f80c77d1596122bb41c6fb9f1ec8d93e3127e2cf7a4726faa"
-dependencies = [
- "alloy-json-abi",
- "alloy-primitives",
- "foundry-compilers-core",
- "memchr",
- "path-slash",
- "rayon",
- "regex",
- "semver 1.0.23",
- "serde",
- "serde_json",
- "thiserror 2.0.12",
- "tracing",
- "yansi",
-]
-
-[[package]]
-name = "foundry-compilers-artifacts-vyper"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34764d842fcf3aee77dc892beba3f12d7d5cebe196caf2050302caa986de8914"
-dependencies = [
- "alloy-json-abi",
- "alloy-primitives",
- "foundry-compilers-artifacts-solc",
- "foundry-compilers-core",
- "path-slash",
- "semver 1.0.23",
- "serde",
-]
-
-[[package]]
-name = "foundry-compilers-core"
-version = "0.19.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48bcd9ff6881e2f5acd8544d490cc91d2c1d47c59c1e9337ea2ade66ce7e1800"
-dependencies = [
- "alloy-primitives",
- "cfg-if",
- "dunce",
- "path-slash",
- "regex",
- "semver 1.0.23",
- "serde",
- "serde_json",
- "svm-rs",
- "thiserror 2.0.12",
- "tokio",
- "walkdir",
- "xxhash-rust",
-]
-
 [[package]]
 name = "fragile"
 version = "2.0.0"
@@ -3927,10 +3345,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
- "js-sys",
  "libc",
  "wasi 0.11.0+wasi-snapshot-preview1",
- "wasm-bindgen",
 ]
 
 [[package]]
@@ -4006,17 +3422,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "half"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
-dependencies = [
- "cfg-if",
- "crunchy",
- "zerocopy 0.8.27",
-]
-
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -4133,12 +3538,6 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
-[[package]]
-name = "hermit-abi"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
-
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -4331,28 +3730,10 @@ dependencies = [
  "http 0.2.12",
  "hyper 0.14.29",
  "log",
- "rustls 0.21.12",
- "rustls-native-certs 0.6.3",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.27.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
-dependencies = [
- "http 1.1.0",
- "hyper 1.6.0",
- "hyper-util",
- "rustls 0.23.35",
- "rustls-native-certs 0.8.0",
- "rustls-pki-types",
+ "rustls",
+ "rustls-native-certs",
  "tokio",
- "tokio-rustls 0.26.4",
- "tower-service",
- "webpki-roots 1.0.4",
+ "tokio-rustls",
 ]
 
 [[package]]
@@ -4527,18 +3908,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "indenter"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5"
-
-[[package]]
-name = "index_vec"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44faf5bb8861a9c72e20d3fb0fdbd59233e43056e2b80475ab0aacdc2e781355"
-
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -4556,7 +3925,6 @@ version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
- "arbitrary",
  "equivalent",
  "hashbrown 0.15.4",
  "serde",
@@ -4571,34 +3939,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "interprocess"
-version = "2.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d941b405bd2322993887859a8ee6ac9134945a24ec5ec763a8a962fc64dfec2d"
-dependencies = [
- "doctest-file",
- "futures-core",
- "libc",
- "recvmsg",
- "tokio",
- "widestring",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "inturn"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2efbe120e37f17bb33fcdc82bc1c65087242608be37ace3cf7ebf49f3164e37"
-dependencies = [
- "boxcar",
- "bumpalo",
- "dashmap",
- "hashbrown 0.14.5",
- "thread_local",
-]
-
 [[package]]
 name = "io-uring"
 version = "0.7.9"
@@ -4616,17 +3956,6 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
 
-[[package]]
-name = "is-terminal"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
-dependencies = [
- "hermit-abi 0.5.2",
- "libc",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.0"
@@ -4675,30 +4004,6 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
-[[package]]
-name = "jiff"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be1f93b8b1eb69c77f24bbb0afdf66f54b632ee39af40ca21c4365a1d7347e49"
-dependencies = [
- "jiff-static",
- "log",
- "portable-atomic",
- "portable-atomic-util",
- "serde",
-]
-
-[[package]]
-name = "jiff-static"
-version = "0.2.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "js-sys"
 version = "0.3.69"
@@ -4723,21 +4028,6 @@ dependencies = [
  "serde_json",
 ]
 
-[[package]]
-name = "jsonwebtoken"
-version = "9.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
-dependencies = [
- "base64 0.22.1",
- "js-sys",
- "pem",
- "ring",
- "serde",
- "serde_json",
- "simple_asn1",
-]
-
 [[package]]
 name = "k256"
 version = "0.13.4"
@@ -4803,16 +4093,6 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "libredox"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
-dependencies = [
- "bitflags 2.10.0",
- "libc",
-]
-
 [[package]]
 name = "libsqlite3-sys"
 version = "0.27.0"
@@ -4824,15 +4104,6 @@ dependencies = [
  "vcpkg",
 ]
 
-[[package]]
-name = "libz-rs-sys"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "840db8cf39d9ec4dd794376f38acc40d0fc65eec2a8f484f7fd375b84602becd"
-dependencies = [
- "zlib-rs",
-]
-
 [[package]]
 name = "libz-sys"
 version = "1.1.18"
@@ -4851,18 +4122,6 @@ version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
-
-[[package]]
-name = "litrs"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11d3d7f243d5c5a8b9bb5d6dd2b1602c0cb0b9db1621bafc7ed66e35ff9fe092"
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -4873,12 +4132,6 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "lockfree-object-pool"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
-
 [[package]]
 name = "log"
 version = "0.4.21"
@@ -5171,12 +4424,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
-[[package]]
-name = "normalize-path"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5438dd2b2ff4c6df6e1ce22d825ed2fa93ee2922235cc45186991717f0a892d"
-
 [[package]]
 name = "nu-ansi-term"
 version = "0.46.0"
@@ -5243,16 +4490,6 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
-[[package]]
-name = "num-format"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3"
-dependencies = [
- "arrayvec",
- "itoa",
-]
-
 [[package]]
 name = "num-integer"
 version = "0.1.46"
@@ -5410,18 +4647,6 @@ version = "1.70.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
 
-[[package]]
-name = "once_map"
-version = "0.4.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29eefd5038c9eee9e788d90966d6b5578dd3f88363a91edaec117a7ae0adc2d5"
-dependencies = [
- "ahash 0.8.11",
- "hashbrown 0.16.0",
- "parking_lot",
- "stable_deref_trait",
-]
-
 [[package]]
 name = "openssl"
 version = "0.10.73"
@@ -5540,12 +4765,6 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
-[[package]]
-name = "option-ext"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
-
 [[package]]
 name = "order-validation"
 version = "0.1.0"
@@ -5619,18 +4838,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
-[[package]]
-name = "p256"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
-dependencies = [
- "ecdsa",
- "elliptic-curve",
- "primeorder",
- "sha2",
-]
-
 [[package]]
 name = "parity-scale-codec"
 version = "3.6.12"
@@ -5692,12 +4899,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
-[[package]]
-name = "path-slash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
-
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -5708,16 +4909,6 @@ dependencies = [
  "hmac",
 ]
 
-[[package]]
-name = "pem"
-version = "3.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
-dependencies = [
- "base64 0.22.1",
- "serde_core",
-]
-
 [[package]]
 name = "pem-rfc7468"
 version = "0.7.0"
@@ -5744,16 +4935,6 @@ dependencies = [
  "ucd-trie",
 ]
 
-[[package]]
-name = "pharos"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414"
-dependencies = [
- "futures",
- "rustc_version 0.4.0",
-]
-
 [[package]]
 name = "pin-project"
 version = "1.1.5"
@@ -5819,15 +5000,6 @@ version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "280dc24453071f1b63954171985a0b0d30058d287960968b9b2aca264c8d4ee6"
 
-[[package]]
-name = "portable-atomic-util"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507"
-dependencies = [
- "portable-atomic",
-]
-
 [[package]]
 name = "powerfmt"
 version = "0.2.0"
@@ -5894,15 +5066,6 @@ dependencies = [
  "syn 2.0.108",
 ]
 
-[[package]]
-name = "primeorder"
-version = "0.13.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "353e1ca18966c16d9deb1c69278edbc5f194139612772bd9537af60ac231e1e6"
-dependencies = [
- "elliptic-curve",
-]
-
 [[package]]
 name = "primitive-types"
 version = "0.12.2"
@@ -6036,17 +5199,6 @@ dependencies = [
  "unarray",
 ]
 
-[[package]]
-name = "proptest-derive"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "095a99f75c69734802359b682be8daaf8980296731f6470434ea2c652af1dd30"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "prost"
 version = "0.12.6"
@@ -6150,58 +5302,6 @@ version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
-[[package]]
-name = "quinn"
-version = "0.11.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62e96808277ec6f97351a2380e6c25114bc9e67037775464979f3037c92d05ef"
-dependencies = [
- "bytes",
- "pin-project-lite",
- "quinn-proto",
- "quinn-udp",
- "rustc-hash",
- "rustls 0.23.35",
- "socket2 0.5.10",
- "thiserror 2.0.12",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "quinn-proto"
-version = "0.11.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2fe5ef3495d7d2e377ff17b1a8ce2ee2ec2a18cde8b6ad6619d65d0701c135d"
-dependencies = [
- "bytes",
- "getrandom 0.2.15",
- "rand 0.8.5",
- "ring",
- "rustc-hash",
- "rustls 0.23.35",
- "rustls-pki-types",
- "slab",
- "thiserror 2.0.12",
- "tinyvec",
- "tracing",
- "web-time",
-]
-
-[[package]]
-name = "quinn-udp"
-version = "0.5.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
-dependencies = [
- "cfg_aliases",
- "libc",
- "once_cell",
- "socket2 0.6.0",
- "tracing",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "quote"
 version = "1.0.41"
@@ -6310,32 +5410,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "rayon"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "recvmsg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175"
-
 [[package]]
 name = "redox_syscall"
 version = "0.4.1"
@@ -6354,17 +5428,6 @@ dependencies = [
  "bitflags 2.10.0",
 ]
 
-[[package]]
-name = "redox_users"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
-dependencies = [
- "getrandom 0.2.15",
- "libredox",
- "thiserror 2.0.12",
-]
-
 [[package]]
 name = "refunder"
 version = "0.1.0"
@@ -6511,7 +5574,6 @@ dependencies = [
  "http-body 1.0.0",
  "http-body-util",
  "hyper 1.6.0",
- "hyper-rustls 0.27.7",
  "hyper-tls 0.6.0",
  "hyper-util",
  "ipnet",
@@ -6522,202 +5584,22 @@ dependencies = [
  "once_cell",
  "percent-encoding",
  "pin-project-lite",
- "quinn",
- "rustls 0.23.35",
- "rustls-native-certs 0.8.0",
  "rustls-pemfile 2.2.0",
- "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.2",
  "tokio",
  "tokio-native-tls",
- "tokio-rustls 0.26.4",
- "tokio-socks",
  "tower 0.5.2",
  "tower-service",
  "url",
  "wasm-bindgen",
  "wasm-bindgen-futures",
  "web-sys",
- "webpki-roots 0.26.11",
  "windows-registry",
 ]
 
-[[package]]
-name = "revm"
-version = "30.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76df793c6ef3bef8f88f05b3873ebebce1494385a3ce8f58ad2e2e111aa0de11"
-dependencies = [
- "revm-bytecode",
- "revm-context",
- "revm-context-interface",
- "revm-database",
- "revm-database-interface",
- "revm-handler",
- "revm-inspector",
- "revm-interpreter",
- "revm-precompile",
- "revm-primitives",
- "revm-state",
-]
-
-[[package]]
-name = "revm-bytecode"
-version = "7.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f2b51c414b7e79edd4a0569d06e2c4c029f8b60e5f3ee3e2fa21dc6c3717ee3"
-dependencies = [
- "bitvec",
- "revm-primitives",
-]
-
-[[package]]
-name = "revm-context"
-version = "10.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7adcce0c14cf59b7128de34185a0fbf8f63309539b9263b35ead870d73584114"
-dependencies = [
- "bitvec",
- "cfg-if",
- "derive-where",
- "revm-bytecode",
- "revm-context-interface",
- "revm-database-interface",
- "revm-primitives",
- "revm-state",
-]
-
-[[package]]
-name = "revm-context-interface"
-version = "11.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d620a9725e443c171fb195a074331fa4a745fa5cbb0018b4bbf42619e64b563"
-dependencies = [
- "alloy-eip2930",
- "alloy-eip7702",
- "auto_impl",
- "either",
- "revm-database-interface",
- "revm-primitives",
- "revm-state",
-]
-
-[[package]]
-name = "revm-database"
-version = "9.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2602625aa11ab1eda8e208e96b652c0bfa989b86c104a36537a62b081228af9"
-dependencies = [
- "revm-bytecode",
- "revm-database-interface",
- "revm-primitives",
- "revm-state",
-]
-
-[[package]]
-name = "revm-database-interface"
-version = "8.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58a4621143d6515e32f969306d9c85797ae0d3fe0c74784f1fda02ba441e5a08"
-dependencies = [
- "auto_impl",
- "either",
- "revm-primitives",
- "revm-state",
-]
-
-[[package]]
-name = "revm-handler"
-version = "11.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d8049b2fbff6636150f4740c95369aa174e41b0383034e0e256cfdffcfcd23"
-dependencies = [
- "auto_impl",
- "derive-where",
- "revm-bytecode",
- "revm-context",
- "revm-context-interface",
- "revm-database-interface",
- "revm-interpreter",
- "revm-precompile",
- "revm-primitives",
- "revm-state",
-]
-
-[[package]]
-name = "revm-inspector"
-version = "11.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2a21dd773b654ec7e080025eecef4ac84c711150d1bd36acadf0546f471329a"
-dependencies = [
- "auto_impl",
- "either",
- "revm-context",
- "revm-database-interface",
- "revm-handler",
- "revm-interpreter",
- "revm-primitives",
- "revm-state",
-]
-
-[[package]]
-name = "revm-interpreter"
-version = "28.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1de5c790122f8ded67992312af8acd41ccfcee629b25b819e10c5b1f69caf57"
-dependencies = [
- "revm-bytecode",
- "revm-context-interface",
- "revm-primitives",
- "revm-state",
-]
-
-[[package]]
-name = "revm-precompile"
-version = "28.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e57aadd7a2087705f653b5aaacc8ad4f8e851f5d330661e3f4c43b5475bbceae"
-dependencies = [
- "ark-bls12-381",
- "ark-bn254",
- "ark-ec",
- "ark-ff 0.5.0",
- "ark-serialize 0.5.0",
- "arrayref",
- "aurora-engine-modexp",
- "cfg-if",
- "k256",
- "p256",
- "revm-primitives",
- "ripemd",
- "sha2",
-]
-
-[[package]]
-name = "revm-primitives"
-version = "21.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "536f30e24c3c2bf0d3d7d20fa9cf99b93040ed0f021fd9301c78cddb0dacda13"
-dependencies = [
- "alloy-primitives",
- "num_enum",
- "once_cell",
-]
-
-[[package]]
-name = "revm-state"
-version = "8.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a0b4873815e31cbc3e5b183b9128b86c09a487c027aaf8cc5cf4b9688878f9b"
-dependencies = [
- "bitflags 2.10.0",
- "revm-bytecode",
- "revm-primitives",
-]
-
 [[package]]
 name = "rfc6979"
 version = "0.4.0"
@@ -6817,7 +5699,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a68df0380e5c9d20ce49534f292a36a7514ae21350726efe1865bdb1fa91d278"
 dependencies = [
  "alloy-rlp",
- "arbitrary",
  "ark-ff 0.3.0",
  "ark-ff 0.4.2",
  "ark-ff 0.5.0",
@@ -6872,9 +5753,6 @@ name = "rustc-hash"
 version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-dependencies = [
- "rand 0.8.5",
-]
 
 [[package]]
 name = "rustc-hex"
@@ -6909,23 +5787,10 @@ dependencies = [
  "bitflags 2.10.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.14",
+ "linux-raw-sys",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustix"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
-dependencies = [
- "bitflags 2.10.0",
- "errno",
- "libc",
- "linux-raw-sys 0.11.0",
- "windows-sys 0.59.0",
-]
-
 [[package]]
 name = "rustls"
 version = "0.21.12"
@@ -6934,24 +5799,10 @@ checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring",
- "rustls-webpki 0.101.7",
+ "rustls-webpki",
  "sct",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.23.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
-dependencies = [
- "once_cell",
- "ring",
- "rustls-pki-types",
- "rustls-webpki 0.103.8",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.6.3"
@@ -6964,19 +5815,6 @@ dependencies = [
  "security-framework",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 2.2.0",
- "rustls-pki-types",
- "schannel",
- "security-framework",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "1.0.4"
@@ -7001,7 +5839,6 @@ version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
 dependencies = [
- "web-time",
  "zeroize",
 ]
 
@@ -7015,17 +5852,6 @@ dependencies = [
  "untrusted",
 ]
 
-[[package]]
-name = "rustls-webpki"
-version = "0.103.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
-dependencies = [
- "ring",
- "rustls-pki-types",
- "untrusted",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.17"
@@ -7201,9 +6027,6 @@ name = "semver"
 version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
-dependencies = [
- "serde",
-]
 
 [[package]]
 name = "semver-parser"
@@ -7214,12 +6037,6 @@ dependencies = [
  "pest",
 ]
 
-[[package]]
-name = "send_wrapper"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
-
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -7450,229 +6267,71 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "signature"
-version = "2.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
-dependencies = [
- "digest 0.10.7",
- "rand_core 0.6.4",
-]
-
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
-[[package]]
-name = "simdutf8"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
-
-[[package]]
-name = "simple_asn1"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
-dependencies = [
- "num-bigint",
- "num-traits",
- "thiserror 2.0.12",
- "time",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
-dependencies = [
- "serde",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
-]
-
-[[package]]
-name = "solar-ast"
-version = "0.1.8"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b6aaf98d032ba3be85dca5f969895ade113a9137bb5956f80c5faf14689de59"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
- "alloy-primitives",
- "bumpalo",
- "either",
- "num-rational",
- "semver 1.0.23",
- "solar-data-structures",
- "solar-interface",
- "solar-macros",
- "strum",
+ "libc",
 ]
 
 [[package]]
-name = "solar-compiler"
-version = "0.1.8"
+name = "signature"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95e792060bcbb007a6b9b060292945fb34ff854c7d93a9628f81b6c809eb4360"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
 dependencies = [
- "alloy-primitives",
- "solar-ast",
- "solar-config",
- "solar-data-structures",
- "solar-interface",
- "solar-macros",
- "solar-parse",
- "solar-sema",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
 ]
 
 [[package]]
-name = "solar-config"
-version = "0.1.8"
+name = "simd-adler32"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff16d692734c757edd339f5db142ba91b42772f8cbe1db1ce3c747f1e777185f"
-dependencies = [
- "colorchoice",
- "strum",
-]
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
 
 [[package]]
-name = "solar-data-structures"
-version = "0.1.8"
+name = "simdutf8"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dea34e58332c7d6a8cde1f1740186d31682b7be46e098b8cc16fcb7ffd98bf5"
-dependencies = [
- "bumpalo",
- "index_vec",
- "indexmap 2.10.0",
- "parking_lot",
- "rayon",
- "rustc-hash",
- "smallvec",
-]
+checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
 
 [[package]]
-name = "solar-interface"
-version = "0.1.8"
+name = "slab"
+version = "0.4.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d6163af2e773f4d455212fa9ba2c0664506029dd26232eb406f5046092ac311"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
 dependencies = [
- "annotate-snippets",
- "anstream",
- "anstyle",
- "derive_more 2.0.1",
- "dunce",
- "inturn",
- "itertools 0.14.0",
- "itoa",
- "normalize-path",
- "once_map",
- "rayon",
- "scoped-tls",
- "serde",
- "serde_json",
- "solar-config",
- "solar-data-structures",
- "solar-macros",
- "thiserror 2.0.12",
- "tracing",
- "unicode-width 0.2.2",
+ "autocfg",
 ]
 
 [[package]]
-name = "solar-macros"
-version = "0.1.8"
+name = "smallvec"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44a98045888d75d17f52e7b76f6098844b76078b5742a450c3ebcdbdb02da124"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
+ "serde",
 ]
 
 [[package]]
-name = "solar-parse"
-version = "0.1.8"
+name = "socket2"
+version = "0.5.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b77a9cbb07948e4586cdcf64f0a483424197308816ebd57a4cf06130b68562"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
 dependencies = [
- "alloy-primitives",
- "bitflags 2.10.0",
- "bumpalo",
- "itertools 0.14.0",
- "memchr",
- "num-bigint",
- "num-rational",
- "num-traits",
- "ruint",
- "smallvec",
- "solar-ast",
- "solar-data-structures",
- "solar-interface",
- "tracing",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
-name = "solar-sema"
-version = "0.1.8"
+name = "socket2"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd033af43a38da316a04b25bbd20b121ce5d728b61e6988fd8fd6e2f1e68d0a1"
+checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
 dependencies = [
- "alloy-json-abi",
- "alloy-primitives",
- "bitflags 2.10.0",
- "bumpalo",
- "derive_more 2.0.1",
- "either",
- "once_map",
- "paste",
- "rayon",
- "serde",
- "serde_json",
- "solar-ast",
- "solar-data-structures",
- "solar-interface",
- "solar-macros",
- "solar-parse",
- "strum",
- "thread_local",
- "tracing",
+ "libc",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -8007,12 +6666,6 @@ dependencies = [
  "urlencoding",
 ]
 
-[[package]]
-name = "stable_deref_trait"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
-
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -8063,37 +6716,6 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
-[[package]]
-name = "svm-rs"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11f15cc0fb280301739995e3b9f0f0dde3aecb876814f4768689f9138570cd3b"
-dependencies = [
- "const-hex",
- "dirs",
- "reqwest 0.12.12",
- "semver 1.0.23",
- "serde",
- "serde_json",
- "sha2",
- "tempfile",
- "thiserror 2.0.12",
- "url",
- "zip",
-]
-
-[[package]]
-name = "svm-rs-builds"
-version = "0.5.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31affc47068aeef445accc5c3d5f7fd24f9072cae0a651cef564239003c94ff8"
-dependencies = [
- "const-hex",
- "semver 1.0.23",
- "serde_json",
- "svm-rs",
-]
-
 [[package]]
 name = "syn"
 version = "1.0.109"
@@ -8196,20 +6818,10 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
  "fastrand",
- "rustix 0.38.34",
+ "rustix",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "terminal_size"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
-dependencies = [
- "rustix 0.38.34",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -8400,29 +7012,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.21.12",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.26.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
-dependencies = [
- "rustls 0.23.35",
- "tokio",
-]
-
-[[package]]
-name = "tokio-socks"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d4770b8024672c1101b3f6733eab95b18007dbe0847a8afe341fcf79e06043f"
-dependencies = [
- "either",
- "futures-util",
- "thiserror 1.0.61",
+ "rustls",
  "tokio",
 ]
 
@@ -8438,22 +7028,6 @@ dependencies = [
  "tokio-util",
 ]
 
-[[package]]
-name = "tokio-tungstenite"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
-dependencies = [
- "futures-util",
- "log",
- "rustls 0.23.35",
- "rustls-pki-types",
- "tokio",
- "tokio-rustls 0.26.4",
- "tungstenite",
- "webpki-roots 0.26.11",
-]
-
 [[package]]
 name = "tokio-util"
 version = "0.7.11"
@@ -8735,25 +7309,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "tungstenite"
-version = "0.26.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13"
-dependencies = [
- "bytes",
- "data-encoding",
- "http 1.1.0",
- "httparse",
- "log",
- "rand 0.9.1",
- "rustls 0.23.35",
- "rustls-pki-types",
- "sha1",
- "thiserror 2.0.12",
- "utf-8",
-]
-
 [[package]]
 name = "typenum"
 version = "1.17.0"
@@ -8826,18 +7381,6 @@ version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
-[[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.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
-
 [[package]]
 name = "unicode-xid"
 version = "0.2.4"
@@ -8874,12 +7417,6 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
-[[package]]
-name = "utf-8"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -9137,24 +7674,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.26.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
-dependencies = [
- "webpki-roots 1.0.4",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
-dependencies = [
- "rustls-pki-types",
-]
-
 [[package]]
 name = "whoami"
 version = "1.5.1"
@@ -9165,12 +7684,6 @@ dependencies = [
  "wasite",
 ]
 
-[[package]]
-name = "widestring"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -9566,25 +8079,6 @@ dependencies = [
  "bitflags 2.10.0",
 ]
 
-[[package]]
-name = "ws_stream_wasm"
-version = "0.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c173014acad22e83f16403ee360115b38846fe754e735c5d9d3803fe70c6abc"
-dependencies = [
- "async_io_stream",
- "futures",
- "js-sys",
- "log",
- "pharos",
- "rustc_version 0.4.0",
- "send_wrapper",
- "thiserror 2.0.12",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
-]
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -9600,37 +8094,13 @@ version = "0.13.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
 
-[[package]]
-name = "xxhash-rust"
-version = "0.8.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
-
-[[package]]
-name = "yansi"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049"
-dependencies = [
- "is-terminal",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
- "zerocopy-derive 0.7.34",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
-dependencies = [
- "zerocopy-derive 0.8.27",
+ "zerocopy-derive",
 ]
 
 [[package]]
@@ -9644,17 +8114,6 @@ dependencies = [
  "syn 2.0.108",
 ]
 
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.108",
-]
-
 [[package]]
 name = "zeroize"
 version = "1.8.1"
@@ -9674,37 +8133,3 @@ dependencies = [
  "quote",
  "syn 2.0.108",
 ]
-
-[[package]]
-name = "zip"
-version = "4.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caa8cd6af31c3b31c6631b8f483848b91589021b28fffe50adada48d4f4d2ed1"
-dependencies = [
- "arbitrary",
- "crc32fast",
- "flate2",
- "indexmap 2.10.0",
- "memchr",
- "zopfli",
-]
-
-[[package]]
-name = "zlib-rs"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f06ae92f42f5e5c42443fd094f245eb656abf56dd7cce9b8b263236565e00f2"
-
-[[package]]
-name = "zopfli"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5019f391bac5cf252e93bbcc53d039ffd62c7bfb7c150414d61369afe57e946"
-dependencies = [
- "bumpalo",
- "crc32fast",
- "lockfree-object-pool",
- "log",
- "once_cell",
- "simd-adler32",
-]
diff --git a/Cargo.toml b/Cargo.toml
index 883a06288b..464b4e6273 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -100,7 +100,6 @@ tracing-opentelemetry = "0.31"
 tracing-serde = "0.2"
 vergen = "8"
 walkdir = "2.5.0"
-forge-sol-macro-gen = {git = "https://github.com/foundry-rs/foundry", version = "1.4.1"}
 quote = "1.0.41"
 syn = "2.0.108"
 prettyplease = "0.2.37"
diff --git a/crates/contracts-generate/Cargo.toml b/crates/contracts-generate/Cargo.toml
index 39add27119..7694c19948 100644
--- a/crates/contracts-generate/Cargo.toml
+++ b/crates/contracts-generate/Cargo.toml
@@ -6,8 +6,7 @@ edition = "2024"
 [dependencies]
 anyhow = { workspace = true }
 alloy-sol-macro-expander = {workspace = true}
-alloy-sol-macro-input = {workspace = true}
-forge-sol-macro-gen = {workspace = true}
+alloy-sol-macro-input = {workspace = true, features = ["json"]}
 prettyplease = {workspace = true}
 proc-macro2 = {workspace = true}
 quote = {workspace = true}
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index 4cb50db41b..10b117ced8 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -1,7 +1,9 @@
+mod sol_macro_gen;
+
 use {
+    crate::sol_macro_gen::SolMacroGen,
     alloy_sol_macro_expander::expand::expand,
     alloy_sol_macro_input::{SolInput, SolInputKind},
-    forge_sol_macro_gen::SolMacroGen,
     quote::{ToTokens, format_ident},
     std::{
         collections::HashMap,
diff --git a/crates/contracts-generate/src/sol_macro_gen.rs b/crates/contracts-generate/src/sol_macro_gen.rs
new file mode 100644
index 0000000000..b32850cc51
--- /dev/null
+++ b/crates/contracts-generate/src/sol_macro_gen.rs
@@ -0,0 +1,40 @@
+//! SolMacroGen implementation vendored from
+//! <https://github.com/foundry-rs/foundry/blob/cc24b6b74978e72b7330ad7d4b39140e9ee33deb/crates/sol-macro-gen/src/sol_macro_gen.rs>
+//! to avoid depending on forge-sol-macro-gen.
+
+use {
+    alloy_sol_macro_input::SolInput,
+    anyhow::{Context, Result},
+    proc_macro2::{Span, TokenStream},
+    std::path::PathBuf,
+};
+
+pub struct SolMacroGen {
+    pub path: PathBuf,
+    pub name: String,
+    pub expansion: Option<TokenStream>,
+}
+
+impl SolMacroGen {
+    pub fn new(path: PathBuf, name: String) -> Self {
+        Self {
+            path,
+            name,
+            expansion: None,
+        }
+    }
+
+    pub fn get_sol_input(&self) -> Result<SolInput> {
+        let path = self.path.to_string_lossy().into_owned();
+        let name = proc_macro2::Ident::new(&self.name, Span::call_site());
+        let tokens = quote::quote! {
+            #[sol(ignore_unlinked)]
+            #name,
+            #path
+        };
+
+        let sol_input: SolInput = syn::parse2(tokens).context("failed to parse input")?;
+
+        Ok(sol_input)
+    }
+}

From 0583047a59e32076f7b244d2e3c3ed99fd934cd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Wed, 5 Nov 2025 16:06:47 +0000
Subject: [PATCH 32/36] Revert flate2 upgrade

---
 Cargo.lock | 195 ++++++++++++-----------------------------------------
 Cargo.toml |   2 +-
 2 files changed, 44 insertions(+), 153 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 77a915617f..b1626a78ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,12 +27,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
 [[package]]
 name = "ahash"
 version = "0.7.8"
@@ -763,9 +757,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.21"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -802,13 +796,12 @@ dependencies = [
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.10"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
- "once_cell_polyfill",
- "windows-sys 0.60.2",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1642,7 +1635,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.3",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -1744,11 +1737,11 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.10.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 dependencies = [
- "serde_core",
+ "serde",
 ]
 
 [[package]]
@@ -1956,7 +1949,7 @@ dependencies = [
  "iana-time-zone",
  "num-traits",
  "serde",
- "windows-link 0.1.3",
+ "windows-link",
 ]
 
 [[package]]
@@ -2846,12 +2839,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.14"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -3101,12 +3094,12 @@ dependencies = [
 
 [[package]]
 name = "flate2"
-version = "1.1.5"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.8.9",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -3945,7 +3938,7 @@ version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "libc",
 ]
@@ -4213,9 +4206,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.6"
+version = "2.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
 
 [[package]]
 name = "mimalloc"
@@ -4257,16 +4250,6 @@ dependencies = [
  "adler",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
- "simd-adler32",
-]
-
 [[package]]
 name = "mio"
 version = "1.0.4"
@@ -4641,19 +4624,13 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
-[[package]]
-name = "once_cell_polyfill"
-version = "1.70.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
-
 [[package]]
 name = "openssl"
 version = "0.10.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -5187,13 +5164,13 @@ checksum = "6fcdab19deb5195a31cf7726a210015ff1496ba1464fd42cb4f537b8b01b471f"
 dependencies = [
  "bit-set",
  "bit-vec",
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
  "lazy_static",
  "num-traits",
  "rand 0.9.1",
  "rand_chacha 0.9.0",
  "rand_xorshift",
- "regex-syntax 0.8.8",
+ "regex-syntax 0.8.3",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -5425,7 +5402,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
@@ -5458,14 +5435,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.12.2"
+version = "1.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.13",
- "regex-syntax 0.8.8",
+ "regex-automata 0.4.6",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -5479,13 +5456,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.13"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.8",
+ "regex-syntax 0.8.3",
 ]
 
 [[package]]
@@ -5502,9 +5479,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.8"
+version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
 
 [[package]]
 name = "rend"
@@ -5784,7 +5761,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
  "errno",
  "libc",
  "linux-raw-sys",
@@ -5996,7 +5973,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -6162,9 +6139,9 @@ dependencies = [
 
 [[package]]
 name = "sha2"
-version = "0.10.9"
+version = "0.10.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -6284,12 +6261,6 @@ dependencies = [
  "rand_core 0.6.4",
 ]
 
-[[package]]
-name = "simd-adler32"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
-
 [[package]]
 name = "simdutf8"
 version = "0.1.4"
@@ -6566,7 +6537,7 @@ dependencies = [
  "atoi",
  "base64 0.21.7",
  "bigdecimal",
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
  "byteorder",
  "bytes",
  "chrono",
@@ -6610,7 +6581,7 @@ dependencies = [
  "atoi",
  "base64 0.21.7",
  "bigdecimal",
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
  "byteorder",
  "chrono",
  "crc",
@@ -7184,7 +7155,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
  "bytes",
  "futures-core",
  "futures-util",
@@ -7419,9 +7390,9 @@ checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
 [[package]]
 name = "utf8parse"
-version = "0.2.2"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
@@ -7775,12 +7746,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
 
-[[package]]
-name = "windows-link"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
-
 [[package]]
 name = "windows-registry"
 version = "0.2.0"
@@ -7838,15 +7803,6 @@ dependencies = [
  "windows-targets 0.52.6",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.60.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
-dependencies = [
- "windows-targets 0.53.5",
-]
-
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -7871,30 +7827,13 @@ dependencies = [
  "windows_aarch64_gnullvm 0.52.6",
  "windows_aarch64_msvc 0.52.6",
  "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
+ "windows_i686_gnullvm",
  "windows_i686_msvc 0.52.6",
  "windows_x86_64_gnu 0.52.6",
  "windows_x86_64_gnullvm 0.52.6",
  "windows_x86_64_msvc 0.52.6",
 ]
 
-[[package]]
-name = "windows-targets"
-version = "0.53.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
-dependencies = [
- "windows-link 0.2.1",
- "windows_aarch64_gnullvm 0.53.1",
- "windows_aarch64_msvc 0.53.1",
- "windows_i686_gnu 0.53.1",
- "windows_i686_gnullvm 0.53.1",
- "windows_i686_msvc 0.53.1",
- "windows_x86_64_gnu 0.53.1",
- "windows_x86_64_gnullvm 0.53.1",
- "windows_x86_64_msvc 0.53.1",
-]
-
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.48.5"
@@ -7907,12 +7846,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
-
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.48.5"
@@ -7925,12 +7858,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
-
 [[package]]
 name = "windows_i686_gnu"
 version = "0.48.5"
@@ -7943,24 +7870,12 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
-
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
-
 [[package]]
 name = "windows_i686_msvc"
 version = "0.48.5"
@@ -7973,12 +7888,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
-
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.48.5"
@@ -7991,12 +7900,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
-
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.48.5"
@@ -8009,12 +7912,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
-
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.48.5"
@@ -8027,12 +7924,6 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
-
 [[package]]
 name = "winnow"
 version = "0.5.40"
@@ -8076,7 +7967,7 @@ version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
- "bitflags 2.10.0",
+ "bitflags 2.9.1",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index f5ee4ceaff..90f516db42 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ mimalloc = "0.1.43"
 ethcontract-generate = { git = "https://github.com/cowprotocol/ethcontract-rs", rev = "8e112a88988040cde6110379ee6d1be768a13244", default-features = false }
 ethcontract-mock = { git = "https://github.com/cowprotocol/ethcontract-rs", rev = "8e112a88988040cde6110379ee6d1be768a13244", default-features = false }
 ethereum-types = "0.14.1"
-flate2 = "1.1.5"
+flate2 = "1.0.30"
 futures = "0.3.30"
 gas-estimation = { git = "https://github.com/cowprotocol/gas-estimation", tag = "v0.7.3", features = ["web3_", "tokio_"] }
 const-hex = "1.17.0"

From b00f81c39a7cc7b2974f9712de66c3875f253bd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Wed, 5 Nov 2025 16:23:17 +0000
Subject: [PATCH 33/36] fix doctest

---
 crates/contracts-generate/src/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
index 10b117ced8..6b258c9662 100644
--- a/crates/contracts-generate/src/lib.rs
+++ b/crates/contracts-generate/src/lib.rs
@@ -384,7 +384,7 @@ impl From<(u64, (String, Option<u64>))> for NetworkArm {
 /// Example, without blocks:
 /// ```no_run
 /// # #[macro_use] extern crate contracts_generate;
-/// # use contracts_generate::{MAINNET, SEPOLIA};
+/// # use contracts_generate::networks::{MAINNET, SEPOLIA};
 /// # fn main() {
 /// # let _: [(_, (_, Option<u64>)); _] =
 /// networks! {
@@ -397,7 +397,7 @@ impl From<(u64, (String, Option<u64>))> for NetworkArm {
 /// Example, with blocks:
 /// ```no_run
 /// # #[macro_use] extern crate contracts_generate;
-/// # use contracts_generate::{MAINNET, SEPOLIA};
+/// # use contracts_generate::networks::{MAINNET, SEPOLIA};
 /// # fn main() {
 /// # let _: [(_, (_, Option<u64>)); _] =
 /// networks! {

From 8c3a0ecd52a3e49e061583730c31fb58dc7cf2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Fri, 7 Nov 2025 14:44:31 +0000
Subject: [PATCH 34/36] move contracts-generate to contracts/build.rs

---
 Cargo.lock                                    |  21 +-
 Cargo.toml                                    |   1 -
 crates/contracts-generate/Cargo.toml          |  17 -
 crates/contracts-generate/src/lib.rs          | 429 ----------------
 .../contracts-generate/src/sol_macro_gen.rs   |  40 --
 crates/contracts/Cargo.toml                   |   8 +-
 crates/contracts/build.rs                     | 459 +++++++++++++++++-
 7 files changed, 470 insertions(+), 505 deletions(-)
 delete mode 100644 crates/contracts-generate/Cargo.toml
 delete mode 100644 crates/contracts-generate/src/lib.rs
 delete mode 100644 crates/contracts-generate/src/sol_macro_gen.rs

diff --git a/Cargo.lock b/Cargo.lock
index b1626a78ad..91a6720fad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2139,29 +2139,20 @@ name = "contracts"
 version = "0.1.0"
 dependencies = [
  "alloy",
+ "alloy-sol-macro-expander",
+ "alloy-sol-macro-input",
  "anyhow",
- "contracts-generate",
  "ethcontract",
  "ethcontract-generate",
  "paste",
- "serde",
- "serde_json",
- "tracing",
- "tracing-subscriber",
- "walkdir",
-]
-
-[[package]]
-name = "contracts-generate"
-version = "0.1.0"
-dependencies = [
- "alloy-sol-macro-expander",
- "alloy-sol-macro-input",
- "anyhow",
  "prettyplease",
  "proc-macro2",
  "quote",
+ "serde",
+ "serde_json",
  "syn 2.0.108",
+ "tracing",
+ "tracing-subscriber",
  "walkdir",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 90f516db42..1c3fd432ef 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -103,7 +103,6 @@ walkdir = "2.5.0"
 quote = "1.0.41"
 syn = "2.0.108"
 prettyplease = "0.2.37"
-contracts-generate = {path = "crates/contracts-generate"}
 proc-macro2 = "1.0.103"
 alloy-sol-macro-input = "1.4.1"
 alloy-sol-macro-expander = "1.4.1"
diff --git a/crates/contracts-generate/Cargo.toml b/crates/contracts-generate/Cargo.toml
deleted file mode 100644
index 7694c19948..0000000000
--- a/crates/contracts-generate/Cargo.toml
+++ /dev/null
@@ -1,17 +0,0 @@
-[package]
-name = "contracts-generate"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-anyhow = { workspace = true }
-alloy-sol-macro-expander = {workspace = true}
-alloy-sol-macro-input = {workspace = true, features = ["json"]}
-prettyplease = {workspace = true}
-proc-macro2 = {workspace = true}
-quote = {workspace = true}
-syn = {workspace = true}
-walkdir = {workspace = true}
-
-[lints]
-workspace = true
diff --git a/crates/contracts-generate/src/lib.rs b/crates/contracts-generate/src/lib.rs
deleted file mode 100644
index 6b258c9662..0000000000
--- a/crates/contracts-generate/src/lib.rs
+++ /dev/null
@@ -1,429 +0,0 @@
-mod sol_macro_gen;
-
-use {
-    crate::sol_macro_gen::SolMacroGen,
-    alloy_sol_macro_expander::expand::expand,
-    alloy_sol_macro_input::{SolInput, SolInputKind},
-    quote::{ToTokens, format_ident},
-    std::{
-        collections::HashMap,
-        fmt::Write,
-        path::{Path, PathBuf},
-    },
-};
-
-pub mod networks {
-    pub const MAINNET: u64 = 1;
-    pub const GNOSIS: u64 = 100;
-    pub const SEPOLIA: u64 = 11155111;
-    pub const ARBITRUM_ONE: u64 = 42161;
-    pub const BASE: u64 = 8453;
-    pub const POLYGON: u64 = 137;
-    pub const AVALANCHE: u64 = 43114;
-    pub const BNB: u64 = 56;
-    pub const OPTIMISM: u64 = 10;
-    pub const LENS: u64 = 232;
-    pub const LINEA: u64 = 59144;
-    pub const PLASMA: u64 = 9745;
-}
-
-const MOD_HEADER: &str = r#"#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all, non_snake_case)]
-    //! This module contains the sol! generated bindings for solidity contracts.
-    //! This is autogenerated code.
-    //! Do not manually edit these files.
-    //! These files may be overwritten by the codegen system at any time.
-    "#;
-
-#[derive(Default)]
-pub struct Module {
-    pub contracts: Vec<Contract>,
-    submodules: Vec<Submodule>,
-}
-
-impl Module {
-    pub fn add_contract(mut self, contract: Contract) -> Self {
-        self.contracts.push(contract);
-        self
-    }
-
-    pub fn add_submodule(mut self, module: Submodule) -> Self {
-        self.submodules.push(module);
-        self
-    }
-
-    pub fn write_formatted<P1, P2>(
-        self,
-        bindings_folder: P1,
-        all_derives: bool,
-        output_folder: P2,
-    ) -> anyhow::Result<()>
-    where
-        P1: AsRef<Path>,
-        P2: AsRef<Path>,
-    {
-        std::fs::create_dir_all(&output_folder)?;
-
-        let mut mod_file = String::from(MOD_HEADER);
-        for submodule in self.submodules {
-            write_mod_name(&mut mod_file, &submodule.name)?;
-            submodule.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
-        }
-
-        for contract in self.contracts {
-            let name = contract.name.clone();
-            contract.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
-            write_mod_name(&mut mod_file, &name)?;
-        }
-
-        let file: syn::File = syn::parse_file(&mod_file)?;
-        let formatted = prettyplease::unparse(&file);
-        std::fs::write(output_folder.as_ref().join("mod.rs"), formatted)?;
-
-        Ok(())
-    }
-}
-
-pub struct Submodule {
-    pub name: String,
-    pub contracts: Vec<Contract>,
-    submodules: Vec<Submodule>,
-}
-
-impl Submodule {
-    pub fn new<S: ToString>(name: S) -> Self {
-        Self {
-            name: name.to_string(),
-            contracts: vec![],
-            submodules: vec![],
-        }
-    }
-
-    pub fn add_contract(mut self, contract: Contract) -> Self {
-        self.contracts.push(contract);
-        self
-    }
-
-    pub fn add_submodule(mut self, module: Submodule) -> Self {
-        self.submodules.push(module);
-        self
-    }
-
-    pub fn write_formatted<P1, P2>(
-        self,
-        bindings_folder: P1,
-        all_derives: bool,
-        output_folder: P2,
-    ) -> anyhow::Result<()>
-    where
-        P1: AsRef<Path>,
-        P2: AsRef<Path>,
-    {
-        let output_folder = output_folder.as_ref().join(self.name);
-        std::fs::create_dir_all(&output_folder)?;
-
-        let mut mod_file = String::from(MOD_HEADER);
-        for submodule in self.submodules {
-            write_mod_name(&mut mod_file, &submodule.name)?;
-            submodule.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
-        }
-
-        for contract in self.contracts {
-            let name = contract.name.clone();
-            contract.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
-            write_mod_name(&mut mod_file, &name)?;
-        }
-
-        let file: syn::File = syn::parse_file(&mod_file)?;
-        let formatted = prettyplease::unparse(&file);
-        std::fs::write(output_folder.join("mod.rs"), formatted)?;
-
-        Ok(())
-    }
-}
-
-pub struct Contract {
-    pub name: String,
-    networks: HashMap<u64, (String, Option<u64>)>,
-}
-
-impl Contract {
-    pub fn new<S: AsRef<str>>(name: S) -> Self {
-        Self {
-            name: name.as_ref().to_string(),
-            networks: HashMap::new(),
-        }
-    }
-
-    pub fn with_networks<S, I>(mut self, networks: I) -> Self
-    where
-        S: AsRef<str>,
-        I: IntoIterator<Item = (u64, (S, Option<u64>))>,
-    {
-        for (id, (address, block_number)) in networks.into_iter() {
-            self.networks
-                .insert(id, (address.as_ref().to_string(), block_number));
-        }
-        self
-    }
-
-    fn bindings_path(&self, bindings_folder: &Path) -> PathBuf {
-        bindings_folder.join(&self.name).with_extension("json")
-    }
-
-    pub fn generate<P: AsRef<Path>>(
-        self,
-        bindings_folder: P,
-        all_derives: bool,
-    ) -> anyhow::Result<proc_macro2::TokenStream> {
-        let bindings_path = self.bindings_path(bindings_folder.as_ref());
-        let mut macrogen = SolMacroGen::new(bindings_path, self.name.clone());
-        generate_binding(&mut macrogen, all_derives)?;
-        let mut expansion = macrogen
-            .expansion
-            .expect("if the expansion failed, it should have errored earlier");
-
-        let module_name_ident = format_ident!("{}", self.name);
-        let instance_name_ident = format_ident!("{}Instance", self.name);
-        let instance = quote::quote! {
-            pub type Instance = #module_name_ident :: #instance_name_ident<::alloy::providers::DynProvider>;
-        };
-        expansion.extend(instance);
-
-        let no_networks = self.networks.is_empty();
-        let networks = self.networks.into_iter().map(NetworkArm::from);
-        let deployment_info = if no_networks {
-            proc_macro2::TokenStream::new()
-        } else {
-            quote::quote! {
-                use {
-                    std::{
-                        sync::LazyLock,
-                        collections::HashMap
-                    },
-                    anyhow::{Result, Context},
-                    alloy::{
-                        providers::{Provider, DynProvider},
-                        primitives::{address, Address},
-                    },
-                };
-
-                pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
-                    match chain_id {
-                        #( #networks ,)*
-                        _ => None
-                    }
-                }
-
-                /// Returns the contract's deployment address (if one exists) for the given chain.
-                pub const fn deployment_address(chain_id: &u64) -> Option<::alloy::primitives::Address> {
-                    match deployment_info(*chain_id) {
-                        Some((address, _)) => Some(address),
-                        None => None,
-                    }
-                }
-
-                /// Returns the contract's deployment block (if one exists) for the given chain.
-                pub const fn deployment_block(chain_id: &u64) -> Option<u64> {
-                    match deployment_info(*chain_id) {
-                        Some((_, block)) => block,
-                        None => None,
-                    }
-                }
-
-                impl Instance {
-                    pub fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
-                        async move {
-                            let chain_id = provider
-                                .get_chain_id()
-                                .await
-                                .context("could not fetch current chain id")?;
-
-                            let (address, _deployed_block) = deployment_info(chain_id)
-                                .with_context(|| format!("no deployment info for chain {chain_id:?}"))?;
-
-                            Ok(Instance::new(
-                                address,
-                                provider.clone(),
-                            ))
-                        }
-                    }
-                }
-            }
-        };
-        expansion.extend(deployment_info);
-
-        Ok(expansion)
-    }
-
-    pub fn write_formatted<P1, P2>(
-        self,
-        bindings_folder: P1,
-        all_derives: bool,
-        output_folder: P2,
-    ) -> anyhow::Result<()>
-    where
-        P1: AsRef<Path>,
-        P2: AsRef<Path>,
-    {
-        let name = self.name.clone();
-        let token_stream = self.generate(bindings_folder, all_derives)?;
-        let mut buffer = String::new();
-        write!(buffer, "{}", token_stream)?;
-        let file: syn::File = syn::parse_file(&buffer)?;
-        let formatted = prettyplease::unparse(&file);
-        std::fs::write(
-            output_folder.as_ref().join(name).with_extension("rs"),
-            formatted,
-        )?;
-        Ok(())
-    }
-}
-
-fn generate_binding(instance: &mut SolMacroGen, all_derives: bool) -> anyhow::Result<()> {
-    let input = instance
-        .get_sol_input()
-        .map_err(|err| anyhow::anyhow!("{:?}", err))?
-        .normalize_json()
-        .map_err(|err| anyhow::anyhow!("{:?}", err))?;
-    let SolInput {
-        attrs: _,
-        path: _,
-        kind,
-    } = input;
-
-    let tokens = match kind {
-        SolInputKind::Sol(mut file) => {
-            let sol_attr: syn::Attribute = if all_derives {
-                syn::parse_quote! {
-                        #[sol(rpc, alloy_sol_types = alloy::sol_types, alloy_contract =
-                alloy::contract, all_derives = true, extra_derives(serde::Serialize,
-                serde::Deserialize))]     }
-            } else {
-                syn::parse_quote! {
-                        #[sol(rpc, alloy_sol_types = alloy::sol_types, alloy_contract =
-                alloy::contract)]     }
-            };
-            file.attrs.push(sol_attr);
-            expand(file)?
-        }
-        _ => unreachable!(),
-    };
-
-    instance.expansion = Some(tokens);
-    Ok(())
-}
-
-fn write_mod_name(contents: &mut String, name: &str) -> anyhow::Result<()> {
-    if syn::parse_str::<syn::ItemMod>(&format!("pub mod {name};")).is_ok() {
-        write!(contents, "pub mod {name};")?;
-    } else {
-        write!(contents, "pub mod r#{name};")?;
-    }
-    Ok(())
-}
-
-/// Wrapper to avoid destructuring the vector of tuples into three iterators.
-///
-/// The following code:
-/// ```ignore
-/// // We need to "destructure" the iterator into several due to
-/// let chain_ids = self.networks.iter().map(|n| n.0);
-/// let addresses = self.networks.iter().map(|n| n.1.0.clone());
-/// let blocks = self.networks.iter().map(|n| match n.1.1 {
-///     Some(block) => quote::quote! {Some (#block)},
-///     None => quote::quote! {None},
-/// });
-/// // ...
-/// quote::quote! {
-///     pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
-///         match chain_id {
-///             #(#chain_id => Some((::alloy::primitives::address!(#address), #block_number)),)*
-///             _ => None
-///         }
-///     }
-/// }
-/// ```
-///
-/// Becomes:
-/// ```ignore
-/// let networks = self.networks.into_iter().map(NetworkArm::from);
-/// // ...
-/// quote::quote! {
-///     pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
-///         match chain_id {
-///             #( #networks ,)*
-///             _ => None
-///         }
-///     }
-/// }
-/// ```
-struct NetworkArm(u64, (String, Option<u64>));
-
-impl ToTokens for NetworkArm {
-    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
-        let chain_id = self.0;
-        let address = &self.1.0;
-        let block_number = match self.1.1 {
-            Some(block) => quote::quote! {Some (#block)},
-            None => quote::quote! {None},
-        };
-        tokens.extend(quote::quote! {
-           #chain_id => Some((::alloy::primitives::address!(#address), #block_number))
-        });
-    }
-}
-
-impl From<(u64, (String, Option<u64>))> for NetworkArm {
-    fn from((chain_id, info): (u64, (String, Option<u64>))) -> Self {
-        Self(chain_id, info)
-    }
-}
-
-/// Declare a network tuple with an optional block number.
-///
-/// Example, without blocks:
-/// ```no_run
-/// # #[macro_use] extern crate contracts_generate;
-/// # use contracts_generate::networks::{MAINNET, SEPOLIA};
-/// # fn main() {
-/// # let _: [(_, (_, Option<u64>)); _] =
-/// networks! {
-///     MAINNET => "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-///     SEPOLIA => "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14",
-/// };
-/// # }
-/// ```
-///
-/// Example, with blocks:
-/// ```no_run
-/// # #[macro_use] extern crate contracts_generate;
-/// # use contracts_generate::networks::{MAINNET, SEPOLIA};
-/// # fn main() {
-/// # let _: [(_, (_, Option<u64>)); _] =
-/// networks! {
-///     MAINNET => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 12593265),
-///     SEPOLIA => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 4717488),
-/// };
-/// # }
-/// ```
-#[macro_export]
-macro_rules! networks {
-    // Entry point: accepts a list of entries and delegates to internal rules
-    [$(
-        $id:expr => $value:tt
-    ),* $(,)?] => {
-        [$(
-            networks!(@entry $id => $value)
-        ),*]
-    };
-
-    // Internal rule: handle entry with address and block (parenthesized)
-    (@entry $id:expr => ($addr:expr, $block:expr)) => {
-        ($id, ($addr, Some($block)))
-    };
-
-    // Internal rule: handle entry with just address
-    (@entry $id:expr => $value:expr) => {
-        ($id, ($value, None))
-    };
-}
diff --git a/crates/contracts-generate/src/sol_macro_gen.rs b/crates/contracts-generate/src/sol_macro_gen.rs
deleted file mode 100644
index b32850cc51..0000000000
--- a/crates/contracts-generate/src/sol_macro_gen.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-//! SolMacroGen implementation vendored from
-//! <https://github.com/foundry-rs/foundry/blob/cc24b6b74978e72b7330ad7d4b39140e9ee33deb/crates/sol-macro-gen/src/sol_macro_gen.rs>
-//! to avoid depending on forge-sol-macro-gen.
-
-use {
-    alloy_sol_macro_input::SolInput,
-    anyhow::{Context, Result},
-    proc_macro2::{Span, TokenStream},
-    std::path::PathBuf,
-};
-
-pub struct SolMacroGen {
-    pub path: PathBuf,
-    pub name: String,
-    pub expansion: Option<TokenStream>,
-}
-
-impl SolMacroGen {
-    pub fn new(path: PathBuf, name: String) -> Self {
-        Self {
-            path,
-            name,
-            expansion: None,
-        }
-    }
-
-    pub fn get_sol_input(&self) -> Result<SolInput> {
-        let path = self.path.to_string_lossy().into_owned();
-        let name = proc_macro2::Ident::new(&self.name, Span::call_site());
-        let tokens = quote::quote! {
-            #[sol(ignore_unlinked)]
-            #name,
-            #path
-        };
-
-        let sol_input: SolInput = syn::parse2(tokens).context("failed to parse input")?;
-
-        Ok(sol_input)
-    }
-}
diff --git a/crates/contracts/Cargo.toml b/crates/contracts/Cargo.toml
index 28d3154f9e..04ad803035 100644
--- a/crates/contracts/Cargo.toml
+++ b/crates/contracts/Cargo.toml
@@ -34,8 +34,14 @@ tracing = { workspace = true, optional = true }
 tracing-subscriber = { workspace = true, features = ["env-filter", "fmt"], optional = true }
 
 [build-dependencies]
+anyhow = { workspace = true }
+alloy-sol-macro-expander = {workspace = true}
+alloy-sol-macro-input = {workspace = true, features = ["json"]}
+prettyplease = {workspace = true}
+proc-macro2 = {workspace = true}
+quote = {workspace = true}
+syn = {workspace = true}
 walkdir = {workspace = true}
-contracts-generate = {workspace = true}
 
 [lints]
 workspace = true
diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index a3a23cf5dd..d9acb4dce6 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -1,6 +1,80 @@
-use std::path::Path;
+use {
+    alloy_sol_macro_expander::expand::expand,
+    alloy_sol_macro_input::{SolInput, SolInputKind},
+    anyhow::{Context, Result},
+    networks::*,
+    proc_macro2::{Span, TokenStream},
+    quote::{ToTokens, format_ident},
+    std::{
+        collections::HashMap,
+        fmt::Write,
+        path::{Path, PathBuf},
+    },
+};
 
-use contracts_generate::{Contract, Module, Submodule, networks, networks::*};
+mod networks {
+    pub const MAINNET: u64 = 1;
+    pub const GNOSIS: u64 = 100;
+    pub const SEPOLIA: u64 = 11155111;
+    pub const ARBITRUM_ONE: u64 = 42161;
+    pub const BASE: u64 = 8453;
+    pub const POLYGON: u64 = 137;
+    pub const AVALANCHE: u64 = 43114;
+    pub const BNB: u64 = 56;
+    pub const OPTIMISM: u64 = 10;
+    pub const LENS: u64 = 232;
+    pub const LINEA: u64 = 59144;
+    pub const PLASMA: u64 = 9745;
+}
+
+/// Declare a network tuple with an optional block number.
+///
+/// Example, without blocks:
+/// ```no_run
+/// # #[macro_use] extern crate contracts_generate;
+/// # use contracts_generate::networks::{MAINNET, SEPOLIA};
+/// # fn main() {
+/// # let _: [(_, (_, Option<u64>)); _] =
+/// networks! {
+///     MAINNET => "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
+///     SEPOLIA => "0xfFf9976782d46CC05630D1f6eBAb18b2324d6B14",
+/// };
+/// # }
+/// ```
+///
+/// Example, with blocks:
+/// ```no_run
+/// # #[macro_use] extern crate contracts_generate;
+/// # use contracts_generate::networks::{MAINNET, SEPOLIA};
+/// # fn main() {
+/// # let _: [(_, (_, Option<u64>)); _] =
+/// networks! {
+///     MAINNET => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 12593265),
+///     SEPOLIA => ("0x9008D19f58AAbD9eD0D60971565AA8510560ab41", 4717488),
+/// };
+/// # }
+/// ```
+#[macro_export]
+macro_rules! networks {
+    // Entry point: accepts a list of entries and delegates to internal rules
+    [$(
+        $id:expr => $value:tt
+    ),* $(,)?] => {
+        [$(
+            networks!(@entry $id => $value)
+        ),*]
+    };
+
+    // Internal rule: handle entry with address and block (parenthesized)
+    (@entry $id:expr => ($addr:expr, $block:expr)) => {
+        ($id, ($addr, Some($block)))
+    };
+
+    // Internal rule: handle entry with just address
+    (@entry $id:expr => $value:expr) => {
+        ($id, ($value, None))
+    };
+}
 
 fn main() {
     // NOTE: This is a workaround for `rerun-if-changed` directives for
@@ -724,3 +798,384 @@ fn main() {
         .write_formatted(Path::new("artifacts"), true, vendored_bindings)
         .unwrap();
 }
+
+// Codegen implementation starts here
+
+const MOD_HEADER: &str = r#"#![allow(unused_imports, unused_attributes, clippy::all, rustdoc::all, non_snake_case)]
+    //! This module contains the sol! generated bindings for solidity contracts.
+    //! This is autogenerated code.
+    //! Do not manually edit these files.
+    //! These files may be overwritten by the codegen system at any time.
+    "#;
+
+#[derive(Default)]
+pub struct Module {
+    pub contracts: Vec<Contract>,
+    submodules: Vec<Submodule>,
+}
+
+impl Module {
+    pub fn add_contract(mut self, contract: Contract) -> Self {
+        self.contracts.push(contract);
+        self
+    }
+
+    pub fn add_submodule(mut self, module: Submodule) -> Self {
+        self.submodules.push(module);
+        self
+    }
+
+    pub fn write_formatted<P1, P2>(
+        self,
+        bindings_folder: P1,
+        all_derives: bool,
+        output_folder: P2,
+    ) -> anyhow::Result<()>
+    where
+        P1: AsRef<Path>,
+        P2: AsRef<Path>,
+    {
+        std::fs::create_dir_all(&output_folder)?;
+
+        let mut mod_file = String::from(MOD_HEADER);
+        for submodule in self.submodules {
+            write_mod_name(&mut mod_file, &submodule.name)?;
+            submodule.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
+        }
+
+        for contract in self.contracts {
+            let name = contract.name.clone();
+            contract.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
+            write_mod_name(&mut mod_file, &name)?;
+        }
+
+        let file: syn::File = syn::parse_file(&mod_file)?;
+        let formatted = prettyplease::unparse(&file);
+        std::fs::write(output_folder.as_ref().join("mod.rs"), formatted)?;
+
+        Ok(())
+    }
+}
+
+pub struct Submodule {
+    pub name: String,
+    pub contracts: Vec<Contract>,
+    submodules: Vec<Submodule>,
+}
+
+impl Submodule {
+    pub fn new<S: ToString>(name: S) -> Self {
+        Self {
+            name: name.to_string(),
+            contracts: vec![],
+            submodules: vec![],
+        }
+    }
+
+    pub fn add_contract(mut self, contract: Contract) -> Self {
+        self.contracts.push(contract);
+        self
+    }
+
+    pub fn add_submodule(mut self, module: Submodule) -> Self {
+        self.submodules.push(module);
+        self
+    }
+
+    pub fn write_formatted<P1, P2>(
+        self,
+        bindings_folder: P1,
+        all_derives: bool,
+        output_folder: P2,
+    ) -> anyhow::Result<()>
+    where
+        P1: AsRef<Path>,
+        P2: AsRef<Path>,
+    {
+        let output_folder = output_folder.as_ref().join(self.name);
+        std::fs::create_dir_all(&output_folder)?;
+
+        let mut mod_file = String::from(MOD_HEADER);
+        for submodule in self.submodules {
+            write_mod_name(&mut mod_file, &submodule.name)?;
+            submodule.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
+        }
+
+        for contract in self.contracts {
+            let name = contract.name.clone();
+            contract.write_formatted(bindings_folder.as_ref(), all_derives, &output_folder)?;
+            write_mod_name(&mut mod_file, &name)?;
+        }
+
+        let file: syn::File = syn::parse_file(&mod_file)?;
+        let formatted = prettyplease::unparse(&file);
+        std::fs::write(output_folder.join("mod.rs"), formatted)?;
+
+        Ok(())
+    }
+}
+
+pub struct Contract {
+    pub name: String,
+    networks: HashMap<u64, (String, Option<u64>)>,
+}
+
+impl Contract {
+    pub fn new<S: AsRef<str>>(name: S) -> Self {
+        Self {
+            name: name.as_ref().to_string(),
+            networks: HashMap::new(),
+        }
+    }
+
+    pub fn with_networks<S, I>(mut self, networks: I) -> Self
+    where
+        S: AsRef<str>,
+        I: IntoIterator<Item = (u64, (S, Option<u64>))>,
+    {
+        for (id, (address, block_number)) in networks.into_iter() {
+            self.networks
+                .insert(id, (address.as_ref().to_string(), block_number));
+        }
+        self
+    }
+
+    fn bindings_path(&self, bindings_folder: &Path) -> PathBuf {
+        bindings_folder.join(&self.name).with_extension("json")
+    }
+
+    pub fn generate<P: AsRef<Path>>(
+        self,
+        bindings_folder: P,
+        all_derives: bool,
+    ) -> anyhow::Result<proc_macro2::TokenStream> {
+        let bindings_path = self.bindings_path(bindings_folder.as_ref());
+        let mut macrogen = SolMacroGen::new(bindings_path, self.name.clone());
+        generate_binding(&mut macrogen, all_derives)?;
+        let mut expansion = macrogen
+            .expansion
+            .expect("if the expansion failed, it should have errored earlier");
+
+        let module_name_ident = format_ident!("{}", self.name);
+        let instance_name_ident = format_ident!("{}Instance", self.name);
+        let instance = quote::quote! {
+            pub type Instance = #module_name_ident :: #instance_name_ident<::alloy::providers::DynProvider>;
+        };
+        expansion.extend(instance);
+
+        let no_networks = self.networks.is_empty();
+        let networks = self.networks.into_iter().map(NetworkArm::from);
+        let deployment_info = if no_networks {
+            proc_macro2::TokenStream::new()
+        } else {
+            quote::quote! {
+                use {
+                    std::{
+                        sync::LazyLock,
+                        collections::HashMap
+                    },
+                    anyhow::{Result, Context},
+                    alloy::{
+                        providers::{Provider, DynProvider},
+                        primitives::{address, Address},
+                    },
+                };
+
+                pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
+                    match chain_id {
+                        #( #networks ,)*
+                        _ => None
+                    }
+                }
+
+                /// Returns the contract's deployment address (if one exists) for the given chain.
+                pub const fn deployment_address(chain_id: &u64) -> Option<::alloy::primitives::Address> {
+                    deployment_info(*chain_id).and_then(|(address, _)| address)
+                }
+
+                /// Returns the contract's deployment block (if one exists) for the given chain.
+                pub const fn deployment_block(chain_id: &u64) -> Option<u64> {
+                    deployment_info(*chain_id).and_then((_, block))
+                }
+
+                impl Instance {
+                    pub fn deployed(provider: &DynProvider) -> impl Future<Output = Result<Self>> + Send {
+                        async move {
+                            let chain_id = provider
+                                .get_chain_id()
+                                .await
+                                .context("could not fetch current chain id")?;
+
+                            let (address, _deployed_block) = deployment_info(chain_id)
+                                .with_context(|| format!("no deployment info for chain {chain_id:?}"))?;
+
+                            Ok(Instance::new(
+                                address,
+                                provider.clone(),
+                            ))
+                        }
+                    }
+                }
+            }
+        };
+        expansion.extend(deployment_info);
+
+        Ok(expansion)
+    }
+
+    pub fn write_formatted<P1, P2>(
+        self,
+        bindings_folder: P1,
+        all_derives: bool,
+        output_folder: P2,
+    ) -> anyhow::Result<()>
+    where
+        P1: AsRef<Path>,
+        P2: AsRef<Path>,
+    {
+        let name = self.name.clone();
+        let token_stream = self.generate(bindings_folder, all_derives)?;
+        let mut buffer = String::new();
+        write!(buffer, "{}", token_stream)?;
+        let file: syn::File = syn::parse_file(&buffer)?;
+        let formatted = prettyplease::unparse(&file);
+        std::fs::write(
+            output_folder.as_ref().join(name).with_extension("rs"),
+            formatted,
+        )?;
+        Ok(())
+    }
+}
+
+fn generate_binding(instance: &mut SolMacroGen, all_derives: bool) -> anyhow::Result<()> {
+    let input = instance
+        .get_sol_input()
+        .map_err(|err| anyhow::anyhow!("{:?}", err))?
+        .normalize_json()
+        .map_err(|err| anyhow::anyhow!("{:?}", err))?;
+    let SolInput {
+        attrs: _,
+        path: _,
+        kind,
+    } = input;
+
+    let tokens = match kind {
+        SolInputKind::Sol(mut file) => {
+            let sol_attr: syn::Attribute = if all_derives {
+                syn::parse_quote! {
+                        #[sol(rpc, alloy_sol_types = alloy::sol_types, alloy_contract =
+                alloy::contract, all_derives = true, extra_derives(serde::Serialize,
+                serde::Deserialize))]     }
+            } else {
+                syn::parse_quote! {
+                        #[sol(rpc, alloy_sol_types = alloy::sol_types, alloy_contract =
+                alloy::contract)]     }
+            };
+            file.attrs.push(sol_attr);
+            expand(file)?
+        }
+        _ => unreachable!(),
+    };
+
+    instance.expansion = Some(tokens);
+    Ok(())
+}
+
+fn write_mod_name(contents: &mut String, name: &str) -> anyhow::Result<()> {
+    if syn::parse_str::<syn::ItemMod>(&format!("pub mod {name};")).is_ok() {
+        write!(contents, "pub mod {name};")?;
+    } else {
+        write!(contents, "pub mod r#{name};")?;
+    }
+    Ok(())
+}
+
+/// Wrapper to avoid destructuring the vector of tuples into three iterators.
+///
+/// The following code:
+/// ```ignore
+/// // We need to "destructure" the iterator into several due to
+/// let chain_ids = self.networks.iter().map(|n| n.0);
+/// let addresses = self.networks.iter().map(|n| n.1.0.clone());
+/// let blocks = self.networks.iter().map(|n| match n.1.1 {
+///     Some(block) => quote::quote! {Some (#block)},
+///     None => quote::quote! {None},
+/// });
+/// // ...
+/// quote::quote! {
+///     pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
+///         match chain_id {
+///             #(#chain_id => Some((::alloy::primitives::address!(#address), #block_number)),)*
+///             _ => None
+///         }
+///     }
+/// }
+/// ```
+///
+/// Becomes:
+/// ```ignore
+/// let networks = self.networks.into_iter().map(NetworkArm::from);
+/// // ...
+/// quote::quote! {
+///     pub const fn deployment_info(chain_id: u64) -> Option<(Address, Option<u64>)> {
+///         match chain_id {
+///             #( #networks ,)*
+///             _ => None
+///         }
+///     }
+/// }
+/// ```
+struct NetworkArm(u64, (String, Option<u64>));
+
+impl ToTokens for NetworkArm {
+    fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+        let chain_id = self.0;
+        let address = &self.1.0;
+        let block_number = match self.1.1 {
+            Some(block) => quote::quote! {Some (#block)},
+            None => quote::quote! {None},
+        };
+        tokens.extend(quote::quote! {
+           #chain_id => Some((::alloy::primitives::address!(#address), #block_number))
+        });
+    }
+}
+
+impl From<(u64, (String, Option<u64>))> for NetworkArm {
+    fn from((chain_id, info): (u64, (String, Option<u64>))) -> Self {
+        Self(chain_id, info)
+    }
+}
+
+/// SolMacroGen implementation vendored from
+/// <https://github.com/foundry-rs/foundry/blob/cc24b6b74978e72b7330ad7d4b39140e9ee33deb/crates/sol-macro-gen/src/sol_macro_gen.rs>
+/// to avoid depending on forge-sol-macro-gen.
+pub struct SolMacroGen {
+    pub path: PathBuf,
+    pub name: String,
+    pub expansion: Option<TokenStream>,
+}
+
+impl SolMacroGen {
+    pub fn new(path: PathBuf, name: String) -> Self {
+        Self {
+            path,
+            name,
+            expansion: None,
+        }
+    }
+
+    pub fn get_sol_input(&self) -> Result<SolInput> {
+        let path = self.path.to_string_lossy().into_owned();
+        let name = proc_macro2::Ident::new(&self.name, Span::call_site());
+        let tokens = quote::quote! {
+            #[sol(ignore_unlinked)]
+            #name,
+            #path
+        };
+
+        let sol_input: SolInput = syn::parse2(tokens).context("failed to parse input")?;
+
+        Ok(sol_input)
+    }
+}

From 5e95aaaeb4de7a6fdf6744163c066f4a77dabe9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Fri, 7 Nov 2025 14:57:00 +0000
Subject: [PATCH 35/36] const fix

---
 crates/contracts/build.rs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index d9acb4dce6..2e07350a37 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -990,12 +990,18 @@ impl Contract {
 
                 /// Returns the contract's deployment address (if one exists) for the given chain.
                 pub const fn deployment_address(chain_id: &u64) -> Option<::alloy::primitives::Address> {
-                    deployment_info(*chain_id).and_then(|(address, _)| address)
+                    match deployment_info(*chain_id) {
+                        Some((address, _)) => Some(address),
+                        None => None,
+                    }
                 }
 
                 /// Returns the contract's deployment block (if one exists) for the given chain.
                 pub const fn deployment_block(chain_id: &u64) -> Option<u64> {
-                    deployment_info(*chain_id).and_then((_, block))
+                    match deployment_info(*chain_id) {
+                        Some((_, block)) => block,
+                        None => None,
+                    }
                 }
 
                 impl Instance {

From e013220a24f53c0521693e10d70f717524087df9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Duarte?= <duarte.gmj@gmail.com>
Date: Tue, 25 Nov 2025 09:17:49 +0000
Subject: [PATCH 36/36] update linea

---
 crates/contracts/build.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crates/contracts/build.rs b/crates/contracts/build.rs
index 2e07350a37..29bdab7bef 100644
--- a/crates/contracts/build.rs
+++ b/crates/contracts/build.rs
@@ -550,8 +550,7 @@ fn main() {
             OPTIMISM => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
             POLYGON => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
             LENS => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
-            // compiled with an older, linea-compatible evm version
-            LINEA => "0xeFcf0d30DB41Ae0b136c5E3B4340dFeE2D099Ada",
+            LINEA => "0x60bf78233f48ec42ee3f101b9a05ec7878728006",
             PLASMA => "0x60Bf78233f48eC42eE3F101b9a05eC7878728006",
         ]))
         .add_contract(Contract::new("CoWSwapEthFlow").with_networks(networks![