diff --git a/Cargo.lock b/Cargo.lock index 567243cb..9fbfeaeb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,7 +62,7 @@ version = "0.1.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28e2652684758b0d9b389d248b209ed9fd9989ef489a550265fe4bb8454fe7eb" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "num_enum", "strum 0.27.2", ] @@ -74,7 +74,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e88e1edea70787c33e11197d3f32ae380f3db19e6e061e539a5bcf8184a6b326" dependencies = [ "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rlp", "alloy-serde", "alloy-trie", @@ -92,7 +92,7 @@ checksum = "57b1bb53f40c0273cd1975573cd457b39213e68584e36d1401d25fd0398a1d65" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rlp", "alloy-serde", "serde", @@ -108,11 +108,11 @@ dependencies = [ "alloy-json-abi", "alloy-network", "alloy-network-primitives", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-provider", "alloy-rpc-types-eth", - "alloy-sol-types", - "alloy-transport", + "alloy-sol-types 0.8.25", + "alloy-transport 0.8.3", "futures", "futures-util", "thiserror 2.0.16", @@ -125,9 +125,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eb8e762aefd39a397ff485bc86df673465c4ad3ec8819cc60833a8a3ba5cdc87" dependencies = [ "alloy-json-abi", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-sol-type-parser", - "alloy-sol-types", + "alloy-sol-types 0.8.25", "const-hex", "itoa", "serde", @@ -141,7 +141,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rlp", "serde", ] @@ -152,7 +152,7 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c986539255fb839d1533c128e190e557e52ff652c9ef62939e233a81dd93f7e" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rlp", "derive_more 1.0.0", "serde", @@ -166,7 +166,7 @@ checksum = "5f9fadfe089e9ccc0650473f2d4ef0a28bc015bbca5631d9f0f09e49b557fdb3" dependencies = [ "alloy-eip2930", "alloy-eip7702", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rlp", "alloy-serde", "c-kzg", @@ -182,7 +182,7 @@ version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe6beff64ad0aa6ad1019a3db26fef565aefeb011736150ab73ed3366c3cfd1b" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-sol-type-parser", "serde", "serde_json", @@ -194,8 +194,22 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29040b9d5fe2fb70415531882685b64f8efd08dfbd6cc907120650504821105" dependencies = [ - "alloy-primitives", - "alloy-sol-types", + "alloy-primitives 0.8.25", + "alloy-sol-types 0.8.25", + "serde", + "serde_json", + "thiserror 2.0.16", + "tracing", +] + +[[package]] +name = "alloy-json-rpc" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca1e31b50f4ed9a83689ae97263d366b15b935a67c4acb5dd46d5b1c3b27e8e6" +dependencies = [ + "alloy-primitives 1.3.1", + "alloy-sol-types 1.3.1", "serde", "serde_json", "thiserror 2.0.16", @@ -211,14 +225,14 @@ dependencies = [ "alloy-consensus", "alloy-consensus-any", "alloy-eips", - "alloy-json-rpc", + "alloy-json-rpc 0.8.3", "alloy-network-primitives", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rpc-types-any", "alloy-rpc-types-eth", "alloy-serde", "alloy-signer", - "alloy-sol-types", + "alloy-sol-types 0.8.25", "async-trait", "auto_impl", "futures-utils-wasm", @@ -235,7 +249,7 @@ checksum = "9081c099e798b8a2bba2145eb82a9a146f01fc7a35e9ab6e7b43305051f97550" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-serde", "serde", ] @@ -267,6 +281,33 @@ dependencies = [ "tiny-keccak", ] +[[package]] +name = "alloy-primitives" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc9485c56de23438127a731a6b4c87803d49faf1a7068dcd1d8768aca3a9edb9" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more 2.0.1", + "foldhash", + "hashbrown 0.15.5", + "indexmap", + "itoa", + "k256", + "keccak-asm", + "paste", + "proptest", + "rand 0.9.2", + "ruint", + "rustc-hash", + "serde", + "sha3", + "tiny-keccak", +] + [[package]] name = "alloy-provider" version = "0.8.3" @@ -276,14 +317,14 @@ dependencies = [ "alloy-chains", "alloy-consensus", "alloy-eips", - "alloy-json-rpc", + "alloy-json-rpc 0.8.3", "alloy-network", "alloy-network-primitives", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-pubsub", "alloy-rpc-client", "alloy-rpc-types-eth", - "alloy-transport", + "alloy-transport 0.8.3", "alloy-transport-http", "alloy-transport-ws", "async-stream", @@ -312,9 +353,9 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "695809e743628d54510c294ad17a4645bd9f465aeb0d20ee9ce9877c9712dc9c" dependencies = [ - "alloy-json-rpc", - "alloy-primitives", - "alloy-transport", + "alloy-json-rpc 0.8.3", + "alloy-primitives 0.8.25", + "alloy-transport 0.8.3", "bimap", "futures", "serde", @@ -353,10 +394,10 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "531137b283547d5b9a5cafc96b006c64ef76810c681d606f28be9781955293b6" dependencies = [ - "alloy-json-rpc", - "alloy-primitives", + "alloy-json-rpc 0.8.3", + "alloy-primitives 0.8.25", "alloy-pubsub", - "alloy-transport", + "alloy-transport 0.8.3", "alloy-transport-http", "alloy-transport-ws", "futures", @@ -378,7 +419,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3410a472ce26c457e9780f708ee6bd540b30f88f1f31fdab7a11d00bd6aa1aee" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rpc-types-engine", "alloy-rpc-types-eth", "alloy-serde", @@ -404,7 +445,7 @@ checksum = "03bd16fa4959255ebf4a7702df08f325e5631df5cdca07c8a8e58bdc10fe02e3" dependencies = [ "alloy-consensus", "alloy-eips", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rlp", "alloy-serde", "derive_more 1.0.0", @@ -424,10 +465,10 @@ dependencies = [ "alloy-consensus-any", "alloy-eips", "alloy-network-primitives", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rlp", "alloy-serde", - "alloy-sol-types", + "alloy-sol-types 0.8.25", "derive_more 1.0.0", "itertools 0.13.0", "serde", @@ -440,7 +481,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5851bf8d5ad33014bd0c45153c603303e730acc8a209450a7ae6b4a12c2789e2" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "serde", "serde_json", ] @@ -451,7 +492,7 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e10ca565da6500cca015ba35ee424d59798f2e1b85bc0dd8f81dafd401f029a" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "async-trait", "auto_impl", "elliptic-curve", @@ -467,7 +508,7 @@ checksum = "47fababf5a745133490cde927d48e50267f97d3d1209b9fc9f1d1d666964d172" dependencies = [ "alloy-consensus", "alloy-network", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-signer", "async-trait", "k256", @@ -481,8 +522,22 @@ version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e10ae8e9a91d328ae954c22542415303919aabe976fe7a92eb06db1b68fd59f2" dependencies = [ - "alloy-sol-macro-expander", - "alloy-sol-macro-input", + "alloy-sol-macro-expander 0.8.25", + "alloy-sol-macro-input 0.8.25", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.106", +] + +[[package]] +name = "alloy-sol-macro" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d20d867dcf42019d4779519a1ceb55eba8d7f3d0e4f0a89bcba82b8f9eb01e48" +dependencies = [ + "alloy-sol-macro-expander 1.3.1", + "alloy-sol-macro-input 1.3.1", "proc-macro-error2", "proc-macro2", "quote", @@ -495,7 +550,7 @@ version = "0.8.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83ad5da86c127751bc607c174d6c9fe9b85ef0889a9ca0c641735d77d4f98f26" dependencies = [ - "alloy-sol-macro-input", + "alloy-sol-macro-input 0.8.25", "const-hex", "heck", "indexmap", @@ -503,7 +558,25 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.106", - "syn-solidity", + "syn-solidity 0.8.25", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-macro-expander" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b74e91b0b553c115d14bd0ed41898309356dc85d0e3d4b9014c4e7715e48c8ad" +dependencies = [ + "alloy-sol-macro-input 1.3.1", + "const-hex", + "heck", + "indexmap", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.106", + "syn-solidity 1.3.1", "tiny-keccak", ] @@ -520,7 +593,23 @@ dependencies = [ "proc-macro2", "quote", "syn 2.0.106", - "syn-solidity", + "syn-solidity 0.8.25", +] + +[[package]] +name = "alloy-sol-macro-input" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84194d31220803f5f62d0a00f583fd3a062b36382e2bea446f1af96727754565" +dependencies = [ + "const-hex", + "dunce", + "heck", + "macro-string", + "proc-macro2", + "quote", + "syn 2.0.106", + "syn-solidity 1.3.1", ] [[package]] @@ -540,19 +629,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d43d5e60466a440230c07761aa67671d4719d46f43be8ea6e7ed334d8db4a9ab" dependencies = [ "alloy-json-abi", - "alloy-primitives", - "alloy-sol-macro", + "alloy-primitives 0.8.25", + "alloy-sol-macro 0.8.25", "const-hex", "serde", ] +[[package]] +name = "alloy-sol-types" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f5383d34ea00079e6dd89c652bcbdb764db160cef84e6250926961a0b2295d04" +dependencies = [ + "alloy-primitives 1.3.1", + "alloy-sol-macro 1.3.1", +] + [[package]] name = "alloy-transport" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "538a04a37221469cac0ce231b737fd174de2fdfcdd843bdd068cb39ed3e066ad" dependencies = [ - "alloy-json-rpc", + "alloy-json-rpc 0.8.3", "base64", "futures-util", "futures-utils-wasm", @@ -566,14 +665,37 @@ dependencies = [ "wasmtimer", ] +[[package]] +name = "alloy-transport" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6964d85cd986cfc015b96887b89beed9e06d0d015b75ee2b7bfbd64341aab874" +dependencies = [ + "alloy-json-rpc 0.15.11", + "alloy-primitives 1.3.1", + "base64", + "derive_more 2.0.1", + "futures", + "futures-utils-wasm", + "parking_lot", + "serde", + "serde_json", + "thiserror 2.0.16", + "tokio", + "tower", + "tracing", + "url", + "wasmtimer", +] + [[package]] name = "alloy-transport-http" version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ed40eb1e1265b2911512f6aa1dcece9702d078f5a646730c45e39e2be00ac1c" dependencies = [ - "alloy-json-rpc", - "alloy-transport", + "alloy-json-rpc 0.8.3", + "alloy-transport 0.8.3", "reqwest", "serde_json", "tower", @@ -588,7 +710,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fba0e39d181d13c266dbb8ca54ed584a2c66d6e9279afca89c7a6b1825e98abb" dependencies = [ "alloy-pubsub", - "alloy-transport", + "alloy-transport 0.8.3", "futures", "http", "rustls", @@ -605,7 +727,7 @@ version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d95a94854e420f07e962f7807485856cde359ab99ab6413883e15235ad996e8b" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rlp", "arrayvec", "derive_more 1.0.0", @@ -2972,6 +3094,7 @@ checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" dependencies = [ "rand_chacha 0.9.0", "rand_core 0.9.3", + "serde", ] [[package]] @@ -3010,6 +3133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38" dependencies = [ "getrandom 0.3.3", + "serde", ] [[package]] @@ -3634,7 +3758,7 @@ version = "0.1.0" dependencies = [ "alloy-consensus", "alloy-network", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-signer", "alloy-signer-local", "async-trait", @@ -3663,7 +3787,7 @@ dependencies = [ name = "solver-core" version = "0.1.0" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "chrono", "once_cell", "serde", @@ -3689,13 +3813,13 @@ version = "0.1.0" dependencies = [ "alloy-consensus", "alloy-network", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-provider", "alloy-rpc-types", "alloy-signer", "alloy-signer-local", - "alloy-sol-types", - "alloy-transport", + "alloy-sol-types 0.8.25", + "alloy-transport 0.15.11", "alloy-transport-http", "async-trait", "hex", @@ -3715,12 +3839,12 @@ name = "solver-discovery" version = "0.1.0" dependencies = [ "alloy-contract", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-provider", "alloy-pubsub", "alloy-rpc-types", - "alloy-sol-types", - "alloy-transport", + "alloy-sol-types 0.8.25", + "alloy-transport 0.15.11", "alloy-transport-http", "alloy-transport-ws", "async-trait", @@ -3745,8 +3869,8 @@ name = "solver-order" version = "0.1.0" dependencies = [ "alloy-dyn-abi", - "alloy-primitives", - "alloy-sol-types", + "alloy-primitives 0.8.25", + "alloy-sol-types 0.8.25", "async-trait", "chrono", "hex", @@ -3764,7 +3888,7 @@ dependencies = [ name = "solver-pricing" version = "0.1.0" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "async-trait", "reqwest", "rust_decimal", @@ -3781,8 +3905,8 @@ dependencies = [ name = "solver-service" version = "0.1.0" dependencies = [ - "alloy-primitives", - "alloy-sol-types", + "alloy-primitives 0.8.25", + "alloy-sol-types 0.8.25", "async-trait", "axum", "chrono", @@ -3824,11 +3948,11 @@ dependencies = [ name = "solver-settlement" version = "0.1.0" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-provider", "alloy-rpc-types", - "alloy-sol-types", - "alloy-transport", + "alloy-sol-types 0.8.25", + "alloy-transport 0.15.11", "alloy-transport-http", "async-trait", "mockall", @@ -3865,9 +3989,9 @@ name = "solver-types" version = "0.1.0" dependencies = [ "alloy-contract", - "alloy-primitives", + "alloy-primitives 0.8.25", "alloy-rpc-types", - "alloy-sol-types", + "alloy-sol-types 0.8.25", "async-trait", "axum", "bytes", @@ -3991,6 +4115,18 @@ dependencies = [ "syn 2.0.106", ] +[[package]] +name = "syn-solidity" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0b198d366dbec045acfcd97295eb653a7a2b40e4dc764ef1e79aafcad439d3c" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.106", +] + [[package]] name = "sync_wrapper" version = "1.0.2" diff --git a/crates/solver-delivery/Cargo.toml b/crates/solver-delivery/Cargo.toml index 35b4f7d4..c547ae3c 100644 --- a/crates/solver-delivery/Cargo.toml +++ b/crates/solver-delivery/Cargo.toml @@ -13,7 +13,7 @@ alloy-rpc-types = "0.8" alloy-signer = "0.8" alloy-signer-local = "0.8" alloy-sol-types = "0.8" -alloy-transport = "0.8" +alloy-transport = "0.15" alloy-transport-http = "0.8" async-trait = "0.1" hex = "0.4" diff --git a/crates/solver-discovery/Cargo.toml b/crates/solver-discovery/Cargo.toml index 3aea32b8..8b362819 100644 --- a/crates/solver-discovery/Cargo.toml +++ b/crates/solver-discovery/Cargo.toml @@ -11,7 +11,7 @@ alloy-provider = { version = "0.8", features = ["ws"] } alloy-pubsub = "0.8" alloy-rpc-types = "0.8" alloy-sol-types = "0.8" -alloy-transport = "0.8" +alloy-transport = "0.15" alloy-transport-http = "0.8" alloy-transport-ws = "0.8" async-trait = "0.1" diff --git a/crates/solver-settlement/Cargo.toml b/crates/solver-settlement/Cargo.toml index 6153e797..7993b626 100644 --- a/crates/solver-settlement/Cargo.toml +++ b/crates/solver-settlement/Cargo.toml @@ -9,7 +9,7 @@ alloy-primitives = "0.8" alloy-provider = "0.8" alloy-rpc-types = "0.8" alloy-sol-types = "0.8" -alloy-transport = "0.8" +alloy-transport = "0.15" alloy-transport-http = "0.8" async-trait = "0.1" mockall = { version = "0.13", optional = true }