From 38d2bee5a4623ef51413d521491791b3060c86b1 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Tue, 27 Aug 2024 22:35:52 -0500 Subject: [PATCH 1/8] Deps: Remove Gadget from Dependencies --- Cargo.lock | 4758 ++---------------------- Cargo.toml | 4 +- avs/incredible-squaring-avs/Cargo.toml | 2 +- avs/tangle-avs/Cargo.toml | 4 +- avs/tangle-avs/src/operator.rs | 7 +- test-utils/Cargo.toml | 2 +- 6 files changed, 262 insertions(+), 4515 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61107a0..a264d0b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -12,22 +12,13 @@ dependencies = [ "regex", ] -[[package]] -name = "addr2line" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" -dependencies = [ - "gimli 0.27.3", -] - [[package]] name = "addr2line" version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.1", + "gimli", ] [[package]] @@ -71,17 +62,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ahash" -version = "0.7.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" -dependencies = [ - "getrandom", - "once_cell", - "version_check", -] - [[package]] name = "ahash" version = "0.8.11" @@ -255,7 +235,7 @@ dependencies = [ "c-kzg", "once_cell", "serde", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -274,7 +254,7 @@ dependencies = [ "once_cell", "rand", "serde", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -321,7 +301,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -335,7 +315,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -445,7 +425,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tracing 0.1.40", + "tracing", "url", ] @@ -482,7 +462,7 @@ dependencies = [ "serde", "serde_json", "tokio", - "tracing 0.1.40", + "tracing", "url", ] @@ -502,7 +482,7 @@ dependencies = [ "tokio", "tokio-stream", "tower", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -512,7 +492,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a43b18702501396fa9bcdeecd533bc85fac75150d308fc0f6800a01e6234a003" dependencies = [ "alloy-rlp-derive", - "arrayvec 0.7.4", + "arrayvec", "bytes", ] @@ -544,7 +524,7 @@ dependencies = [ "tokio", "tokio-stream", "tower", - "tracing 0.1.40", + "tracing", "url", ] @@ -570,7 +550,7 @@ dependencies = [ "tokio", "tokio-stream", "tower", - "tracing 0.1.40", + "tracing", "url", ] @@ -751,7 +731,7 @@ dependencies = [ "futures-util", "semver 1.0.23", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -787,7 +767,7 @@ dependencies = [ "async-trait", "semver 1.0.23", "thiserror", - "tracing 0.1.40", + "tracing", "trezor-client", ] @@ -814,8 +794,8 @@ dependencies = [ "alloy-json-abi", "alloy-sol-macro-input", "const-hex", - "heck 0.5.0", - "indexmap 2.3.0", + "heck", + "indexmap", "proc-macro-error", "proc-macro2", "quote", @@ -833,7 +813,7 @@ dependencies = [ "alloy-json-abi", "const-hex", "dunce", - "heck 0.5.0", + "heck", "proc-macro2", "quote", "serde_json", @@ -879,7 +859,7 @@ dependencies = [ "thiserror", "tokio", "tower", - "tracing 0.1.40", + "tracing", "url", ] @@ -898,7 +878,7 @@ dependencies = [ "thiserror", "tokio", "tower", - "tracing 0.1.40", + "tracing", "url", ] @@ -913,7 +893,7 @@ dependencies = [ "reqwest 0.12.5", "serde_json", "tower", - "tracing 0.1.40", + "tracing", "url", ] @@ -931,7 +911,7 @@ dependencies = [ "reqwest 0.12.5", "serde_json", "tower", - "tracing 0.1.40", + "tracing", "url", ] @@ -951,7 +931,7 @@ dependencies = [ "serde_json", "tokio", "tokio-util", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -968,7 +948,7 @@ dependencies = [ "serde_json", "tokio", "tokio-tungstenite 0.23.1", - "tracing 0.1.40", + "tracing", "ws_stream_wasm", ] @@ -985,7 +965,7 @@ dependencies = [ "nybbles", "serde", "smallvec", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -1003,15 +983,6 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" version = "0.6.15" @@ -1091,7 +1062,7 @@ dependencies = [ "axum", "bytes", "chrono", - "clap 4.5.13", + "clap", "clap_complete", "clap_complete_fig", "ctrlc", @@ -1117,8 +1088,8 @@ dependencies = [ "tikv-jemallocator", "tokio", "tower", - "tracing 0.1.40", - "tracing-subscriber 0.3.18", + "tracing", + "tracing-subscriber", "vergen", "yansi 1.0.1", ] @@ -1163,7 +1134,7 @@ dependencies = [ "async-trait", "axum", "bytes", - "clap 4.5.13", + "clap", "futures", "interprocess", "parking_lot", @@ -1173,7 +1144,7 @@ dependencies = [ "thiserror", "tokio-util", "tower-http", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -1201,55 +1172,6 @@ dependencies = [ "yansi 1.0.1", ] -[[package]] -name = "ark-bls12-377" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-bls12-377-ext" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55" -dependencies = [ - "ark-bls12-377", - "ark-ec", - "ark-models-ext", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-bls12-381" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-bls12-381-ext" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c" -dependencies = [ - "ark-bls12-381", - "ark-ec", - "ark-ff 0.4.2", - "ark-models-ext", - "ark-serialize 0.4.2", - "ark-std 0.4.0", -] - [[package]] name = "ark-bn254" version = "0.4.0" @@ -1261,31 +1183,6 @@ dependencies = [ "ark-std 0.4.0", ] -[[package]] -name = "ark-bw6-761" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700" -dependencies = [ - "ark-bls12-377", - "ark-ec", - "ark-ff 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-bw6-761-ext" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2" -dependencies = [ - "ark-bw6-761", - "ark-ec", - "ark-ff 0.4.2", - "ark-models-ext", - "ark-std 0.4.0", -] - [[package]] name = "ark-ec" version = "0.4.2" @@ -1300,60 +1197,9 @@ dependencies = [ "hashbrown 0.13.2", "itertools 0.10.5", "num-traits", - "rayon", "zeroize", ] -[[package]] -name = "ark-ed-on-bls12-377" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6" -dependencies = [ - "ark-bls12-377", - "ark-ec", - "ark-ff 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-ed-on-bls12-377-ext" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d" -dependencies = [ - "ark-ec", - "ark-ed-on-bls12-377", - "ark-ff 0.4.2", - "ark-models-ext", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-ed-on-bls12-381-bandersnatch" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c" -dependencies = [ - "ark-bls12-381", - "ark-ec", - "ark-ff 0.4.2", - "ark-std 0.4.0", -] - -[[package]] -name = "ark-ed-on-bls12-381-bandersnatch-ext" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346" -dependencies = [ - "ark-ec", - "ark-ed-on-bls12-381-bandersnatch", - "ark-ff 0.4.2", - "ark-models-ext", - "ark-std 0.4.0", -] - [[package]] name = "ark-ff" version = "0.3.0" @@ -1437,19 +1283,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-models-ext" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "derivative", -] - [[package]] name = "ark-poly" version = "0.4.2" @@ -1463,20 +1296,6 @@ dependencies = [ "hashbrown 0.13.2", ] -[[package]] -name = "ark-scale" -version = "0.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "parity-scale-codec", - "scale-info", -] - [[package]] name = "ark-secp256k1" version = "0.4.0" @@ -1488,21 +1307,6 @@ dependencies = [ "ark-std 0.4.0", ] -[[package]] -name = "ark-secret-scalar" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "ark-transcript", - "digest 0.10.7", - "getrandom_or_panic", - "zeroize", -] - [[package]] name = "ark-serialize" version = "0.3.0" @@ -1555,41 +1359,6 @@ dependencies = [ "colored", "num-traits", "rand", - "rayon", -] - -[[package]] -name = "ark-transcript" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "digest 0.10.7", - "rand_core 0.6.4", - "sha3", -] - -[[package]] -name = "array-bytes" -version = "6.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293" - -[[package]] -name = "arrayref" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" - -[[package]] -name = "arrayvec" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9fd44efafa8690358b7408d253adf110036b88f55672a933f01d616ad9b1b9" -dependencies = [ - "nodrop", ] [[package]] @@ -1607,121 +1376,6 @@ dependencies = [ "term", ] -[[package]] -name = "async-channel" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" -dependencies = [ - "concurrent-queue", - "event-listener-strategy", - "futures-core", - "pin-project-lite", -] - -[[package]] -name = "async-executor" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "slab", -] - -[[package]] -name = "async-fs" -version = "2.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a" -dependencies = [ - "async-lock", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-io" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964" -dependencies = [ - "async-lock", - "cfg-if", - "concurrent-queue", - "futures-io", - "futures-lite", - "parking", - "polling", - "rustix 0.38.34", - "slab", - "tracing 0.1.40", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-lock" -version = "3.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" -dependencies = [ - "event-listener 5.3.1", - "event-listener-strategy", - "pin-project-lite", -] - -[[package]] -name = "async-net" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" -dependencies = [ - "async-io", - "blocking", - "futures-lite", -] - -[[package]] -name = "async-process" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7eda79bbd84e29c2b308d1dc099d7de8dcc7035e48f4bf5dc4a531a44ff5e2a" -dependencies = [ - "async-channel", - "async-io", - "async-lock", - "async-signal", - "async-task", - "blocking", - "cfg-if", - "event-listener 5.3.1", - "futures-lite", - "rustix 0.38.34", - "tracing 0.1.40", - "windows-sys 0.52.0", -] - -[[package]] -name = "async-signal" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32" -dependencies = [ - "async-io", - "async-lock", - "atomic-waker", - "cfg-if", - "futures-core", - "futures-io", - "rustix 0.38.34", - "signal-hook-registry", - "slab", - "windows-sys 0.52.0", -] - [[package]] name = "async-stream" version = "0.3.5" @@ -1744,12 +1398,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "async-task" -version = "4.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" - [[package]] name = "async-trait" version = "0.1.81" @@ -1772,15 +1420,6 @@ dependencies = [ "rustc_version 0.4.0", ] -[[package]] -name = "atoi" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" -dependencies = [ - "num-traits", -] - [[package]] name = "atomic" version = "0.6.0" @@ -1790,12 +1429,6 @@ dependencies = [ "bytemuck", ] -[[package]] -name = "atomic-take" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8ab6b55fe97976e46f91ddbed8d147d966475dc29b2032757ba47e02376fbc3" - [[package]] name = "atomic-waker" version = "1.1.2" @@ -1803,34 +1436,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] -name = "atomic-write-file" -version = "0.1.4" +name = "aurora-engine-modexp" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf54d4588732bdfc5ebc3eb9f74f20e027112fc31de412fc7ff0cd1c6896dae" +checksum = "0aef7712851e524f35fbbb74fa6599c5cd8692056a1c36f9ca0d2001b670e7e5" dependencies = [ - "nix 0.28.0", - "rand", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - -[[package]] -name = "aurora-engine-modexp" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0aef7712851e524f35fbbb74fa6599c5cd8692056a1c36f9ca0d2001b670e7e5" -dependencies = [ - "hex", - "num", + "hex", + "num", ] [[package]] @@ -1876,7 +1488,7 @@ dependencies = [ "ring 0.17.8", "time", "tokio", - "tracing 0.1.40", + "tracing", "url", "zeroize", ] @@ -1933,7 +1545,7 @@ dependencies = [ "http-body 0.4.6", "percent-encoding", "pin-project-lite", - "tracing 0.1.40", + "tracing", "uuid 1.10.0", ] @@ -1956,7 +1568,7 @@ dependencies = [ "http 0.2.12", "once_cell", "regex-lite", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -1965,7 +1577,7 @@ version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "558bbcec8db82a1a8af1610afcb3b10d00652d25ad366a0558eecdff2400a1d1" dependencies = [ - "ahash 0.8.11", + "ahash", "aws-credential-types", "aws-runtime", "aws-sigv4", @@ -1982,15 +1594,15 @@ dependencies = [ "bytes", "fastrand", "hex", - "hmac 0.12.1", + "hmac", "http 0.2.12", "http-body 0.4.6", "lru", "once_cell", "percent-encoding", "regex-lite", - "sha2 0.10.8", - "tracing 0.1.40", + "sha2", + "tracing", "url", ] @@ -2014,7 +1626,7 @@ dependencies = [ "http 0.2.12", "once_cell", "regex-lite", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2036,7 +1648,7 @@ dependencies = [ "http 0.2.12", "once_cell", "regex-lite", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2058,7 +1670,7 @@ dependencies = [ "http 0.2.12", "once_cell", "regex-lite", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2081,7 +1693,7 @@ dependencies = [ "http 0.2.12", "once_cell", "regex-lite", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2099,17 +1711,17 @@ dependencies = [ "crypto-bigint 0.5.5", "form_urlencoded", "hex", - "hmac 0.12.1", + "hmac", "http 0.2.12", "http 1.1.0", "once_cell", "p256 0.11.1", "percent-encoding", "ring 0.17.8", - "sha2 0.10.8", + "sha2", "subtle", "time", - "tracing 0.1.40", + "tracing", "zeroize", ] @@ -2141,8 +1753,8 @@ dependencies = [ "md-5", "pin-project-lite", "sha1", - "sha2 0.10.8", - "tracing 0.1.40", + "sha2", + "tracing", ] [[package]] @@ -2174,7 +1786,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "pin-utils", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2220,7 +1832,7 @@ dependencies = [ "pin-utils", "rustls 0.21.12", "tokio", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2236,7 +1848,7 @@ dependencies = [ "http 1.1.0", "pin-project-lite", "tokio", - "tracing 0.1.40", + "tracing", "zeroize", ] @@ -2286,7 +1898,7 @@ dependencies = [ "aws-smithy-runtime-api", "aws-smithy-types", "rustc_version 0.4.0", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2323,7 +1935,7 @@ dependencies = [ "tower", "tower-layer", "tower-service", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2344,7 +1956,7 @@ dependencies = [ "sync_wrapper 0.1.2", "tower-layer", "tower-service", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -2353,44 +1965,15 @@ version = "0.3.71" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d" dependencies = [ - "addr2line 0.21.0", + "addr2line", "cc", "cfg-if", "libc", "miniz_oxide", - "object 0.32.2", + "object", "rustc-demangle", ] -[[package]] -name = "bandersnatch_vrfs" -version = "0.0.4" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-bls12-381", - "ark-ec", - "ark-ed-on-bls12-381-bandersnatch", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "dleq_vrf", - "fflonk", - "merlin", - "rand_chacha", - "rand_core 0.6.4", - "ring 0.1.0", - "sha2 0.10.8", - "sp-ark-bls12-381", - "sp-ark-ed-on-bls12-381-bandersnatch", - "zeroize", -] - -[[package]] -name = "base-x" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cbbc9d0964165b47557570cce6c952866c2678457aca742aafc9fb771d30270" - [[package]] name = "base16ct" version = "0.1.1" @@ -2403,12 +1986,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" -[[package]] -name = "base58" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581" - [[package]] name = "base64" version = "0.13.1" @@ -2449,15 +2026,6 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" -[[package]] -name = "beef" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" -dependencies = [ - "serde", -] - [[package]] name = "bimap" version = "0.6.3" @@ -2473,19 +2041,6 @@ dependencies = [ "serde", ] -[[package]] -name = "bip39" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" -dependencies = [ - "bitcoin_hashes", - "rand", - "rand_core 0.6.4", - "serde", - "unicode-normalization", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -2501,12 +2056,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" -[[package]] -name = "bitcoin_hashes" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" - [[package]] name = "bitflags" version = "1.3.2" @@ -2536,45 +2085,6 @@ dependencies = [ "wyz", ] -[[package]] -name = "blake2" -version = "0.10.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe" -dependencies = [ - "digest 0.10.7", -] - -[[package]] -name = "blake2-rfc" -version = "0.2.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400" -dependencies = [ - "arrayvec 0.4.12", - "constant_time_eq 0.1.5", -] - -[[package]] -name = "blake2b_simd" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" -dependencies = [ - "arrayref", - "arrayvec 0.7.4", - "constant_time_eq 0.3.0", -] - -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.4" @@ -2584,19 +2094,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "blocking" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea" -dependencies = [ - "async-channel", - "async-task", - "futures-io", - "futures-lite", - "piper", -] - [[package]] name = "bls12_381" version = "0.8.0" @@ -2606,7 +2103,7 @@ dependencies = [ "ff 0.13.0", "group 0.13.0", "pairing", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -2622,25 +2119,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "bounded-collections" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1" -dependencies = [ - "log", - "parity-scale-codec", - "scale-info", - "serde", -] - [[package]] name = "bs58" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" dependencies = [ - "sha2 0.10.8", + "sha2", "tinyvec", ] @@ -2795,12 +2280,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cesu8" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" - [[package]] name = "cfg-if" version = "1.0.0" @@ -2813,12 +2292,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - [[package]] name = "chacha20" version = "0.9.1" @@ -2866,21 +2339,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "ansi_term", - "atty", - "bitflags 1.3.2", - "strsim 0.8.0", - "textwrap", - "unicode-width", - "vec_map", -] - [[package]] name = "clap" version = "4.5.13" @@ -2900,7 +2358,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim 0.11.1", + "strsim", "terminal_size", "unicase", "unicode-width", @@ -2912,7 +2370,7 @@ version = "4.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8670053e87c316345e384ca1f3eba3006fc6355ed8b8a1140d104e109e3df34" dependencies = [ - "clap 4.5.13", + "clap", ] [[package]] @@ -2921,7 +2379,7 @@ version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d494102c8ff3951810c72baf96910b980fb065ca5d3101243e6a8dc19747c86b" dependencies = [ - "clap 4.5.13", + "clap", "clap_complete", ] @@ -2931,7 +2389,7 @@ version = "4.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "syn 2.0.72", @@ -2952,10 +2410,10 @@ dependencies = [ "bs58", "coins-core 0.8.7", "digest 0.10.7", - "hmac 0.12.1", + "hmac", "k256", "serde", - "sha2 0.10.8", + "sha2", "thiserror", ] @@ -2968,10 +2426,10 @@ dependencies = [ "bs58", "coins-core 0.11.1", "digest 0.10.7", - "hmac 0.12.1", + "hmac", "k256", "serde", - "sha2 0.10.8", + "sha2", "thiserror", ] @@ -2983,11 +2441,11 @@ checksum = "3db8fba409ce3dc04f7d804074039eb68b960b0829161f8e06c95fea3f122528" dependencies = [ "bitvec", "coins-bip32 0.8.7", - "hmac 0.12.1", + "hmac", "once_cell", "pbkdf2 0.12.2", "rand", - "sha2 0.10.8", + "sha2", "thiserror", ] @@ -2999,11 +2457,11 @@ checksum = "4c4587c0b4064da887ed39a6522f577267d57e58bdd583178cd877d721b56a2e" dependencies = [ "bitvec", "coins-bip32 0.11.1", - "hmac 0.12.1", + "hmac", "once_cell", "pbkdf2 0.12.2", "rand", - "sha2 0.10.8", + "sha2", "thiserror", ] @@ -3022,7 +2480,7 @@ dependencies = [ "ripemd", "serde", "serde_derive", - "sha2 0.10.8", + "sha2", "sha3", "thiserror", ] @@ -3041,7 +2499,7 @@ dependencies = [ "generic-array", "ripemd", "serde", - "sha2 0.10.8", + "sha2", "sha3", "thiserror", ] @@ -3064,7 +2522,7 @@ dependencies = [ "once_cell", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", "wasm-bindgen", "wasm-bindgen-futures", ] @@ -3082,7 +2540,6 @@ dependencies = [ "once_cell", "owo-colors", "tracing-error", - "url", ] [[package]] @@ -3093,7 +2550,7 @@ checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" dependencies = [ "once_cell", "owo-colors", - "tracing-core 0.1.32", + "tracing-core", "tracing-error", ] @@ -3113,16 +2570,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "combine" -version = "4.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "comfy-table" version = "7.1.1" @@ -3135,28 +2582,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "common" -version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#665f5f51af5734c7b6d90b985dd6861d4c5b4752" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "fflonk", - "getrandom_or_panic", - "merlin", - "rand_chacha", -] - -[[package]] -name = "common-path" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" - [[package]] name = "compact_str" version = "0.7.1" @@ -3170,15 +2595,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "concurrent-queue" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "console" version = "0.15.8" @@ -3192,16 +2608,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "console_error_panic_hook" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" -dependencies = [ - "cfg-if", - "wasm-bindgen", -] - [[package]] name = "const-hex" version = "1.12.0" @@ -3227,18 +2633,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" -[[package]] -name = "constant_time_eq" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" - -[[package]] -name = "constcat" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08" - [[package]] name = "convert_case" version = "0.4.0" @@ -3261,24 +2655,6 @@ version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" -[[package]] -name = "core2" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" -dependencies = [ - "memchr", -] - -[[package]] -name = "cpp_demangle" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeaa953eaad386a53111e47172c2fedba671e5684c8dd601a5f474f4f118710f" -dependencies = [ - "cfg-if", -] - [[package]] name = "cpufeatures" version = "0.2.12" @@ -3288,30 +2664,6 @@ dependencies = [ "libc", ] -[[package]] -name = "cranelift-entity" -version = "0.95.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40099d38061b37e505e63f89bab52199037a72b931ad4868d9089ff7268660b0" -dependencies = [ - "serde", -] - -[[package]] -name = "crc" -version = "3.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5" - [[package]] name = "crc32c" version = "0.6.8" @@ -3349,15 +2701,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - [[package]] name = "crossbeam-utils" version = "0.8.20" @@ -3402,7 +2745,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -3414,7 +2757,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "subtle", "zeroize", ] @@ -3426,30 +2769,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" dependencies = [ "generic-array", - "rand_core 0.6.4", + "rand_core", "typenum", ] -[[package]] -name = "crypto-mac" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" -dependencies = [ - "generic-array", - "subtle", -] - -[[package]] -name = "crypto-mac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "ctr" version = "0.9.2" @@ -3470,126 +2793,51 @@ dependencies = [ ] [[package]] -name = "curve25519-dalek" -version = "3.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" -dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", - "subtle", - "zeroize", -] - -[[package]] -name = "curve25519-dalek" -version = "4.1.3" +name = "darling" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "cfg-if", - "cpufeatures", - "curve25519-dalek-derive", - "digest 0.10.7", - "fiat-crypto", - "rustc_version 0.4.0", - "subtle", - "zeroize", + "darling_core", + "darling_macro", ] [[package]] -name = "curve25519-dalek-derive" -version = "0.1.1" +name = "darling_core" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ + "fnv", + "ident_case", "proc-macro2", "quote", + "strsim", "syn 2.0.72", ] [[package]] -name = "darling" -version = "0.14.4" +name = "darling_macro" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.14.4", - "darling_macro 0.14.4", + "darling_core", + "quote", + "syn 2.0.72", ] [[package]] -name = "darling" -version = "0.20.10" +name = "dashmap" +version = "5.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" +checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ - "darling_core 0.20.10", - "darling_macro 0.20.10", -] - -[[package]] -name = "darling_core" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.10.0", - "syn 1.0.109", -] - -[[package]] -name = "darling_core" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" -dependencies = [ - "fnv", - "ident_case", - "proc-macro2", - "quote", - "strsim 0.11.1", - "syn 2.0.72", -] - -[[package]] -name = "darling_macro" -version = "0.14.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" -dependencies = [ - "darling_core 0.14.4", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core 0.20.10", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "dashmap" -version = "5.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" -dependencies = [ - "cfg-if", - "hashbrown 0.14.5", - "lock_api", - "once_cell", - "parking_lot_core", + "cfg-if", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -3598,26 +2846,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" -[[package]] -name = "data-encoding-macro" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" -dependencies = [ - "data-encoding", - "data-encoding-macro-internal", -] - -[[package]] -name = "data-encoding-macro-internal" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" -dependencies = [ - "data-encoding", - "syn 1.0.109", -] - [[package]] name = "der" version = "0.6.1" @@ -3659,28 +2887,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive-syn-parse" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "derive-where" -version = "1.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "derive_arbitrary" version = "1.3.2" @@ -3707,7 +2913,7 @@ version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" dependencies = [ - "darling 0.20.10", + "darling", "proc-macro2", "quote", "syn 2.0.72", @@ -3764,7 +2970,7 @@ version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.4", + "block-buffer", "const-oid", "crypto-common", "subtle", @@ -3823,49 +3029,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "dleq_vrf" -version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-scale", - "ark-secret-scalar", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "ark-transcript", - "arrayvec 0.7.4", - "zeroize", -] - -[[package]] -name = "docify" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43a2f138ad521dc4a2ced1a4576148a6a610b4c5923933b062a263130a6802ce" -dependencies = [ - "docify_macros", -] - -[[package]] -name = "docify_macros" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a081e51fb188742f5a7a1164ad752121abcb22874b21e2c3b0dd040c515fdad" -dependencies = [ - "common-path", - "derive-syn-parse", - "once_cell", - "proc-macro2", - "quote", - "regex", - "syn 2.0.72", - "termcolor", - "toml", - "walkdir", -] - [[package]] name = "doctest-file" version = "1.0.0" @@ -3878,39 +3041,12 @@ version = "0.15.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - [[package]] name = "dunce" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" -[[package]] -name = "dyn-clonable" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e9232f0e607a262ceb9bd5141a3dfb3e4db6994b31989bbfd845878cba59fd4" -dependencies = [ - "dyn-clonable-impl", - "dyn-clone", -] - -[[package]] -name = "dyn-clonable-impl" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "dyn-clone" version = "1.0.17" @@ -3943,72 +3079,6 @@ dependencies = [ "spki 0.7.3", ] -[[package]] -name = "ed25519" -version = "2.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" -dependencies = [ - "pkcs8 0.10.2", - "signature 2.2.0", -] - -[[package]] -name = "ed25519-dalek" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" -dependencies = [ - "curve25519-dalek 4.1.3", - "ed25519", - "rand_core 0.6.4", - "serde", - "sha2 0.10.8", - "subtle", - "zeroize", -] - -[[package]] -name = "ed25519-zebra" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" -dependencies = [ - "curve25519-dalek 3.2.0", - "hashbrown 0.12.3", - "hex", - "rand_core 0.6.4", - "sha2 0.9.9", - "zeroize", -] - -[[package]] -name = "ed25519-zebra" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" -dependencies = [ - "curve25519-dalek 4.1.3", - "ed25519", - "hashbrown 0.14.5", - "hex", - "rand_core 0.6.4", - "sha2 0.10.8", - "zeroize", -] - -[[package]] -name = "educe" -version = "0.4.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f0042ff8246a363dbe77d2ceedb073339e85a804b9a47636c6e016a9a32c05f" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "eigen-contracts" version = "0.1.0" @@ -4063,18 +3133,18 @@ dependencies = [ "num-bigint", "pin-project-lite", "rand", - "rand_core 0.6.4", + "rand_core", "regex", "reqwest 0.12.5", "scrypt 0.11.0", - "secp256k1 0.29.0", + "secp256k1", "serde", "serde_json", "sha3", "tempfile", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", "tree_magic_mini", "uuid 1.10.0", ] @@ -4096,9 +3166,6 @@ name = "either" version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" -dependencies = [ - "serde", -] [[package]] name = "elliptic-curve" @@ -4114,7 +3181,7 @@ dependencies = [ "generic-array", "group 0.12.1", "pkcs8 0.9.0", - "rand_core 0.6.4", + "rand_core", "sec1 0.3.0", "subtle", "zeroize", @@ -4134,7 +3201,7 @@ dependencies = [ "group 0.13.0", "pem-rfc7468", "pkcs8 0.10.2", - "rand_core 0.6.4", + "rand_core", "sec1 0.7.3", "subtle", "zeroize", @@ -4182,19 +3249,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "enum-ordinalize" -version = "3.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf1fa3f06bbff1ea5b1a9c7b14aa992a39657db60a2759457328d7e058f49ee" -dependencies = [ - "num-bigint", - "num-traits", - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "enumn" version = "0.1.14" @@ -4242,12 +3296,6 @@ dependencies = [ "log", ] -[[package]] -name = "environmental" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48c92028aaa870e83d51c64e5d4e0b6981b360c522198c23959f219a4e1b15b" - [[package]] name = "equivalent" version = "1.0.1" @@ -4264,17 +3312,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "etcetera" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136d1b5283a1ab77bd9257427ffd09d8667ced0570b6f938942bc7568ed5b943" -dependencies = [ - "cfg-if", - "home", - "windows-sys 0.48.0", -] - [[package]] name = "eth-keystore" version = "0.5.0" @@ -4285,13 +3322,13 @@ dependencies = [ "ctr", "digest 0.10.7", "hex", - "hmac 0.12.1", + "hmac", "pbkdf2 0.11.0", "rand", "scrypt 0.10.0", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "sha3", "thiserror", "uuid 0.8.2", @@ -4449,7 +3486,7 @@ version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bytes", "cargo_metadata", "chrono", @@ -4486,7 +3523,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -4511,7 +3548,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", "tracing-futures", "url", ] @@ -4544,7 +3581,7 @@ dependencies = [ "thiserror", "tokio", "tokio-tungstenite 0.20.1", - "tracing 0.1.40", + "tracing", "tracing-futures", "url", "wasm-bindgen", @@ -4567,9 +3604,9 @@ dependencies = [ "eth-keystore", "ethers-core", "rand", - "sha2 0.10.8", + "sha2", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -4599,63 +3636,11 @@ dependencies = [ "thiserror", "tiny-keccak", "tokio", - "tracing 0.1.40", + "tracing", "walkdir", "yansi 0.5.1", ] -[[package]] -name = "event-listener" -version = "2.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" - -[[package]] -name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "pin-project-lite", -] - -[[package]] -name = "event-listener" -version = "5.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite", -] - -[[package]] -name = "event-listener-strategy" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" -dependencies = [ - "event-listener 5.3.1", - "pin-project-lite", -] - -[[package]] -name = "expander" -version = "2.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2c470c71d91ecbd179935b24170459e926382eaaa86b590b78814e180d8a8e2" -dependencies = [ - "blake2", - "file-guard", - "fs-err", - "prettyplease", - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "eyre" version = "0.6.12" @@ -4666,34 +3651,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", - "failure_derive", -] - -[[package]] -name = "failure_derive" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - [[package]] name = "fastrand" version = "2.1.0" @@ -4706,7 +3663,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "auto_impl", "bytes", ] @@ -4727,7 +3684,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" dependencies = [ - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -4738,29 +3695,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "bitvec", - "rand_core 0.6.4", + "rand_core", "subtle", ] -[[package]] -name = "fflonk" -version = "0.1.0" -source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "merlin", -] - -[[package]] -name = "fiat-crypto" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" - [[package]] name = "figment" version = "0.10.19" @@ -4775,26 +3713,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "file-guard" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21ef72acf95ec3d7dbf61275be556299490a245f017cf084bd23b4f68cf9407c" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "finito" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2384245d85162258a14b43567a9ee3598f5ae746a1581fb5d3d2cb780f0dbf95" -dependencies = [ - "futures-timer", - "pin-project", -] - [[package]] name = "fireblocks-client" version = "0.1.0" @@ -4819,10 +3737,10 @@ dependencies = [ "rsa", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", "tree_magic_mini", "uuid 1.10.0", ] @@ -4856,17 +3774,6 @@ dependencies = [ "miniz_oxide", ] -[[package]] -name = "flume" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181" -dependencies = [ - "futures-core", - "futures-sink", - "spin 0.9.8", -] - [[package]] name = "fnv" version = "1.0.7" @@ -4899,7 +3806,7 @@ dependencies = [ "itertools 0.13.0", "solang-parser", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -4926,7 +3833,7 @@ dependencies = [ "serde", "serde_json", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -4968,7 +3875,7 @@ dependencies = [ "serde_json", "thiserror", "toml", - "tracing 0.1.40", + "tracing", "vergen", "walkdir", ] @@ -4994,7 +3901,7 @@ dependencies = [ "alloy-primitives", "alloy-provider 0.2.1", "alloy-transport 0.2.1", - "clap 4.5.13", + "clap", "color-eyre", "dotenvy", "eyre", @@ -5010,11 +3917,11 @@ dependencies = [ "once_cell", "regex", "serde", - "strsim 0.11.1", + "strsim", "strum", "tokio", - "tracing 0.1.40", - "tracing-subscriber 0.3.18", + "tracing", + "tracing-subscriber", "yansi 1.0.1", ] @@ -5040,7 +3947,7 @@ dependencies = [ "alloy-transport-ipc", "alloy-transport-ws", "async-trait", - "clap 4.5.13", + "clap", "comfy-table", "dunce", "eyre", @@ -5058,7 +3965,7 @@ dependencies = [ "thiserror", "tokio", "tower", - "tracing 0.1.40", + "tracing", "url", "walkdir", "yansi 1.0.1", @@ -5106,13 +4013,13 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "solang-parser", "svm-rs 0.5.4", "svm-rs-builds", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", "winnow 0.6.18", "yansi 1.0.1", ] @@ -5146,7 +4053,7 @@ dependencies = [ "serde_repr", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", "walkdir", "yansi 1.0.1", ] @@ -5218,7 +4125,7 @@ dependencies = [ "thiserror", "toml", "toml_edit 0.22.20", - "tracing 0.1.40", + "tracing", "walkdir", ] @@ -5237,7 +4144,7 @@ dependencies = [ "revm", "revm-inspectors", "serde", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -5264,7 +4171,7 @@ dependencies = [ "revm", "revm-inspectors", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -5313,7 +4220,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -5330,7 +4237,7 @@ dependencies = [ "revm", "rustc-hash 2.0.0", "semver 1.0.23", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -5338,7 +4245,7 @@ name = "foundry-evm-fuzz" version = "0.2.0" source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" dependencies = [ - "ahash 0.8.11", + "ahash", "alloy-dyn-abi", "alloy-json-abi", "alloy-primitives", @@ -5349,7 +4256,7 @@ dependencies = [ "foundry-evm-core", "foundry-evm-coverage", "foundry-evm-traces", - "indexmap 2.3.0", + "indexmap", "itertools 0.13.0", "parking_lot", "proptest", @@ -5357,7 +4264,7 @@ dependencies = [ "revm", "serde", "thiserror", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -5387,7 +4294,7 @@ dependencies = [ "solang-parser", "tempfile", "tokio", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -5410,7 +4317,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", "url", ] @@ -5452,7 +4359,7 @@ dependencies = [ "alloy-sol-types", "async-trait", "aws-sdk-kms", - "clap 4.5.13", + "clap", "derive_builder", "eth-keystore", "eyre", @@ -5460,39 +4367,7 @@ dependencies = [ "rpassword", "serde", "thiserror", - "tracing 0.1.40", -] - -[[package]] -name = "frame-metadata" -version = "15.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", -] - -[[package]] -name = "frame-metadata" -version = "16.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692" -dependencies = [ - "cfg-if", - "parity-scale-codec", - "scale-info", - "serde", -] - -[[package]] -name = "fs-err" -version = "2.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" -dependencies = [ - "autocfg", + "tracing", ] [[package]] @@ -5511,7 +4386,7 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" dependencies = [ - "rustix 0.38.34", + "rustix", "windows-sys 0.52.0", ] @@ -5561,18 +4436,6 @@ dependencies = [ "futures-core", "futures-task", "futures-util", - "num_cpus", -] - -[[package]] -name = "futures-intrusive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" -dependencies = [ - "futures-core", - "lock_api", - "parking_lot", ] [[package]] @@ -5581,19 +4444,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" -[[package]] -name = "futures-lite" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "parking", - "pin-project-lite", -] - [[package]] name = "futures-locks" version = "0.7.1" @@ -5670,111 +4520,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "gadget-common" -version = "0.1.0" -source = "git+https://github.com/webb-tools/gadget#7e47266d904800f1d568f23cb1581256ac727b86" -dependencies = [ - "async-trait", - "auto_impl", - "color-eyre", - "futures", - "futures-util", - "gadget-core", - "gadget-io", - "getrandom", - "hex", - "lazy_static", - "libsecp256k1", - "log", - "parity-scale-codec", - "parking_lot", - "prometheus", - "protocol-macros", - "round-based", - "serde", - "serde_json", - "sp-api", - "sp-core", - "sp-io", - "sp-runtime", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sqlx", - "substrate-prometheus-endpoint", - "subxt", - "subxt-signer", - "tangle-subxt", - "thiserror", - "tracing 0.2.0", - "tracing-core 0.2.0", - "tracing-subscriber 0.3.0", -] - -[[package]] -name = "gadget-core" -version = "0.0.1" -source = "git+https://github.com/webb-tools/gadget#7e47266d904800f1d568f23cb1581256ac727b86" -dependencies = [ - "async-trait", - "auto_impl", - "futures", - "futures-timer", - "gadget-io", - "getrandom", - "hex", - "log", - "parking_lot", - "serde", - "sp-core", - "wasm-bindgen-futures", - "wasm-bindgen-test", -] - -[[package]] -name = "gadget-executor" -version = "0.1.0" -source = "git+https://github.com/webb-tools/gadget#7e47266d904800f1d568f23cb1581256ac727b86" -dependencies = [ - "failure", - "futures", - "nix 0.29.0", - "serde", - "serde_json", - "sysinfo", - "tokio", -] - -[[package]] -name = "gadget-io" -version = "0.0.1" -source = "git+https://github.com/webb-tools/gadget#7e47266d904800f1d568f23cb1581256ac727b86" -dependencies = [ - "color-eyre", - "getrandom", - "hex", - "js-sys", - "libp2p", - "p256 0.13.2", - "parity-scale-codec", - "rand", - "sc-keystore", - "scale-info", - "serde", - "serde-wasm-bindgen", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "structopt", - "tokio", - "tracing 0.1.40", - "tsify", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasmtimer", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -5799,16 +4544,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "getrandom_or_panic" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" -dependencies = [ - "rand", - "rand_core 0.6.4", -] - [[package]] name = "ghash" version = "0.5.1" @@ -5819,17 +4554,6 @@ dependencies = [ "polyval", ] -[[package]] -name = "gimli" -version = "0.27.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e" -dependencies = [ - "fallible-iterator", - "indexmap 1.9.3", - "stable_deref_trait", -] - [[package]] name = "gimli" version = "0.28.1" @@ -5867,19 +4591,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gloo-utils" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "037fcb07216cb3a30f7292bd0176b050b7b9a052ba830ef7d5d65f6dc64ba58e" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "group" version = "0.12.1" @@ -5887,7 +4598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" dependencies = [ "ff 0.12.1", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -5898,7 +4609,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff 0.13.0", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -5914,11 +4625,11 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.3.0", + "indexmap", "slab", "tokio", "tokio-util", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -5933,35 +4644,11 @@ dependencies = [ "futures-core", "futures-sink", "http 1.1.0", - "indexmap 2.3.0", + "indexmap", "slab", "tokio", "tokio-util", - "tracing 0.1.40", -] - -[[package]] -name = "hash-db" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e7d7786361d7425ae2fe4f9e407eb0efaa0840f5212d109cc018c40c35c6ab4" - -[[package]] -name = "hash256-std-hasher" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92c171d55b98633f4ed3860808f004099b36c1cc29c42cfc53aa8591b21efcf2" -dependencies = [ - "crunchy", -] - -[[package]] -name = "hashbrown" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" -dependencies = [ - "ahash 0.7.8", + "tracing", ] [[package]] @@ -5970,7 +4657,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.11", + "ahash", ] [[package]] @@ -5979,7 +4666,7 @@ version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ - "ahash 0.8.11", + "ahash", "allocator-api2", "serde", ] @@ -5993,60 +4680,18 @@ dependencies = [ "fxhash", ] -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.5", -] - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "heck" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] - [[package]] name = "heck" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -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.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" - [[package]] name = "hex" version = "0.4.3" @@ -6074,35 +4719,6 @@ dependencies = [ "rusb", ] -[[package]] -name = "hkdf" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" -dependencies = [ - "hmac 0.12.1", -] - -[[package]] -name = "hmac" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "126888268dcc288495a26bf004b38c5fdbb31682f992c84ceb046a1f0fe38840" -dependencies = [ - "crypto-mac 0.8.0", - "digest 0.9.0", -] - -[[package]] -name = "hmac" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" -dependencies = [ - "crypto-mac 0.11.0", - "digest 0.9.0", -] - [[package]] name = "hmac" version = "0.12.1" @@ -6112,17 +4728,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "hmac-drbg" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17ea0a1394df5b6574da6e0c1ade9e78868c9fb0a4e5ef4428e32da4676b85b1" -dependencies = [ - "digest 0.9.0", - "generic-array", - "hmac 0.8.1", -] - [[package]] name = "home" version = "0.5.9" @@ -6226,7 +4831,7 @@ dependencies = [ "socket2", "tokio", "tower-service", - "tracing 0.1.40", + "tracing", "want", ] @@ -6319,7 +4924,7 @@ dependencies = [ "tokio", "tower", "tower-service", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -6431,7 +5036,6 @@ dependencies = [ "ethabi", "foundry-common", "futures", - "gadget-common", "getrandom", "hex", "http-body-util", @@ -6455,17 +5059,6 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" -[[package]] -name = "indexmap" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" -dependencies = [ - "autocfg", - "hashbrown 0.12.3", - "serde", -] - [[package]] name = "indexmap" version = "2.3.0" @@ -6476,12 +5069,6 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "indexmap-nostd" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e04e2fd2b8188ea827b32ef11de88377086d690286ab35747ef7f9bf3ccb590" - [[package]] name = "indicatif" version = "0.17.8" @@ -6519,15 +5106,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "integer-sqrt" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "276ec31bcb4a9ee45f58bec6f9ec700ae4cf4f4f8f2fa7e06cb406bd5ffdd770" -dependencies = [ - "num-traits", -] - [[package]] name = "interprocess" version = "2.2.1" @@ -6543,17 +5121,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.9", - "libc", - "windows-sys 0.48.0", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -6566,7 +5133,7 @@ version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "windows-sys 0.52.0", ] @@ -6619,26 +5186,6 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" -[[package]] -name = "jni" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" -dependencies = [ - "cesu8", - "combine", - "jni-sys", - "log", - "thiserror", - "walkdir", -] - -[[package]] -name = "jni-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" - [[package]] name = "jobserver" version = "0.1.32" @@ -6668,177 +5215,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "jsonrpsee" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad" -dependencies = [ - "jsonrpsee-client-transport 0.22.5", - "jsonrpsee-core 0.22.5", - "jsonrpsee-http-client", - "jsonrpsee-types 0.22.5", -] - -[[package]] -name = "jsonrpsee" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47" -dependencies = [ - "jsonrpsee-core 0.23.2", - "jsonrpsee-types 0.23.2", - "jsonrpsee-ws-client", -] - -[[package]] -name = "jsonrpsee-client-transport" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa" -dependencies = [ - "futures-util", - "http 0.2.12", - "jsonrpsee-core 0.22.5", - "pin-project", - "rustls-native-certs 0.7.1", - "rustls-pki-types", - "soketto 0.7.1", - "thiserror", - "tokio", - "tokio-rustls 0.25.0", - "tokio-util", - "tracing 0.1.40", - "url", -] - -[[package]] -name = "jsonrpsee-client-transport" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432" -dependencies = [ - "base64 0.22.1", - "futures-util", - "http 1.1.0", - "jsonrpsee-core 0.23.2", - "pin-project", - "rustls 0.23.12", - "rustls-pki-types", - "rustls-platform-verifier", - "soketto 0.8.0", - "thiserror", - "tokio", - "tokio-rustls 0.26.0", - "tokio-util", - "tracing 0.1.40", - "url", -] - -[[package]] -name = "jsonrpsee-core" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d" -dependencies = [ - "anyhow", - "async-trait", - "beef", - "futures-timer", - "futures-util", - "hyper 0.14.30", - "jsonrpsee-types 0.22.5", - "pin-project", - "rustc-hash 1.1.0", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tracing 0.1.40", -] - -[[package]] -name = "jsonrpsee-core" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b" -dependencies = [ - "anyhow", - "async-trait", - "beef", - "futures-timer", - "futures-util", - "jsonrpsee-types 0.23.2", - "pin-project", - "rustc-hash 1.1.0", - "serde", - "serde_json", - "thiserror", - "tokio", - "tokio-stream", - "tracing 0.1.40", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5" -dependencies = [ - "async-trait", - "hyper 0.14.30", - "hyper-rustls 0.24.2", - "jsonrpsee-core 0.22.5", - "jsonrpsee-types 0.22.5", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower", - "tracing 0.1.40", - "url", -] - -[[package]] -name = "jsonrpsee-types" -version = "0.22.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d" -dependencies = [ - "anyhow", - "beef", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "jsonrpsee-types" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af" -dependencies = [ - "beef", - "http 1.1.0", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "jsonrpsee-ws-client" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e" -dependencies = [ - "http 1.1.0", - "jsonrpsee-client-transport 0.23.2", - "jsonrpsee-core 0.23.2", - "jsonrpsee-types 0.23.2", - "url", -] - [[package]] name = "jsonwebtoken" version = "8.3.0" @@ -6878,7 +5254,7 @@ dependencies = [ "ecdsa 0.16.9", "elliptic-curve 0.13.8", "once_cell", - "sha2 0.10.8", + "sha2", "signature 2.2.0", ] @@ -6967,116 +5343,6 @@ version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" -[[package]] -name = "libp2p" -version = "0.53.2" -source = "git+https://github.com/libp2p/rust-libp2p/?rev=3644879956b6ab93b8d23553a33e8fdb838f576f#3644879956b6ab93b8d23553a33e8fdb838f576f" -dependencies = [ - "bytes", - "either", - "futures", - "futures-timer", - "getrandom", - "instant", - "libp2p-allow-block-list", - "libp2p-connection-limits", - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", - "multiaddr", - "pin-project", - "rw-stream-sink", - "thiserror", -] - -[[package]] -name = "libp2p-allow-block-list" -version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p/?rev=3644879956b6ab93b8d23553a33e8fdb838f576f#3644879956b6ab93b8d23553a33e8fdb838f576f" -dependencies = [ - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", - "void", -] - -[[package]] -name = "libp2p-connection-limits" -version = "0.3.1" -source = "git+https://github.com/libp2p/rust-libp2p/?rev=3644879956b6ab93b8d23553a33e8fdb838f576f#3644879956b6ab93b8d23553a33e8fdb838f576f" -dependencies = [ - "libp2p-core", - "libp2p-identity", - "libp2p-swarm", - "void", -] - -[[package]] -name = "libp2p-core" -version = "0.41.2" -source = "git+https://github.com/libp2p/rust-libp2p/?rev=3644879956b6ab93b8d23553a33e8fdb838f576f#3644879956b6ab93b8d23553a33e8fdb838f576f" -dependencies = [ - "either", - "fnv", - "futures", - "futures-timer", - "instant", - "libp2p-identity", - "multiaddr", - "multihash", - "multistream-select", - "once_cell", - "parking_lot", - "pin-project", - "quick-protobuf", - "rand", - "rw-stream-sink", - "smallvec", - "thiserror", - "tracing 0.1.40", - "unsigned-varint 0.8.0", - "void", -] - -[[package]] -name = "libp2p-identity" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cca1eb2bc1fd29f099f3daaab7effd01e1a54b7c577d0ed082521034d912e8" -dependencies = [ - "bs58", - "ed25519-dalek", - "hkdf", - "multihash", - "quick-protobuf", - "rand", - "sha2 0.10.8", - "thiserror", - "tracing 0.1.40", - "zeroize", -] - -[[package]] -name = "libp2p-swarm" -version = "0.44.2" -source = "git+https://github.com/libp2p/rust-libp2p/?rev=3644879956b6ab93b8d23553a33e8fdb838f576f#3644879956b6ab93b8d23553a33e8fdb838f576f" -dependencies = [ - "either", - "fnv", - "futures", - "futures-timer", - "instant", - "libp2p-core", - "libp2p-identity", - "lru", - "multistream-select", - "once_cell", - "rand", - "smallvec", - "tracing 0.1.40", - "void", -] - [[package]] name = "libredox" version = "0.1.3" @@ -7087,65 +5353,6 @@ dependencies = [ "libc", ] -[[package]] -name = "libsecp256k1" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" -dependencies = [ - "arrayref", - "base64 0.13.1", - "digest 0.9.0", - "hmac-drbg", - "libsecp256k1-core", - "libsecp256k1-gen-ecmult", - "libsecp256k1-gen-genmult", - "rand", - "serde", - "sha2 0.9.9", - "typenum", -] - -[[package]] -name = "libsecp256k1-core" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" -dependencies = [ - "crunchy", - "digest 0.9.0", - "subtle", -] - -[[package]] -name = "libsecp256k1-gen-ecmult" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3038c808c55c87e8a172643a7d87187fc6c4174468159cb3090659d55bcb4809" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsecp256k1-gen-genmult" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3db8d6ba2cec9eacc40e6e8ccc98931840301f1006e95647ceb2dd5c3aa06f7c" -dependencies = [ - "libsecp256k1-core", -] - -[[package]] -name = "libsqlite3-sys" -version = "0.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "libusb1-sys" version = "0.7.0" @@ -7158,12 +5365,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linux-raw-sys" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" - [[package]] name = "linux-raw-sys" version = "0.4.14" @@ -7201,29 +5402,11 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - [[package]] name = "matchers" -version = "0.0.1" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata 0.1.10", -] - -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ "regex-automata 0.1.10", ] @@ -7250,15 +5433,6 @@ version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" -[[package]] -name = "memfd" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" -dependencies = [ - "rustix 0.38.34", -] - [[package]] name = "memmap2" version = "0.9.4" @@ -7286,36 +5460,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1" -dependencies = [ - "autocfg", -] - -[[package]] -name = "memory-db" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" -dependencies = [ - "hash-db", -] - -[[package]] -name = "merlin" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c38e2799fc0978b65dfff8023ec7843e2330bb462f19198840b34b6582397d" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.6.4", - "zeroize", -] - [[package]] name = "mime" version = "0.3.17" @@ -7355,65 +5499,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", "wasi", "windows-sys 0.52.0", ] -[[package]] -name = "multiaddr" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070" -dependencies = [ - "arrayref", - "byteorder", - "data-encoding", - "libp2p-identity", - "multibase", - "multihash", - "percent-encoding", - "serde", - "static_assertions", - "unsigned-varint 0.7.2", - "url", -] - -[[package]] -name = "multibase" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b3539ec3c1f04ac9748a260728e855f261b4977f5c3406612c884564f329404" -dependencies = [ - "base-x", - "data-encoding", - "data-encoding-macro", -] - -[[package]] -name = "multihash" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492" -dependencies = [ - "core2", - "unsigned-varint 0.7.2", -] - -[[package]] -name = "multistream-select" -version = "0.13.0" -source = "git+https://github.com/libp2p/rust-libp2p/?rev=3644879956b6ab93b8d23553a33e8fdb838f576f#3644879956b6ab93b8d23553a33e8fdb838f576f" -dependencies = [ - "bytes", - "futures", - "pin-project", - "smallvec", - "tracing 0.1.40", - "unsigned-varint 0.8.0", -] - [[package]] name = "native-tls" version = "0.2.12" @@ -7470,40 +5561,10 @@ checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - -[[package]] -name = "nix" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", ] -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - -[[package]] -name = "nodrop" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" - -[[package]] -name = "nohash-hasher" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" - [[package]] name = "nom" version = "7.1.3" @@ -7514,15 +5575,6 @@ dependencies = [ "minimal-lexical", ] -[[package]] -name = "ntapi" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" -dependencies = [ - "winapi", -] - [[package]] name = "nu-ansi-term" version = "0.46.0" @@ -7595,7 +5647,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "itoa", ] @@ -7646,7 +5698,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi", "libc", ] @@ -7665,7 +5717,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.72", @@ -7699,18 +5751,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "object" -version = "0.30.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03b4680b86d9cfafba8fc491dc9b6df26b68cf40e9e6cd73909194759a63c385" -dependencies = [ - "crc32fast", - "hashbrown 0.13.2", - "indexmap 1.9.3", - "memchr", -] - [[package]] name = "object" version = "0.32.2" @@ -7747,7 +5787,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "786393f80485445794f6043fd3138854dd109cc6c4bd1a6383db304c9ce9b9ce" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "auto_impl", "bytes", "ethereum-types", @@ -7842,7 +5882,7 @@ checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" dependencies = [ "ecdsa 0.14.8", "elliptic-curve 0.12.3", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -7854,7 +5894,7 @@ dependencies = [ "ecdsa 0.16.9", "elliptic-curve 0.13.8", "primeorder", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -7872,10 +5912,9 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bitvec", "byte-slice-cast", - "bytes", "impl-trait-for-tuples", "parity-scale-codec-derive", "serde", @@ -7887,24 +5926,12 @@ version = "3.6.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "parity-wasm" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" - -[[package]] -name = "parking" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" - [[package]] name = "parking_lot" version = "0.12.3" @@ -7923,7 +5950,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.5.3", + "redox_syscall", "smallvec", "windows-targets 0.52.6", ] @@ -7935,7 +5962,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7676374caaee8a325c9e7a2ae557f216c5563a171d6997b0ef8a65af35147700" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -7946,7 +5973,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166" dependencies = [ "base64ct", - "rand_core 0.6.4", + "rand_core", "subtle", ] @@ -7962,15 +5989,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42" -[[package]] -name = "pbkdf2" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" -dependencies = [ - "crypto-mac 0.11.0", -] - [[package]] name = "pbkdf2" version = "0.11.0" @@ -7978,9 +5996,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ "digest 0.10.7", - "hmac 0.12.1", + "hmac", "password-hash 0.4.2", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -7990,7 +6008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2" dependencies = [ "digest 0.10.7", - "hmac 0.12.1", + "hmac", ] [[package]] @@ -8068,16 +6086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.3.0", -] - -[[package]] -name = "phantom-type" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f710afd11c9711b04f97ab61bb9747d5a04562fdf0f9f44abc3de92490084982" -dependencies = [ - "educe", + "indexmap", ] [[package]] @@ -8129,7 +6138,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher 0.3.11", + "siphasher", ] [[package]] @@ -8138,7 +6147,7 @@ version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" dependencies = [ - "siphasher 0.3.11", + "siphasher", ] [[package]] @@ -8195,17 +6204,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "piper" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391" -dependencies = [ - "atomic-waker", - "fastrand", - "futures-io", -] - [[package]] name = "pkcs1" version = "0.7.5" @@ -8243,58 +6241,6 @@ version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" -[[package]] -name = "polkavm-common" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92" - -[[package]] -name = "polkavm-derive" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606" -dependencies = [ - "polkavm-derive-impl-macro", -] - -[[package]] -name = "polkavm-derive-impl" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c" -dependencies = [ - "polkavm-common", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "polkavm-derive-impl-macro" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429" -dependencies = [ - "polkavm-derive-impl", - "syn 2.0.72", -] - -[[package]] -name = "polling" -version = "3.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b" -dependencies = [ - "cfg-if", - "concurrent-queue", - "hermit-abi 0.4.0", - "pin-project-lite", - "rustix 0.38.34", - "tracing 0.1.40", - "windows-sys 0.52.0", -] - [[package]] name = "poly1305" version = "0.8.0" @@ -8388,16 +6334,6 @@ dependencies = [ "uint", ] -[[package]] -name = "proc-macro-crate" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" -dependencies = [ - "once_cell", - "toml_edit 0.19.15", -] - [[package]] name = "proc-macro-crate" version = "3.1.0" @@ -8518,40 +6454,12 @@ dependencies = [ "thiserror", ] -[[package]] -name = "protocol-macros" -version = "0.1.0" -source = "git+https://github.com/webb-tools/gadget#7e47266d904800f1d568f23cb1581256ac727b86" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "psm" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874" -dependencies = [ - "cc", -] - [[package]] name = "quick-error" version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" -[[package]] -name = "quick-protobuf" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f" -dependencies = [ - "byteorder", -] - [[package]] name = "quinn" version = "0.11.2" @@ -8566,7 +6474,7 @@ dependencies = [ "rustls 0.23.12", "thiserror", "tokio", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -8583,7 +6491,7 @@ dependencies = [ "slab", "thiserror", "tinyvec", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -8621,7 +6529,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -8631,15 +6539,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" - [[package]] name = "rand_core" version = "0.6.4" @@ -8655,7 +6557,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -8698,37 +6600,12 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "reconnecting-jsonrpsee-ws-client" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06fa4f17e09edfc3131636082faaec633c7baa269396b4004040bc6c52f49f65" -dependencies = [ - "cfg_aliases 0.2.1", - "finito", - "futures", - "jsonrpsee 0.23.2", - "serde_json", - "thiserror", - "tokio", - "tracing 0.1.40", -] - [[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" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_syscall" version = "0.5.3" @@ -8749,26 +6626,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ref-cast" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931" -dependencies = [ - "ref-cast-impl", -] - -[[package]] -name = "ref-cast-impl" -version = "1.0.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "regex" version = "1.10.6" @@ -8967,8 +6824,8 @@ dependencies = [ "p256 0.13.2", "revm-primitives", "ripemd", - "secp256k1 0.29.0", - "sha2 0.10.8", + "secp256k1", + "sha2", "substrate-bn", ] @@ -9002,7 +6859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" dependencies = [ "crypto-bigint 0.4.9", - "hmac 0.12.1", + "hmac", "zeroize", ] @@ -9012,27 +6869,10 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "hmac 0.12.1", + "hmac", "subtle", ] -[[package]] -name = "ring" -version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof#665f5f51af5734c7b6d90b985dd6861d4c5b4752" -dependencies = [ - "ark-ec", - "ark-ff 0.4.2", - "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", - "arrayvec 0.7.4", - "blake2", - "common", - "fflonk", - "merlin", -] - [[package]] name = "ring" version = "0.16.20" @@ -9095,35 +6935,10 @@ dependencies = [ ] [[package]] -name = "round-based" -version = "0.3.0" +name = "rpassword" +version = "7.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55f473f56ecfa6457a75c0922c4e51ad036d4a1d27b0a697ac3a9b26f74acc3b" -dependencies = [ - "displaydoc", - "futures-util", - "phantom-type", - "round-based-derive", - "thiserror", - "tracing 0.1.40", -] - -[[package]] -name = "round-based-derive" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c3f220fb17bab108a448f516ce4ec470584675233ab3a799915ba71295da32e" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "rpassword" -version = "7.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" +checksum = "80472be3c897911d0137b2d2b9055faf6eeac5b14e324073d83bc17b191d7e3f" dependencies = [ "libc", "rtoolbox", @@ -9143,7 +6958,7 @@ dependencies = [ "num-traits", "pkcs1", "pkcs8 0.10.2", - "rand_core 0.6.4", + "rand_core", "signature 2.2.0", "spki 0.7.3", "subtle", @@ -9243,20 +7058,6 @@ dependencies = [ "semver 1.0.23", ] -[[package]] -name = "rustix" -version = "0.36.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.1.4", - "windows-sys 0.45.0", -] - [[package]] name = "rustix" version = "0.38.34" @@ -9266,7 +7067,7 @@ dependencies = [ "bitflags 2.6.0", "errno", "libc", - "linux-raw-sys 0.4.14", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -9282,27 +7083,12 @@ dependencies = [ "sct", ] -[[package]] -name = "rustls" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432" -dependencies = [ - "log", - "ring 0.17.8", - "rustls-pki-types", - "rustls-webpki 0.102.6", - "subtle", - "zeroize", -] - [[package]] name = "rustls" version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ - "log", "once_cell", "ring 0.17.8", "rustls-pki-types", @@ -9361,33 +7147,6 @@ version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" -[[package]] -name = "rustls-platform-verifier" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93bda3f493b9abe5b93b3e7e3ecde0df292f2bd28c0296b90586ee0055ff5123" -dependencies = [ - "core-foundation", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls 0.23.12", - "rustls-native-certs 0.7.1", - "rustls-platform-verifier-android", - "rustls-webpki 0.102.6", - "security-framework", - "security-framework-sys", - "webpki-roots 0.26.3", - "winapi", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" - [[package]] name = "rustls-webpki" version = "0.101.7" @@ -9427,27 +7186,6 @@ dependencies = [ "wait-timeout", ] -[[package]] -name = "ruzstd" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d" -dependencies = [ - "byteorder", - "derive_more", - "twox-hash", -] - -[[package]] -name = "rw-stream-sink" -version = "0.4.0" -source = "git+https://github.com/libp2p/rust-libp2p/?rev=3644879956b6ab93b8d23553a33e8fdb838f576f#3644879956b6ab93b8d23553a33e8fdb838f576f" -dependencies = [ - "futures", - "pin-project", - "static_assertions", -] - [[package]] name = "ryu" version = "1.0.18" @@ -9472,99 +7210,16 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "sc-keystore" -version = "25.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "array-bytes", - "parking_lot", - "serde_json", - "sp-application-crypto", - "sp-core", - "sp-keystore", - "thiserror", -] - -[[package]] -name = "scale-bits" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54" -dependencies = [ - "parity-scale-codec", - "scale-info", - "scale-type-resolver", - "serde", -] - -[[package]] -name = "scale-decode" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27" -dependencies = [ - "derive_more", - "parity-scale-codec", - "primitive-types", - "scale-bits", - "scale-decode-derive", - "scale-type-resolver", - "smallvec", -] - -[[package]] -name = "scale-decode-derive" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb22f574168103cdd3133b19281639ca65ad985e24612728f727339dcaf4021" -dependencies = [ - "darling 0.14.4", - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "scale-encode" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba0b9c48dc0eb20c60b083c29447c0c4617cb7c4a4c9fef72aa5c5bc539e15e" -dependencies = [ - "derive_more", - "parity-scale-codec", - "primitive-types", - "scale-bits", - "scale-encode-derive", - "scale-type-resolver", - "smallvec", -] - -[[package]] -name = "scale-encode-derive" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82ab7e60e2d9c8d47105f44527b26f04418e5e624ffc034f6b4a86c0ba19c5bf" -dependencies = [ - "darling 0.14.4", - "proc-macro-crate 1.3.1", - "proc-macro2", - "quote", - "syn 1.0.109", -] - [[package]] name = "scale-info" version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ - "bitvec", "cfg-if", "derive_more", "parity-scale-codec", "scale-info-derive", - "serde", ] [[package]] @@ -9573,56 +7228,12 @@ version = "2.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62" dependencies = [ - "proc-macro-crate 3.1.0", + "proc-macro-crate", "proc-macro2", "quote", "syn 1.0.109", ] -[[package]] -name = "scale-type-resolver" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb" -dependencies = [ - "scale-info", - "smallvec", -] - -[[package]] -name = "scale-typegen" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "498d1aecf2ea61325d4511787c115791639c0fd21ef4f8e11e49dd09eff2bbac" -dependencies = [ - "proc-macro2", - "quote", - "scale-info", - "syn 2.0.72", - "thiserror", -] - -[[package]] -name = "scale-value" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab68da501822d2769c4c5823535f6104a6d4cd15f0d3eba3e647e725294ae22" -dependencies = [ - "base58", - "blake2", - "derive_more", - "either", - "frame-metadata 15.1.0", - "parity-scale-codec", - "scale-bits", - "scale-decode", - "scale-encode", - "scale-info", - "scale-type-resolver", - "serde", - "yap", -] - [[package]] name = "schannel" version = "0.1.23" @@ -9632,42 +7243,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "schnellru" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367" -dependencies = [ - "ahash 0.8.11", - "cfg-if", - "hashbrown 0.13.2", -] - -[[package]] -name = "schnorrkel" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" -dependencies = [ - "aead", - "arrayref", - "arrayvec 0.7.4", - "curve25519-dalek 4.1.3", - "getrandom_or_panic", - "merlin", - "rand_core 0.6.4", - "serde_bytes", - "sha2 0.10.8", - "subtle", - "zeroize", -] - -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -9680,10 +7255,10 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f9e24d2b632954ded8ab2ef9fea0a0c769ea56ea98bddbafbad22caeeadf45d" dependencies = [ - "hmac 0.12.1", + "hmac", "pbkdf2 0.11.0", "salsa20", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -9695,7 +7270,7 @@ dependencies = [ "password-hash 0.5.0", "pbkdf2 0.12.2", "salsa20", - "sha2 0.10.8", + "sha2", ] [[package]] @@ -9736,15 +7311,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "secp256k1" -version = "0.28.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10" -dependencies = [ - "secp256k1-sys 0.9.2", -] - [[package]] name = "secp256k1" version = "0.29.0" @@ -9752,16 +7318,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ "rand", - "secp256k1-sys 0.10.0", -] - -[[package]] -name = "secp256k1-sys" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" -dependencies = [ - "cc", + "secp256k1-sys", ] [[package]] @@ -9773,15 +7330,6 @@ dependencies = [ "cc", ] -[[package]] -name = "secrecy" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bd1c54ea06cfd2f6b63219704de0b9b4f72dcc2b8fdef820be6cd799780e91e" -dependencies = [ - "zeroize", -] - [[package]] name = "security-framework" version = "2.11.1" @@ -9792,7 +7340,6 @@ dependencies = [ "core-foundation", "core-foundation-sys", "libc", - "num-bigint", "security-framework-sys", ] @@ -9854,17 +7401,6 @@ dependencies = [ "serde_derive", ] -[[package]] -name = "serde-wasm-bindgen" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8302e169f0eddcc139c70f139d19d6467353af16f9fce27e8c30158036a1e16b" -dependencies = [ - "js-sys", - "serde", - "wasm-bindgen", -] - [[package]] name = "serde_bytes" version = "0.11.15" @@ -9885,24 +7421,13 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "serde_derive_internals" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "serde_json" version = "1.0.122" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" dependencies = [ - "indexmap 2.3.0", + "indexmap", "itoa", "memchr", "ryu", @@ -9967,26 +7492,13 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.3.0", + "indexmap", "itoa", "ryu", "serde", "unsafe-libyaml", ] -[[package]] -name = "sha-1" -version = "0.9.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha1" version = "0.10.6" @@ -9998,19 +7510,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.8" @@ -10094,7 +7593,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -10104,7 +7603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -10113,11 +7612,6 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" -[[package]] -name = "simple-mermaid" -version = "0.1.0" -source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b" - [[package]] name = "simple_asn1" version = "0.6.2" @@ -10136,12 +7630,6 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" -[[package]] -name = "siphasher" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" - [[package]] name = "slab" version = "0.4.9" @@ -10158,703 +7646,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] -name = "smol" -version = "2.0.0" +name = "socket2" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e635339259e51ef85ac7aa29a1cd991b957047507288697a690e80ab97d07cad" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ - "async-channel", - "async-executor", - "async-fs", - "async-io", - "async-lock", - "async-net", - "async-process", - "blocking", - "futures-lite", + "libc", + "windows-sys 0.52.0", ] [[package]] -name = "smoldot" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9" -dependencies = [ - "arrayvec 0.7.4", - "async-lock", - "atomic-take", - "base64 0.21.7", - "bip39", - "blake2-rfc", - "bs58", - "chacha20", - "crossbeam-queue", - "derive_more", - "ed25519-zebra 4.0.3", - "either", - "event-listener 4.0.3", - "fnv", - "futures-lite", - "futures-util", - "hashbrown 0.14.5", - "hex", - "hmac 0.12.1", - "itertools 0.12.1", - "libm", - "libsecp256k1", - "merlin", - "no-std-net", - "nom", - "num-bigint", - "num-rational", - "num-traits", - "pbkdf2 0.12.2", - "pin-project", - "poly1305", - "rand", - "rand_chacha", - "ruzstd", - "schnorrkel", - "serde", - "serde_json", - "sha2 0.10.8", - "sha3", - "siphasher 1.0.1", - "slab", - "smallvec", - "soketto 0.7.1", - "twox-hash", - "wasmi", - "x25519-dalek", - "zeroize", -] - -[[package]] -name = "smoldot-light" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7" -dependencies = [ - "async-channel", - "async-lock", - "base64 0.21.7", - "blake2-rfc", - "derive_more", - "either", - "event-listener 4.0.3", - "fnv", - "futures-channel", - "futures-lite", - "futures-util", - "hashbrown 0.14.5", - "hex", - "itertools 0.12.1", - "log", - "lru", - "no-std-net", - "parking_lot", - "pin-project", - "rand", - "rand_chacha", - "serde", - "serde_json", - "siphasher 1.0.1", - "slab", - "smol", - "smoldot", - "zeroize", -] - -[[package]] -name = "socket2" -version = "0.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "soketto" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" -dependencies = [ - "base64 0.13.1", - "bytes", - "futures", - "httparse", - "log", - "rand", - "sha-1", -] - -[[package]] -name = "soketto" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37468c595637c10857701c990f93a40ce0e357cedb0953d1c26c8d8027f9bb53" -dependencies = [ - "base64 0.22.1", - "bytes", - "futures", - "httparse", - "log", - "rand", - "sha1", -] - -[[package]] -name = "solang-parser" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26" -dependencies = [ - "itertools 0.11.0", - "lalrpop", - "lalrpop-util", - "phf", - "thiserror", - "unicode-xid", -] - -[[package]] -name = "sp-api" -version = "26.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "scale-info", - "sp-api-proc-macro", - "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-metadata-ir", - "sp-runtime", - "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-trie", - "sp-version", - "thiserror", -] - -[[package]] -name = "sp-api-proc-macro" -version = "15.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "Inflector", - "blake2", - "expander", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "sp-application-crypto" -version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core", - "sp-io", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", -] - -[[package]] -name = "sp-arithmetic" -version = "23.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "integer-sqrt", - "num-traits", - "parity-scale-codec", - "scale-info", - "serde", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "static_assertions", -] - -[[package]] -name = "sp-ark-bls12-381" -version = "0.4.2" -source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" -dependencies = [ - "ark-bls12-381-ext", - "sp-crypto-ec-utils", -] - -[[package]] -name = "sp-ark-ed-on-bls12-381-bandersnatch" -version = "0.4.2" -source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" -dependencies = [ - "ark-ed-on-bls12-381-bandersnatch-ext", - "sp-crypto-ec-utils", -] - -[[package]] -name = "sp-core" -version = "28.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "array-bytes", - "bandersnatch_vrfs", - "bip39", - "bitflags 1.3.2", - "blake2", - "bounded-collections", - "bs58", - "dyn-clonable", - "ed25519-zebra 3.1.0", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "itertools 0.10.5", - "libsecp256k1", - "log", - "merlin", - "parity-scale-codec", - "parking_lot", - "paste", - "primitive-types", - "rand", - "scale-info", - "schnorrkel", - "secp256k1 0.28.2", - "secrecy", - "serde", - "sp-crypto-hashing 0.0.0", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "ss58-registry", - "substrate-bip39", - "thiserror", - "tracing 0.1.40", - "w3f-bls", - "zeroize", -] - -[[package]] -name = "sp-crypto-ec-utils" -version = "0.10.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" -dependencies = [ - "ark-bls12-377", - "ark-bls12-377-ext", - "ark-bls12-381", - "ark-bls12-381-ext", - "ark-bw6-761", - "ark-bw6-761-ext", - "ark-ec", - "ark-ed-on-bls12-377", - "ark-ed-on-bls12-377-ext", - "ark-ed-on-bls12-381-bandersnatch", - "ark-ed-on-bls12-381-bandersnatch-ext", - "ark-scale", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk)", -] - -[[package]] -name = "sp-crypto-hashing" -version = "0.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "twox-hash", -] - -[[package]] -name = "sp-crypto-hashing" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb" -dependencies = [ - "blake2b_simd", - "byteorder", - "digest 0.10.7", - "sha2 0.10.8", - "sha3", - "twox-hash", -] - -[[package]] -name = "sp-crypto-hashing-proc-macro" -version = "0.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "quote", - "sp-crypto-hashing 0.0.0", - "syn 2.0.72", -] - -[[package]] -name = "sp-debug-derive" -version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "sp-debug-derive" -version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "sp-externalities" -version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", -] - -[[package]] -name = "sp-externalities" -version = "0.25.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)", -] - -[[package]] -name = "sp-io" -version = "30.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "bytes", - "ed25519-dalek", - "libsecp256k1", - "log", - "parity-scale-codec", - "rustversion", - "secp256k1 0.28.2", - "sp-core", - "sp-crypto-hashing 0.0.0", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-keystore", - "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-state-machine", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-trie", - "tracing 0.1.40", - "tracing-core 0.1.32", -] - -[[package]] -name = "sp-keystore" -version = "0.34.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "parity-scale-codec", - "parking_lot", - "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "thiserror", -] - -[[package]] -name = "sp-metadata-ir" -version = "0.6.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "frame-metadata 16.0.0", - "parity-scale-codec", - "scale-info", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", -] - -[[package]] -name = "sp-panic-handler" -version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "backtrace", - "lazy_static", - "regex", -] - -[[package]] -name = "sp-runtime" -version = "31.0.1" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "docify", - "either", - "hash256-std-hasher", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "paste", - "rand", - "scale-info", - "serde", - "simple-mermaid", - "sp-application-crypto", - "sp-arithmetic", - "sp-core", - "sp-io", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-weights", -] - -[[package]] -name = "sp-runtime-interface" -version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "primitive-types", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "24.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "polkavm-derive", - "primitive-types", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk)", - "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", - "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)", - "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk)", - "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk)", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "Inflector", - "expander", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "sp-runtime-interface-proc-macro" -version = "17.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" -dependencies = [ - "Inflector", - "expander", - "proc-macro-crate 3.1.0", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "sp-state-machine" -version = "0.35.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot", - "rand", - "smallvec", - "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-panic-handler", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-trie", - "thiserror", - "tracing 0.1.40", - "trie-db", -] - -[[package]] -name = "sp-std" -version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" - -[[package]] -name = "sp-std" -version = "14.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" - -[[package]] -name = "sp-storage" -version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", -] - -[[package]] -name = "sp-storage" -version = "19.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)", -] - -[[package]] -name = "sp-tracing" -version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "parity-scale-codec", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "tracing 0.1.40", - "tracing-core 0.1.32", - "tracing-subscriber 0.2.25", -] - -[[package]] -name = "sp-tracing" -version = "16.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" -dependencies = [ - "parity-scale-codec", - "tracing 0.1.40", - "tracing-core 0.1.32", - "tracing-subscriber 0.3.18", -] - -[[package]] -name = "sp-trie" -version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "ahash 0.8.11", - "hash-db", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "rand", - "scale-info", - "schnellru", - "sp-core", - "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "thiserror", - "tracing 0.1.40", - "trie-db", - "trie-root", -] - -[[package]] -name = "sp-version" -version = "29.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" +name = "solang-parser" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c425ce1c59f4b154717592f0bdf4715c3a1d55058883622d3157e1f0908a5b26" dependencies = [ - "impl-serde", - "parity-scale-codec", - "parity-wasm", - "scale-info", - "serde", - "sp-crypto-hashing-proc-macro", - "sp-runtime", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-version-proc-macro", + "itertools 0.11.0", + "lalrpop", + "lalrpop-util", + "phf", "thiserror", -] - -[[package]] -name = "sp-version-proc-macro" -version = "13.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "parity-scale-codec", - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "sp-wasm-interface" -version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "wasmtime", -] - -[[package]] -name = "sp-wasm-interface" -version = "20.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk#035211d707d0a74a2a768fd658160721f09d5b44" -dependencies = [ - "impl-trait-for-tuples", - "log", - "parity-scale-codec", -] - -[[package]] -name = "sp-weights" -version = "27.0.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "bounded-collections", - "parity-scale-codec", - "scale-info", - "serde", - "smallvec", - "sp-arithmetic", - "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", - "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0)", + "unicode-xid", ] [[package]] @@ -10868,9 +7680,6 @@ name = "spin" version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" -dependencies = [ - "lock_api", -] [[package]] name = "spki" @@ -10892,230 +7701,6 @@ dependencies = [ "der 0.7.9", ] -[[package]] -name = "sqlformat" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f" -dependencies = [ - "nom", - "unicode_categories", -] - -[[package]] -name = "sqlx" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba03c279da73694ef99763320dea58b51095dfe87d001b1d4b5fe78ba8763cf" -dependencies = [ - "sqlx-core", - "sqlx-macros", - "sqlx-mysql", - "sqlx-postgres", - "sqlx-sqlite", -] - -[[package]] -name = "sqlx-core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d84b0a3c3739e220d94b3239fd69fb1f74bc36e16643423bd99de3b43c21bfbd" -dependencies = [ - "ahash 0.8.11", - "atoi", - "byteorder", - "bytes", - "crc", - "crossbeam-queue", - "dotenvy", - "either", - "event-listener 2.5.3", - "futures-channel", - "futures-core", - "futures-intrusive", - "futures-io", - "futures-util", - "hashlink", - "hex", - "indexmap 2.3.0", - "log", - "memchr", - "once_cell", - "paste", - "percent-encoding", - "rustls 0.21.12", - "rustls-pemfile 1.0.4", - "serde", - "serde_json", - "sha2 0.10.8", - "smallvec", - "sqlformat", - "thiserror", - "tokio", - "tokio-stream", - "tracing 0.1.40", - "url", - "webpki-roots 0.25.4", -] - -[[package]] -name = "sqlx-macros" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89961c00dc4d7dffb7aee214964b065072bff69e36ddb9e2c107541f75e4f2a5" -dependencies = [ - "proc-macro2", - "quote", - "sqlx-core", - "sqlx-macros-core", - "syn 1.0.109", -] - -[[package]] -name = "sqlx-macros-core" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0bd4519486723648186a08785143599760f7cc81c52334a55d6a83ea1e20841" -dependencies = [ - "atomic-write-file", - "dotenvy", - "either", - "heck 0.4.1", - "hex", - "once_cell", - "proc-macro2", - "quote", - "serde", - "serde_json", - "sha2 0.10.8", - "sqlx-core", - "sqlx-mysql", - "sqlx-sqlite", - "syn 1.0.109", - "tempfile", - "tokio", - "url", -] - -[[package]] -name = "sqlx-mysql" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e37195395df71fd068f6e2082247891bc11e3289624bbc776a0cdfa1ca7f1ea4" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.6.0", - "byteorder", - "bytes", - "crc", - "digest 0.10.7", - "dotenvy", - "either", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "generic-array", - "hex", - "hkdf", - "hmac 0.12.1", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "percent-encoding", - "rand", - "rsa", - "serde", - "sha1", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing 0.1.40", - "whoami", -] - -[[package]] -name = "sqlx-postgres" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6ac0ac3b7ccd10cc96c7ab29791a7dd236bd94021f31eec7ba3d46a74aa1c24" -dependencies = [ - "atoi", - "base64 0.21.7", - "bitflags 2.6.0", - "byteorder", - "crc", - "dotenvy", - "etcetera", - "futures-channel", - "futures-core", - "futures-io", - "futures-util", - "hex", - "hkdf", - "hmac 0.12.1", - "home", - "itoa", - "log", - "md-5", - "memchr", - "once_cell", - "rand", - "serde", - "serde_json", - "sha1", - "sha2 0.10.8", - "smallvec", - "sqlx-core", - "stringprep", - "thiserror", - "tracing 0.1.40", - "whoami", -] - -[[package]] -name = "sqlx-sqlite" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210976b7d948c7ba9fced8ca835b11cbb2d677c59c79de41ac0d397e14547490" -dependencies = [ - "atoi", - "flume", - "futures-channel", - "futures-core", - "futures-executor", - "futures-intrusive", - "futures-util", - "libsqlite3-sys", - "log", - "percent-encoding", - "serde", - "sqlx-core", - "tracing 0.1.40", - "url", - "urlencoding", -] - -[[package]] -name = "ss58-registry" -version = "1.47.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4743ce898933fbff7bbf414f497c459a782d496269644b3d650a398ae6a487ba" -dependencies = [ - "Inflector", - "num-format", - "proc-macro2", - "quote", - "serde", - "serde_json", - "unicode-xid", -] - [[package]] name = "stability" version = "0.2.1" @@ -11126,12 +7711,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" - [[package]] name = "static_assertions" version = "1.1.0" @@ -11146,63 +7725,16 @@ checksum = "f91138e76242f575eb1d3b38b4f1362f10d3a43f47d182a5b359af488a02293b" dependencies = [ "new_debug_unreachable", "once_cell", - "parking_lot", - "phf_shared 0.10.0", - "precomputed-hash", -] - -[[package]] -name = "stringprep" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1" -dependencies = [ - "unicode-bidi", - "unicode-normalization", - "unicode-properties", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "structopt" -version = "0.3.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" -dependencies = [ - "clap 2.34.0", - "lazy_static", - "structopt-derive", + "parking_lot", + "phf_shared 0.10.0", + "precomputed-hash", ] [[package]] -name = "structopt-derive" -version = "0.4.18" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" -dependencies = [ - "heck 0.3.3", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.109", -] +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "strum" @@ -11219,26 +7751,13 @@ version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.5.0", + "heck", "proc-macro2", "quote", "rustversion", "syn 2.0.72", ] -[[package]] -name = "substrate-bip39" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a7590dc041b9bc2825e52ce5af8416c73dbe9d0654402bfd4b4941938b94d8f" -dependencies = [ - "hmac 0.11.0", - "pbkdf2 0.8.0", - "schnorrkel", - "sha2 0.9.9", - "zeroize", -] - [[package]] name = "substrate-bn" version = "0.6.0" @@ -11252,174 +7771,12 @@ dependencies = [ "rustc-hex", ] -[[package]] -name = "substrate-prometheus-endpoint" -version = "0.17.0" -source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.0#851c824dc7a8e7e6db2d0c9fb29d232f2f45198a" -dependencies = [ - "hyper 0.14.30", - "log", - "prometheus", - "thiserror", - "tokio", -] - [[package]] name = "subtle" version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "subxt" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a160cba1edbf3ec4fbbeaea3f1a185f70448116a6bccc8276bb39adb3b3053bd" -dependencies = [ - "async-trait", - "derive-where", - "either", - "frame-metadata 16.0.0", - "futures", - "hex", - "impl-serde", - "instant", - "jsonrpsee 0.22.5", - "parity-scale-codec", - "primitive-types", - "reconnecting-jsonrpsee-ws-client", - "scale-bits", - "scale-decode", - "scale-encode", - "scale-info", - "scale-value", - "serde", - "serde_json", - "sp-crypto-hashing 0.1.0", - "subxt-core", - "subxt-lightclient", - "subxt-macro", - "subxt-metadata", - "thiserror", - "tokio-util", - "tracing 0.1.40", - "url", -] - -[[package]] -name = "subxt-codegen" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d703dca0905cc5272d7cc27a4ac5f37dcaae7671acc7fef0200057cc8c317786" -dependencies = [ - "frame-metadata 16.0.0", - "heck 0.5.0", - "hex", - "jsonrpsee 0.22.5", - "parity-scale-codec", - "proc-macro2", - "quote", - "scale-info", - "scale-typegen", - "subxt-metadata", - "syn 2.0.72", - "thiserror", - "tokio", -] - -[[package]] -name = "subxt-core" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59f41eb2e2eea6ed45649508cc735f92c27f1fcfb15229e75f8270ea73177345" -dependencies = [ - "base58", - "blake2", - "derive-where", - "frame-metadata 16.0.0", - "hashbrown 0.14.5", - "hex", - "impl-serde", - "parity-scale-codec", - "primitive-types", - "scale-bits", - "scale-decode", - "scale-encode", - "scale-info", - "scale-value", - "serde", - "serde_json", - "sp-crypto-hashing 0.1.0", - "subxt-metadata", - "tracing 0.1.40", -] - -[[package]] -name = "subxt-lightclient" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d9406fbdb9548c110803cb8afa750f8b911d51eefdf95474b11319591d225d9" -dependencies = [ - "futures", - "futures-util", - "serde", - "serde_json", - "smoldot-light", - "thiserror", - "tokio", - "tokio-stream", - "tracing 0.1.40", -] - -[[package]] -name = "subxt-macro" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c195f803d70687e409aba9be6c87115b5da8952cd83c4d13f2e043239818fcd" -dependencies = [ - "darling 0.20.10", - "parity-scale-codec", - "proc-macro-error", - "quote", - "scale-typegen", - "subxt-codegen", - "syn 2.0.72", -] - -[[package]] -name = "subxt-metadata" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "738be5890fdeff899bbffff4d9c0f244fe2a952fb861301b937e3aa40ebb55da" -dependencies = [ - "frame-metadata 16.0.0", - "hashbrown 0.14.5", - "parity-scale-codec", - "scale-info", - "sp-crypto-hashing 0.1.0", -] - -[[package]] -name = "subxt-signer" -version = "0.37.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49888ae6ae90fe01b471193528eea5bd4ed52d8eecd2d13f4a2333b87388850" -dependencies = [ - "bip39", - "cfg-if", - "hex", - "hmac 0.12.1", - "parity-scale-codec", - "pbkdf2 0.12.2", - "regex", - "schnorrkel", - "secrecy", - "sha2 0.10.8", - "sp-crypto-hashing 0.1.0", - "subxt-core", - "zeroize", -] - [[package]] name = "svm-rs" version = "0.3.5" @@ -11434,7 +7791,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "thiserror", "url", "zip 0.6.6", @@ -11454,7 +7811,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "sha2 0.10.8", + "sha2", "thiserror", "url", "zip 2.1.6", @@ -11519,33 +7876,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - -[[package]] -name = "sysinfo" -version = "0.30.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3" -dependencies = [ - "cfg-if", - "core-foundation-sys", - "libc", - "ntapi", - "once_cell", - "rayon", - "windows", -] - [[package]] name = "system-configuration" version = "0.5.1" @@ -11596,15 +7926,13 @@ dependencies = [ "env_logger 0.10.2", "env_logger 0.11.5", "foundry-common", - "gadget-common", - "gadget-executor", "getrandom", "hex", "k256", "lazy_static", "log", "prometheus", - "rand_core 0.6.4", + "rand_core", "reqwest 0.12.5", "serde", "thiserror", @@ -11612,29 +7940,12 @@ dependencies = [ "url", ] -[[package]] -name = "tangle-subxt" -version = "0.1.4" -source = "git+https://github.com/webb-tools/tangle.git#cc5105c840cd36eb8e37de2d932bcc201cfc7ea2" -dependencies = [ - "parity-scale-codec", - "scale-info", - "subxt", - "subxt-signer", -] - [[package]] name = "tap" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" -[[package]] -name = "target-lexicon" -version = "0.12.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" - [[package]] name = "tempfile" version = "3.10.1" @@ -11643,7 +7954,7 @@ checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", "fastrand", - "rustix 0.38.34", + "rustix", "windows-sys 0.52.0", ] @@ -11673,7 +7984,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.38.34", + "rustix", "windows-sys 0.48.0", ] @@ -11708,7 +8019,6 @@ dependencies = [ "ethers", "foundry-common", "futures", - "gadget-common", "hex", "http-body-util", "hyper 1.4.1", @@ -11729,15 +8039,6 @@ dependencies = [ "url", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.63" @@ -11903,17 +8204,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-rustls" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f" -dependencies = [ - "rustls 0.22.4", - "rustls-pki-types", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.0" @@ -11988,7 +8278,6 @@ checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ "bytes", "futures-core", - "futures-io", "futures-sink", "pin-project-lite", "tokio", @@ -12000,7 +8289,7 @@ version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ - "indexmap 2.3.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -12016,24 +8305,13 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.19.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" -dependencies = [ - "indexmap 2.3.0", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "indexmap 2.3.0", + "indexmap", "toml_datetime", "winnow 0.5.40", ] @@ -12044,7 +8322,7 @@ version = "0.22.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" dependencies = [ - "indexmap 2.3.0", + "indexmap", "serde", "serde_spanned", "toml_datetime", @@ -12064,7 +8342,7 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -12081,7 +8359,7 @@ dependencies = [ "pin-project-lite", "tower-layer", "tower-service", - "tracing 0.1.40", + "tracing", ] [[package]] @@ -12104,18 +8382,8 @@ checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ "log", "pin-project-lite", - "tracing-attributes 0.1.27", - "tracing-core 0.1.32", -] - -[[package]] -name = "tracing" -version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing#527b4f66a604e7a6baa6aa7536428e3a303ba3c8" -dependencies = [ - "pin-project-lite", - "tracing-attributes 0.2.0", - "tracing-core 0.2.0", + "tracing-attributes", + "tracing-core", ] [[package]] @@ -12129,16 +8397,6 @@ dependencies = [ "syn 2.0.72", ] -[[package]] -name = "tracing-attributes" -version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing#527b4f66a604e7a6baa6aa7536428e3a303ba3c8" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - [[package]] name = "tracing-core" version = "0.1.32" @@ -12149,22 +8407,14 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-core" -version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing#527b4f66a604e7a6baa6aa7536428e3a303ba3c8" -dependencies = [ - "once_cell", -] - [[package]] name = "tracing-error" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d686ec1c0f384b1277f097b2f279a2ecc11afe8c133c1aabf036a27cb4cd206e" dependencies = [ - "tracing 0.1.40", - "tracing-subscriber 0.3.18", + "tracing", + "tracing-subscriber", ] [[package]] @@ -12174,18 +8424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" dependencies = [ "pin-project", - "tracing 0.1.40", -] - -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core 0.1.32", + "tracing", ] [[package]] @@ -12196,47 +8435,7 @@ checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ "log", "once_cell", - "tracing-core 0.1.32", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core 0.1.32", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing 0.1.40", - "tracing-core 0.1.32", - "tracing-log 0.1.4", - "tracing-serde", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.0" -source = "git+https://github.com/tokio-rs/tracing#527b4f66a604e7a6baa6aa7536428e3a303ba3c8" -dependencies = [ - "tracing-core 0.2.0", + "tracing-core", ] [[package]] @@ -12245,17 +8444,16 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", "regex", "sharded-slab", "smallvec", "thread_local", - "time", - "tracing 0.1.40", - "tracing-core 0.1.32", - "tracing-log 0.2.0", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -12283,61 +8481,14 @@ dependencies = [ "protobuf", "rusb", "thiserror", - "tracing 0.1.40", -] - -[[package]] -name = "trie-db" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" -dependencies = [ - "hash-db", - "hashbrown 0.13.2", - "log", - "rustc-hex", - "smallvec", -] - -[[package]] -name = "trie-root" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" -dependencies = [ - "hash-db", -] - -[[package]] -name = "try-lock" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" - -[[package]] -name = "tsify" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6b26cf145f2f3b9ff84e182c448eaf05468e247f148cf3d2a7d67d78ff023a0" -dependencies = [ - "gloo-utils", - "serde", - "serde_json", - "tsify-macros", - "wasm-bindgen", + "tracing", ] [[package]] -name = "tsify-macros" -version = "0.4.5" +name = "try-lock" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a94b0f0954b3e59bfc2c246b4c8574390d94a4ad4ad246aaf2fb07d7dfd3b47" -dependencies = [ - "proc-macro2", - "quote", - "serde_derive_internals", - "syn 2.0.72", -] +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "tungstenite" @@ -12398,18 +8549,6 @@ dependencies = [ "utf-8", ] -[[package]] -name = "twox-hash" -version = "1.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "digest 0.10.7", - "rand", - "static_assertions", -] - [[package]] name = "typenum" version = "1.17.0" @@ -12480,12 +8619,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-properties" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4259d9d4425d9f0661581b804cb85fe66a4c631cadd8f490d1c13a35d5d9291" - [[package]] name = "unicode-segmentation" version = "1.11.0" @@ -12515,12 +8648,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "unicode_categories" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" - [[package]] name = "universal-hash" version = "0.5.1" @@ -12537,18 +8664,6 @@ version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" -[[package]] -name = "unsigned-varint" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" - -[[package]] -name = "unsigned-varint" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" - [[package]] name = "untrusted" version = "0.7.1" @@ -12570,7 +8685,6 @@ dependencies = [ "form_urlencoded", "idna", "percent-encoding", - "serde", ] [[package]] @@ -12623,12 +8737,6 @@ version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - [[package]] name = "vergen" version = "8.3.2" @@ -12647,42 +8755,12 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" -[[package]] -name = "void" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" - [[package]] name = "vsimd" version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" -[[package]] -name = "w3f-bls" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c5da5fa2c6afa2c9158eaa7cd9aee249765eb32b5fb0c63ad8b9e79336a47ec" -dependencies = [ - "ark-bls12-377", - "ark-bls12-381", - "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-serialize-derive", - "arrayref", - "constcat", - "digest 0.10.7", - "rand", - "rand_chacha", - "rand_core 0.6.4", - "sha2 0.10.8", - "sha3", - "thiserror", - "zeroize", -] - [[package]] name = "wait-timeout" version = "0.2.0" @@ -12717,12 +8795,6 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -[[package]] -name = "wasite" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b" - [[package]] name = "wasm-bindgen" version = "0.2.92" @@ -12789,226 +8861,6 @@ version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" -[[package]] -name = "wasm-bindgen-test" -version = "0.3.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9bf62a58e0780af3e852044583deee40983e5886da43a271dd772379987667b" -dependencies = [ - "console_error_panic_hook", - "js-sys", - "scoped-tls", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", -] - -[[package]] -name = "wasmi" -version = "0.31.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7" -dependencies = [ - "smallvec", - "spin 0.9.8", - "wasmi_arena", - "wasmi_core", - "wasmparser-nostd", -] - -[[package]] -name = "wasmi_arena" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073" - -[[package]] -name = "wasmi_core" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a" -dependencies = [ - "downcast-rs", - "libm", - "num-traits", - "paste", -] - -[[package]] -name = "wasmparser" -version = "0.102.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48134de3d7598219ab9eaf6b91b15d8e50d31da76b8519fe4ecfcec2cf35104b" -dependencies = [ - "indexmap 1.9.3", - "url", -] - -[[package]] -name = "wasmparser-nostd" -version = "0.100.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa" -dependencies = [ - "indexmap-nostd", -] - -[[package]] -name = "wasmtime" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f907fdead3153cb9bfb7a93bbd5b62629472dc06dee83605358c64c52ed3dda9" -dependencies = [ - "anyhow", - "bincode", - "cfg-if", - "indexmap 1.9.3", - "libc", - "log", - "object 0.30.4", - "once_cell", - "paste", - "psm", - "serde", - "target-lexicon", - "wasmparser", - "wasmtime-environ", - "wasmtime-jit", - "wasmtime-runtime", - "windows-sys 0.45.0", -] - -[[package]] -name = "wasmtime-asm-macros" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3b9daa7c14cd4fa3edbf69de994408d5f4b7b0959ac13fa69d465f6597f810d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "wasmtime-environ" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a990198cee4197423045235bf89d3359e69bd2ea031005f4c2d901125955c949" -dependencies = [ - "anyhow", - "cranelift-entity", - "gimli 0.27.3", - "indexmap 1.9.3", - "log", - "object 0.30.4", - "serde", - "target-lexicon", - "thiserror", - "wasmparser", - "wasmtime-types", -] - -[[package]] -name = "wasmtime-jit" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de48df552cfca1c9b750002d3e07b45772dd033b0b206d5c0968496abf31244" -dependencies = [ - "addr2line 0.19.0", - "anyhow", - "bincode", - "cfg-if", - "cpp_demangle", - "gimli 0.27.3", - "log", - "object 0.30.4", - "rustc-demangle", - "serde", - "target-lexicon", - "wasmtime-environ", - "wasmtime-jit-icache-coherence", - "wasmtime-runtime", - "windows-sys 0.45.0", -] - -[[package]] -name = "wasmtime-jit-debug" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" -dependencies = [ - "once_cell", -] - -[[package]] -name = "wasmtime-jit-icache-coherence" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aecae978b13f7f67efb23bd827373ace4578f2137ec110bbf6a4a7cde4121bbd" -dependencies = [ - "cfg-if", - "libc", - "windows-sys 0.45.0", -] - -[[package]] -name = "wasmtime-runtime" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "658cf6f325232b6760e202e5255d823da5e348fdea827eff0a2a22319000b441" -dependencies = [ - "anyhow", - "cc", - "cfg-if", - "indexmap 1.9.3", - "libc", - "log", - "mach", - "memfd", - "memoffset 0.8.0", - "paste", - "rand", - "rustix 0.36.17", - "wasmtime-asm-macros", - "wasmtime-environ", - "wasmtime-jit-debug", - "windows-sys 0.45.0", -] - -[[package]] -name = "wasmtime-types" -version = "8.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4f6fffd2a1011887d57f07654dd112791e872e3ff4a2e626aee8059ee17f06f" -dependencies = [ - "cranelift-entity", - "serde", - "thiserror", - "wasmparser", -] - -[[package]] -name = "wasmtimer" -version = "0.2.0" -source = "git+https://github.com/whizsid/wasmtimer-rs.git#fc507844b02d7f8abac107e3a46f404d75753e8e" -dependencies = [ - "futures", - "js-sys", - "parking_lot", - "pin-utils", - "slab", - "wasm-bindgen", -] - [[package]] name = "web-sys" version = "0.3.69" @@ -13034,16 +8886,6 @@ dependencies = [ "rustls-pki-types", ] -[[package]] -name = "whoami" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44ab49fad634e88f55bf8f9bb3abd2f27d7204172a112c7c9987e01c1c94ea9" -dependencies = [ - "redox_syscall 0.4.1", - "wasite", -] - [[package]] name = "widestring" version = "1.1.0" @@ -13081,16 +8923,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" -dependencies = [ - "windows-core", - "windows-targets 0.52.6", -] - [[package]] name = "windows-core" version = "0.52.0" @@ -13100,15 +8932,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.45.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" -dependencies = [ - "windows-targets 0.42.2", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -13127,21 +8950,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" -dependencies = [ - "windows_aarch64_gnullvm 0.42.2", - "windows_aarch64_msvc 0.42.2", - "windows_i686_gnu 0.42.2", - "windows_i686_msvc 0.42.2", - "windows_x86_64_gnu 0.42.2", - "windows_x86_64_gnullvm 0.42.2", - "windows_x86_64_msvc 0.42.2", -] - [[package]] name = "windows-targets" version = "0.48.5" @@ -13173,12 +8981,6 @@ dependencies = [ "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -13191,12 +8993,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -13209,12 +9005,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_i686_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -13233,12 +9023,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -13251,12 +9035,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_x86_64_gnu" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -13269,12 +9047,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -13287,12 +9059,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_msvc" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -13371,18 +9137,6 @@ dependencies = [ "tap", ] -[[package]] -name = "x25519-dalek" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" -dependencies = [ - "curve25519-dalek 4.1.3", - "rand_core 0.6.4", - "serde", - "zeroize", -] - [[package]] name = "xmlparser" version = "0.13.6" @@ -13404,12 +9158,6 @@ dependencies = [ "is-terminal", ] -[[package]] -name = "yap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff4524214bc4629eba08d78ceb1d6507070cc0bcbbed23af74e19e6e924a24cf" - [[package]] name = "zerocopy" version = "0.6.6" @@ -13480,11 +9228,11 @@ dependencies = [ "aes", "byteorder", "bzip2", - "constant_time_eq 0.1.5", + "constant_time_eq", "crc32fast", "crossbeam-utils", "flate2", - "hmac 0.12.1", + "hmac", "pbkdf2 0.11.0", "sha1", "time", @@ -13502,7 +9250,7 @@ dependencies = [ "crossbeam-utils", "displaydoc", "flate2", - "indexmap 2.3.0", + "indexmap", "memchr", "thiserror", "zopfli", diff --git a/Cargo.toml b/Cargo.toml index 94e1661..53ec7ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,9 +30,6 @@ test-utils = { path = "./test-utils" } incredible-squaring-avs = { path = "./avs/incredible-squaring-avs" } tangle-avs = { path = "./avs/tangle-avs" } -gadget-common = { git = "https://github.com/webb-tools/gadget", default-features = false } -gadget-executor = { git = "https://github.com/webb-tools/gadget", default-features = false } - # ARK Libraries ark-std = { version = "0.4.0", default-features = false, features = ["print-trace", "std"] } ark-crypto-primitives = { version = "0.4.0", default-features = false } @@ -137,6 +134,7 @@ ethers = "2.0.14" anvil = { git = "https://github.com/foundry-rs/foundry.git" } foundry-common = { git = "https://github.com/foundry-rs/foundry.git" } alloy = "0.2.1" +revm = { version = "13.0.0", default-features = false } alloy-abi = "0.1.0" alloy-chains = "0.1.23" alloy-primitives = "0.7.7" diff --git a/avs/incredible-squaring-avs/Cargo.toml b/avs/incredible-squaring-avs/Cargo.toml index 42955f6..aa090e8 100644 --- a/avs/incredible-squaring-avs/Cargo.toml +++ b/avs/incredible-squaring-avs/Cargo.toml @@ -29,7 +29,7 @@ aws-sdk-kms.workspace = true eigen-contracts.workspace = true eigen-utils.workspace = true aws-kms.workspace = true -gadget-common = { workspace = true, default-features = false, features = ["default"] } +#gadget-common = { workspace = true, default-features = false, features = ["default"] } # gadget-common = { workspace = true, features = ["tangle-testnet"] } foundry-common.workspace = true diff --git a/avs/tangle-avs/Cargo.toml b/avs/tangle-avs/Cargo.toml index 1a75529..9677754 100644 --- a/avs/tangle-avs/Cargo.toml +++ b/avs/tangle-avs/Cargo.toml @@ -40,8 +40,8 @@ reqwest.workspace = true thiserror.workspace = true tokio.workspace = true serde = { version = "1.0.203", features = ["derive"] } -gadget-common = { workspace = true, default-features = false, features = ["default"] } -gadget-executor = { workspace = true } +#gadget-common = { workspace = true, default-features = false, features = ["default"] } +#gadget-executor = { workspace = true } env_logger = "0.10.2" [dev-dependencies] diff --git a/avs/tangle-avs/src/operator.rs b/avs/tangle-avs/src/operator.rs index 9edf00c..bf1f042 100644 --- a/avs/tangle-avs/src/operator.rs +++ b/avs/tangle-avs/src/operator.rs @@ -334,9 +334,10 @@ impl Operator { } log::info!("Starting Tangle Validator..."); - gadget_executor::run_tangle_validator() - .await - .map_err(|e| OperatorError::OperatorStartError(e.to_string()))?; + // gadget_executor::run_tangle_validator() + // .await + // .map_err(|e| OperatorError::OperatorStartError(e.to_string()))?; + // TODO: Start Tangle Validator without gadget executor Ok(()) } diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index 7fd52ba..e557da7 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -41,7 +41,7 @@ eigen-utils.workspace = true incredible-squaring-avs.workspace = true tangle-avs.workspace = true aws-kms.workspace = true -gadget-common = { workspace = true, default-features = false, features = ["default"] } +#gadget-common = { workspace = true, default-features = false, features = ["default"] } # gadget-common = { workspace = true, features = ["tangle-testnet"] } foundry-common.workspace = true From 0926a99c865b9e8c0f1d166e479c4cc7e1618c20 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Wed, 28 Aug 2024 11:48:48 -0500 Subject: [PATCH 2/8] Deps: Restructure and machete --- Cargo.lock | 1131 +++++++++++------------- Cargo.toml | 22 +- avs/incredible-squaring-avs/Cargo.toml | 16 +- avs/tangle-avs/Cargo.toml | 21 +- eigensdk-rs/Cargo.toml | 12 - fireblocks-client/Cargo.toml | 12 +- {eigensdk-rs/src => src}/lib.rs | 0 test-utils/Cargo.toml | 32 - utils/Cargo.toml | 21 - 9 files changed, 525 insertions(+), 742 deletions(-) delete mode 100644 eigensdk-rs/Cargo.toml rename {eigensdk-rs/src => src}/lib.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index a264d0b..6583134 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.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" + [[package]] name = "aead" version = "0.5.2" @@ -48,20 +54,6 @@ dependencies = [ "cpufeatures", ] -[[package]] -name = "aes-gcm" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" -dependencies = [ - "aead", - "aes", - "cipher", - "ctr", - "ghash", - "subtle", -] - [[package]] name = "ahash" version = "0.8.11" @@ -72,7 +64,7 @@ dependencies = [ "getrandom", "once_cell", "version_check", - "zerocopy 0.7.35", + "zerocopy", ] [[package]] @@ -107,34 +99,11 @@ dependencies = [ "alloy-transport-http 0.1.4", ] -[[package]] -name = "alloy" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4a4aaae80afd4be443a6aecd92a6b255dcdd000f97996928efb33d8a71e100" -dependencies = [ - "alloy-consensus 0.2.1", - "alloy-core", - "alloy-eips 0.2.1", - "alloy-genesis 0.2.1", - "alloy-provider 0.2.1", - "alloy-rpc-client 0.2.1", - "alloy-serde 0.2.1", - "alloy-signer 0.2.1", - "alloy-transport-http 0.2.1", -] - -[[package]] -name = "alloy-abi" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95d80fbdae433a4c98109023eada56d864e49750d131824bad158f59d79a95d2" - [[package]] name = "alloy-chains" -version = "0.1.24" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47ff94ce0f141c2671c23d02c7b88990dd432856639595c5d010663d017c2c58" +checksum = "bb07629a5d0645d29f68d2fb6f4d0cf15c89ec0965be915f303967180929743f" dependencies = [ "num_enum", "serde", @@ -215,12 +184,12 @@ dependencies = [ "arbitrary", "const-hex", "derive_arbitrary", - "derive_more", + "derive_more 0.99.18", "itoa", "proptest", "serde", "serde_json", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -249,7 +218,7 @@ dependencies = [ "alloy-serde 0.2.1", "arbitrary", "c-kzg", - "derive_more", + "derive_more 0.99.18", "k256", "once_cell", "rand", @@ -382,7 +351,7 @@ dependencies = [ "cfg-if", "const-hex", "derive_arbitrary", - "derive_more", + "derive_more 0.99.18", "ethereum_ssz", "getrandom", "hex-literal", @@ -421,7 +390,7 @@ dependencies = [ "futures-utils-wasm", "lru", "pin-project", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "serde_json", "tokio", @@ -458,7 +427,7 @@ dependencies = [ "futures-utils-wasm", "lru", "pin-project", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "serde_json", "tokio", @@ -487,9 +456,9 @@ dependencies = [ [[package]] name = "alloy-rlp" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a43b18702501396fa9bcdeecd533bc85fac75150d308fc0f6800a01e6234a003" +checksum = "26154390b1d205a4a7ac7352aa2eb4f81f391399d4e2f546fb81a2f8bb383f62" dependencies = [ "alloy-rlp-derive", "arrayvec", @@ -498,13 +467,13 @@ dependencies = [ [[package]] name = "alloy-rlp-derive" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83524c1f6162fcb5b0decf775498a125066c86dda6066ed609531b0e912f85a" +checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -518,7 +487,7 @@ dependencies = [ "alloy-transport-http 0.1.4", "futures", "pin-project", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "serde_json", "tokio", @@ -544,7 +513,7 @@ dependencies = [ "futures", "hyper-util", "pin-project", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "serde_json", "tokio", @@ -782,7 +751,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -799,7 +768,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "syn-solidity", "tiny-keccak", ] @@ -817,7 +786,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.72", + "syn 2.0.76", "syn-solidity", ] @@ -828,7 +797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cbcba3ca07cf7975f15d871b721fb18031eec8bce51103907f6dcce00b255d98" dependencies = [ "serde", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -890,7 +859,7 @@ checksum = "86d65871f9f1cafe1ed25cde2f1303be83e6473e995a2d56c275ae4fcce6119c" dependencies = [ "alloy-json-rpc 0.1.4", "alloy-transport 0.1.4", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde_json", "tower", "tracing", @@ -908,7 +877,7 @@ dependencies = [ "http-body-util", "hyper 1.4.1", "hyper-util", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde_json", "tower", "tracing", @@ -960,7 +929,7 @@ checksum = "03704f265cbbb943b117ecb5055fd46e8f41e7dc8a58b1aed20bcd40ace38c15" dependencies = [ "alloy-primitives", "alloy-rlp", - "derive_more", + "derive_more 0.99.18", "hashbrown 0.14.5", "nybbles", "serde", @@ -1035,7 +1004,7 @@ dependencies = [ [[package]] name = "anvil" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-chains", "alloy-consensus 0.2.1", @@ -1097,7 +1066,7 @@ dependencies = [ [[package]] name = "anvil-core" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-consensus 0.2.1", "alloy-dyn-abi", @@ -1119,7 +1088,7 @@ dependencies = [ [[package]] name = "anvil-rpc" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "serde", "serde_json", @@ -1128,7 +1097,7 @@ dependencies = [ [[package]] name = "anvil-server" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "anvil-rpc", "async-trait", @@ -1234,7 +1203,7 @@ dependencies = [ "num-bigint", "num-traits", "paste", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "zeroize", ] @@ -1363,9 +1332,9 @@ dependencies = [ [[package]] name = "arrayvec" -version = "0.7.4" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "ascii-canvas" @@ -1395,7 +1364,7 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -1406,7 +1375,7 @@ checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -1417,7 +1386,7 @@ checksum = "b6d7b9decdf35d8908a7e3ef02f64c5e9b1695e230154c0e8de3969142d9b94c" dependencies = [ "futures", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -1453,7 +1422,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -1464,9 +1433,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-config" -version = "1.5.4" +version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf6cfe2881cb1fcbba9ae946fb9a6480d3b7a714ca84c74925014a89ef3387a" +checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1484,7 +1453,6 @@ dependencies = [ "fastrand", "hex", "http 0.2.12", - "hyper 0.14.30", "ring 0.17.8", "time", "tokio", @@ -1527,9 +1495,9 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.3.1" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c5f920ffd1e0526ec9e70e50bf444db50b204395a0fa7016bbf9e31ea1698f" +checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" dependencies = [ "aws-credential-types", "aws-sigv4", @@ -1543,6 +1511,7 @@ dependencies = [ "fastrand", "http 0.2.12", "http-body 0.4.6", + "once_cell", "percent-encoding", "pin-project-lite", "tracing", @@ -1551,9 +1520,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d91f43512620f4b0d9e67ccf7d768fab5ed310ac2229ebb9422177abe99c36ba" +checksum = "70ebbbc319551583b9233a74b359ede7349102e779fc12371d2478e80b50d218" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1573,9 +1542,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.42.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558bbcec8db82a1a8af1610afcb3b10d00652d25ad366a0558eecdff2400a1d1" +checksum = "4abf69a87be33b6f125a93d5046b5f7395c26d1f449bf8d3927f5577463b6de0" dependencies = [ "ahash", "aws-credential-types", @@ -1608,9 +1577,9 @@ dependencies = [ [[package]] name = "aws-sdk-secretsmanager" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66a0cc1d41792d2d383746c154f48521715c50f5d59e9cdf36ef763de3c2345f" +checksum = "f468d566c05086b1b6a08e9de12dca141071a717580dc075f180d0fe11b6190f" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1631,9 +1600,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.36.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acca681c53374bf1d9af0e317a41d12a44902ca0f2d1e10e5cb5bb98ed74f35" +checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1653,9 +1622,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.37.0" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b79c6bdfe612503a526059c05c9ccccbf6bd9530b003673cb863e547fd7c0c9a" +checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1675,9 +1644,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.36.0" +version = "1.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32e6ecdb2bd756f3b2383e6f0588dc10a4e65f5d551e70a56e0bfe0c884673ce" +checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1738,9 +1707,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.60.11" +version = "0.60.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c4134cf3adaeacff34d588dbe814200357b0c466d730cf1c0d8054384a2de4" +checksum = "598b1689d001c4d4dc3cb386adb07d37786783aee3ac4b324bcadac116bf3d23" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -1810,9 +1779,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.2" +version = "1.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce87155eba55e11768b8c1afa607f3e864ae82f03caf63258b37455b0ad02537" +checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1837,9 +1806,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime-api" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30819352ed0a04ecf6a2f3477e344d2d1ba33d43e0f09ad9047c12e0d923616f" +checksum = "e086682a53d3aa241192aa110fa8dfce98f2f5ac2ead0de84d41582c7e8fdb96" dependencies = [ "aws-smithy-async", "aws-smithy-types", @@ -1854,9 +1823,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfe321a6b21f5d8eabd0ade9c55d3d0335f3c3157fc2b3e87f05f34b539e4df5" +checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8" dependencies = [ "base64-simd", "bytes", @@ -1897,7 +1866,7 @@ dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", "aws-smithy-types", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "tracing", ] @@ -1969,7 +1938,7 @@ dependencies = [ "cc", "cfg-if", "libc", - "miniz_oxide", + "miniz_oxide 0.7.4", "object", "rustc-demangle", ] @@ -2032,15 +2001,6 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "230c5f1ca6a325a32553f8640d31ac9b49f2411e901e427570154868b46da4f7" -[[package]] -name = "bincode" -version = "1.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" -dependencies = [ - "serde", -] - [[package]] name = "bit-set" version = "0.5.3" @@ -2159,9 +2119,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.16.3" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83" +checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" [[package]] name = "byteorder" @@ -2211,23 +2171,24 @@ dependencies = [ [[package]] name = "c-kzg" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf100c4cea8f207e883ff91ca886d621d8a166cb04971dfaa9bb8fd99ed95df" +checksum = "f0307f72feab3300336fb803a57134159f6e20139af1357f36c54cb90d8e8928" dependencies = [ "blst", "cc", "glob", "hex", "libc", + "once_cell", "serde", ] [[package]] name = "camino" -version = "1.1.7" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" +checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3" dependencies = [ "serde", ] @@ -2272,12 +2233,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.7" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc" +checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" dependencies = [ "jobserver", "libc", + "shlex", ] [[package]] @@ -2292,6 +2254,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "chacha20" version = "0.9.1" @@ -2341,9 +2309,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.13" +version = "4.5.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc" +checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" dependencies = [ "clap_builder", "clap_derive", @@ -2351,9 +2319,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.13" +version = "4.5.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99" +checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" dependencies = [ "anstream", "anstyle", @@ -2366,9 +2334,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.12" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8670053e87c316345e384ca1f3eba3006fc6355ed8b8a1140d104e109e3df34" +checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" dependencies = [ "clap", ] @@ -2392,7 +2360,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2576,7 +2544,7 @@ version = "7.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7" dependencies = [ - "crossterm", + "crossterm 0.27.0", "strum", "strum_macros", "unicode-width", @@ -2584,13 +2552,14 @@ dependencies = [ [[package]] name = "compact_str" -version = "0.7.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f86b9c4c00838774a6d902ef931eff7470720c51d90c2e32cfe15dc304737b3f" +checksum = "6050c3a16ddab2e412160b31f2c871015704239bca62f72f6e5f0be631d3f644" dependencies = [ "castaway", "cfg-if", "itoa", + "rustversion", "ryu", "static_assertions", ] @@ -2639,6 +2608,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -2651,15 +2629,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.6" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.12" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" +checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" dependencies = [ "libc", ] @@ -2670,7 +2648,7 @@ version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" dependencies = [ - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -2716,8 +2694,21 @@ dependencies = [ "bitflags 2.6.0", "crossterm_winapi", "libc", - "mio 0.8.11", "parking_lot", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.6.0", + "crossterm_winapi", + "mio", + "parking_lot", + "rustix", "signal-hook", "signal-hook-mio", "winapi", @@ -2784,12 +2775,12 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.4" +version = "3.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" +checksum = "90eeab0aa92f3f9b4e87f258c72b139c207d251f9cbc1080a0086b86a8870dd3" dependencies = [ - "nix 0.28.0", - "windows-sys 0.52.0", + "nix 0.29.0", + "windows-sys 0.59.0", ] [[package]] @@ -2813,7 +2804,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2824,7 +2815,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2895,7 +2886,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2916,7 +2907,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2926,7 +2917,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" dependencies = [ "derive_builder_core", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -2935,11 +2926,33 @@ version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "convert_case", + "convert_case 0.4.0", "proc-macro2", "quote", - "rustc_version 0.4.0", - "syn 2.0.72", + "rustc_version 0.4.1", + "syn 2.0.76", +] + +[[package]] +name = "derive_more" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4a9b99b9cbbe49445b21764dc0625032a89b145a2642e67603e1c936f5458d05" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7330aeadfbe296029522e6c40f315320aba36fc43a5b3632f3795348f3bd22" +dependencies = [ + "convert_case 0.6.0", + "proc-macro2", + "quote", + "syn 2.0.76", + "unicode-xid", ] [[package]] @@ -3026,7 +3039,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -3043,9 +3056,9 @@ checksum = "1aaf95b3e5c8f23aa320147307562d361db0ae0d51242340f558153b4eb2439b" [[package]] name = "dunce" -version = "1.0.4" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" +checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" [[package]] name = "dyn-clone" @@ -3092,24 +3105,15 @@ name = "eigen-utils" version = "0.1.0" dependencies = [ "aes", - "aes-gcm", - "alloy-abi", - "alloy-consensus 0.2.1", "alloy-contract", - "alloy-eips 0.2.1", "alloy-network 0.2.1", "alloy-primitives", "alloy-provider 0.2.1", "alloy-pubsub", "alloy-rpc-types", "alloy-signer 0.2.1", - "alloy-signer-local", "alloy-sol-types", "alloy-transport 0.2.1", - "alloy-transport-http 0.2.1", - "alloy-transport-ws", - "anvil", - "anyhow", "ark-bn254", "ark-ec", "ark-ff 0.4.2", @@ -3117,34 +3121,24 @@ dependencies = [ "ark-std 0.4.0", "async-trait", "base64 0.22.1", - "bincode", "chacha20poly1305", "ctr", - "dirs", "eigen-contracts", - "ethers", - "futures", "hex", "http-body-util", "hyper 1.4.1", "k256", "log", - "nix 0.24.3", - "num-bigint", "pin-project-lite", "rand", - "rand_core", "regex", - "reqwest 0.12.5", + "reqwest 0.12.7", "scrypt 0.11.0", - "secp256k1", "serde", "serde_json", "sha3", - "tempfile", "thiserror", "tokio", - "tracing", "tree_magic_mini", "uuid 1.10.0", ] @@ -3153,7 +3147,6 @@ dependencies = [ name = "eigensdk-rs" version = "0.1.0" dependencies = [ - "aws-kms", "eigen-contracts", "eigen-utils", "fireblocks-client", @@ -3257,7 +3250,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -3459,7 +3452,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.72", + "syn 2.0.76", "toml", "walkdir", ] @@ -3477,7 +3470,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -3503,7 +3496,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.72", + "syn 2.0.76", "tempfile", "thiserror", "tiny-keccak", @@ -3653,9 +3646,9 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.1.0" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fastrlp" @@ -3717,31 +3710,21 @@ dependencies = [ name = "fireblocks-client" version = "0.1.0" dependencies = [ - "alloy-consensus 0.2.1", "alloy-network 0.2.1", "alloy-primitives", "alloy-provider 0.2.1", "alloy-rpc-types", "alloy-transport 0.2.1", - "alloy-transport-ws", - "anyhow", - "async-trait", - "futures", "hex", "jsonwebtoken 9.3.0", "log", - "num-bigint", "pretty_env_logger", - "regex", - "reqwest 0.12.5", - "rsa", + "reqwest 0.12.7", "serde", "serde_json", "sha2", "thiserror", "tokio", - "tracing", - "tree_magic_mini", "uuid 1.10.0", ] @@ -3766,12 +3749,12 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" dependencies = [ "crc32fast", - "miniz_oxide", + "miniz_oxide 0.8.0", ] [[package]] @@ -3798,7 +3781,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "forge-fmt" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-primitives", "ariadne", @@ -3820,15 +3803,15 @@ dependencies = [ [[package]] name = "foundry-block-explorers" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3306c1dfb236a3f7c86f7f6c9a88843d621cea96add97fdefbdc53ef3ecf6dfe" +checksum = "c1580bdb99a6a531b44ac5cda229069cacc11ae7d54faa45676e1bee9ee7da1c" dependencies = [ "alloy-chains", "alloy-json-abi", "alloy-primitives", "foundry-compilers", - "reqwest 0.12.5", + "reqwest 0.12.7", "semver 1.0.23", "serde", "serde_json", @@ -3839,7 +3822,7 @@ dependencies = [ [[package]] name = "foundry-cheatcodes" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-consensus 0.2.1", "alloy-dyn-abi", @@ -3855,12 +3838,14 @@ dependencies = [ "base64 0.22.1", "chrono", "dialoguer", + "ecdsa 0.16.9", "eyre", "foundry-cheatcodes-spec", "foundry-common", "foundry-compilers", "foundry-config", "foundry-evm-core", + "foundry-evm-traces", "foundry-wallets", "itertools 0.13.0", "jsonpath_lib", @@ -3870,7 +3855,7 @@ dependencies = [ "parking_lot", "rand", "revm", - "rustc-hash 2.0.0", + "rustc-hash", "semver 1.0.23", "serde_json", "thiserror", @@ -3883,7 +3868,7 @@ dependencies = [ [[package]] name = "foundry-cheatcodes-spec" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-sol-types", "foundry-macros", @@ -3893,7 +3878,7 @@ dependencies = [ [[package]] name = "foundry-cli" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-chains", "alloy-dyn-abi", @@ -3914,7 +3899,6 @@ dependencies = [ "foundry-wallets", "futures", "indicatif", - "once_cell", "regex", "serde", "strsim", @@ -3928,7 +3912,7 @@ dependencies = [ [[package]] name = "foundry-common" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-consensus 0.2.1", "alloy-contract", @@ -3956,9 +3940,8 @@ dependencies = [ "foundry-compilers", "foundry-config", "num-format", - "once_cell", - "reqwest 0.12.5", - "rustc-hash 2.0.0", + "reqwest 0.12.7", + "rustc-hash", "semver 1.0.23", "serde", "serde_json", @@ -3974,7 +3957,7 @@ dependencies = [ [[package]] name = "foundry-common-fmt" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-consensus 0.2.1", "alloy-dyn-abi", @@ -3991,9 +3974,9 @@ dependencies = [ [[package]] name = "foundry-compilers" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b8ffe1d5a00cd78a9461262377270d88b8d6a8a5f51b402996242bccef3994" +checksum = "7eaa24a47bb84e1db38c84f03e8c90ca81050bd20beac8bdc99aae8afd0b8784" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -4015,20 +3998,20 @@ dependencies = [ "serde_json", "sha2", "solang-parser", - "svm-rs 0.5.4", + "svm-rs 0.5.6", "svm-rs-builds", "thiserror", "tokio", "tracing", - "winnow 0.6.18", + "winnow", "yansi 1.0.1", ] [[package]] name = "foundry-compilers-artifacts" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cdb80803e20447fc8c3f4ec97d47ad5fa37286648bb8224edbbc553ebe1a0f4" +checksum = "3588ee6a986f89040d1158fb90459731580b404fb72b8c6c832c0ddbc95fed58" dependencies = [ "foundry-compilers-artifacts-solc", "foundry-compilers-artifacts-vyper", @@ -4036,9 +4019,9 @@ dependencies = [ [[package]] name = "foundry-compilers-artifacts-solc" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3280cf657d802358856a397cb8465b18a0a6c09b1fa6422842e422a9aa21276d" +checksum = "a149c5e8c326c7bae8f73cacb28c637f4bc2e535f950eec10348494990e9636f" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -4060,9 +4043,9 @@ dependencies = [ [[package]] name = "foundry-compilers-artifacts-vyper" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ecc61aa540bff773d4441a94e0f158769fcedd61f61d3e91608a76d6bcd7aa" +checksum = "8645c9e7c070c81bf8c90f456416953234334f097b67445c773af98df74e27b0" dependencies = [ "alloy-json-abi", "alloy-primitives", @@ -4075,9 +4058,9 @@ dependencies = [ [[package]] name = "foundry-compilers-core" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a14603a33a217e64cc38977c215b01b37b48a0cae0a739a9f9b3555f16938704" +checksum = "66492aeb708f3d142c078457dba5f52b04ca5031012d48903a0bcb37d205d595" dependencies = [ "alloy-primitives", "cfg-if", @@ -4089,7 +4072,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "svm-rs 0.5.4", + "svm-rs 0.5.6", "thiserror", "tokio", "walkdir", @@ -4098,7 +4081,7 @@ dependencies = [ [[package]] name = "foundry-config" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "Inflector", "alloy-chains", @@ -4112,10 +4095,9 @@ dependencies = [ "glob", "globset", "number_prefix", - "once_cell", "path-slash", "regex", - "reqwest 0.12.5", + "reqwest 0.12.7", "revm-primitives", "semver 1.0.23", "serde", @@ -4124,7 +4106,7 @@ dependencies = [ "solang-parser", "thiserror", "toml", - "toml_edit 0.22.20", + "toml_edit", "tracing", "walkdir", ] @@ -4132,10 +4114,10 @@ dependencies = [ [[package]] name = "foundry-debugger" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-primitives", - "crossterm", + "crossterm 0.28.1", "eyre", "foundry-common", "foundry-compilers", @@ -4150,7 +4132,7 @@ dependencies = [ [[package]] name = "foundry-evm" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -4177,22 +4159,21 @@ dependencies = [ [[package]] name = "foundry-evm-abi" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-primitives", "alloy-sol-types", - "derive_more", + "derive_more 1.0.0", "foundry-common-fmt", "foundry-macros", "itertools 0.13.0", - "once_cell", - "rustc-hash 2.0.0", + "rustc-hash", ] [[package]] name = "foundry-evm-core" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-dyn-abi", "alloy-genesis 0.2.1", @@ -4215,7 +4196,7 @@ dependencies = [ "parking_lot", "revm", "revm-inspectors", - "rustc-hash 2.0.0", + "rustc-hash", "serde", "serde_json", "thiserror", @@ -4226,7 +4207,7 @@ dependencies = [ [[package]] name = "foundry-evm-coverage" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-primitives", "eyre", @@ -4235,7 +4216,7 @@ dependencies = [ "foundry-evm-core", "rayon", "revm", - "rustc-hash 2.0.0", + "rustc-hash", "semver 1.0.23", "tracing", ] @@ -4243,7 +4224,7 @@ dependencies = [ [[package]] name = "foundry-evm-fuzz" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "ahash", "alloy-dyn-abi", @@ -4270,7 +4251,7 @@ dependencies = [ [[package]] name = "foundry-evm-traces" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-dyn-abi", "alloy-json-abi", @@ -4285,11 +4266,10 @@ dependencies = [ "foundry-linking", "futures", "itertools 0.13.0", - "once_cell", "rayon", "revm", "revm-inspectors", - "rustc-hash 2.0.0", + "rustc-hash", "serde", "solang-parser", "tempfile", @@ -4299,9 +4279,9 @@ dependencies = [ [[package]] name = "foundry-fork-db" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "734f01574b6804ed6985d042684235c6c1007228eff8b2b488c260e3caf742d5" +checksum = "48e1217b5063138a87feb51bd9ac71857d370f06f1aa3d8c22b73aae0e49f4c3" dependencies = [ "alloy-primitives", "alloy-provider 0.2.1", @@ -4312,7 +4292,7 @@ dependencies = [ "futures", "parking_lot", "revm", - "rustc-hash 2.0.0", + "rustc-hash", "serde", "serde_json", "thiserror", @@ -4324,7 +4304,7 @@ dependencies = [ [[package]] name = "foundry-linking" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-primitives", "foundry-compilers", @@ -4335,18 +4315,18 @@ dependencies = [ [[package]] name = "foundry-macros" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "foundry-wallets" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#f348df381762c2379501c9ff42b8a4c86dd9c469" +source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" dependencies = [ "alloy-consensus 0.2.1", "alloy-dyn-abi", @@ -4382,9 +4362,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" +checksum = "e8c6b3bd49c37d2aa3f3f2220233b29a7cd23f79d1fe70e5337d25fb390793de" dependencies = [ "rustix", "windows-sys 0.52.0", @@ -4462,7 +4442,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -4544,16 +4524,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "ghash" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d8a4362ccb29cb0b265253fb0a2728f592895ee6854fd9bc13f2ffda266ff1" -dependencies = [ - "opaque-debug", - "polyval", -] - [[package]] name = "gimli" version = "0.28.1" @@ -4634,9 +4604,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +checksum = "524e8ac6999421f49a846c2d4411f337e53497d8ec55d67753beffa43c5d9205" dependencies = [ "atomic-waker", "bytes", @@ -4692,6 +4662,12 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +[[package]] +name = "hermit-abi" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" + [[package]] name = "hex" version = "0.4.3" @@ -4844,7 +4820,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -4883,7 +4859,7 @@ dependencies = [ "hyper 1.4.1", "hyper-util", "rustls 0.23.12", - "rustls-native-certs 0.7.1", + "rustls-native-certs 0.7.3", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", @@ -4909,9 +4885,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" dependencies = [ "bytes", "futures-channel", @@ -5008,8 +4984,7 @@ dependencies = [ name = "incredible-squaring-avs" version = "0.1.0" dependencies = [ - "alloy 0.1.4", - "alloy-abi", + "alloy", "alloy-contract", "alloy-primitives", "alloy-provider 0.2.1", @@ -5021,21 +4996,14 @@ dependencies = [ "alloy-signer-local", "alloy-sol-types", "alloy-transport 0.2.1", - "alloy-transport-http 0.2.1", - "alloy-transport-ws", "anvil", "ark-bn254", "ark-ec", "ark-ff 0.4.2", "async-trait", - "aws-kms", - "aws-sdk-kms", "eigen-contracts", "eigen-utils", "env_logger 0.11.5", - "ethabi", - "foundry-common", - "futures", "getrandom", "hex", "http-body-util", @@ -5044,8 +5012,7 @@ dependencies = [ "lazy_static", "log", "prometheus", - "rand", - "reqwest 0.12.5", + "reqwest 0.12.7", "serde", "serde_json", "thiserror", @@ -5061,9 +5028,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0" +checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -5097,6 +5064,16 @@ dependencies = [ "generic-array", ] +[[package]] +name = "instability" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" +dependencies = [ + "quote", + "syn 2.0.76", +] + [[package]] name = "instant" version = "0.1.13" @@ -5129,11 +5106,11 @@ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi", + "hermit-abi 0.4.0", "libc", "windows-sys 0.52.0", ] @@ -5162,15 +5139,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -5197,9 +5165,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a" dependencies = [ "wasm-bindgen", ] @@ -5269,9 +5237,9 @@ dependencies = [ [[package]] name = "keccak-asm" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47a3633291834c4fbebf8673acbc1b04ec9d151418ff9b8e26dcd79129928758" +checksum = "422fbc7ff2f2f5bdffeb07718e5a5324dca72b0c9293d50df4026652385e3314" dependencies = [ "digest 0.10.7", "sha3-asm", @@ -5333,9 +5301,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.155" +version = "0.2.158" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" [[package]] name = "libm" @@ -5442,15 +5410,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - [[package]] name = "memoffset" version = "0.7.1" @@ -5482,25 +5441,23 @@ dependencies = [ ] [[package]] -name = "mio" -version = "0.8.11" +name = "miniz_oxide" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", + "adler2", ] [[package]] name = "mio" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" +checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", + "log", "wasi", "windows-sys 0.52.0", ] @@ -5530,38 +5487,38 @@ checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" [[package]] name = "nix" -version = "0.24.3" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", + "memoffset", + "pin-utils", ] [[package]] name = "nix" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "cfg-if", + "cfg_aliases 0.1.1", "libc", - "memoffset 0.7.1", - "pin-utils", ] [[package]] name = "nix" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" +checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases", + "cfg_aliases 0.2.1", "libc", ] @@ -5609,23 +5566,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-bigint-dig" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc84195820f291c7697304f3cbdadd1cb7199c0efc917ff5eafd71225c136151" -dependencies = [ - "byteorder", - "lazy_static", - "libm", - "num-integer", - "num-iter", - "num-traits", - "rand", - "smallvec", - "zeroize", -] - [[package]] name = "num-complex" version = "0.4.6" @@ -5698,7 +5638,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.9", "libc", ] @@ -5720,7 +5660,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -5829,7 +5769,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6031,7 +5971,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6096,7 +6036,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e9567389417feee6ce15dd6527a8a1ecac205ef62c2932bcf3d9f6fc5b78b414" dependencies = [ "futures", - "rustc_version 0.4.0", + "rustc_version 0.4.1", ] [[package]] @@ -6129,7 +6069,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6189,7 +6129,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6204,17 +6144,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs1" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f" -dependencies = [ - "der 0.7.9", - "pkcs8 0.10.2", - "spki 0.7.3", -] - [[package]] name = "pkcs8" version = "0.9.0" @@ -6252,18 +6181,6 @@ dependencies = [ "universal-hash", ] -[[package]] -name = "polyval" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1fe60d06143b2430aa532c94cfe9e29783047f06c0d7fd359a9a51b729fa25" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug", - "universal-hash", -] - [[package]] name = "portable-atomic" version = "1.7.0" @@ -6278,11 +6195,11 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" -version = "0.2.18" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" dependencies = [ - "zerocopy 0.6.6", + "zerocopy", ] [[package]] @@ -6303,12 +6220,12 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -6336,11 +6253,11 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b" dependencies = [ - "toml_edit 0.21.1", + "toml_edit", ] [[package]] @@ -6384,7 +6301,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "version_check", "yansi 1.0.1", ] @@ -6462,16 +6379,17 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" +checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", - "rustc-hash 1.1.0", + "rustc-hash", "rustls 0.23.12", + "socket2", "thiserror", "tokio", "tracing", @@ -6479,14 +6397,14 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.3" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" dependencies = [ "bytes", "rand", "ring 0.17.8", - "rustc-hash 1.1.0", + "rustc-hash", "rustls 0.23.12", "slab", "thiserror", @@ -6503,14 +6421,15 @@ dependencies = [ "libc", "once_cell", "socket2", + "tracing", "windows-sys 0.52.0", ] [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -6562,19 +6481,20 @@ dependencies = [ [[package]] name = "ratatui" -version = "0.26.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f44c9e68fd46eda15c646fbb85e1040b657a58cdc8c98db1d97a55930d991eef" +checksum = "fdef7f9be5c0122f890d58bdf4d964349ba6a6161f705907526d891efabba57d" dependencies = [ "bitflags 2.6.0", "cassowary", "compact_str", - "crossterm", - "itertools 0.12.1", + "crossterm 0.28.1", + "instability", + "itertools 0.13.0", "lru", "paste", - "stability", "strum", + "strum_macros", "unicode-segmentation", "unicode-truncate", "unicode-width", @@ -6617,9 +6537,9 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" +checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", @@ -6705,7 +6625,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "sync_wrapper 0.1.2", - "system-configuration", + "system-configuration 0.5.1", "tokio", "tokio-rustls 0.24.1", "tower-service", @@ -6714,14 +6634,14 @@ dependencies = [ "wasm-bindgen-futures", "web-sys", "webpki-roots 0.25.4", - "winreg 0.50.0", + "winreg", ] [[package]] name = "reqwest" -version = "0.12.5" +version = "0.12.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +checksum = "f8f4955649ef5c38cc7f9e8aa41761d48fb9677197daea9984dc54f56aad5e63" dependencies = [ "base64 0.22.1", "bytes", @@ -6729,7 +6649,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.4.5", + "h2 0.4.6", "http 1.1.0", "http-body 1.0.1", "http-body-util", @@ -6747,31 +6667,32 @@ dependencies = [ "pin-project-lite", "quinn", "rustls 0.23.12", - "rustls-native-certs 0.7.1", - "rustls-pemfile 2.1.2", + "rustls-native-certs 0.7.3", + "rustls-pemfile 2.1.3", "rustls-pki-types", "serde", "serde_json", "serde_urlencoded", "sync_wrapper 1.0.1", - "system-configuration", + "system-configuration 0.6.1", "tokio", "tokio-native-tls", "tokio-rustls 0.26.0", + "tokio-socks", "tower-service", "url", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", "webpki-roots 0.26.3", - "winreg 0.52.0", + "windows-registry", ] [[package]] name = "revm" -version = "12.1.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cfb48bce8ca2113e157bdbddbd5eeb09daac1c903d79ec17085897c38c7c91" +checksum = "6b2f635bbbf4002b1b5c0219f841ec1a317723883ed7662c0d138617539a6087" dependencies = [ "auto_impl", "cfg-if", @@ -6784,9 +6705,9 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.5.5" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a785dafff303a335980e317669c4e9800cdd5dd2830c6880c3247022761e88" +checksum = "ec16f9b9d3cdaaf2f4b7ceaf004eb2c89df04e7ea29622584c0a6ec676bd0a83" dependencies = [ "alloy-primitives", "alloy-rpc-types", @@ -6801,9 +6722,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "8.1.0" +version = "9.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b0daddea06fc6da5346acc39b32a357bbe3579e9e3d94117d9ae125cd596fc" +checksum = "f2ad04c7d87dc3421a5ccca76e56dbd0b29a358c03bb41fe9e80976e9d3f397d" dependencies = [ "revm-primitives", "serde", @@ -6811,9 +6732,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "9.2.0" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef55228211251d7b6c7707c3ee13bb70dea4d2fd81ec4034521e4fe31010b2ea" +checksum = "3526a4ba5ec400e7bbe71affbc10fe2e67c1cd1fb782bab988873d09a102e271" dependencies = [ "aurora-engine-modexp", "blst", @@ -6831,9 +6752,9 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "7.1.0" +version = "8.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fc4311037ee093ec50ec734e1424fcb3e12d535c6cef683b75d1c064639630c" +checksum = "4093d98a26601f0a793871c5bc7928410592f76b1f03fc89fde77180c554643c" dependencies = [ "alloy-eips 0.2.1", "alloy-primitives", @@ -6842,7 +6763,7 @@ dependencies = [ "bitvec", "c-kzg", "cfg-if", - "derive_more", + "derive_more 0.99.18", "dyn-clone", "enumn", "hashbrown 0.14.5", @@ -6945,26 +6866,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "rsa" -version = "0.9.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" -dependencies = [ - "const-oid", - "digest 0.10.7", - "num-bigint-dig", - "num-integer", - "num-traits", - "pkcs1", - "pkcs8 0.10.2", - "rand_core", - "signature 2.2.0", - "spki 0.7.3", - "subtle", - "zeroize", -] - [[package]] name = "rtoolbox" version = "0.0.2" @@ -7022,12 +6923,6 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - [[package]] name = "rustc-hash" version = "2.0.0" @@ -7051,18 +6946,18 @@ dependencies = [ [[package]] name = "rustc_version" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" +checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92" dependencies = [ "semver 1.0.23", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" dependencies = [ "bitflags 2.6.0", "errno", @@ -7092,7 +6987,7 @@ dependencies = [ "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.6", + "rustls-webpki 0.102.7", "subtle", "zeroize", ] @@ -7111,12 +7006,12 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5" dependencies = [ "openssl-probe", - "rustls-pemfile 2.1.2", + "rustls-pemfile 2.1.3", "rustls-pki-types", "schannel", "security-framework", @@ -7133,9 +7028,9 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "2.1.2" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +checksum = "196fe16b00e106300d3e45ecfcb764fa292a535d7326a29a5875c579c7417425" dependencies = [ "base64 0.22.1", "rustls-pki-types", @@ -7143,9 +7038,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" [[package]] name = "rustls-webpki" @@ -7159,9 +7054,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.102.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -7217,7 +7112,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024" dependencies = [ "cfg-if", - "derive_more", + "derive_more 0.99.18", "parity-scale-codec", "scale-info-derive", ] @@ -7394,9 +7289,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.204" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" dependencies = [ "serde_derive", ] @@ -7412,20 +7307,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.209" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] name = "serde_json" -version = "1.0.122" +version = "1.0.127" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da" +checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" dependencies = [ "indexmap", "itoa", @@ -7462,7 +7357,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7533,9 +7428,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b57fd861253bff08bb1919e995f90ba8f4889de2726091c8876f3a4e823b40" +checksum = "57d79b758b7cb2085612b11a235055e485605a5103faccdd633f35bd7aee69dd" dependencies = [ "cc", "cfg-if", @@ -7556,6 +7451,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde" +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook" version = "0.3.17" @@ -7573,7 +7474,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd" dependencies = [ "libc", - "mio 0.8.11", + "mio", "signal-hook", ] @@ -7701,16 +7602,6 @@ dependencies = [ "der 0.7.9", ] -[[package]] -name = "stability" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d904e7009df136af5297832a3ace3370cd14ff1546a232f4f185036c2736fcac" -dependencies = [ - "quote", - "syn 2.0.72", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -7755,7 +7646,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7799,35 +7690,35 @@ dependencies = [ [[package]] name = "svm-rs" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5910befd515534a92e9424f250d952fe6f6dba6a92bd001dfeba1fb4a2f87c" +checksum = "00d3230221bec82c4a79cd7af637ac29f04f369e95e476bc492f22882bb83c91" dependencies = [ "const-hex", "dirs", "fs4", - "once_cell", - "reqwest 0.12.5", + "reqwest 0.12.7", "semver 1.0.23", "serde", "serde_json", "sha2", + "tempfile", "thiserror", "url", - "zip 2.1.6", + "zip 2.2.0", ] [[package]] name = "svm-rs-builds" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d5ea000fdbeab0b2739315f9093c75ea63030e5c44f92daa72401d11b48adda" +checksum = "83fe4ebbe1038a5a517a07948c2487b3ccf79a4908953cc8f0047cf652233546" dependencies = [ "build_const", "const-hex", "semver 1.0.23", "serde_json", - "svm-rs 0.5.4", + "svm-rs 0.5.6", ] [[package]] @@ -7843,9 +7734,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.72" +version = "2.0.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" +checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" dependencies = [ "proc-macro2", "quote", @@ -7861,7 +7752,7 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -7875,6 +7766,9 @@ name = "sync_wrapper" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" +dependencies = [ + "futures-core", +] [[package]] name = "system-configuration" @@ -7884,7 +7778,18 @@ checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" dependencies = [ "bitflags 1.3.2", "core-foundation", - "system-configuration-sys", + "system-configuration-sys 0.5.0", +] + +[[package]] +name = "system-configuration" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b" +dependencies = [ + "bitflags 2.6.0", + "core-foundation", + "system-configuration-sys 0.6.0", ] [[package]] @@ -7897,33 +7802,32 @@ dependencies = [ "libc", ] +[[package]] +name = "system-configuration-sys" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" +dependencies = [ + "core-foundation-sys", + "libc", +] + [[package]] name = "tangle-avs" version = "0.1.0" dependencies = [ - "alloy 0.1.4", - "alloy-consensus 0.2.1", + "alloy", "alloy-contract", - "alloy-network 0.2.1", "alloy-primitives", "alloy-provider 0.2.1", - "alloy-pubsub", "alloy-rpc-client 0.2.1", - "alloy-rpc-types", "alloy-rpc-types-eth 0.2.1", "alloy-signer 0.2.1", "alloy-signer-local", "alloy-sol-types", "alloy-transport 0.2.1", - "alloy-transport-http 0.2.1", - "alloy-transport-ws", "anvil", - "async-trait", - "aws-kms", - "aws-sdk-kms", - "eigen-contracts", "eigen-utils", - "env_logger 0.10.2", "env_logger 0.11.5", "foundry-common", "getrandom", @@ -7931,10 +7835,7 @@ dependencies = [ "k256", "lazy_static", "log", - "prometheus", "rand_core", - "reqwest 0.12.5", - "serde", "thiserror", "tokio", "url", @@ -7948,14 +7849,15 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7992,49 +7894,24 @@ dependencies = [ name = "test-utils" version = "0.1.0" dependencies = [ - "alloy 0.2.1", - "alloy-abi", - "alloy-contract", "alloy-primitives", "alloy-provider 0.2.1", - "alloy-pubsub", - "alloy-rpc-client 0.2.1", - "alloy-rpc-types", "alloy-rpc-types-eth 0.2.1", "alloy-signer 0.2.1", "alloy-signer-local", "alloy-sol-types", - "alloy-transport 0.2.1", - "alloy-transport-http 0.2.1", "alloy-transport-ws", "anvil", - "ark-bn254", - "async-trait", - "aws-kms", - "aws-sdk-kms", "eigen-contracts", "eigen-utils", "env_logger 0.11.5", - "ethabi", "ethers", - "foundry-common", - "futures", "hex", - "http-body-util", - "hyper 1.4.1", "incredible-squaring-avs", "k256", - "lazy_static", "log", "nix 0.28.0", - "prometheus", - "rand", - "reqwest 0.12.5", - "serde", - "serde_json", - "sha3", "tangle-avs", - "thiserror", "tokio", "url", ] @@ -8056,7 +7933,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -8080,9 +7957,9 @@ dependencies = [ [[package]] name = "tikv-jemalloc-sys" -version = "0.5.4+5.3.0-patched" +version = "0.6.0+5.3.0-1-ge13ca993e8ccb9ba9847cc330696e02839f328f7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9402443cb8fd499b6f327e40565234ff34dbda27460c5b47db0db77443dd85d1" +checksum = "cd3c60906412afa9c2b5b5a48ca6a5abe5736aec9eb48ad05037a677e52e4e2d" dependencies = [ "cc", "libc", @@ -8090,9 +7967,9 @@ dependencies = [ [[package]] name = "tikv-jemallocator" -version = "0.5.4" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965fe0c26be5c56c94e38ba547249074803efd52adfb66de62107d95aab3eaca" +checksum = "4cec5ff18518d81584f477e9bfdf957f5bb0979b0bac3af4ca30b5b3ae2d2865" dependencies = [ "libc", "tikv-jemalloc-sys", @@ -8157,14 +8034,14 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.2" +version = "1.39.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1" +checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" dependencies = [ "backtrace", "bytes", "libc", - "mio 1.0.1", + "mio", "parking_lot", "pin-project-lite", "signal-hook-registry", @@ -8181,7 +8058,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -8215,6 +8092,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", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.15" @@ -8293,7 +8182,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.22.20", + "toml_edit", ] [[package]] @@ -8305,17 +8194,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_edit" -version = "0.21.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" -dependencies = [ - "indexmap", - "toml_datetime", - "winnow 0.5.40", -] - [[package]] name = "toml_edit" version = "0.22.20" @@ -8326,7 +8204,7 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "winnow 0.6.18", + "winnow", ] [[package]] @@ -8364,15 +8242,15 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" [[package]] name = "tower-service" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" @@ -8394,7 +8272,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -8612,9 +8490,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" dependencies = [ "tinyvec", ] @@ -8644,9 +8522,9 @@ checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unicode-xid" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" +checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" [[package]] name = "universal-hash" @@ -8797,34 +8675,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.42" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" +checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed" dependencies = [ "cfg-if", "js-sys", @@ -8834,9 +8713,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -8844,28 +8723,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0" dependencies = [ "js-sys", "wasm-bindgen", @@ -8910,11 +8789,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8932,6 +8811,36 @@ dependencies = [ "windows-targets 0.52.6", ] +[[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.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", +] + [[package]] name = "windows-sys" version = "0.48.0" @@ -8950,6 +8859,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + [[package]] name = "windows-targets" version = "0.48.5" @@ -9071,15 +8989,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "winnow" -version = "0.5.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" -dependencies = [ - "memchr", -] - [[package]] name = "winnow" version = "0.6.18" @@ -9099,16 +9008,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "winreg" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" -dependencies = [ - "cfg-if", - "windows-sys 0.48.0", -] - [[package]] name = "ws_stream_wasm" version = "0.7.4" @@ -9120,7 +9019,7 @@ dependencies = [ "js-sys", "log", "pharos", - "rustc_version 0.4.0", + "rustc_version 0.4.1", "send_wrapper 0.6.0", "thiserror", "wasm-bindgen", @@ -9158,34 +9057,14 @@ dependencies = [ "is-terminal", ] -[[package]] -name = "zerocopy" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6" -dependencies = [ - "byteorder", - "zerocopy-derive 0.6.6", -] - [[package]] name = "zerocopy" version = "0.7.35" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" dependencies = [ - "zerocopy-derive 0.7.35", -] - -[[package]] -name = "zerocopy-derive" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.72", + "byteorder", + "zerocopy-derive", ] [[package]] @@ -9196,7 +9075,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -9216,7 +9095,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.72", + "syn 2.0.76", ] [[package]] @@ -9241,9 +9120,9 @@ dependencies = [ [[package]] name = "zip" -version = "2.1.6" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40dd8c92efc296286ce1fbd16657c5dbefff44f1b4ca01cc5f517d8b7b3d3e2e" +checksum = "dc5e4288ea4057ae23afc69a4472434a87a2495cafce6632fd1c4ec9f5cf3494" dependencies = [ "arbitrary", "crc32fast", diff --git a/Cargo.toml b/Cargo.toml index 53ec7ab..f7733b1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,7 +5,6 @@ members = [ "avs/tangle-avs", "aws", "contracts", - "eigensdk-rs", "fireblocks-client", "test-utils", "utils", @@ -47,7 +46,7 @@ ark-secp256k1 = { version = "0.4", default-features = false } ark-ed25519 = { version = "0.4", default-features = false } base64 = "0.22.1" -tokio-rustls = "0.24.1" +tokio-rustls = "0.26.0" tokio = { version = "1.32.0", default-features = false } tokio-util = { version = "0.7.10", default-features = false } bincode2 = { version = "2" } @@ -69,7 +68,7 @@ auto_impl = "1.1.0" uuid = "1.4.1" bytes = "1.5.0" serde_bytes = { version = "0.11.12", default-features = false } -itertools = "0.12.0" +itertools = "0.13.0" strum = "0.26" clap = "4.0.32" color-eyre = { version = "0.6", features = [ @@ -82,12 +81,12 @@ rand = "0.8.5" rand_core = "0.6" getrandom = { version = "0.2.12", default-features = false } rand_chacha = { version = "0.3.1" } -jsonrpsee = "0.16.2" +jsonrpsee = "0.24.3" linked-hash-map = { version = "0.5.6", default-features = false } k256 = { version = "0.13.2", default-features = false } p256 = { version = "0.13.2", default-features = false } signature = "2.2.0" -starknet-crypto = "0.6.1" +starknet-crypto = "0.7.1" anyhow = "1.0.79" libsecp256k1 = "0.7.1" rayon = { version = "1.8.0" } @@ -171,3 +170,16 @@ wasmer = { version = "4.2.6", default-features = false } [profile.dev.package.backtrace] opt-level = 3 + +[package] +name = "eigensdk-rs" +version = "0.1.0" +description = "Eigen SDK for Web3.0" +edition = "2021" + +[dependencies] +eigen-contracts.workspace = true +eigen-utils.workspace = true +fireblocks-client.workspace = true +incredible-squaring-avs.workspace = true +tangle-avs.workspace = true diff --git a/avs/incredible-squaring-avs/Cargo.toml b/avs/incredible-squaring-avs/Cargo.toml index aa090e8..d1ab816 100644 --- a/avs/incredible-squaring-avs/Cargo.toml +++ b/avs/incredible-squaring-avs/Cargo.toml @@ -10,44 +10,30 @@ repository.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -alloy-abi.workspace = true alloy-contract.workspace = true alloy-primitives.workspace = true alloy-provider.workspace = true alloy-pubsub.workspace = true -alloy-rpc-client.workspace = true alloy-rpc-types.workspace = true alloy-sol-types.workspace = true alloy-signer.workspace = true alloy-signer-local = { workspace = true, features = ["keystore"] } -alloy-transport-http.workspace = true -alloy-transport-ws.workspace = true alloy-transport.workspace = true async-trait.workspace = true -aws-sdk-kms.workspace = true eigen-contracts.workspace = true eigen-utils.workspace = true -aws-kms.workspace = true -#gadget-common = { workspace = true, default-features = false, features = ["default"] } -# gadget-common = { workspace = true, features = ["tangle-testnet"] } - -foundry-common.workspace = true -futures.workspace = true http-body-util.workspace = true hyper = { workspace = true, features = ["full"] } hex.workspace = true k256 = { workspace = true, features = ["expose-field"] } log.workspace = true prometheus.workspace = true -rand.workspace = true reqwest.workspace = true serde.workspace = true serde_json.workspace = true thiserror.workspace = true tokio.workspace = true -env_logger.workspace = true -ethabi = "18.0.0" [dev-dependencies] anvil.workspace = true @@ -69,4 +55,4 @@ lazy_static.workspace = true url.workspace = true ark-ec.workspace = true ark-ff.workspace = true -ark-bn254.workspace = true \ No newline at end of file +ark-bn254.workspace = true diff --git a/avs/tangle-avs/Cargo.toml b/avs/tangle-avs/Cargo.toml index 9677754..c80a2c6 100644 --- a/avs/tangle-avs/Cargo.toml +++ b/avs/tangle-avs/Cargo.toml @@ -11,38 +11,19 @@ repository.workspace = true [dependencies] alloy-contract.workspace = true -alloy-consensus.workspace = true -alloy-network.workspace = true alloy-primitives.workspace = true alloy-provider = { workspace = true, features = ["hyper"] } -alloy-pubsub.workspace = true -alloy-rpc-client.workspace = true -alloy-rpc-types.workspace = true alloy-sol-types.workspace = true alloy-signer.workspace = true alloy-signer-local.workspace = true -alloy-transport-http.workspace = true -alloy-transport-ws.workspace = true alloy-transport.workspace = true -async-trait.workspace = true -aws-sdk-kms.workspace = true - -eigen-contracts.workspace = true eigen-utils.workspace = true -aws-kms.workspace = true hex.workspace = true #k256.workspace = true k256 = { workspace = true, features = ["ecdsa"] } log.workspace = true -prometheus.workspace = true -reqwest.workspace = true thiserror.workspace = true -tokio.workspace = true -serde = { version = "1.0.203", features = ["derive"] } -#gadget-common = { workspace = true, default-features = false, features = ["default"] } -#gadget-executor = { workspace = true } -env_logger = "0.10.2" [dev-dependencies] rand_core.workspace = true @@ -67,4 +48,4 @@ url.workspace = true [features] default = [] -tangle = [] \ No newline at end of file +tangle = [] diff --git a/eigensdk-rs/Cargo.toml b/eigensdk-rs/Cargo.toml deleted file mode 100644 index c070b9c..0000000 --- a/eigensdk-rs/Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ -[package] -name = "eigensdk-rs" -version = "0.1.0" -edition = "2021" - -[dependencies] -eigen-contracts = { workspace = true } -eigen-utils = { workspace = true } -tangle-avs = { workspace = true } -incredible-squaring-avs = { workspace = true } -fireblocks-client = { workspace = true } -aws-kms = { workspace = true } \ No newline at end of file diff --git a/fireblocks-client/Cargo.toml b/fireblocks-client/Cargo.toml index 67b31ba..1fc2058 100644 --- a/fireblocks-client/Cargo.toml +++ b/fireblocks-client/Cargo.toml @@ -6,30 +6,20 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -async-trait.workspace = true -regex.workspace = true -anyhow.workspace = true thiserror.workspace = true -tracing.workspace = true serde.workspace = true serde_json.workspace = true -num-bigint.workspace = true reqwest = { workspace = true, features = ["json"] } -tree_magic_mini.workspace = true tokio.workspace = true hex.workspace = true -futures.workspace = true jsonwebtoken.workspace = true uuid = { workspace = true, features = ["v4"] } log.workspace = true sha2.workspace = true -rsa.workspace = true pretty_env_logger.workspace = true alloy-provider.workspace = true alloy-primitives = { workspace = true, features = ["serde"] } alloy-transport.workspace = true alloy-network.workspace = true -alloy-transport-ws.workspace = true -alloy-consensus.workspace = true -alloy-rpc-types.workspace = true \ No newline at end of file +alloy-rpc-types.workspace = true diff --git a/eigensdk-rs/src/lib.rs b/src/lib.rs similarity index 100% rename from eigensdk-rs/src/lib.rs rename to src/lib.rs diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index e557da7..1c829e8 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -20,48 +20,21 @@ name = "tangle" path = "src/bin/tangle.rs" [dependencies] -alloy-abi.workspace = true -alloy-contract.workspace = true alloy-primitives.workspace = true alloy-provider.workspace = true -alloy-pubsub.workspace = true -alloy-rpc-client.workspace = true -alloy-rpc-types.workspace = true alloy-sol-types.workspace = true alloy-signer.workspace = true alloy-signer-local = { workspace = true, features = ["keystore"] } -alloy-transport-http.workspace = true alloy-transport-ws.workspace = true -alloy-transport.workspace = true -async-trait.workspace = true -aws-sdk-kms.workspace = true eigen-contracts.workspace = true eigen-utils.workspace = true incredible-squaring-avs.workspace = true tangle-avs.workspace = true -aws-kms.workspace = true -#gadget-common = { workspace = true, default-features = false, features = ["default"] } -# gadget-common = { workspace = true, features = ["tangle-testnet"] } - -foundry-common.workspace = true -futures.workspace = true -http-body-util.workspace = true -hyper = { workspace = true, features = ["full"] } k256 = { workspace = true, features = ["expose-field"] } -prometheus.workspace = true -rand.workspace = true -reqwest.workspace = true -serde.workspace = true -serde_json.workspace = true -thiserror.workspace = true tokio.workspace = true -ethabi = "18.0.0" anvil.workspace = true ethers.workspace = true - -#tokio = { workspace = true, features = ["full"] } -alloy = { workspace = true, features = ["serde", "signers"] } alloy-rpc-types-eth.workspace = true #alloy-primitives = { workspace = true, features = ["rand"] } #alloy-signer-local.workspace = true @@ -71,9 +44,4 @@ env_logger.workspace = true hex.workspace = true #lazy_static.workspace = true url.workspace = true -#ark-ec.workspace = true -#ark-ff.workspace = true -ark-bn254.workspace = true -sha3 = "0.10.8" nix = "0.28.0" -lazy_static = "1.5.0" \ No newline at end of file diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 7083f06..9c281c3 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -10,35 +10,25 @@ async-trait.workspace = true alloy-primitives.workspace = true alloy-provider.workspace = true alloy-sol-types = { workspace = true, features = ["json"] } -alloy-transport-http.workspace = true alloy-rpc-types.workspace = true alloy-pubsub.workspace = true eigen-contracts.workspace = true hyper = { workspace = true, features = ["full"] } regex.workspace = true chacha20poly1305.workspace = true -anyhow.workspace = true pin-project-lite.workspace = true http-body-util.workspace = true thiserror.workspace = true -tracing.workspace = true serde = { workspace = true, features = ["derive"] } serde_json.workspace = true -num-bigint.workspace = true reqwest.workspace = true tree_magic_mini.workspace = true tokio.workspace = true hex.workspace = true -futures.workspace = true log.workspace = true -alloy-abi.workspace = true alloy-contract.workspace = true -alloy-consensus.workspace = true -alloy-eips.workspace = true alloy-transport.workspace = true alloy-network.workspace = true -alloy-transport-ws.workspace = true -alloy-signer-local.workspace = true alloy-signer.workspace = true scrypt.workspace = true @@ -50,20 +40,9 @@ ark-serialize.workspace = true base64.workspace = true rand.workspace = true -rand_core.workspace = true uuid = { workspace = true, features = ["v4", "serde"] } -bincode.workspace = true sha3 = "0.10.8" k256.workspace = true -aes-gcm = "0.10.3" -secp256k1 = "0.29.0" -dirs = "5.0.1" #gadget-common.workspace = true aes = "0.8.4" ctr = "0.9.2" - -# Anvil testnet dependencies -ethers = "2.0.4" -nix = "0.24.3" -tempfile = "3.10.1" -anvil = { workspace = true } \ No newline at end of file From f759f43734eea023e91060bedc0c456b6a655aab Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Thu, 5 Sep 2024 13:49:26 -0500 Subject: [PATCH 3/8] Fix: Removed unnecessary fallibility of some crypto functions for use in gadget's keystore --- Cargo.toml | 2 +- utils/src/crypto/bls.rs | 216 +++----------------------------------- utils/src/crypto/bn254.rs | 44 +++----- utils/src/crypto/ecdsa.rs | 8 +- 4 files changed, 35 insertions(+), 235 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f7733b1..671e161 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,7 +63,7 @@ tracing-subscriber = { version = "0.3", default-features = false } tracing-core = { version = "0.1.32", default-features = false } parking_lot = "0.12.1" futures = "0.3.30" -hex = { version = "0.4.3", default-features = false } +hex = { version = "0.4.3", default-features = false, features = ["alloc"] } auto_impl = "1.1.0" uuid = "1.4.1" bytes = "1.5.0" diff --git a/utils/src/crypto/bls.rs b/utils/src/crypto/bls.rs index ccb30ee..3dfd8d2 100644 --- a/utils/src/crypto/bls.rs +++ b/utils/src/crypto/bls.rs @@ -96,15 +96,13 @@ impl G1Point { } pub fn generator() -> Self { - // let gen = G1Affine::generator(); - let gen = get_g1_generator().unwrap(); + let gen = get_g1_generator(); ark_point_to_g1_point(&gen) } pub fn add(&mut self, other: &G1Point) { let affine_p1 = g1_point_to_ark_point(self); let affine_p2 = g1_point_to_ark_point(other); - // let pt = (affine_p1 + affine_p2).into_affine(); let pt = affine_p1.add(affine_p2); *self = g1_projective_to_g1_point(&pt); } @@ -207,7 +205,7 @@ impl G2Point { /// Uses the fixed [G2Affine::generator] to generate a [G2Point]. pub fn generator() -> Self { // let gen = G2Affine::generator(); - let gen = get_g2_generator().unwrap(); + let gen = get_g2_generator(); ark_point_to_g2_point(&gen) } @@ -354,7 +352,7 @@ impl Signature { pubkey: &G2Point, pre_hashed_message: &[u8; 32], ) -> Result { - let g2_gen = ark_point_to_g2_point(&get_g2_generator()?); + let g2_gen = ark_point_to_g2_point(&get_g2_generator()); let msg_affine = map_to_curve(pre_hashed_message).into_affine(); let msg_point = ark_point_to_g1_point(&msg_affine); let neg_sig = self.g1_point.neg(); @@ -366,7 +364,7 @@ impl Signature { let q_projective = [g2_point_to_ark_point(&q[0]), g2_point_to_ark_point(&q[1])]; // If Pairing Left and Right are equal, then the signature is valid as well - let e1 = Bn254::pairing(self.g1_point.to_ark_g1(), get_g2_generator().unwrap()); + let e1 = Bn254::pairing(self.g1_point.to_ark_g1(), get_g2_generator()); let e2 = Bn254::pairing(msg_affine, g2_point_to_ark_point(&pubkey.clone())); log::info!("Are e1 and e2 pairings equal? {:?}", e1 == e2); @@ -384,27 +382,21 @@ pub struct KeyPair { } impl KeyPair { - pub fn new(sk: PrivateKey) -> Result { - let pub_key_point_result = mul_by_generator_g1(sk); - - match pub_key_point_result { - Ok(pub_key_point) => Ok(Self { - priv_key: sk, - pub_key: pub_key_point, - }), - Err(_) => Err(AvsError::KeyError( - "Failed to generate new key pair".to_string(), - )), + pub fn new(sk: PrivateKey) -> Self { + let pub_key_point = mul_by_generator_g1(sk); + Self { + priv_key: sk, + pub_key: pub_key_point, } } - pub fn from_string(s: String) -> Result { + pub fn from_string(s: String) -> Self { let bigint = hex_string_to_biginteger256(&s); let private_key = Fr::from(bigint); KeyPair::new(private_key) } - pub fn gen_random() -> Result { + pub fn gen_random() -> Self { let mut rng = rand::thread_rng(); let key = Fr::rand(&mut rng); KeyPair::new(key) @@ -569,7 +561,7 @@ mod tests { #[tokio::test] async fn test_keypair_generation() { - let keypair = KeyPair::gen_random().unwrap(); + let keypair = KeyPair::gen_random(); // Check that the public key is not zero assert_ne!(keypair.pub_key, G1Projective::zero()); @@ -577,7 +569,7 @@ mod tests { #[tokio::test] async fn test_signature_generation() { - let keypair = KeyPair::gen_random().unwrap(); + let keypair = KeyPair::gen_random(); let message = [0u8; 32]; let signature = keypair.sign_message(&message); @@ -606,7 +598,7 @@ mod tests { #[tokio::test] async fn test_signature_verification() { - let keypair = KeyPair::gen_random().unwrap(); + let keypair = KeyPair::gen_random(); let pub_key_g2 = keypair.get_pub_key_g2(); let mut message = [0u8; 32]; thread_rng().fill(&mut message); @@ -627,7 +619,7 @@ mod tests { #[tokio::test] async fn test_signature_verification_invalid() { let mut rng = thread_rng(); - let keypair = KeyPair::gen_random().unwrap(); + let keypair = KeyPair::gen_random(); let mut message = [0u8; 32]; rand::thread_rng().fill(&mut message); @@ -658,182 +650,8 @@ mod tests { let keypair_result_from_string = KeyPair::from_string(hex_string); let keypair_result_normal = KeyPair::new(Fr::from(bigint)); - let keypair_from_string = keypair_result_from_string.unwrap(); - let keypair_from_new = keypair_result_normal.unwrap(); + let keypair_from_string = keypair_result_from_string; + let keypair_from_new = keypair_result_normal; assert_eq!(keypair_from_new.priv_key, keypair_from_string.priv_key); } - // - // #[tokio::test] - // async fn test_convert_to_g1_point() { - // let x_point = F::from_str( - // "17709620697113958145616918533531128159269167719799793368595970620022661612059", - // ) - // .unwrap(); - // let y_point = F::from_str( - // "9890439522434691655532127414660267222813910180198976870423582442696952349816", - // ) - // .unwrap(); - // let g1_affine = G1Affine::new(x_point, y_point); - // - // let alloy_g1_point = ark_point_to_g1_point(&g1_affine); - // assert_eq!( - // alloy_g1_point.x, - // U256::from_str( - // "17709620697113958145616918533531128159269167719799793368595970620022661612059" - // ) - // .unwrap() - // ); - // assert_eq!( - // alloy_g1_point.y, - // U256::from_str( - // "9890439522434691655532127414660267222813910180198976870423582442696952349816" - // ) - // .unwrap() - // ); - // } - // - // #[tokio::test] - // async fn test_convert_to_g2_point() { - // let x_point_c0 = F::from_str( - // "6834287759893774453556191528501556195232162436167606874229072410417955767882", - // ) - // .unwrap(); - // let x_point_c1 = F::from_str( - // "15529400123788596166111036611862227541174221446291015207340396747864347375335", - // ) - // .unwrap(); - // - // let y_point_c0 = F::from_str( - // "7616309349481520605447660298084926776417001188005125143383153219707218450524", - // ) - // .unwrap(); - // let y_point_c1 = F::from_str( - // "19775028091101520702581412350510183088819198056772055625089714355379667714558", - // ) - // .unwrap(); - // - // let x_point = ark_bn254::Fq2::new(x_point_c0, x_point_c1); - // let y_point = ark_bn254::Fq2::new(y_point_c0, y_point_c1); - // - // let g2_affine = G2Affine::new(x_point, y_point); - // - // let alloy_g2_point = ark_point_to_g2_point(&g2_affine); - // assert_eq!( - // alloy_g2_point.x[0], - // U256::from_str( - // "15529400123788596166111036611862227541174221446291015207340396747864347375335" - // ) - // .unwrap() - // ); - // assert_eq!( - // alloy_g2_point.x[1], - // U256::from_str( - // "6834287759893774453556191528501556195232162436167606874229072410417955767882" - // ) - // .unwrap() - // ); - // assert_eq!( - // alloy_g2_point.y[0], - // U256::from_str( - // "19775028091101520702581412350510183088819198056772055625089714355379667714558" - // ) - // .unwrap() - // ); - // assert_eq!( - // alloy_g2_point.y[1], - // U256::from_str( - // "7616309349481520605447660298084926776417001188005125143383153219707218450524" - // ) - // .unwrap() - // ); - // } - // - // #[tokio::test] - // async fn test_bls_key_pair() { - // let bls_priv_key = - // "12248929636257230549931416853095037629726205319386239410403476017439825112537"; - // let bls_key_pair = KeyPair::new(PrivateKey::from_str(bls_priv_key).unwrap()).unwrap(); - // - // assert_eq!( - // U256::from_limbs(*bls_key_pair.get_pub_key_g1().x.as_limbs()), - // U256::from_str( - // "277950648056014144722774518899051149098728246263316284984520891067822832300" - // ) - // .unwrap() - // ); - // assert_eq!( - // U256::from_limbs(*bls_key_pair.get_pub_key_g1().y.as_limbs()), - // U256::from_str( - // "16927236637669640540790285431111034664564710839671197540688155537113438534238" - // ) - // .unwrap() - // ); - // } - // - // #[test] - // fn test_map_to_curve() { - // let message: [u8; 32] = [ - // 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - // 25, 26, 27, 28, 29, 30, 31, 32, - // ]; - // let g1 = crate::crypto::bn254::map_to_curve(&message); - // - // assert_eq!( - // U256::from_limbs(g1.x.into_bigint().0), - // U256::from_str( - // "455867356320691211509944977504407603390036387149619137164185182714736811811" - // ) - // .unwrap() - // ); - // assert_eq!( - // U256::from_limbs(g1.y.into_bigint().0), - // U256::from_str( - // "9802125641729881429496664198939823213610051907104384160271670136040620850981" - // ) - // .unwrap() - // ); - // } - // - // #[test] - // fn test_sign_message() { - // let message: [u8; 32] = [ - // 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - // 25, 26, 27, 28, 29, 30, 31, 32, - // ]; - // let bls_priv_key = - // "12248929636257230549931416853095037629726205319386239410403476017439825112537"; - // let bls_key_pair = KeyPair::new(PrivateKey::from_str(bls_priv_key).unwrap()).unwrap(); - // - // - // let signature = bls_key_pair.sign_message(&message); - // assert_eq!( - // U256::from_limbs(*signature.g1_point.x.as_limbs()), - // U256::from_str( - // "6125087140203962697351933212367898471377426213402772883153680722977416765651" - // ) - // .unwrap() - // ); - // assert_eq!( - // U256::from_limbs(*signature.g1_point.y.as_limbs()), - // U256::from_str( - // "19120302240465611628345095276448175199636936878728446037184749040811421969742" - // ) - // .unwrap() - // ); - // } - // - // #[test] - // fn test_verify_message() { - // let message: [u8; 32] = [ - // 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - // 25, 26, 27, 28, 29, 30, 31, 32, - // ]; - // let bls_priv_key = - // "12248929636257230549931416853095037629726205319386239410403476017439825112537"; - // let bls_key_pair = KeyPair::new(PrivateKey::from_str(bls_priv_key).unwrap()).unwrap(); - // - // let signature = bls_key_pair.sign_message(&message); - // - // assert!(signature.verify(&bls_key_pair.get_pub_key_g2(), &message).unwrap()) - // } } diff --git a/utils/src/crypto/bn254.rs b/utils/src/crypto/bn254.rs index 40b0ab2..dd1c01a 100644 --- a/utils/src/crypto/bn254.rs +++ b/utils/src/crypto/bn254.rs @@ -1,4 +1,3 @@ -use crate::types::AvsError; use alloy_primitives::U256; use ark_bn254::Fq as F; use ark_bn254::{Fr, G1Affine, G1Projective, G2Affine, G2Projective}; @@ -66,44 +65,27 @@ pub fn biginteger256_to_u256(bi: BigInteger256) -> U256 { U256::from_be_slice(&s) } -pub fn get_g1_generator() -> Result { - let g1_affine = G1Affine::new(ark_bn254::g1::G1_GENERATOR_X, ark_bn254::g1::G1_GENERATOR_Y); - Ok(g1_affine) +pub fn get_g1_generator() -> G1Affine { + G1Affine::new(ark_bn254::g1::G1_GENERATOR_X, ark_bn254::g1::G1_GENERATOR_Y) } -pub fn get_g2_generator() -> Result { - let g2_affine = G2Affine::new(ark_bn254::g2::G2_GENERATOR_X, ark_bn254::g2::G2_GENERATOR_Y); - Ok(g2_affine) +pub fn get_g2_generator() -> G2Affine { + G2Affine::new(ark_bn254::g2::G2_GENERATOR_X, ark_bn254::g2::G2_GENERATOR_Y) } -pub fn get_g2_generator_neg() -> Result { - let g2_gen = get_g2_generator()?; - Ok(g2_gen.neg()) +pub fn get_g2_generator_neg() -> G2Affine { + let g2_gen = get_g2_generator(); + g2_gen.neg() } -pub fn mul_by_generator_g1(pvt_key: Fr) -> Result { - let g1_gen_result = get_g1_generator(); - - match g1_gen_result { - Ok(g1_gen) => { - // let s: G1Projective = g1_gen.into(); - Ok(g1_gen.mul_bigint(pvt_key.0)) - } - Err(_) => Err(AvsError::KeyError( - "Invalid G1 Generator Result".to_string(), - )), - } +pub fn mul_by_generator_g1(pvt_key: Fr) -> G1Projective { + let g1_gen = get_g1_generator(); + g1_gen.mul_bigint(pvt_key.0) } -pub fn mul_by_generator_g2(pvt_key: Fr) -> Result { - let g2_gen_result = get_g2_generator(); - - match g2_gen_result { - Ok(g2_gen) => Ok(g2_gen.mul_bigint(pvt_key.0)), - Err(_) => Err(AvsError::KeyError( - "Invalid G2 Generator Result".to_string(), - )), - } +pub fn mul_by_generator_g2(pvt_key: Fr) -> G2Projective { + let g2_gen = get_g2_generator(); + g2_gen.mul_bigint(pvt_key.0) } #[cfg(test)] diff --git a/utils/src/crypto/ecdsa.rs b/utils/src/crypto/ecdsa.rs index 4b84d8f..ec99443 100644 --- a/utils/src/crypto/ecdsa.rs +++ b/utils/src/crypto/ecdsa.rs @@ -162,12 +162,12 @@ fn decrypt_data_v3(crypto_json: &CryptoJSON, auth: &str) -> Result, Box< ))); } - let mac = hex::decode(&crypto_json.mac)?; - let iv = hex::decode(&crypto_json.cipher_params.iv)?; - let cipher_text = hex::decode(&crypto_json.cipher_text)?; + let mac = hex::decode(&crypto_json.mac).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; + let iv = hex::decode(&crypto_json.cipher_params.iv).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; + let cipher_text = hex::decode(&crypto_json.cipher_text).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; let kdf_params: serde_json::Value = serde_json::from_value(crypto_json.kdf_params.clone())?; - let salt = hex::decode(kdf_params["salt"].as_str().ok_or("missing salt")?)?; + let salt = hex::decode(kdf_params["salt"].as_str().ok_or("missing salt")?).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; let scrypt_n = kdf_params["n"].as_u64().ok_or("missing n")? as u8; let scrypt_p = kdf_params["p"].as_u64().ok_or("missing p")? as u32; let scrypt_params = Params::new( From 4f2111ab38c0573a2157cb207f1f36ded52275f0 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Thu, 5 Sep 2024 17:56:23 -0500 Subject: [PATCH 4/8] Feat: G1Point Deserialization and fmt --- utils/src/crypto/bls.rs | 6 ++++++ utils/src/crypto/ecdsa.rs | 12 ++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/utils/src/crypto/bls.rs b/utils/src/crypto/bls.rs index 3dfd8d2..fcfd198 100644 --- a/utils/src/crypto/bls.rs +++ b/utils/src/crypto/bls.rs @@ -89,6 +89,12 @@ impl G1Point { ser_buf } + pub fn from_bytes(bytes: &[u8]) -> Result { + let bytes = + Self::deserialize_compressed(bytes).map_err(|e| AvsError::KeyError(e.to_string()))?; + Ok(bytes) + } + pub fn neg(&self) -> Self { let affine = g1_point_to_ark_point(self); let neg_affine = affine.neg(); diff --git a/utils/src/crypto/ecdsa.rs b/utils/src/crypto/ecdsa.rs index ec99443..558176c 100644 --- a/utils/src/crypto/ecdsa.rs +++ b/utils/src/crypto/ecdsa.rs @@ -162,12 +162,16 @@ fn decrypt_data_v3(crypto_json: &CryptoJSON, auth: &str) -> Result, Box< ))); } - let mac = hex::decode(&crypto_json.mac).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; - let iv = hex::decode(&crypto_json.cipher_params.iv).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; - let cipher_text = hex::decode(&crypto_json.cipher_text).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; + let mac = hex::decode(&crypto_json.mac) + .map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; + let iv = hex::decode(&crypto_json.cipher_params.iv) + .map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; + let cipher_text = hex::decode(&crypto_json.cipher_text) + .map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; let kdf_params: serde_json::Value = serde_json::from_value(crypto_json.kdf_params.clone())?; - let salt = hex::decode(kdf_params["salt"].as_str().ok_or("missing salt")?).map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; + let salt = hex::decode(kdf_params["salt"].as_str().ok_or("missing salt")?) + .map_err(|e| io::Error::new(ErrorKind::InvalidInput, e.to_string()))?; let scrypt_n = kdf_params["n"].as_u64().ok_or("missing n")? as u8; let scrypt_p = kdf_params["p"].as_u64().ok_or("missing p")? as u32; let scrypt_params = Params::new( From 332d63711d6f76f2fd30b07dbf82b9416fa98414 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Fri, 6 Sep 2024 16:00:47 -0500 Subject: [PATCH 5/8] Feat: Derive Eq for G1Point --- utils/src/crypto/bls.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/crypto/bls.rs b/utils/src/crypto/bls.rs index fcfd198..eda015d 100644 --- a/utils/src/crypto/bls.rs +++ b/utils/src/crypto/bls.rs @@ -32,7 +32,7 @@ struct EncryptedBLSKeyJSONV3 { pub crypto: serde_json::Value, // Adjust this type to match your specific encryption structure } -#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)] +#[derive(Clone, Debug, Default, PartialEq, Eq, Serialize, Deserialize)] pub struct G1Point { pub x: U256, pub y: U256, From 526a05240edd1a13ad05859bee9b57f117d00dfb Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Tue, 17 Sep 2024 18:58:35 -0500 Subject: [PATCH 6/8] Cargo Cleanup --- Cargo.lock | 22 ++-------------------- Cargo.toml | 1 + test-utils/Cargo.toml | 7 +------ 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6583134..8044517 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2248,12 +2248,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cfg_aliases" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" - [[package]] name = "cfg_aliases" version = "0.2.1" @@ -5498,18 +5492,6 @@ dependencies = [ "pin-utils", ] -[[package]] -name = "nix" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" -dependencies = [ - "bitflags 2.6.0", - "cfg-if", - "cfg_aliases 0.1.1", - "libc", -] - [[package]] name = "nix" version = "0.29.0" @@ -5518,7 +5500,7 @@ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46" dependencies = [ "bitflags 2.6.0", "cfg-if", - "cfg_aliases 0.2.1", + "cfg_aliases", "libc", ] @@ -7910,7 +7892,7 @@ dependencies = [ "incredible-squaring-avs", "k256", "log", - "nix 0.28.0", + "nix 0.29.0", "tangle-avs", "tokio", "url", diff --git a/Cargo.toml b/Cargo.toml index 671e161..72b1a7d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -129,6 +129,7 @@ hyper = "1.3.1" pin-project-lite = "0.2.14" http-body-util = "0.1.1" ethers = "2.0.14" +nix = "0.29.0" anvil = { git = "https://github.com/foundry-rs/foundry.git" } foundry-common = { git = "https://github.com/foundry-rs/foundry.git" } diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index 1c829e8..b97bf34 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -26,7 +26,6 @@ alloy-sol-types.workspace = true alloy-signer.workspace = true alloy-signer-local = { workspace = true, features = ["keystore"] } alloy-transport-ws.workspace = true - eigen-contracts.workspace = true eigen-utils.workspace = true incredible-squaring-avs.workspace = true @@ -36,12 +35,8 @@ tokio.workspace = true anvil.workspace = true ethers.workspace = true alloy-rpc-types-eth.workspace = true -#alloy-primitives = { workspace = true, features = ["rand"] } -#alloy-signer-local.workspace = true log.workspace = true env_logger.workspace = true -#getrandom.workspace = true hex.workspace = true -#lazy_static.workspace = true url.workspace = true -nix = "0.28.0" +nix.workspace = true From fcc68360a4105a93cc3af38e8f31011ad5d2fc2b Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Fri, 20 Sep 2024 15:16:41 -0500 Subject: [PATCH 7/8] Fixes after upstream changes --- Cargo.lock | 1475 +++++++++-------- Cargo.toml | 59 +- .../src/aggregator/mod.rs | 48 +- avs/incredible-squaring-avs/src/avs/mod.rs | 53 +- avs/incredible-squaring-avs/src/avs/reader.rs | 9 +- avs/incredible-squaring-avs/src/avs/writer.rs | 15 +- .../src/challenger/mod.rs | 7 +- avs/incredible-squaring-avs/src/lib.rs | 63 +- avs/incredible-squaring-avs/src/operator.rs | 8 +- avs/incredible-squaring-avs/src/rpc_client.rs | 2 +- avs/tangle-avs/Cargo.toml | 51 - avs/tangle-avs/build.rs | 57 - .../contracts/.github/workflows/test.yml | 34 - avs/tangle-avs/contracts/.gitignore | 14 - avs/tangle-avs/contracts/foundry.toml | 5 - .../contracts/lib/eigenlayer-middleware | 1 - avs/tangle-avs/contracts/lib/forge-std | 1 - avs/tangle-avs/contracts/remappings.txt | 7 - avs/tangle-avs/contracts/script/Counter.s.sol | 12 - avs/tangle-avs/contracts/src/ERC20Mock.sol | 308 ---- .../src/ITangleValidatorTaskManager.sol | 15 - .../src/TangleValidatorServiceManager.sol | 48 - .../src/TangleValidatorTaskManager.sol | 52 - avs/tangle-avs/src/lib.rs | 27 - avs/tangle-avs/src/operator.rs | 344 ---- contracts/src/lib.rs | 536 +++--- src/lib.rs | 2 +- test-utils/Cargo.toml | 5 - .../src/anvil/testnet/incredible_squaring.rs | 12 +- test-utils/src/anvil/testnet/mod.rs | 1 - test-utils/src/anvil/testnet/tangle.rs | 576 ------- test-utils/src/bin/tangle.rs | 133 -- test-utils/src/lib.rs | 2 +- utils/Cargo.toml | 1 - utils/src/avs_registry/reader.rs | 8 +- utils/src/avs_registry/writer.rs | 32 +- utils/src/el_contracts/writer.rs | 7 +- utils/src/types.rs | 3 +- 38 files changed, 1261 insertions(+), 2772 deletions(-) delete mode 100644 avs/tangle-avs/Cargo.toml delete mode 100644 avs/tangle-avs/build.rs delete mode 100644 avs/tangle-avs/contracts/.github/workflows/test.yml delete mode 100644 avs/tangle-avs/contracts/.gitignore delete mode 100644 avs/tangle-avs/contracts/foundry.toml delete mode 160000 avs/tangle-avs/contracts/lib/eigenlayer-middleware delete mode 160000 avs/tangle-avs/contracts/lib/forge-std delete mode 100644 avs/tangle-avs/contracts/remappings.txt delete mode 100644 avs/tangle-avs/contracts/script/Counter.s.sol delete mode 100644 avs/tangle-avs/contracts/src/ERC20Mock.sol delete mode 100644 avs/tangle-avs/contracts/src/ITangleValidatorTaskManager.sol delete mode 100644 avs/tangle-avs/contracts/src/TangleValidatorServiceManager.sol delete mode 100644 avs/tangle-avs/contracts/src/TangleValidatorTaskManager.sol delete mode 100644 avs/tangle-avs/src/lib.rs delete mode 100644 avs/tangle-avs/src/operator.rs delete mode 100644 test-utils/src/anvil/testnet/tangle.rs delete mode 100644 test-utils/src/bin/tangle.rs diff --git a/Cargo.lock b/Cargo.lock index 8044517..5a0543d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,9 +101,9 @@ dependencies = [ [[package]] name = "alloy-chains" -version = "0.1.29" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb07629a5d0645d29f68d2fb6f4d0cf15c89ec0965be915f303967180929743f" +checksum = "abf770dad29577cd3580f3dd09005799224a912b8cdfdd6dc04d030d42b3df4e" dependencies = [ "num_enum", "serde", @@ -117,7 +117,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da374e868f54c7f4ad2ad56829827badca388efd645f8cf5fccc61c2b5343504" dependencies = [ "alloy-eips 0.1.4", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde 0.1.4", "c-kzg", @@ -126,34 +126,34 @@ dependencies = [ [[package]] name = "alloy-consensus" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04c309895995eaa4bfcc345f5515a39c7df9447798645cc8bf462b6c5bf1dc96" +checksum = "629b62e38d471cc15fea534eb7283d2f8a4e8bdb1811bcc5d66dda6cfce6fae1" dependencies = [ - "alloy-eips 0.2.1", - "alloy-primitives", + "alloy-eips 0.3.6", + "alloy-primitives 0.8.3", "alloy-rlp", - "alloy-serde 0.2.1", + "alloy-serde 0.3.6", "c-kzg", "serde", ] [[package]] name = "alloy-contract" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4e0ef72b0876ae3068b2ed7dfae9ae1779ce13cfaec2ee1f08f5bd0348dc57" +checksum = "0eefe64fd344cffa9cf9e3435ec4e93e6e9c3481bc37269af988bf497faf4a6a" dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-network 0.2.1", + "alloy-dyn-abi 0.8.3", + "alloy-json-abi 0.8.3", + "alloy-network 0.3.6", "alloy-network-primitives", - "alloy-primitives", - "alloy-provider 0.2.1", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-pubsub", - "alloy-rpc-types-eth 0.2.1", - "alloy-sol-types", - "alloy-transport 0.2.1", + "alloy-rpc-types-eth 0.3.6", + "alloy-sol-types 0.8.3", + "alloy-transport 0.3.6", "futures", "futures-util", "thiserror", @@ -165,10 +165,10 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "529fc6310dc1126c8de51c376cbc59c79c7f662bd742be7dc67055d5421a81b4" dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-types", + "alloy-dyn-abi 0.7.7", + "alloy-json-abi 0.7.7", + "alloy-primitives 0.7.7", + "alloy-sol-types 0.7.7", ] [[package]] @@ -177,14 +177,31 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "413902aa18a97569e60f679c23f46a18db1656d87ab4d4e49d0e1e52042f66df" dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-type-parser", - "alloy-sol-types", + "alloy-json-abi 0.7.7", + "alloy-primitives 0.7.7", + "alloy-sol-type-parser 0.7.7", + "alloy-sol-types 0.7.7", + "const-hex", + "itoa", + "serde", + "serde_json", + "winnow", +] + +[[package]] +name = "alloy-dyn-abi" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4004925bff5ba0a11739ae84dbb6601a981ea692f3bd45b626935ee90a6b8471" +dependencies = [ + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", + "alloy-sol-type-parser 0.8.3", + "alloy-sol-types 0.8.3", "arbitrary", "const-hex", "derive_arbitrary", - "derive_more 0.99.18", + "derive_more 1.0.0", "itoa", "proptest", "serde", @@ -192,13 +209,40 @@ dependencies = [ "winnow", ] +[[package]] +name = "alloy-eip2930" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0069cf0642457f87a01a014f6dc29d5d893cd4fd8fddf0c3cdfad1bb3ebafc41" +dependencies = [ + "alloy-primitives 0.8.3", + "alloy-rlp", + "arbitrary", + "rand", + "serde", +] + +[[package]] +name = "alloy-eip7702" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37d319bb544ca6caeab58c39cea8921c55d924d4f68f2c60f24f914673f9a74a" +dependencies = [ + "alloy-primitives 0.8.3", + "alloy-rlp", + "arbitrary", + "k256", + "rand", + "serde", +] + [[package]] name = "alloy-eips" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f76ecab54890cdea1e4808fc0891c7e6cfcf71fe1a9fe26810c7280ef768f4ed" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde 0.1.4", "c-kzg", @@ -209,19 +253,19 @@ dependencies = [ [[package]] name = "alloy-eips" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9431c99a3b3fe606ede4b3d4043bdfbcb780c45b8d8d226c3804e2b75cfbe68" +checksum = "f923dd5fca5f67a43d81ed3ebad0880bd41f6dd0ada930030353ac356c54cd0f" dependencies = [ - "alloy-primitives", + "alloy-eip2930", + "alloy-eip7702", + "alloy-primitives 0.8.3", "alloy-rlp", - "alloy-serde 0.2.1", + "alloy-serde 0.3.6", "arbitrary", "c-kzg", - "derive_more 0.99.18", - "k256", + "derive_more 1.0.0", "once_cell", - "rand", "serde", "sha2", ] @@ -232,19 +276,19 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bca15afde1b6d15e3fc1c97421262b1bbb37aee45752e3c8b6d6f13f776554ff" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-serde 0.1.4", "serde", ] [[package]] name = "alloy-genesis" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79614dfe86144328da11098edcc7bc1a3f25ad8d3134a9eb9e857e06f0d9840d" +checksum = "3a7a18afb0b318616b6b2b0e2e7ac5529d32a966c673b48091c9919e284e6aca" dependencies = [ - "alloy-primitives", - "alloy-serde 0.2.1", + "alloy-primitives 0.8.3", + "alloy-serde 0.3.6", "serde", ] @@ -254,8 +298,20 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc05b04ac331a9f07e3a4036ef7926e49a8bf84a99a1ccfc7e2ab55a5fcbb372" dependencies = [ - "alloy-primitives", - "alloy-sol-type-parser", + "alloy-primitives 0.7.7", + "alloy-sol-type-parser 0.7.7", + "serde", + "serde_json", +] + +[[package]] +name = "alloy-json-abi" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9996daf962fd0a90d3c93b388033228865953b92de7bb1959b891d78750a4091" +dependencies = [ + "alloy-primitives 0.8.3", + "alloy-sol-type-parser 0.8.3", "serde", "serde_json", ] @@ -266,7 +322,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d6f34930b7e3e2744bcc79056c217f00cb2abb33bc5d4ff88da7623c5bb078b" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "serde", "serde_json", "thiserror", @@ -275,12 +331,12 @@ dependencies = [ [[package]] name = "alloy-json-rpc" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e2865c4c3bb4cdad3f0d9ec1ab5c0c657ba69a375651bd35e32fb6c180ccc2" +checksum = "d3c717b5298fad078cd3a418335b266eba91b511383ca9bd497f742d5975d5ab" dependencies = [ - "alloy-primitives", - "alloy-sol-types", + "alloy-primitives 0.8.3", + "alloy-sol-types 0.8.3", "serde", "serde_json", "thiserror", @@ -296,11 +352,11 @@ dependencies = [ "alloy-consensus 0.1.4", "alloy-eips 0.1.4", "alloy-json-rpc 0.1.4", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rpc-types-eth 0.1.4", "alloy-serde 0.1.4", "alloy-signer 0.1.4", - "alloy-sol-types", + "alloy-sol-types 0.7.7", "async-trait", "auto_impl", "futures-utils-wasm", @@ -309,19 +365,19 @@ dependencies = [ [[package]] name = "alloy-network" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e701fc87ef9a3139154b0b4ccb935b565d27ffd9de020fe541bf2dec5ae4ede" +checksum = "fb3705ce7d8602132bcf5ac7a1dd293a42adc2f183abf5907c30ac535ceca049" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-eips 0.2.1", - "alloy-json-rpc 0.2.1", + "alloy-consensus 0.3.6", + "alloy-eips 0.3.6", + "alloy-json-rpc 0.3.6", "alloy-network-primitives", - "alloy-primitives", - "alloy-rpc-types-eth 0.2.1", - "alloy-serde 0.2.1", - "alloy-signer 0.2.1", - "alloy-sol-types", + "alloy-primitives 0.8.3", + "alloy-rpc-types-eth 0.3.6", + "alloy-serde 0.3.6", + "alloy-signer 0.3.6", + "alloy-sol-types 0.8.3", "async-trait", "auto_impl", "futures-utils-wasm", @@ -330,12 +386,13 @@ dependencies = [ [[package]] name = "alloy-network-primitives" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9d5a0f9170b10988b6774498a022845e13eda94318440d17709d50687f67f9" +checksum = "94ad40869867ed2d9cd3842b1e800889e5b49e6b92da346e93862b4a741bedf3" dependencies = [ - "alloy-primitives", - "alloy-serde 0.2.1", + "alloy-eips 0.3.6", + "alloy-primitives 0.8.3", + "alloy-serde 0.3.6", "serde", ] @@ -344,6 +401,28 @@ name = "alloy-primitives" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccb3ead547f4532bc8af961649942f0b9c16ee9226e26caa3f38420651cc0bf4" +dependencies = [ + "alloy-rlp", + "bytes", + "cfg-if", + "const-hex", + "derive_more 0.99.18", + "hex-literal", + "itoa", + "k256", + "keccak-asm", + "proptest", + "rand", + "ruint", + "serde", + "tiny-keccak", +] + +[[package]] +name = "alloy-primitives" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "411aff151f2a73124ee473708e82ed51b2535f68928b6a1caa8bc1246ae6f7cd" dependencies = [ "alloy-rlp", "arbitrary", @@ -351,8 +430,7 @@ dependencies = [ "cfg-if", "const-hex", "derive_arbitrary", - "derive_more 0.99.18", - "ethereum_ssz", + "derive_more 1.0.0", "getrandom", "hex-literal", "itoa", @@ -377,7 +455,7 @@ dependencies = [ "alloy-eips 0.1.4", "alloy-json-rpc 0.1.4", "alloy-network 0.1.4", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rpc-client 0.1.4", "alloy-rpc-types-eth 0.1.4", "alloy-transport 0.1.4", @@ -385,7 +463,7 @@ dependencies = [ "async-stream", "async-trait", "auto_impl", - "dashmap", + "dashmap 5.5.3", "futures", "futures-utils-wasm", "lru", @@ -400,29 +478,29 @@ dependencies = [ [[package]] name = "alloy-provider" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9c0ab10b93de601a6396fc7ff2ea10d3b28c46f079338fa562107ebf9857c8" +checksum = "927f708dd457ed63420400ee5f06945df9632d5d101851952056840426a10dc5" dependencies = [ "alloy-chains", - "alloy-consensus 0.2.1", - "alloy-eips 0.2.1", - "alloy-json-rpc 0.2.1", - "alloy-network 0.2.1", + "alloy-consensus 0.3.6", + "alloy-eips 0.3.6", + "alloy-json-rpc 0.3.6", + "alloy-network 0.3.6", "alloy-network-primitives", - "alloy-primitives", + "alloy-primitives 0.8.3", "alloy-pubsub", - "alloy-rpc-client 0.2.1", - "alloy-rpc-types-eth 0.2.1", + "alloy-rpc-client 0.3.6", + "alloy-rpc-types-eth 0.3.6", "alloy-rpc-types-trace", - "alloy-transport 0.2.1", - "alloy-transport-http 0.2.1", + "alloy-transport 0.3.6", + "alloy-transport-http 0.3.6", "alloy-transport-ipc", "alloy-transport-ws", "async-stream", "async-trait", "auto_impl", - "dashmap", + "dashmap 6.1.0", "futures", "futures-utils-wasm", "lru", @@ -430,6 +508,7 @@ dependencies = [ "reqwest 0.12.7", "serde", "serde_json", + "thiserror", "tokio", "tracing", "url", @@ -437,20 +516,20 @@ dependencies = [ [[package]] name = "alloy-pubsub" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f5da2c55cbaf229bad3c5f8b00b5ab66c74ef093e5f3a753d874cfecf7d2281" +checksum = "2d05f63677e210d758cd5d6d1ce10f20c980c3560ccfbe79ba1997791862a04f" dependencies = [ - "alloy-json-rpc 0.2.1", - "alloy-primitives", - "alloy-transport 0.2.1", + "alloy-json-rpc 0.3.6", + "alloy-primitives 0.8.3", + "alloy-transport 0.3.6", "bimap", "futures", "serde", "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", ] @@ -473,7 +552,7 @@ checksum = "4d0f2d905ebd295e7effec65e5f6868d153936130ae718352771de3e7d03c75c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -492,79 +571,77 @@ dependencies = [ "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.4.13", "tracing", "url", ] [[package]] name = "alloy-rpc-client" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b38e3ffdb285df5d9f60cb988d336d9b8e3505acb78750c3bc60336a7af41d3" +checksum = "7d82952dca71173813d4e5733e2c986d8b04aea9e0f3b0a576664c232ad050a5" dependencies = [ - "alloy-json-rpc 0.2.1", - "alloy-primitives", + "alloy-json-rpc 0.3.6", + "alloy-primitives 0.8.3", "alloy-pubsub", - "alloy-transport 0.2.1", - "alloy-transport-http 0.2.1", + "alloy-transport 0.3.6", + "alloy-transport-http 0.3.6", "alloy-transport-ipc", "alloy-transport-ws", "futures", - "hyper-util", "pin-project", "reqwest 0.12.7", "serde", "serde_json", "tokio", "tokio-stream", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-rpc-types" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c31a3750b8f5a350d17354e46a52b0f2f19ec5f2006d816935af599dedc521" +checksum = "64333d639f2a0cf73491813c629a405744e16343a4bc5640931be707c345ecc5" dependencies = [ "alloy-rpc-types-anvil", "alloy-rpc-types-engine", - "alloy-rpc-types-eth 0.2.1", + "alloy-rpc-types-eth 0.3.6", "alloy-rpc-types-trace", "alloy-rpc-types-txpool", - "alloy-serde 0.2.1", + "alloy-serde 0.3.6", "serde", ] [[package]] name = "alloy-rpc-types-anvil" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ab6509cd38b2e8c8da726e0f61c1e314a81df06a38d37ddec8bced3f8d25ed" +checksum = "d25cb45ad7c0930dd62eecf164d2afe4c3d2dd2c82af85680ad1f118e1e5cb83" dependencies = [ - "alloy-primitives", - "alloy-serde 0.2.1", + "alloy-primitives 0.8.3", + "alloy-serde 0.3.6", "serde", ] [[package]] name = "alloy-rpc-types-engine" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff63f51b2fb2f547df5218527fd0653afb1947bf7fead5b3ce58c75d170b30f7" +checksum = "1464c4dd646e1bdfde86ae65ce5ba168dbb29180b478011fe87117ae46b1629b" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-eips 0.2.1", - "alloy-primitives", + "alloy-consensus 0.3.6", + "alloy-eips 0.3.6", + "alloy-primitives 0.8.3", "alloy-rlp", - "alloy-rpc-types-eth 0.2.1", - "alloy-serde 0.2.1", + "alloy-serde 0.3.6", + "derive_more 1.0.0", "jsonwebtoken 9.3.0", "rand", "serde", - "thiserror", ] [[package]] @@ -575,10 +652,10 @@ checksum = "ab4123ee21f99ba4bd31bfa36ba89112a18a500f8b452f02b35708b1b951e2b9" dependencies = [ "alloy-consensus 0.1.4", "alloy-eips 0.1.4", - "alloy-primitives", + "alloy-primitives 0.7.7", "alloy-rlp", "alloy-serde 0.1.4", - "alloy-sol-types", + "alloy-sol-types 0.7.7", "itertools 0.13.0", "serde", "serde_json", @@ -587,32 +664,34 @@ dependencies = [ [[package]] name = "alloy-rpc-types-eth" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81e18424d962d7700a882fe423714bd5b9dde74c7a7589d4255ea64068773aef" +checksum = "83aa984386deda02482660aa31cb8ca1e63d533f1c31a52d7d181ac5ec68e9b8" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-eips 0.2.1", + "alloy-consensus 0.3.6", + "alloy-eips 0.3.6", "alloy-network-primitives", - "alloy-primitives", + "alloy-primitives 0.8.3", "alloy-rlp", - "alloy-serde 0.2.1", - "alloy-sol-types", + "alloy-serde 0.3.6", + "alloy-sol-types 0.8.3", + "cfg-if", + "derive_more 1.0.0", + "hashbrown 0.14.5", "itertools 0.13.0", "serde", "serde_json", - "thiserror", ] [[package]] name = "alloy-rpc-types-trace" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a86eeb49ea0cc79f249faa1d35c20541bb1c317a59b5962cb07b1890355b0064" +checksum = "98db35cd42c90b484377e6bc44d95377a7a38a5ebee996e67754ac0446d542ab" dependencies = [ - "alloy-primitives", - "alloy-rpc-types-eth 0.2.1", - "alloy-serde 0.2.1", + "alloy-primitives 0.8.3", + "alloy-rpc-types-eth 0.3.6", + "alloy-serde 0.3.6", "serde", "serde_json", "thiserror", @@ -620,13 +699,13 @@ dependencies = [ [[package]] name = "alloy-rpc-types-txpool" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2342fed8175642b15a37a51f8729b05b2469281fbeb816f0ccbb0087e2dd74a" +checksum = "6bac37082c3b21283b3faf5cc0e08974272aee2f756ce1adeb26db56a5fce0d5" dependencies = [ - "alloy-primitives", - "alloy-rpc-types-eth 0.2.1", - "alloy-serde 0.2.1", + "alloy-primitives 0.8.3", + "alloy-rpc-types-eth 0.3.6", + "alloy-serde 0.3.6", "serde", ] @@ -636,18 +715,18 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9416c52959e66ead795a11f4a86c248410e9e368a0765710e57055b8a1774dd6" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "serde", "serde_json", ] [[package]] name = "alloy-serde" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e33feda6a53e6079895aed1d08dcb98a1377b000d80d16370fbbdb8155d547ef" +checksum = "731f75ec5d383107fd745d781619bd9cedf145836c51ecb991623d41278e71fa" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.3", "arbitrary", "serde", "serde_json", @@ -659,7 +738,7 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b33753c09fa1ad85e5b092b8dc2372f1e337a42e84b9b4cff9fede75ba4adb32" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.7.7", "async-trait", "auto_impl", "elliptic-curve 0.13.8", @@ -669,13 +748,13 @@ dependencies = [ [[package]] name = "alloy-signer" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740a25b92e849ed7b0fa013951fe2f64be9af1ad5abe805037b44fb7770c5c47" +checksum = "307324cca94354cd654d6713629f0383ec037e1ff9e3e3d547212471209860c0" dependencies = [ - "alloy-dyn-abi", - "alloy-primitives", - "alloy-sol-types", + "alloy-dyn-abi 0.8.3", + "alloy-primitives 0.8.3", + "alloy-sol-types 0.8.3", "async-trait", "auto_impl", "elliptic-curve 0.13.8", @@ -685,16 +764,16 @@ dependencies = [ [[package]] name = "alloy-signer-ledger" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f4f7e76cb4f63dbb56857a74665510517a013fe18da82082f7c66c6d321531e" +checksum = "f3df66f5ddcc32d2070485dc702f5f5fb97cfbfa817f6e2e6bac16a4e32ed44c" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-dyn-abi", - "alloy-network 0.2.1", - "alloy-primitives", - "alloy-signer 0.2.1", - "alloy-sol-types", + "alloy-consensus 0.3.6", + "alloy-dyn-abi 0.8.3", + "alloy-network 0.3.6", + "alloy-primitives 0.8.3", + "alloy-signer 0.3.6", + "alloy-sol-types 0.8.3", "async-trait", "coins-ledger", "futures-util", @@ -705,17 +784,17 @@ dependencies = [ [[package]] name = "alloy-signer-local" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b0707d4f63e4356a110b30ef3add8732ab6d181dd7be4607bf79b8777105cee" +checksum = "9fabe917ab1778e760b4701628d1cae8e028ee9d52ac6307de4e1e9286ab6b5f" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-network 0.2.1", - "alloy-primitives", - "alloy-signer 0.2.1", + "alloy-consensus 0.3.6", + "alloy-network 0.3.6", + "alloy-primitives 0.8.3", + "alloy-signer 0.3.6", "async-trait", - "coins-bip32 0.11.1", - "coins-bip39 0.11.1", + "coins-bip32 0.12.0", + "coins-bip39 0.12.0", "elliptic-curve 0.13.8", "eth-keystore", "k256", @@ -725,14 +804,14 @@ dependencies = [ [[package]] name = "alloy-signer-trezor" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81147fb1a384f878653524b9473af71ef2820846bd64a473f26e49fca8e5f8f9" +checksum = "1068949eda889b2c052b29a6e8c7ea2ba16be6d1af83ad165fff2a4e4ad19fcd" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-network 0.2.1", - "alloy-primitives", - "alloy-signer 0.2.1", + "alloy-consensus 0.3.6", + "alloy-network 0.3.6", + "alloy-primitives 0.8.3", + "alloy-signer 0.3.6", "async-trait", "semver 1.0.23", "thiserror", @@ -746,12 +825,26 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b40397ddcdcc266f59f959770f601ce1280e699a91fc1862f29cef91707cd09" dependencies = [ - "alloy-sol-macro-expander", - "alloy-sol-macro-input", + "alloy-sol-macro-expander 0.7.7", + "alloy-sol-macro-input 0.7.7", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", +] + +[[package]] +name = "alloy-sol-macro" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0458ccb02a564228fcd76efb8eb5a520521a8347becde37b402afec9a1b83859" +dependencies = [ + "alloy-sol-macro-expander 0.8.3", + "alloy-sol-macro-input 0.8.3", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.77", ] [[package]] @@ -760,16 +853,34 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "867a5469d61480fea08c7333ffeca52d5b621f5ca2e44f271b117ec1fc9a0525" dependencies = [ - "alloy-json-abi", - "alloy-sol-macro-input", + "alloy-sol-macro-input 0.7.7", "const-hex", "heck", "indexmap", "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.76", - "syn-solidity", + "syn 2.0.77", + "syn-solidity 0.7.7", + "tiny-keccak", +] + +[[package]] +name = "alloy-sol-macro-expander" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bc65475025fc1e84bf86fc840f04f63fcccdcf3cf12053c99918e4054dfbc69" +dependencies = [ + "alloy-json-abi 0.8.3", + "alloy-sol-macro-input 0.8.3", + "const-hex", + "heck", + "indexmap", + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.77", + "syn-solidity 0.8.3", "tiny-keccak", ] @@ -779,15 +890,30 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e482dc33a32b6fadbc0f599adea520bd3aaa585c141a80b404d0a3e3fa72528" dependencies = [ - "alloy-json-abi", + "const-hex", + "dunce", + "heck", + "proc-macro2", + "quote", + "syn 2.0.77", + "syn-solidity 0.7.7", +] + +[[package]] +name = "alloy-sol-macro-input" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed10f0715a0b69fde3236ff3b9ae5f6f7c97db5a387747100070d3016b9266b" +dependencies = [ + "alloy-json-abi 0.8.3", "const-hex", "dunce", "heck", "proc-macro2", "quote", "serde_json", - "syn 2.0.76", - "syn-solidity", + "syn 2.0.77", + "syn-solidity 0.8.3", ] [[package]] @@ -800,15 +926,37 @@ dependencies = [ "winnow", ] +[[package]] +name = "alloy-sol-type-parser" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3edae8ea1de519ccba896b6834dec874230f72fe695ff3c9c118e90ec7cff783" +dependencies = [ + "serde", + "winnow", +] + [[package]] name = "alloy-sol-types" version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a91ca40fa20793ae9c3841b83e74569d1cc9af29a2f5237314fd3452d51e38c7" dependencies = [ - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-macro", + "alloy-primitives 0.7.7", + "alloy-sol-macro 0.7.7", + "const-hex", + "serde", +] + +[[package]] +name = "alloy-sol-types" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1eb88e4da0a1b697ed6a9f811fdba223cf4d5c21410804fd1707836af73a462b" +dependencies = [ + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", + "alloy-sol-macro 0.8.3", "const-hex", "serde", ] @@ -827,18 +975,18 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.4.13", "tracing", "url", ] [[package]] name = "alloy-transport" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d0590afbdacf2f8cca49d025a2466f3b6584a016a8b28f532f29f8da1007bae" +checksum = "33616b2edf7454302a1d48084db185e52c309f73f6c10be99b0fe39354b3f1e9" dependencies = [ - "alloy-json-rpc 0.2.1", + "alloy-json-rpc 0.3.6", "base64 0.22.1", "futures-util", "futures-utils-wasm", @@ -846,7 +994,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.5.1", "tracing", "url", ] @@ -861,38 +1009,35 @@ dependencies = [ "alloy-transport 0.1.4", "reqwest 0.12.7", "serde_json", - "tower", + "tower 0.4.13", "tracing", "url", ] [[package]] name = "alloy-transport-http" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2437d145d80ea1aecde8574d2058cceb8b3c9cba05f6aea8e67907c660d46698" +checksum = "a944f5310c690b62bbb3e7e5ce34527cbd36b2d18532a797af123271ce595a49" dependencies = [ - "alloy-json-rpc 0.2.1", - "alloy-transport 0.2.1", - "http-body-util", - "hyper 1.4.1", - "hyper-util", + "alloy-json-rpc 0.3.6", + "alloy-transport 0.3.6", "reqwest 0.12.7", "serde_json", - "tower", + "tower 0.5.1", "tracing", "url", ] [[package]] name = "alloy-transport-ipc" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "804494366e20468776db4e18f9eb5db7db0fe14f1271eb6dbf155d867233405c" +checksum = "09fd8491249f74d16ec979b1f5672377b12ebb818e6056478ffa386954dbd350" dependencies = [ - "alloy-json-rpc 0.2.1", + "alloy-json-rpc 0.3.6", "alloy-pubsub", - "alloy-transport 0.2.1", + "alloy-transport 0.3.6", "bytes", "futures", "interprocess", @@ -905,15 +1050,15 @@ dependencies = [ [[package]] name = "alloy-transport-ws" -version = "0.2.1" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af855163e7df008799941aa6dd324a43ef2bf264b08ba4b22d44aad6ced65300" +checksum = "a9704761f6297fe482276bee7f77a93cb42bd541c2bd6c1c560b6f3a9ece672e" dependencies = [ "alloy-pubsub", - "alloy-transport 0.2.1", + "alloy-transport 0.3.6", "futures", "http 1.1.0", - "rustls 0.23.12", + "rustls 0.23.13", "serde_json", "tokio", "tokio-tungstenite 0.23.1", @@ -923,13 +1068,13 @@ dependencies = [ [[package]] name = "alloy-trie" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03704f265cbbb943b117ecb5055fd46e8f41e7dc8a58b1aed20bcd40ace38c15" +checksum = "0a46c9c4fdccda7982e7928904bd85fe235a0404ee3d7e197fff13d61eac8b4f" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.3", "alloy-rlp", - "derive_more 0.99.18", + "derive_more 1.0.0", "hashbrown 0.14.5", "nybbles", "serde", @@ -1004,24 +1149,24 @@ dependencies = [ [[package]] name = "anvil" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ "alloy-chains", - "alloy-consensus 0.2.1", + "alloy-consensus 0.3.6", "alloy-contract", - "alloy-dyn-abi", - "alloy-eips 0.2.1", - "alloy-genesis 0.2.1", - "alloy-network 0.2.1", - "alloy-primitives", - "alloy-provider 0.2.1", + "alloy-dyn-abi 0.8.3", + "alloy-eips 0.3.6", + "alloy-genesis 0.3.6", + "alloy-network 0.3.6", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-rlp", "alloy-rpc-types", - "alloy-serde 0.2.1", - "alloy-signer 0.2.1", + "alloy-serde 0.3.6", + "alloy-signer 0.3.6", "alloy-signer-local", - "alloy-sol-types", - "alloy-transport 0.2.1", + "alloy-sol-types 0.8.3", + "alloy-transport 0.3.6", "alloy-trie", "anvil-core", "anvil-rpc", @@ -1056,7 +1201,7 @@ dependencies = [ "thiserror", "tikv-jemallocator", "tokio", - "tower", + "tower 0.4.13", "tracing", "tracing-subscriber", "vergen", @@ -1066,15 +1211,15 @@ dependencies = [ [[package]] name = "anvil-core" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-dyn-abi", - "alloy-eips 0.2.1", - "alloy-primitives", + "alloy-consensus 0.3.6", + "alloy-dyn-abi 0.8.3", + "alloy-eips 0.3.6", + "alloy-primitives 0.8.3", "alloy-rlp", "alloy-rpc-types", - "alloy-serde 0.2.1", + "alloy-serde 0.3.6", "alloy-trie", "bytes", "foundry-common", @@ -1088,7 +1233,7 @@ dependencies = [ [[package]] name = "anvil-rpc" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ "serde", "serde_json", @@ -1097,7 +1242,7 @@ dependencies = [ [[package]] name = "anvil-server" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ "anvil-rpc", "async-trait", @@ -1118,9 +1263,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "arbitrary" @@ -1364,18 +1509,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "async-trait" -version = "0.1.81" +version = "0.1.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107" +checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1422,7 +1567,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -1433,9 +1578,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "aws-config" -version = "1.5.5" +version = "1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e95816a168520d72c0e7680c405a5a8c1fb6a035b4bc4b9d7b0de8e1a941697" +checksum = "848d7b9b605720989929279fa644ce8f244d0ce3146fcca5b70e4eb7b3c020fc" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1463,9 +1608,9 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +checksum = "60e8f6b615cb5fc60a98132268508ad104310f0cfb25a1c22eee76efdf9154da" dependencies = [ "aws-smithy-async", "aws-smithy-runtime-api", @@ -1477,8 +1622,8 @@ dependencies = [ name = "aws-kms" version = "0.1.0" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-primitives", + "alloy-consensus 0.3.6", + "alloy-primitives 0.8.3", "ark-ff 0.4.2", "ark-secp256k1", "aws-config", @@ -1495,15 +1640,16 @@ dependencies = [ [[package]] name = "aws-runtime" -version = "1.4.0" +version = "1.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f42c2d4218de4dcd890a109461e2f799a1a2ba3bcd2cde9af88360f5df9266c6" +checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468" 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", @@ -1520,9 +1666,9 @@ dependencies = [ [[package]] name = "aws-sdk-kms" -version = "1.40.0" +version = "1.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ebbbc319551583b9233a74b359ede7349102e779fc12371d2478e80b50d218" +checksum = "c6550445e0913c9383375f4a5a2f550817567a19a178107fce1e1afd767f802a" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1542,9 +1688,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.46.0" +version = "1.51.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4abf69a87be33b6f125a93d5046b5f7395c26d1f449bf8d3927f5577463b6de0" +checksum = "c09fd4b5c7ed75f52b913b4f3ff0501dae7f8cb9125f6d45db4553980cbc0528" dependencies = [ "ahash", "aws-credential-types", @@ -1577,9 +1723,9 @@ dependencies = [ [[package]] name = "aws-sdk-secretsmanager" -version = "1.43.0" +version = "1.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f468d566c05086b1b6a08e9de12dca141071a717580dc075f180d0fe11b6190f" +checksum = "b8e704722a2359470f1cdddbd5bc6e2b5c80a37e13ee1d59f8d0e14f32959daf" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1600,9 +1746,9 @@ dependencies = [ [[package]] name = "aws-sdk-sso" -version = "1.39.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11822090cf501c316c6f75711d77b96fba30658e3867a7762e5e2f5d32d31e81" +checksum = "70a9d27ed1c12b1140c47daf1bc541606c43fdafd918c4797d520db0043ceef2" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1622,9 +1768,9 @@ dependencies = [ [[package]] name = "aws-sdk-ssooidc" -version = "1.40.0" +version = "1.44.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a2a06ff89176123945d1bbe865603c4d7101bea216a550bb4d2e4e9ba74d74" +checksum = "44514a6ca967686cde1e2a1b81df6ef1883d0e3e570da8d8bc5c491dcb6fc29b" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1644,9 +1790,9 @@ dependencies = [ [[package]] name = "aws-sdk-sts" -version = "1.39.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a20a91795850826a6f456f4a48eff1dfa59a0e69bdbf5b8c50518fd372106574" +checksum = "cd7a4d279762a35b9df97209f6808b95d4fe78547fe2316b4d200a0283960c5a" dependencies = [ "aws-credential-types", "aws-runtime", @@ -1667,9 +1813,9 @@ dependencies = [ [[package]] name = "aws-sigv4" -version = "1.2.3" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5df1b0fa6be58efe9d4ccc257df0a53b89cd8909e86591a13ca54817c87517be" +checksum = "cc8db6904450bafe7473c6ca9123f88cc11089e41a025408f992db4e22d3be68" dependencies = [ "aws-credential-types", "aws-smithy-eventstream", @@ -1728,9 +1874,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.60.4" +version = "0.60.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" +checksum = "cef7d0a272725f87e51ba2bf89f8c21e4df61b9e49ae1ac367a6d69916ef7c90" dependencies = [ "aws-smithy-types", "bytes", @@ -1739,9 +1885,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.60.9" +version = "0.60.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9cd0ae3d97daa0a2bf377a4d8e8e1362cae590c4a1aad0d40058ebca18eb91e" +checksum = "5c8bc3e8fdc6b8d07d976e301c02fe553f72a39b7a9fea820e023268467d7ab6" dependencies = [ "aws-smithy-eventstream", "aws-smithy-runtime-api", @@ -1779,9 +1925,9 @@ dependencies = [ [[package]] name = "aws-smithy-runtime" -version = "1.6.3" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0abbf454960d0db2ad12684a1640120e7557294b0ff8e2f11236290a1b293225" +checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87" dependencies = [ "aws-smithy-async", "aws-smithy-http", @@ -1823,9 +1969,9 @@ dependencies = [ [[package]] name = "aws-smithy-types" -version = "1.2.2" +version = "1.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6cee7cadb433c781d3299b916fbf620fea813bf38f49db282fb6858141a05cc8" +checksum = "03701449087215b5369c7ea17fef0dd5d24cb93439ec5af0c7615f58c3f22605" dependencies = [ "base64-simd", "bytes", @@ -1849,9 +1995,9 @@ dependencies = [ [[package]] name = "aws-smithy-xml" -version = "0.60.8" +version = "0.60.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" +checksum = "ab0b0166827aa700d3dc519f72f8b3a91c35d0b8d042dc5d643a91e6f80648fc" dependencies = [ "xmlparser", ] @@ -1901,7 +2047,7 @@ dependencies = [ "sync_wrapper 1.0.1", "tokio", "tokio-tungstenite 0.21.0", - "tower", + "tower 0.4.13", "tower-layer", "tower-service", "tracing", @@ -2054,19 +2200,6 @@ dependencies = [ "generic-array", ] -[[package]] -name = "bls12_381" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403" -dependencies = [ - "ff 0.13.0", - "group 0.13.0", - "pairing", - "rand_core", - "subtle", -] - [[package]] name = "blst" version = "0.3.13" @@ -2119,9 +2252,9 @@ checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "bytemuck" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2" +checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae" [[package]] name = "byteorder" @@ -2131,9 +2264,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" dependencies = [ "serde", ] @@ -2233,9 +2366,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.15" +version = "1.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6" +checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0" dependencies = [ "jobserver", "libc", @@ -2303,9 +2436,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.16" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019" +checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" dependencies = [ "clap_builder", "clap_derive", @@ -2313,9 +2446,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.15" +version = "4.5.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6" +checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" dependencies = [ "anstream", "anstyle", @@ -2328,9 +2461,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.24" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b" +checksum = "9b378c786d3bde9442d2c6dd7e6080b2a818db2b96e30d6e7f1b6d224eb617d3" dependencies = [ "clap", ] @@ -2354,7 +2487,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2381,12 +2514,12 @@ dependencies = [ [[package]] name = "coins-bip32" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66c43ff7fd9ff522219058808a259e61423335767b1071d5b346de60d9219657" +checksum = "2073678591747aed4000dd468b97b14d7007f7936851d3f2f01846899f5ebf08" dependencies = [ "bs58", - "coins-core 0.11.1", + "coins-core 0.12.0", "digest 0.10.7", "hmac", "k256", @@ -2413,12 +2546,12 @@ dependencies = [ [[package]] name = "coins-bip39" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c4587c0b4064da887ed39a6522f577267d57e58bdd583178cd877d721b56a2e" +checksum = "74b169b26623ff17e9db37a539fe4f15342080df39f129ef7631df7683d6d9d4" dependencies = [ "bitvec", - "coins-bip32 0.11.1", + "coins-bip32 0.12.0", "hmac", "once_cell", "pbkdf2 0.12.2", @@ -2449,9 +2582,9 @@ dependencies = [ [[package]] name = "coins-core" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3aeeec621f4daec552e9d28befd58020a78cfc364827d06a753e8bc13c6c4b" +checksum = "62b962ad8545e43a28e14e87377812ba9ae748dd4fd963f4c10e9fcc6d13475b" dependencies = [ "base64 0.21.7", "bech32", @@ -2468,9 +2601,9 @@ dependencies = [ [[package]] name = "coins-ledger" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166ef757aa936b45f3e5d39c344047f65ef7d25a50067246a498021a816d074b" +checksum = "ab9bc0994d0aa0f4ade5f3a9baf4a8d936f250278c85a1124b401860454246ab" dependencies = [ "async-trait", "byteorder", @@ -2629,9 +2762,9 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51e852e6dc9a5bed1fae92dd2375037bf2b768725bf3be87811edee3249d09ad" +checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0" dependencies = [ "libc", ] @@ -2798,7 +2931,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2809,7 +2942,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2825,6 +2958,20 @@ dependencies = [ "parking_lot_core", ] +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "data-encoding" version = "2.6.0" @@ -2880,38 +3027,38 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "derive_builder" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7" +checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d" +checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38" dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "derive_builder_macro" -version = "0.20.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b" +checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc" dependencies = [ "derive_builder_core", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2924,7 +3071,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version 0.4.1", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -2945,7 +3092,7 @@ dependencies = [ "convert_case 0.6.0", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "unicode-xid", ] @@ -3033,7 +3180,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3091,7 +3238,7 @@ name = "eigen-contracts" version = "0.1.0" dependencies = [ "alloy-contract", - "alloy-sol-types", + "alloy-sol-types 0.8.3", ] [[package]] @@ -3100,14 +3247,14 @@ version = "0.1.0" dependencies = [ "aes", "alloy-contract", - "alloy-network 0.2.1", - "alloy-primitives", - "alloy-provider 0.2.1", + "alloy-network 0.3.6", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-pubsub", "alloy-rpc-types", - "alloy-signer 0.2.1", - "alloy-sol-types", - "alloy-transport 0.2.1", + "alloy-signer 0.3.6", + "alloy-sol-types 0.8.3", + "alloy-transport 0.3.6", "ark-bn254", "ark-ec", "ark-ff 0.4.2", @@ -3145,7 +3292,7 @@ dependencies = [ "eigen-utils", "fireblocks-client", "incredible-squaring-avs", - "tangle-avs", + "test-utils", ] [[package]] @@ -3244,7 +3391,7 @@ checksum = "2f9ed6b3789237c8a0c1c505af1c7eb2c560df6186f01b098c3a1064ea532f38" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3369,17 +3516,6 @@ dependencies = [ "uint", ] -[[package]] -name = "ethereum_ssz" -version = "0.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d3627f83d8b87b432a5fad9934b4565260722a141a2c40f371f8080adec9425" -dependencies = [ - "ethereum-types", - "itertools 0.10.5", - "smallvec", -] - [[package]] name = "ethers" version = "2.0.14" @@ -3446,7 +3582,7 @@ dependencies = [ "reqwest 0.11.27", "serde", "serde_json", - "syn 2.0.76", + "syn 2.0.77", "toml", "walkdir", ] @@ -3464,7 +3600,7 @@ dependencies = [ "proc-macro2", "quote", "serde_json", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -3490,7 +3626,7 @@ dependencies = [ "serde", "serde_json", "strum", - "syn 2.0.76", + "syn 2.0.77", "tempfile", "thiserror", "tiny-keccak", @@ -3681,7 +3817,6 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "bitvec", "rand_core", "subtle", ] @@ -3704,11 +3839,11 @@ dependencies = [ name = "fireblocks-client" version = "0.1.0" dependencies = [ - "alloy-network 0.2.1", - "alloy-primitives", - "alloy-provider 0.2.1", + "alloy-network 0.3.6", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-rpc-types", - "alloy-transport 0.2.1", + "alloy-transport 0.3.6", "hex", "jsonwebtoken 9.3.0", "log", @@ -3728,7 +3863,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ - "arbitrary", "byteorder", "rand", "rustc-hex", @@ -3775,9 +3909,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "forge-fmt" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.3", "ariadne", "foundry-config", "itertools 0.13.0", @@ -3797,13 +3931,13 @@ dependencies = [ [[package]] name = "foundry-block-explorers" -version = "0.5.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1580bdb99a6a531b44ac5cda229069cacc11ae7d54faa45676e1bee9ee7da1c" +checksum = "ff37530e7c5deead0f9d7dc2a27b070e683bef79735ab453849ebdee74fa848f" dependencies = [ "alloy-chains", - "alloy-json-abi", - "alloy-primitives", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", "foundry-compilers", "reqwest 0.12.7", "semver 1.0.23", @@ -3816,19 +3950,19 @@ dependencies = [ [[package]] name = "foundry-cheatcodes" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" -dependencies = [ - "alloy-consensus 0.2.1", - "alloy-dyn-abi", - "alloy-genesis 0.2.1", - "alloy-json-abi", - "alloy-primitives", - "alloy-provider 0.2.1", +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" +dependencies = [ + "alloy-consensus 0.3.6", + "alloy-dyn-abi 0.8.3", + "alloy-genesis 0.3.6", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-rlp", "alloy-rpc-types", - "alloy-signer 0.2.1", + "alloy-signer 0.3.6", "alloy-signer-local", - "alloy-sol-types", + "alloy-sol-types 0.8.3", "base64 0.22.1", "chrono", "dialoguer", @@ -3862,9 +3996,9 @@ dependencies = [ [[package]] name = "foundry-cheatcodes-spec" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-sol-types", + "alloy-sol-types 0.8.3", "foundry-macros", "serde", ] @@ -3872,14 +4006,14 @@ dependencies = [ [[package]] name = "foundry-cli" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ "alloy-chains", - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-primitives", - "alloy-provider 0.2.1", - "alloy-transport 0.2.1", + "alloy-dyn-abi 0.8.3", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", + "alloy-transport 0.3.6", "clap", "color-eyre", "dotenvy", @@ -3906,22 +4040,22 @@ dependencies = [ [[package]] name = "foundry-common" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-consensus 0.2.1", + "alloy-consensus 0.3.6", "alloy-contract", - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-json-rpc 0.2.1", - "alloy-primitives", - "alloy-provider 0.2.1", + "alloy-dyn-abi 0.8.3", + "alloy-json-abi 0.8.3", + "alloy-json-rpc 0.3.6", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-pubsub", - "alloy-rpc-client 0.2.1", + "alloy-rpc-client 0.3.6", "alloy-rpc-types", - "alloy-serde 0.2.1", - "alloy-sol-types", - "alloy-transport 0.2.1", - "alloy-transport-http 0.2.1", + "alloy-serde 0.3.6", + "alloy-sol-types 0.8.3", + "alloy-transport 0.3.6", + "alloy-transport-http 0.3.6", "alloy-transport-ipc", "alloy-transport-ws", "async-trait", @@ -3941,7 +4075,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tower", + "tower 0.4.13", "tracing", "url", "walkdir", @@ -3951,13 +4085,13 @@ dependencies = [ [[package]] name = "foundry-common-fmt" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-dyn-abi", - "alloy-primitives", + "alloy-consensus 0.3.6", + "alloy-dyn-abi 0.8.3", + "alloy-primitives 0.8.3", "alloy-rpc-types", - "alloy-serde 0.2.1", + "alloy-serde 0.3.6", "chrono", "comfy-table", "revm-primitives", @@ -3968,12 +4102,12 @@ dependencies = [ [[package]] name = "foundry-compilers" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eaa24a47bb84e1db38c84f03e8c90ca81050bd20beac8bdc99aae8afd0b8784" +checksum = "6d91e510bd537970f68f8462dea0e8df0a2302d4749fb57bc8e10bbd32a283e2" dependencies = [ - "alloy-json-abi", - "alloy-primitives", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", "auto_impl", "derivative", "dirs", @@ -3992,7 +4126,7 @@ dependencies = [ "serde_json", "sha2", "solang-parser", - "svm-rs 0.5.6", + "svm-rs 0.5.7", "svm-rs-builds", "thiserror", "tokio", @@ -4003,9 +4137,9 @@ dependencies = [ [[package]] name = "foundry-compilers-artifacts" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3588ee6a986f89040d1158fb90459731580b404fb72b8c6c832c0ddbc95fed58" +checksum = "f9971eefe4eae1cf2ac707beb4d40f63304b34c81c0961d299e461c14a23b1e7" dependencies = [ "foundry-compilers-artifacts-solc", "foundry-compilers-artifacts-vyper", @@ -4013,12 +4147,12 @@ dependencies = [ [[package]] name = "foundry-compilers-artifacts-solc" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a149c5e8c326c7bae8f73cacb28c637f4bc2e535f950eec10348494990e9636f" +checksum = "0cde3d12776c295ad85bcdbbae18f4601e384f40a62b0e3371d880bbcd91c65c" dependencies = [ - "alloy-json-abi", - "alloy-primitives", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", "foundry-compilers-core", "futures-util", "md-5", @@ -4037,12 +4171,12 @@ dependencies = [ [[package]] name = "foundry-compilers-artifacts-vyper" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8645c9e7c070c81bf8c90f456416953234334f097b67445c773af98df74e27b0" +checksum = "569a769f6105248816c253715ec39977d61d369e9c67e4774d6870da8f64dffc" dependencies = [ - "alloy-json-abi", - "alloy-primitives", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", "foundry-compilers-artifacts-solc", "foundry-compilers-core", "path-slash", @@ -4052,11 +4186,11 @@ dependencies = [ [[package]] name = "foundry-compilers-core" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66492aeb708f3d142c078457dba5f52b04ca5031012d48903a0bcb37d205d595" +checksum = "5f10ade77fa0eab75e142a76711c42a258781bad0c4516ad64aa413297ebb72e" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.3", "cfg-if", "dunce", "memmap2", @@ -4066,7 +4200,7 @@ dependencies = [ "semver 1.0.23", "serde", "serde_json", - "svm-rs 0.5.6", + "svm-rs 0.5.7", "thiserror", "tokio", "walkdir", @@ -4075,11 +4209,11 @@ dependencies = [ [[package]] name = "foundry-config" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ "Inflector", "alloy-chains", - "alloy-primitives", + "alloy-primitives 0.8.3", "dirs-next", "dunce", "eyre", @@ -4088,6 +4222,7 @@ dependencies = [ "foundry-compilers", "glob", "globset", + "mesc", "number_prefix", "path-slash", "regex", @@ -4108,9 +4243,9 @@ dependencies = [ [[package]] name = "foundry-debugger" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.3", "crossterm 0.28.1", "eyre", "foundry-common", @@ -4126,12 +4261,12 @@ dependencies = [ [[package]] name = "foundry-evm" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-types", + "alloy-dyn-abi 0.8.3", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", + "alloy-sol-types 0.8.3", "eyre", "foundry-cheatcodes", "foundry-common", @@ -4153,10 +4288,10 @@ dependencies = [ [[package]] name = "foundry-evm-abi" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-primitives", - "alloy-sol-types", + "alloy-primitives 0.8.3", + "alloy-sol-types 0.8.3", "derive_more 1.0.0", "foundry-common-fmt", "foundry-macros", @@ -4167,17 +4302,17 @@ dependencies = [ [[package]] name = "foundry-evm-core" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-dyn-abi", - "alloy-genesis 0.2.1", - "alloy-json-abi", - "alloy-primitives", - "alloy-provider 0.2.1", + "alloy-dyn-abi 0.8.3", + "alloy-genesis 0.3.6", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-rpc-types", - "alloy-serde 0.2.1", - "alloy-sol-types", - "alloy-transport 0.2.1", + "alloy-serde 0.3.6", + "alloy-sol-types 0.8.3", + "alloy-transport 0.3.6", "auto_impl", "eyre", "foundry-cheatcodes-spec", @@ -4201,9 +4336,9 @@ dependencies = [ [[package]] name = "foundry-evm-coverage" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.3", "eyre", "foundry-common", "foundry-compilers", @@ -4218,12 +4353,12 @@ dependencies = [ [[package]] name = "foundry-evm-fuzz" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ "ahash", - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-primitives", + "alloy-dyn-abi 0.8.3", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", "eyre", "foundry-common", "foundry-compilers", @@ -4245,12 +4380,12 @@ dependencies = [ [[package]] name = "foundry-evm-traces" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-dyn-abi", - "alloy-json-abi", - "alloy-primitives", - "alloy-sol-types", + "alloy-dyn-abi 0.8.3", + "alloy-json-abi 0.8.3", + "alloy-primitives 0.8.3", + "alloy-sol-types 0.8.3", "eyre", "foundry-block-explorers", "foundry-common", @@ -4273,15 +4408,15 @@ dependencies = [ [[package]] name = "foundry-fork-db" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e1217b5063138a87feb51bd9ac71857d370f06f1aa3d8c22b73aae0e49f4c3" +checksum = "c88cb03fc4bd87856fc4d0ad38fd067f85c7c6306bf794202fc50a897449837b" dependencies = [ - "alloy-primitives", - "alloy-provider 0.2.1", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-rpc-types", - "alloy-serde 0.2.1", - "alloy-transport 0.2.1", + "alloy-serde 0.3.6", + "alloy-transport 0.3.6", "eyre", "futures", "parking_lot", @@ -4298,9 +4433,9 @@ dependencies = [ [[package]] name = "foundry-linking" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-primitives", + "alloy-primitives 0.8.3", "foundry-compilers", "semver 1.0.23", "thiserror", @@ -4309,28 +4444,28 @@ dependencies = [ [[package]] name = "foundry-macros" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "foundry-wallets" version = "0.2.0" -source = "git+https://github.com/foundry-rs/foundry.git#0d8302880b79fa9c3c4aa52ab446583dece19a34" +source = "git+https://github.com/foundry-rs/foundry.git?branch=master#f2c14c176b6f69ede1c067bcfcc0fdf2d6beba5e" dependencies = [ - "alloy-consensus 0.2.1", - "alloy-dyn-abi", - "alloy-network 0.2.1", - "alloy-primitives", - "alloy-signer 0.2.1", + "alloy-consensus 0.3.6", + "alloy-dyn-abi 0.8.3", + "alloy-network 0.3.6", + "alloy-primitives 0.8.3", + "alloy-signer 0.3.6", "alloy-signer-ledger", "alloy-signer-local", "alloy-signer-trezor", - "alloy-sol-types", + "alloy-sol-types 0.8.3", "async-trait", "aws-sdk-kms", "clap", @@ -4436,7 +4571,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -4532,9 +4667,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -4844,21 +4979,21 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.27.2" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333" dependencies = [ "futures-util", "http 1.1.0", "hyper 1.4.1", "hyper-util", - "rustls 0.23.12", - "rustls-native-certs 0.7.3", + "rustls 0.23.13", + "rustls-native-certs 0.8.0", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", "tower-service", - "webpki-roots 0.26.3", + "webpki-roots 0.26.6", ] [[package]] @@ -4879,9 +5014,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9" +checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" dependencies = [ "bytes", "futures-channel", @@ -4892,16 +5027,16 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", + "tower 0.4.13", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -4980,16 +5115,16 @@ version = "0.1.0" dependencies = [ "alloy", "alloy-contract", - "alloy-primitives", - "alloy-provider 0.2.1", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", "alloy-pubsub", - "alloy-rpc-client 0.2.1", + "alloy-rpc-client 0.3.6", "alloy-rpc-types", - "alloy-rpc-types-eth 0.2.1", - "alloy-signer 0.2.1", + "alloy-rpc-types-eth 0.3.6", + "alloy-signer 0.3.6", "alloy-signer-local", - "alloy-sol-types", - "alloy-transport 0.2.1", + "alloy-sol-types 0.8.3", + "alloy-transport 0.3.6", "anvil", "ark-bn254", "ark-ec", @@ -5022,9 +5157,9 @@ checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" [[package]] name = "indexmap" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ead53efc7ea8ed3cfb0c79fc8023fbb782a5432b52830b6518941cebe6505c" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", "hashbrown 0.14.5", @@ -5065,7 +5200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c" dependencies = [ "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5094,9 +5229,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" +checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" [[package]] name = "is-terminal" @@ -5231,29 +5366,14 @@ dependencies = [ [[package]] name = "keccak-asm" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "422fbc7ff2f2f5bdffeb07718e5a5324dca72b0c9293d50df4026652385e3314" +checksum = "505d1856a39b200489082f90d897c3f07c455563880bc5952e38eabf731c83b6" dependencies = [ "digest 0.10.7", "sha3-asm", ] -[[package]] -name = "kzg-rs" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd9920cd4460ce3cbca19c62f3bb9a9611562478a4dc9d2c556f4a7d049c5b6b" -dependencies = [ - "bls12_381", - "glob", - "hex", - "once_cell", - "serde", - "serde_derive", - "serde_yaml", -] - [[package]] name = "lalrpop" version = "0.20.2" @@ -5397,9 +5517,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" +checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f" dependencies = [ "libc", ] @@ -5413,6 +5533,17 @@ dependencies = [ "autocfg", ] +[[package]] +name = "mesc" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d04b0347d2799ef17df4623dbcb03531031142105168e0c549e0bf1f980e9e7e" +dependencies = [ + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "mime" version = "0.3.17" @@ -5642,7 +5773,7 @@ dependencies = [ "proc-macro-crate", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5751,7 +5882,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5819,15 +5950,6 @@ dependencies = [ "sha2", ] -[[package]] -name = "pairing" -version = "0.23.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" -dependencies = [ - "group 0.13.0", -] - [[package]] name = "parity-scale-codec" version = "3.6.12" @@ -5953,7 +6075,7 @@ dependencies = [ "proc-macro2", "proc-macro2-diagnostics", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -5992,9 +6114,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" -version = "2.7.11" +version = "2.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd53dff83f26735fdc1ca837098ccf133605d794cdae66acfc2bfac3ec809d95" +checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9" dependencies = [ "memchr", "thiserror", @@ -6051,7 +6173,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -6111,7 +6233,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -6165,9 +6287,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.7.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265" +checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce" [[package]] name = "powerfmt" @@ -6207,7 +6329,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba" dependencies = [ "proc-macro2", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -6266,6 +6388,28 @@ dependencies = [ "version_check", ] +[[package]] +name = "proc-macro-error-attr2" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.77", +] + [[package]] name = "proc-macro2" version = "1.0.86" @@ -6283,7 +6427,7 @@ checksum = "af066a9c399a26e020ada66a034357a868728e72cd426f3adcd35f80d88d88c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "version_check", "yansi 1.0.1", ] @@ -6324,13 +6468,13 @@ dependencies = [ [[package]] name = "proptest-derive" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf16337405ca084e9c78985114633b6827711d22b9e6ef6c6c0d665eb3f0b6e" +checksum = "6ff7ff745a347b87471d859a377a9a404361e7efc2a971d73424a6d183c0fc77" dependencies = [ "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.77", ] [[package]] @@ -6361,16 +6505,16 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quinn" -version = "0.11.3" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b22d8e7369034b9a7132bc2008cac12f2013c8132b45e0554e6e20e2617f2156" +checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684" dependencies = [ "bytes", "pin-project-lite", "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.12", + "rustls 0.23.13", "socket2", "thiserror", "tokio", @@ -6379,15 +6523,15 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.11.6" +version = "0.11.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba92fb39ec7ad06ca2582c0ca834dfeadcaf06ddfc8e635c80aa7e1c05315fdd" +checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6" dependencies = [ "bytes", "rand", "ring 0.17.8", "rustc-hash", - "rustls 0.23.12", + "rustls 0.23.13", "slab", "thiserror", "tinyvec", @@ -6396,15 +6540,15 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.4" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +checksum = "4fe68c2e9e1a1234e218683dbdf9f9dfcb094113c5ac2b938dfcb9bab4c4140b" dependencies = [ "libc", "once_cell", "socket2", "tracing", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -6510,9 +6654,9 @@ checksum = "d3edd4d5d42c92f0a659926464d4cce56b562761267ecf0f469d85b7de384175" [[package]] name = "redox_syscall" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" +checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" dependencies = [ "bitflags 2.6.0", ] @@ -6636,7 +6780,7 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.4.1", - "hyper-rustls 0.27.2", + "hyper-rustls 0.27.3", "hyper-tls", "hyper-util", "ipnet", @@ -6648,7 +6792,7 @@ dependencies = [ "percent-encoding", "pin-project-lite", "quinn", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-native-certs 0.7.3", "rustls-pemfile 2.1.3", "rustls-pki-types", @@ -6666,15 +6810,15 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.26.3", + "webpki-roots 0.26.6", "windows-registry", ] [[package]] name = "revm" -version = "13.0.0" +version = "14.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b2f635bbbf4002b1b5c0219f841ec1a317723883ed7662c0d138617539a6087" +checksum = "a9f3f55d0414c3d73902d876ba3d55a654f05fe937089fbf5f34b1ced26d78d5" dependencies = [ "auto_impl", "cfg-if", @@ -6687,13 +6831,14 @@ dependencies = [ [[package]] name = "revm-inspectors" -version = "0.5.7" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec16f9b9d3cdaaf2f4b7ceaf004eb2c89df04e7ea29622584c0a6ec676bd0a83" +checksum = "48294aab02ed5d1940ad9b06f2a3230c3f0d98db6eacd618878cf143e204f6b0" dependencies = [ - "alloy-primitives", - "alloy-rpc-types", - "alloy-sol-types", + "alloy-primitives 0.8.3", + "alloy-rpc-types-eth 0.3.6", + "alloy-rpc-types-trace", + "alloy-sol-types 0.8.3", "anstyle", "colorchoice", "revm", @@ -6704,9 +6849,9 @@ dependencies = [ [[package]] name = "revm-interpreter" -version = "9.0.0" +version = "10.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ad04c7d87dc3421a5ccca76e56dbd0b29a358c03bb41fe9e80976e9d3f397d" +checksum = "713dbb271acd13afb06dcd460c1dc43da211e7ac9bc73cdf13528f615f55f96b" dependencies = [ "revm-primitives", "serde", @@ -6714,9 +6859,9 @@ dependencies = [ [[package]] name = "revm-precompile" -version = "10.0.0" +version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3526a4ba5ec400e7bbe71affbc10fe2e67c1cd1fb782bab988873d09a102e271" +checksum = "f73010c271d53fa7904e9845338e95f3955eb1200a0355e0abfdb89c41aaa9cd" dependencies = [ "aurora-engine-modexp", "blst", @@ -6734,24 +6879,21 @@ dependencies = [ [[package]] name = "revm-primitives" -version = "8.0.0" +version = "9.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4093d98a26601f0a793871c5bc7928410592f76b1f03fc89fde77180c554643c" +checksum = "e7a6bff9dbde3370a5ac9555104117f7e6039b3cc76e8d5d9d01899088beca2a" dependencies = [ - "alloy-eips 0.2.1", - "alloy-primitives", + "alloy-eips 0.3.6", + "alloy-primitives 0.8.3", "auto_impl", "bitflags 2.6.0", "bitvec", "c-kzg", "cfg-if", - "derive_more 0.99.18", "dyn-clone", "enumn", "hashbrown 0.14.5", "hex", - "kzg-rs", - "once_cell", "serde", ] @@ -6937,9 +7079,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.35" +version = "0.38.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f" +checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811" dependencies = [ "bitflags 2.6.0", "errno", @@ -6962,14 +7104,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8" dependencies = [ "once_cell", "ring 0.17.8", "rustls-pki-types", - "rustls-webpki 0.102.7", + "rustls-webpki 0.102.8", "subtle", "zeroize", ] @@ -6999,6 +7141,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.1.3", + "rustls-pki-types", + "schannel", + "security-framework", +] + [[package]] name = "rustls-pemfile" version = "1.0.4" @@ -7036,9 +7191,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.7" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84678086bd54edf2b415183ed7a94d0efb049f1b646a33e22a36f3794be6ae56" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring 0.17.8", "rustls-pki-types", @@ -7113,11 +7268,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" +checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -7190,9 +7345,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.29.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "rand", "secp256k1-sys", @@ -7200,9 +7355,9 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] @@ -7271,9 +7426,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73" [[package]] name = "serde" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09" +checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" dependencies = [ "serde_derive", ] @@ -7289,20 +7444,20 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.209" +version = "1.0.210" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170" +checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] name = "serde_json" -version = "1.0.127" +version = "1.0.128" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad" +checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" dependencies = [ "indexmap", "itoa", @@ -7339,7 +7494,7 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7363,19 +7518,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.9.34+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" -dependencies = [ - "indexmap", - "itoa", - "ryu", - "serde", - "unsafe-libyaml", -] - [[package]] name = "sha1" version = "0.10.6" @@ -7410,9 +7552,9 @@ dependencies = [ [[package]] name = "sha3-asm" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d79b758b7cb2085612b11a235055e485605a5103faccdd633f35bd7aee69dd" +checksum = "c28efc5e327c837aa837c59eae585fc250715ef939ac32881bcc11677cd02d46" dependencies = [ "cc", "cfg-if", @@ -7628,7 +7770,7 @@ dependencies = [ "proc-macro2", "quote", "rustversion", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -7672,9 +7814,9 @@ dependencies = [ [[package]] name = "svm-rs" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00d3230221bec82c4a79cd7af637ac29f04f369e95e476bc492f22882bb83c91" +checksum = "4aebac1b1ef2b46e2e2bdf3c09db304800f2a77c1fa902bd5231490203042be8" dependencies = [ "const-hex", "dirs", @@ -7692,15 +7834,15 @@ dependencies = [ [[package]] name = "svm-rs-builds" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fe4ebbe1038a5a517a07948c2487b3ccf79a4908953cc8f0047cf652233546" +checksum = "f2fa0f145894cb4d1c14446f08098ee5f21fc37ccbd1a7dd9dd355bbc806de3b" dependencies = [ "build_const", "const-hex", "semver 1.0.23", "serde_json", - "svm-rs 0.5.6", + "svm-rs 0.5.7", ] [[package]] @@ -7716,9 +7858,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.76" +version = "2.0.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525" +checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" dependencies = [ "proc-macro2", "quote", @@ -7734,7 +7876,19 @@ dependencies = [ "paste", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", +] + +[[package]] +name = "syn-solidity" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b95156f8b577cb59dc0b1df15c6f29a10afc5f8a7ac9786b0b5c68c19149278" +dependencies = [ + "paste", + "proc-macro2", + "quote", + "syn 2.0.77", ] [[package]] @@ -7794,35 +7948,6 @@ dependencies = [ "libc", ] -[[package]] -name = "tangle-avs" -version = "0.1.0" -dependencies = [ - "alloy", - "alloy-contract", - "alloy-primitives", - "alloy-provider 0.2.1", - "alloy-rpc-client 0.2.1", - "alloy-rpc-types-eth 0.2.1", - "alloy-signer 0.2.1", - "alloy-signer-local", - "alloy-sol-types", - "alloy-transport 0.2.1", - "anvil", - "eigen-utils", - "env_logger 0.11.5", - "foundry-common", - "getrandom", - "hex", - "k256", - "lazy_static", - "log", - "rand_core", - "thiserror", - "tokio", - "url", -] - [[package]] name = "tap" version = "1.0.1" @@ -7876,12 +8001,12 @@ dependencies = [ name = "test-utils" version = "0.1.0" dependencies = [ - "alloy-primitives", - "alloy-provider 0.2.1", - "alloy-rpc-types-eth 0.2.1", - "alloy-signer 0.2.1", + "alloy-primitives 0.8.3", + "alloy-provider 0.3.6", + "alloy-rpc-types-eth 0.3.6", + "alloy-signer 0.3.6", "alloy-signer-local", - "alloy-sol-types", + "alloy-sol-types 0.8.3", "alloy-transport-ws", "anvil", "eigen-contracts", @@ -7893,7 +8018,6 @@ dependencies = [ "k256", "log", "nix 0.29.0", - "tangle-avs", "tokio", "url", ] @@ -7915,7 +8039,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -8016,9 +8140,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.39.3" +version = "1.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9babc99b9923bfa4804bd74722ff02c0381021eafa4db9949217e3be8e84fff5" +checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" dependencies = [ "backtrace", "bytes", @@ -8040,7 +8164,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -8069,7 +8193,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", ] @@ -8088,9 +8212,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" +checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" dependencies = [ "futures-core", "pin-project-lite", @@ -8133,19 +8257,19 @@ checksum = "c6989540ced10490aaf14e6bad2e3d33728a2813310a0c71d1574304c49631cd" dependencies = [ "futures-util", "log", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "tokio", "tokio-rustls 0.26.0", "tungstenite 0.23.0", - "webpki-roots 0.26.3", + "webpki-roots 0.26.6", ] [[package]] name = "tokio-util" -version = "0.7.11" +version = "0.7.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" +checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" dependencies = [ "bytes", "futures-core", @@ -8178,9 +8302,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.20" +version = "0.22.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "583c44c02ad26b0c3f3066fe629275e50627026c51ac2e595cca4c230ce1ce1d" +checksum = "3b072cee73c449a636ffd6f32bd8de3a9f7119139aff882f44943ce2986dc5cf" dependencies = [ "indexmap", "serde", @@ -8205,6 +8329,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "tower" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tower-layer", + "tower-service", +] + [[package]] name = "tower-http" version = "0.5.2" @@ -8254,7 +8392,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -8402,7 +8540,7 @@ dependencies = [ "httparse", "log", "rand", - "rustls 0.23.12", + "rustls 0.23.13", "rustls-pki-types", "sha1", "thiserror", @@ -8427,7 +8565,6 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52" dependencies = [ - "arbitrary", "byteorder", "crunchy", "hex", @@ -8466,24 +8603,24 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-truncate" @@ -8498,15 +8635,15 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-xid" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229730647fbc343e3a80e463c1db7f78f3855d3f3739bee0dda773c9a037c90a" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" [[package]] name = "universal-hash" @@ -8518,12 +8655,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "unsafe-libyaml" -version = "0.2.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "673aac59facbab8a9007c7f6108d11f63b603f7cabff99fabf650fea5c32b861" - [[package]] name = "untrusted" version = "0.7.1" @@ -8677,7 +8808,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-shared", ] @@ -8711,7 +8842,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -8740,9 +8871,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -9057,7 +9188,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] @@ -9077,7 +9208,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.76", + "syn 2.0.77", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 72b1a7d..9f155f4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,6 @@ resolver = "2" members = [ "avs/incredible-squaring-avs", - "avs/tangle-avs", "aws", "contracts", "fireblocks-client", @@ -27,7 +26,6 @@ test-utils = { path = "./test-utils" } # AVS examples incredible-squaring-avs = { path = "./avs/incredible-squaring-avs" } -tangle-avs = { path = "./avs/tangle-avs" } # ARK Libraries ark-std = { version = "0.4.0", default-features = false, features = ["print-trace", "std"] } @@ -107,7 +105,8 @@ sqlx = "=0.7.3" postcard = "1.0.8" sha2 = "0.10.8" derivation-path = "0.2.0" -libp2p = { git = "https://github.com/libp2p/rust-libp2p/", default-features = false, rev = "3644879956b6ab93b8d23553a33e8fdb838f576f" } +#libp2p = { git = "https://github.com/libp2p/rust-libp2p/", default-features = false, rev = "3644879956b6ab93b8d23553a33e8fdb838f576f" } +libp2p = { git = "https://github.com/libp2p/rust-libp2p/", default-features = false } structopt = "0.3.26" env_logger = "0.11.3" regex = "1.10.4" @@ -131,38 +130,38 @@ http-body-util = "0.1.1" ethers = "2.0.14" nix = "0.29.0" -anvil = { git = "https://github.com/foundry-rs/foundry.git" } -foundry-common = { git = "https://github.com/foundry-rs/foundry.git" } -alloy = "0.2.1" +anvil = { git = "https://github.com/foundry-rs/foundry.git", branch = "master" } +foundry-common = { git = "https://github.com/foundry-rs/foundry.git", branch = "master" } +alloy = "0.3.6" revm = { version = "13.0.0", default-features = false } alloy-abi = "0.1.0" alloy-chains = "0.1.23" -alloy-primitives = "0.7.7" -alloy-dyn-abi = "0.7.7" -alloy-sol-types = "0.7.7" +alloy-primitives = "0.8.3" +alloy-dyn-abi = "0.8.3" +alloy-sol-types = { version = "0.8.3", default-features = false } alloy-rlp = "0.3.7" -alloy-trie = "0.4.1" -alloy-rpc-types = { version = "0.2.0" } -alloy-rpc-types-anvil = { version = "0.2.0" } -alloy-rpc-types-eth = { version = "0.2.0" } -alloy-rpc-types-trace = { version = "0.2.0" } -alloy-rpc-types-engine = { version = "0.2.0" } -alloy-genesis = { version = "0.2.0" } -alloy-node-bindings = { version = "0.2.0" } -alloy-provider = { version = "0.2.0", default-features = false, features = [ +alloy-trie = "0.5.3" +alloy-rpc-types = { version = "0.3.6" } +alloy-rpc-types-anvil = { version = "0.3.6" } +alloy-rpc-types-eth = { version = "0.3.6" } +alloy-rpc-types-trace = { version = "0.3.6" } +alloy-rpc-types-engine = { version = "0.3.6" } +alloy-genesis = { version = "0.3.6" } +alloy-node-bindings = { version = "0.3.6" } +alloy-provider = { version = "0.3.6", default-features = false, features = [ "reqwest","ws" ] } -alloy-pubsub = { version = "0.2.0" } -alloy-transport-http = { version = "0.2.0" } -alloy-eips = { version = "0.2.0", default-features = false } -alloy-signer = { version = "0.2.0" } -alloy-signer-local = { version = "0.2.0" } -alloy-network = { version = "0.2.0" } -alloy-consensus = { version = "0.2.0" } -alloy-contract = { version = "0.2.0" } -alloy-transport = { version = "0.2.0" } -alloy-transport-ws = { version = "0.2.0" } -alloy-rpc-client = { version = "0.2.0" } +alloy-pubsub = { version = "0.3.6" } +alloy-transport-http = { version = "0.3.6" } +alloy-eips = { version = "0.3.6", default-features = false } +alloy-signer = { version = "0.3.6" } +alloy-signer-local = { version = "0.3.6" } +alloy-network = { version = "0.3.6" } +alloy-consensus = { version = "0.3.6" } +alloy-contract = { version = "0.3.6" } +alloy-transport = { version = "0.3.6" } +alloy-transport-ws = { version = "0.3.6" } +alloy-rpc-client = { version = "0.3.6" } # WebAssembly wasmtime = { version = "8.0.1", default-features = false } @@ -183,4 +182,4 @@ eigen-contracts.workspace = true eigen-utils.workspace = true fireblocks-client.workspace = true incredible-squaring-avs.workspace = true -tangle-avs.workspace = true +test-utils.workspace = true diff --git a/avs/incredible-squaring-avs/src/aggregator/mod.rs b/avs/incredible-squaring-avs/src/aggregator/mod.rs index 516d218..be1d676 100644 --- a/avs/incredible-squaring-avs/src/aggregator/mod.rs +++ b/avs/incredible-squaring-avs/src/aggregator/mod.rs @@ -1,9 +1,9 @@ use crate::{ + avs::Bn254::{G1Point, G2Point}, + avs::NonSignerStakesAndSignature, avs::{ writer::IncredibleSquaringWriter, - IncredibleSquaringContractManager, - IncredibleSquaringTaskManager::{self, Task, TaskResponse}, - SetupConfig, SignedTaskResponse, + IncredibleSquaringContractManager, SetupConfig, SignedTaskResponse, {Task, TaskResponse}, }, get_task_response_digest, operator::OperatorError, @@ -185,7 +185,7 @@ where let non_signer_pubkeys = bls_agg_service_resp .non_signers_pubkeys_g1 .into_iter() - .map(|pubkey| IncredibleSquaringTaskManager::G1Point { + .map(|pubkey| G1Point { X: pubkey.x, Y: pubkey.y, }) @@ -194,26 +194,25 @@ where let quorum_apks = bls_agg_service_resp .quorum_apks_g1 .into_iter() - .map(|apk| IncredibleSquaringTaskManager::G1Point { X: apk.x, Y: apk.y }) + .map(|apk| G1Point { X: apk.x, Y: apk.y }) .collect(); - let non_signer_stakes_and_signature = - IncredibleSquaringTaskManager::NonSignerStakesAndSignature { - nonSignerPubkeys: non_signer_pubkeys, - quorumApks: quorum_apks, - apkG2: IncredibleSquaringTaskManager::G2Point { - X: bls_agg_service_resp.signers_apk_g2.x, - Y: bls_agg_service_resp.signers_apk_g2.y, - }, - sigma: IncredibleSquaringTaskManager::G1Point { - X: bls_agg_service_resp.signers_agg_sig_g1.g1_point.x, - Y: bls_agg_service_resp.signers_agg_sig_g1.g1_point.y, - }, - nonSignerQuorumBitmapIndices: bls_agg_service_resp.non_signer_quorum_bitmap_indices, - quorumApkIndices: bls_agg_service_resp.quorum_apk_indices, - totalStakeIndices: bls_agg_service_resp.total_stake_indices, - nonSignerStakeIndices: bls_agg_service_resp.non_signer_stake_indices, - }; + let non_signer_stakes_and_signature = NonSignerStakesAndSignature { + nonSignerPubkeys: non_signer_pubkeys, + quorumApks: quorum_apks, + apkG2: G2Point { + X: bls_agg_service_resp.signers_apk_g2.x, + Y: bls_agg_service_resp.signers_apk_g2.y, + }, + sigma: G1Point { + X: bls_agg_service_resp.signers_agg_sig_g1.g1_point.x, + Y: bls_agg_service_resp.signers_agg_sig_g1.g1_point.y, + }, + nonSignerQuorumBitmapIndices: bls_agg_service_resp.non_signer_quorum_bitmap_indices, + quorumApkIndices: bls_agg_service_resp.quorum_apk_indices, + totalStakeIndices: bls_agg_service_resp.total_stake_indices, + nonSignerStakeIndices: bls_agg_service_resp.non_signer_stake_indices, + }; log::info!( "Threshold reached. Sending aggregated response onchain. {}", @@ -255,10 +254,7 @@ where log::info!("Received signed task response: {:?}", signed_task_response); - let task_response = IncredibleSquaringTaskManager::TaskResponse::abi_decode( - &signed_task_response.task_response, - true, - )?; + let task_response = TaskResponse::abi_decode(&signed_task_response.task_response, true)?; let task_index = task_response.referenceTaskIndex; let task_response_digest = get_task_response_digest(&task_response); let task_response_digest_u256 = U256::from_le_bytes(task_response_digest.0); diff --git a/avs/incredible-squaring-avs/src/avs/mod.rs b/avs/incredible-squaring-avs/src/avs/mod.rs index 375471e..68330fa 100644 --- a/avs/incredible-squaring-avs/src/avs/mod.rs +++ b/avs/incredible-squaring-avs/src/avs/mod.rs @@ -4,45 +4,58 @@ pub mod writer; use alloy_primitives::{Address, Bytes, U256}; use alloy_rpc_types::{Log, TransactionReceipt}; -use alloy_sol_types::sol; use eigen_contracts::RegistryCoordinator; use eigen_utils::{ crypto::bls::{G1Point, Signature}, types::{AvsError, OperatorId}, Config, }; +pub use erc_20_mock::Erc20Mock; +pub use incredible_squaring_service_manager::IncredibleSquaringServiceManager; +pub use incredible_squaring_task_manager::IBLSSignatureChecker::NonSignerStakesAndSignature; +pub use incredible_squaring_task_manager::IBLSSignatureChecker::QuorumStakeTotals; +pub use incredible_squaring_task_manager::IIncredibleSquaringTaskManager::{ + Task, TaskResponse, TaskResponseMetadata, +}; +pub use incredible_squaring_task_manager::IncredibleSquaringTaskManager; +pub use incredible_squaring_task_manager::BN254 as Bn254; use serde::{Deserialize, Serialize}; -use IncredibleSquaringTaskManager::{Task, TaskResponse, TaskResponseMetadata}; -sol!( - #[allow(missing_docs)] - #[derive(Debug)] - #[sol(rpc)] - IncredibleSquaringTaskManager, - "./contracts/out/IncredibleSquaringTaskManager.sol/IncredibleSquaringTaskManager.json" -); +mod incredible_squaring_task_manager { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[derive(Debug)] + #[sol(rpc)] + IncredibleSquaringTaskManager, + "./contracts/out/IncredibleSquaringTaskManager.sol/IncredibleSquaringTaskManager.json" + ); +} -sol!( +mod incredible_squaring_service_manager { + alloy_sol_types::sol!( #[allow(missing_docs)] #[derive(Debug)] #[sol(rpc)] IncredibleSquaringServiceManager, "./contracts/out/IncredibleSquaringServiceManager.sol/IncredibleSquaringServiceManager.json" ); +} -sol!( - #[allow(missing_docs)] - #[derive(Debug)] - #[sol(rpc)] - Erc20Mock, - "./contracts/out/ERC20Mock.sol/ERC20Mock.json" -); +mod erc_20_mock { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[derive(Debug)] + #[sol(rpc)] + Erc20Mock, + "./contracts/out/ERC20Mock.sol/ERC20Mock.json" + ); +} #[derive(Debug, Clone)] pub struct TaskResponseData { pub task_response: TaskResponse, pub task_response_metadata: TaskResponseMetadata, - pub non_signing_operator_keys: Vec, + pub non_signing_operator_keys: Vec, } #[derive(Debug, Clone, Serialize, Deserialize)] @@ -147,7 +160,7 @@ impl IncredibleSquaringContractManager { task_response_metadata, pubkeys_of_non_signing_operators .iter() - .map(|pt| IncredibleSquaringTaskManager::G1Point { X: pt.x, Y: pt.y }) + .map(|pt| Bn254::G1Point { X: pt.x, Y: pt.y }) .collect(), ) .send() @@ -161,7 +174,7 @@ impl IncredibleSquaringContractManager { &self, task: Task, task_response: TaskResponse, - non_signer_stakes_and_signature: IncredibleSquaringTaskManager::NonSignerStakesAndSignature, + non_signer_stakes_and_signature: NonSignerStakesAndSignature, ) -> Result { let task_manager = IncredibleSquaringTaskManager::new( self.task_manager_addr, diff --git a/avs/incredible-squaring-avs/src/avs/reader.rs b/avs/incredible-squaring-avs/src/avs/reader.rs index 890c1ed..735953b 100644 --- a/avs/incredible-squaring-avs/src/avs/reader.rs +++ b/avs/incredible-squaring-avs/src/avs/reader.rs @@ -1,6 +1,7 @@ use super::{Erc20Mock, IncredibleSquaringContractManager, IncredibleSquaringTaskManager}; use alloy_primitives::{Address, Bytes, FixedBytes}; +use super::{NonSignerStakesAndSignature, QuorumStakeTotals}; use async_trait::async_trait; use eigen_utils::{types::AvsError, Config}; @@ -13,8 +14,8 @@ pub trait IncredibleSquaringReader { msg_hash: FixedBytes<32>, quorum_numbers: Bytes, reference_block_number: u32, - non_signer_stakes_and_signature: IncredibleSquaringTaskManager::NonSignerStakesAndSignature, - ) -> Result; + non_signer_stakes_and_signature: NonSignerStakesAndSignature, + ) -> Result; async fn get_erc20_mock(&self, token_addr: Address) -> Result; } @@ -28,8 +29,8 @@ impl IncredibleSquaringReader for IncredibleSquaringContractManager, quorum_numbers: Bytes, reference_block_number: u32, - non_signer_stakes_and_signature: IncredibleSquaringTaskManager::NonSignerStakesAndSignature, - ) -> Result { + non_signer_stakes_and_signature: NonSignerStakesAndSignature, + ) -> Result { let task_manager = IncredibleSquaringTaskManager::new( self.task_manager_addr, self.eth_client_http.clone(), diff --git a/avs/incredible-squaring-avs/src/avs/writer.rs b/avs/incredible-squaring-avs/src/avs/writer.rs index 475d851..96166b1 100644 --- a/avs/incredible-squaring-avs/src/avs/writer.rs +++ b/avs/incredible-squaring-avs/src/avs/writer.rs @@ -1,12 +1,13 @@ +use super::Bn254::G1Point; +use super::NonSignerStakesAndSignature; +use super::{IncredibleSquaringContractManager, IncredibleSquaringTaskManager}; +use super::{Task, TaskResponse, TaskResponseMetadata}; use alloy_primitives::{Bytes, U256}; use alloy_rpc_types::TransactionReceipt; use async_trait::async_trait; use eigen_utils::types::{AvsError, TaskIndex}; use eigen_utils::Config; -use super::IncredibleSquaringTaskManager::{Task, TaskResponse, TaskResponseMetadata}; -use super::{IncredibleSquaringContractManager, IncredibleSquaringTaskManager}; - #[async_trait] pub trait IncredibleSquaringWriter: Send + Sync { async fn send_new_task_number_to_square( @@ -21,14 +22,14 @@ pub trait IncredibleSquaringWriter: Send + Sync { task: Task, task_response: TaskResponse, task_response_metadata: TaskResponseMetadata, - pubkeys_of_non_signing_operators: Vec, + pubkeys_of_non_signing_operators: Vec, ) -> Result; async fn send_aggregated_response( &self, task: Task, task_response: TaskResponse, - non_signer_stakes_and_signature: IncredibleSquaringTaskManager::NonSignerStakesAndSignature, + non_signer_stakes_and_signature: NonSignerStakesAndSignature, ) -> Result; } @@ -74,7 +75,7 @@ impl IncredibleSquaringWriter for IncredibleSquaringContractManager, + pubkeys_of_non_signing_operators: Vec, ) -> Result { let task_manager = IncredibleSquaringTaskManager::new( self.task_manager_addr, @@ -98,7 +99,7 @@ impl IncredibleSquaringWriter for IncredibleSquaringContractManager Result { let task_manager = IncredibleSquaringTaskManager::new( self.task_manager_addr, diff --git a/avs/incredible-squaring-avs/src/challenger/mod.rs b/avs/incredible-squaring-avs/src/challenger/mod.rs index 4f45fef..4285c91 100644 --- a/avs/incredible-squaring-avs/src/challenger/mod.rs +++ b/avs/incredible-squaring-avs/src/challenger/mod.rs @@ -10,9 +10,10 @@ use tokio::sync::Mutex; use crate::avs::subscriber::IncredibleSquaringSubscriber; use crate::avs::writer::IncredibleSquaringWriter; -use crate::avs::IncredibleSquaringTaskManager::{NewTaskCreated, Task, TaskResponded}; +use crate::avs::IncredibleSquaringTaskManager::{NewTaskCreated, TaskResponded}; use crate::avs::{ - IncredibleSquaringContractManager, IncredibleSquaringTaskManager, SetupConfig, TaskResponseData, + Bn254, IncredibleSquaringContractManager, IncredibleSquaringTaskManager, SetupConfig, Task, + TaskResponseData, }; #[derive(Clone)] @@ -141,7 +142,7 @@ impl Challenger { async fn get_non_signing_operator_pub_keys( &self, v_log: &Log, - ) -> Result, AvsError> { + ) -> Result, AvsError> { log::info!("vLog.Raw is: {:?}", v_log.data()); // Get the nonSignerStakesAndSignature diff --git a/avs/incredible-squaring-avs/src/lib.rs b/avs/incredible-squaring-avs/src/lib.rs index 4c2da17..8794c3b 100644 --- a/avs/incredible-squaring-avs/src/lib.rs +++ b/avs/incredible-squaring-avs/src/lib.rs @@ -1,6 +1,6 @@ use alloy_primitives::{keccak256, B256}; use alloy_sol_types::SolValue; -use avs::IncredibleSquaringTaskManager::TaskResponse; +use avs::TaskResponse; pub mod aggregator; pub mod avs; @@ -12,64 +12,3 @@ pub fn get_task_response_digest(task_response: &TaskResponse) -> B256 { let encoded = task_response.abi_encode_packed(); keccak256(encoded) } - -// #[derive(Default)] -// pub struct EigenEnvironment; - -// impl GadgetEnvironment for EigenEnvironment { -// type Event = EigenEvent; -// type ProtocolMessage = EigenProtocolMessage; -// type Client = EigenRuntime; -// type WorkManager = EigenWorkManager; -// type Error = crate::Error; -// type Clock = ::Clock; -// type RetryID = ::RetryID; -// type TaskID = ::TaskID; -// type SessionID = ::SessionID; -// type TransactionManager = TangleTransactionManager; - -// fn build_protocol_message( -// associated_block_id: Self::Clock, -// associated_session_id: Self::SessionID, -// associated_retry_id: Self::RetryID, -// associated_task_id: Self::TaskID, -// from: UserID, -// to: Option, -// payload: &Payload, -// from_account_id: Option, -// to_network_id: Option, -// ) -> Self::ProtocolMessage { -// EigenProtocolMessage { -// associated_block_id, -// associated_session_id, -// associated_retry_id, -// task_hash: associated_task_id, -// from, -// to, -// payload: serialize(payload).expect("Failed to serialize message"), -// from_network_id: from_account_id, -// to_network_id, -// } -// } -// } - -// pub enum EventType { -// BlsApkRegistry(BlsApkRegistry::BlsApkRegistryEvents), -// RegistryCoordinator(RegistryCoordinator::RegistryCoordinatorEvents), -// } -// pub struct EigenEvent { -// pub event: T, -// number: ::Clock, -// } - -// impl EigenEvent { -// pub fn new(event: T, number: ::Clock) -> Self { -// Self { event, number } -// } -// } - -// impl EventMetadata for EigenEvent { -// fn number(&self) -> ::Clock { -// self.number -// } -// } diff --git a/avs/incredible-squaring-avs/src/operator.rs b/avs/incredible-squaring-avs/src/operator.rs index 2b6e0b0..d7b3080 100644 --- a/avs/incredible-squaring-avs/src/operator.rs +++ b/avs/incredible-squaring-avs/src/operator.rs @@ -3,7 +3,7 @@ use crate::aggregator::Aggregator; use crate::avs::subscriber::IncredibleSquaringSubscriber; use crate::avs::{ IncredibleSquaringContractManager, IncredibleSquaringTaskManager, SetupConfig, - SignedTaskResponse, + SignedTaskResponse, TaskResponse, }; use crate::get_task_response_digest; use crate::rpc_client::AggregatorRpcClient; @@ -446,7 +446,7 @@ impl Operator { pub fn process_new_task_created_log( &self, new_task_created_log: &Log, - ) -> IncredibleSquaringTaskManager::TaskResponse { + ) -> TaskResponse { log::debug!("Received new task: {:?}", new_task_created_log); log::info!("Received new task: numberToBeSquared={}, taskIndex={}, taskCreatedBlock={}, quorumNumbers={}, QuorumThresholdPercentage={}", new_task_created_log.inner.task.numberToBeSquared, @@ -460,7 +460,7 @@ impl Operator { .task .numberToBeSquared .pow(U256::from(2)); - IncredibleSquaringTaskManager::TaskResponse { + TaskResponse { referenceTaskIndex: new_task_created_log.inner.taskIndex, numberSquared: number_squared, } @@ -468,7 +468,7 @@ impl Operator { pub fn sign_task_response( &self, - task_response: &IncredibleSquaringTaskManager::TaskResponse, + task_response: &TaskResponse, ) -> Result { let task_response_hash = get_task_response_digest(task_response); let bls_signature = self.bls_keypair.sign_message(&task_response_hash); diff --git a/avs/incredible-squaring-avs/src/rpc_client.rs b/avs/incredible-squaring-avs/src/rpc_client.rs index f0fc7ac..f5f8d20 100644 --- a/avs/incredible-squaring-avs/src/rpc_client.rs +++ b/avs/incredible-squaring-avs/src/rpc_client.rs @@ -28,7 +28,7 @@ impl AggregatorRpcClient { async fn dial_aggregator_rpc_client(&self) -> Result<(), Box> { let response = self .client - .get(&format!("http://{}/", self.aggregator_ip_port_addr)) + .get(format!("http://{}/", self.aggregator_ip_port_addr)) .send() .await?; log::info!("Dialing aggregator RPC client. Response: {:?}", response); diff --git a/avs/tangle-avs/Cargo.toml b/avs/tangle-avs/Cargo.toml deleted file mode 100644 index c80a2c6..0000000 --- a/avs/tangle-avs/Cargo.toml +++ /dev/null @@ -1,51 +0,0 @@ -[package] -name = "tangle-avs" -version = "0.1.0" -authors.workspace = true -edition.workspace = true -license.workspace = true -homepage.workspace = true -repository.workspace = true - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] -alloy-contract.workspace = true -alloy-primitives.workspace = true -alloy-provider = { workspace = true, features = ["hyper"] } -alloy-sol-types.workspace = true -alloy-signer.workspace = true -alloy-signer-local.workspace = true -alloy-transport.workspace = true -eigen-utils.workspace = true - -hex.workspace = true -#k256.workspace = true -k256 = { workspace = true, features = ["ecdsa"] } -log.workspace = true -thiserror.workspace = true - -[dev-dependencies] -rand_core.workspace = true -anvil.workspace = true -foundry-common.workspace = true -tokio = { version = "1.38.0", features = ["full"] } -alloy = { version = "0.1.3", features = ["serde", "signers"] } -alloy-rpc-types-eth.workspace = true -alloy-rpc-client.workspace = true -alloy-primitives.workspace = true -alloy-provider.workspace = true -alloy-contract.workspace = true -alloy-sol-types.workspace = true -alloy-signer-local.workspace = true -log.workspace = true -env_logger.workspace = true -getrandom.workspace = true -#addr2line.workspace = true -hex.workspace = true -lazy_static.workspace = true -url.workspace = true - -[features] -default = [] -tangle = [] diff --git a/avs/tangle-avs/build.rs b/avs/tangle-avs/build.rs deleted file mode 100644 index 5c21750..0000000 --- a/avs/tangle-avs/build.rs +++ /dev/null @@ -1,57 +0,0 @@ -use std::env; -use std::path::PathBuf; -use std::process::Command; - -fn main() { - // List of directories containing Solidity contracts - let contract_dirs: Vec<&str> = vec![ - "./../contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts", - "./../contracts/lib/eigenlayer-middleware", - "./../contracts", - "./contracts", - ]; - - // Get the project root directory - let root = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap()); - - // Try to find the `forge` executable dynamically - let forge_executable = match Command::new("which").arg("forge").output() { - Ok(output) => { - let path = String::from_utf8_lossy(&output.stdout).trim().to_string(); - if path.is_empty() { - panic!("Forge executable not found. Make sure Foundry is installed."); - } - path - } - Err(_) => panic!("Failed to locate `forge` executable. Make sure Foundry is installed."), - }; - - for dir in contract_dirs { - let full_path = root.join(dir).canonicalize().unwrap_or_else(|_| { - println!( - "Directory not found or inaccessible: {}", - root.join(dir).display() - ); - root.join(dir) - }); - - if full_path.exists() { - println!("cargo:rerun-if-changed={}", full_path.display()); - - let status = Command::new(&forge_executable) - .current_dir(&full_path) - .arg("build") - .status() - .expect("Failed to execute Forge build"); - - if !status.success() { - panic!("Forge build failed for directory: {}", full_path.display()); - } - } else { - println!( - "Directory not found or does not exist: {}", - full_path.display() - ); - } - } -} diff --git a/avs/tangle-avs/contracts/.github/workflows/test.yml b/avs/tangle-avs/contracts/.github/workflows/test.yml deleted file mode 100644 index 09880b1..0000000 --- a/avs/tangle-avs/contracts/.github/workflows/test.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: test - -on: workflow_dispatch - -env: - FOUNDRY_PROFILE: ci - -jobs: - check: - strategy: - fail-fast: true - - name: Foundry project - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - with: - submodules: recursive - - - name: Install Foundry - uses: foundry-rs/foundry-toolchain@v1 - with: - version: nightly - - - name: Run Forge build - run: | - forge --version - forge build --sizes - id: build - - - name: Run Forge tests - run: | - forge test -vvv - id: test diff --git a/avs/tangle-avs/contracts/.gitignore b/avs/tangle-avs/contracts/.gitignore deleted file mode 100644 index 85198aa..0000000 --- a/avs/tangle-avs/contracts/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -# Compiler files -cache/ -out/ - -# Ignores development broadcast logs -!/broadcast -/broadcast/*/31337/ -/broadcast/**/dry-run/ - -# Docs -docs/ - -# Dotenv file -.env diff --git a/avs/tangle-avs/contracts/foundry.toml b/avs/tangle-avs/contracts/foundry.toml deleted file mode 100644 index 21570e2..0000000 --- a/avs/tangle-avs/contracts/foundry.toml +++ /dev/null @@ -1,5 +0,0 @@ -[profile.default] -src = "src" -out = "out" -libs = ["lib"] -solc_version = "0.8.20" \ No newline at end of file diff --git a/avs/tangle-avs/contracts/lib/eigenlayer-middleware b/avs/tangle-avs/contracts/lib/eigenlayer-middleware deleted file mode 160000 index 7d49b51..0000000 --- a/avs/tangle-avs/contracts/lib/eigenlayer-middleware +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7d49b5181b09198ed275783453aa082bb3766990 diff --git a/avs/tangle-avs/contracts/lib/forge-std b/avs/tangle-avs/contracts/lib/forge-std deleted file mode 160000 index 07263d1..0000000 --- a/avs/tangle-avs/contracts/lib/forge-std +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 07263d193d621c4b2b0ce8b4d54af58f6957d97d diff --git a/avs/tangle-avs/contracts/remappings.txt b/avs/tangle-avs/contracts/remappings.txt deleted file mode 100644 index b74927b..0000000 --- a/avs/tangle-avs/contracts/remappings.txt +++ /dev/null @@ -1,7 +0,0 @@ -@openzeppelin-upgrades/=lib/eigenlayer-middleware/lib/openzeppelin-contracts-upgradeable/ -@openzeppelin/=lib/eigenlayer-middleware/lib/openzeppelin-contracts/ -@openzeppelin-interfaces/=lib/eigenlayer-middleware/lib/openzeppelin-contracts/contracts/interfaces/ -ds-test/=lib/ds-test/src/ -eigenlayer-contracts/=lib/eigenlayer-middleware/lib/eigenlayer-contracts -eigenlayer-middleware/=lib/eigenlayer-middleware/ -forge-std/=lib/forge-std/src/ diff --git a/avs/tangle-avs/contracts/script/Counter.s.sol b/avs/tangle-avs/contracts/script/Counter.s.sol deleted file mode 100644 index 0e546ab..0000000 --- a/avs/tangle-avs/contracts/script/Counter.s.sol +++ /dev/null @@ -1,12 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.13; - -import "forge-std/Script.sol"; - -contract CounterScript is Script { - function setUp() public {} - - function run() public { - vm.broadcast(); - } -} diff --git a/avs/tangle-avs/contracts/src/ERC20Mock.sol b/avs/tangle-avs/contracts/src/ERC20Mock.sol deleted file mode 100644 index 841ed7c..0000000 --- a/avs/tangle-avs/contracts/src/ERC20Mock.sol +++ /dev/null @@ -1,308 +0,0 @@ -// SPDX-License-Identifier: MIT -// OpenZeppelin Contracts (last updated v4.8.0) (token/ERC20/ERC20.sol) - -pragma solidity ^0.8.20; - -import "@openzeppelin-interfaces/IERC20.sol"; -import "@openzeppelin/contracts/utils/Context.sol"; - -/** - * @dev Implementation of the {IERC20} interface. - * - * This implementation is agnostic to the way tokens are created. This means - * that a supply mechanism has to be added in a derived contract using {_mint}. - * For a generic mechanism see {ERC20PresetMinterPauser}. - * - * TIP: For a detailed writeup see our guide - * https://forum.openzeppelin.com/t/how-to-implement-erc20-supply-mechanisms/226[How - * to implement supply mechanisms]. - * - * The default value of {decimals} is 18. To change this, you should override - * this function so it returns a different value. - * - * We have followed general OpenZeppelin Contracts guidelines: functions revert - * instead returning `false` on failure. This behavior is nonetheless - * conventional and does not conflict with the expectations of ERC20 - * applications. - * - * Additionally, an {Approval} event is emitted on calls to {transferFrom}. - * This allows applications to reconstruct the allowance for all accounts just - * by listening to said events. Other implementations of the EIP may not emit - * these events, as it isn't required by the specification. - * - * Finally, the non-standard {decreaseAllowance} and {increaseAllowance} - * functions have been added to mitigate the well-known issues around setting - * allowances. See {IERC20-approve}. - */ -contract ERC20Mock is Context, IERC20 { - mapping(address => uint256) private _balances; - - mapping(address => mapping(address => uint256)) private _allowances; - - uint256 private _totalSupply; - - /** - * @dev See {IERC20-totalSupply}. - */ - function totalSupply() public view virtual override returns (uint256) { - return _totalSupply; - } - - /** - * @dev See {IERC20-balanceOf}. - */ - function balanceOf( - address account - ) public view virtual override returns (uint256) { - return _balances[account]; - } - - function mint(address account, uint256 amount) public { - _mint(account, amount); - } - - /** - * @dev See {IERC20-transfer}. - * - * Requirements: - * - * - `to` cannot be the zero address. - * - the caller must have a balance of at least `amount`. - */ - function transfer( - address to, - uint256 amount - ) public virtual override returns (bool) { - address owner = _msgSender(); - _transfer(owner, to, amount); - return true; - } - - /** - * @dev See {IERC20-allowance}. - */ - function allowance( - address owner, - address spender - ) public view virtual override returns (uint256) { - return _allowances[owner][spender]; - } - - /** - * @dev See {IERC20-approve}. - * - * NOTE: If `amount` is the maximum `uint256`, the allowance is not updated on - * `transferFrom`. This is semantically equivalent to an infinite approval. - * - * Requirements: - * - * - `spender` cannot be the zero address. - */ - function approve( - address /*spender*/, - uint256 /*amount*/ - ) public virtual override returns (bool) { - return true; - } - - /** - * @dev See {IERC20-transferFrom}. - * - * Emits an {Approval} event indicating the updated allowance. This is not - * required by the EIP. See the note at the beginning of {ERC20}. - * - * NOTE: Does not update the allowance if the current allowance - * is the maximum `uint256`. - * - * Requirements: - * - * - `from` and `to` cannot be the zero address. - * - `from` must have a balance of at least `amount`. - * - the caller must have allowance for ``from``'s tokens of at least - * `amount`. - */ - function transferFrom( - address from, - address to, - uint256 amount - ) public virtual override returns (bool) { - _transfer(from, to, amount); - return true; - } - - /** - * @dev Moves `amount` of tokens from `from` to `to`. - * - * This internal function is equivalent to {transfer}, and can be used to - * e.g. implement automatic token fees, slashing mechanisms, etc. - * - * Emits a {Transfer} event. - * - * Requirements: - * - * - `from` cannot be the zero address. - * - `to` cannot be the zero address. - * - `from` must have a balance of at least `amount`. - */ - function _transfer( - address from, - address to, - uint256 amount - ) internal virtual { - require(from != address(0), "ERC20: transfer from the zero address"); - require(to != address(0), "ERC20: transfer to the zero address"); - - _beforeTokenTransfer(from, to, amount); - - require( - _balances[from] >= amount, - "ERC20: transfer amount exceeds balance" - ); - unchecked { - _balances[from] = _balances[from] - amount; - // Overflow not possible: the sum of all balances is capped by totalSupply, and the sum is preserved by - // decrementing then incrementing. - _balances[to] += amount; - } - - emit Transfer(from, to, amount); - - _afterTokenTransfer(from, to, amount); - } - - /** @dev Creates `amount` tokens and assigns them to `account`, increasing - * the total supply. - * - * Emits a {Transfer} event with `from` set to the zero address. - * - * Requirements: - * - * - `account` cannot be the zero address. - */ - function _mint(address account, uint256 amount) internal virtual { - require(account != address(0), "ERC20: mint to the zero address"); - - _totalSupply += amount; - unchecked { - // Overflow not possible: balance + amount is at most totalSupply + amount, which is checked above. - _balances[account] += amount; - } - emit Transfer(address(0), account, amount); - } - - /** - * @dev Destroys `amount` tokens from `account`, reducing the - * total supply. - * - * Emits a {Transfer} event with `to` set to the zero address. - * - * Requirements: - * - * - `account` cannot be the zero address. - * - `account` must have at least `amount` tokens. - */ - function _burn(address account, uint256 amount) internal virtual { - require(account != address(0), "ERC20: burn from the zero address"); - - _beforeTokenTransfer(account, address(0), amount); - - uint256 accountBalance = _balances[account]; - require(accountBalance >= amount, "ERC20: burn amount exceeds balance"); - unchecked { - _balances[account] = accountBalance - amount; - // Overflow not possible: amount <= accountBalance <= totalSupply. - _totalSupply -= amount; - } - - emit Transfer(account, address(0), amount); - - _afterTokenTransfer(account, address(0), amount); - } - - /** - * @dev Sets `amount` as the allowance of `spender` over the `owner` s tokens. - * - * This internal function is equivalent to `approve`, and can be used to - * e.g. set automatic allowances for certain subsystems, etc. - * - * Emits an {Approval} event. - * - * Requirements: - * - * - `owner` cannot be the zero address. - * - `spender` cannot be the zero address. - */ - function _approve( - address owner, - address spender, - uint256 amount - ) internal virtual { - require(owner != address(0), "ERC20: approve from the zero address"); - require(spender != address(0), "ERC20: approve to the zero address"); - - _allowances[owner][spender] = amount; - emit Approval(owner, spender, amount); - } - - /** - * @dev Updates `owner` s allowance for `spender` based on spent `amount`. - * - * Does not update the allowance amount in case of infinite allowance. - * Revert if not enough allowance is available. - * - * Might emit an {Approval} event. - */ - function _spendAllowance( - address owner, - address spender, - uint256 amount - ) internal virtual { - uint256 currentAllowance = allowance(owner, spender); - if (currentAllowance != type(uint256).max) { - require( - currentAllowance >= amount, - "ERC20: insufficient allowance" - ); - } - } - - /** - * @dev Hook that is called before any transfer of tokens. This includes - * minting and burning. - * - * Calling conditions: - * - * - when `from` and `to` are both non-zero, `amount` of ``from``'s tokens - * will be transferred to `to`. - * - when `from` is zero, `amount` tokens will be minted for `to`. - * - when `to` is zero, `amount` of ``from``'s tokens will be burned. - * - `from` and `to` are never both zero. - * - * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks]. - */ - function _beforeTokenTransfer( - address from, - address to, - uint256 amount - ) internal virtual {} - - /** - * @dev Hook that is called after any transfer of tokens. This includes - * minting and burning. - * - * Calling conditions: - * - * - when `from` and `to` are both non-zero, `amount` of ``from``'s tokens - * has been transferred to `to`. - * - when `from` is zero, `amount` tokens have been minted for `to`. - * - when `to` is zero, `amount` of ``from``'s tokens have been burned. - * - `from` and `to` are never both zero. - * - * To learn more about hooks, head to xref:ROOT:extending-contracts.adoc#using-hooks[Using Hooks]. - */ - function _afterTokenTransfer( - address from, - address to, - uint256 amount - ) internal virtual {} -} diff --git a/avs/tangle-avs/contracts/src/ITangleValidatorTaskManager.sol b/avs/tangle-avs/contracts/src/ITangleValidatorTaskManager.sol deleted file mode 100644 index 7b6ddeb..0000000 --- a/avs/tangle-avs/contracts/src/ITangleValidatorTaskManager.sol +++ /dev/null @@ -1,15 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; - -import "eigenlayer-middleware/src/libraries/BN254.sol"; - -interface ITangleValidatorTaskManager { - struct TangleSlashingEvent { - bytes data; - } - - /// NOTE: This function reports slashing events from Tangle - function reportSlashingEvent( - TangleSlashingEvent calldata slashingEvent - ) external; -} diff --git a/avs/tangle-avs/contracts/src/TangleValidatorServiceManager.sol b/avs/tangle-avs/contracts/src/TangleValidatorServiceManager.sol deleted file mode 100644 index 0939c45..0000000 --- a/avs/tangle-avs/contracts/src/TangleValidatorServiceManager.sol +++ /dev/null @@ -1,48 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; - -import "eigenlayer-middleware/lib/eigenlayer-contracts/src/contracts/libraries/BytesLib.sol"; -import "src/ITangleValidatorTaskManager.sol"; -import "eigenlayer-middleware/src/ServiceManagerBase.sol"; - -/** - * @title Primary entrypoint for procuring services from TangleValidator. - * @author Tangle Foundation - */ -contract TangleValidatorServiceManager is ServiceManagerBase { - using BytesLib for bytes; - - ITangleValidatorTaskManager - public immutable TangleValidatorOperatorManager; - - /// @notice when applied to a function, ensures that the function is only callable by the `registryCoordinator`. - modifier onlyTangleValidatorOperatorManager() { - require( - msg.sender == address(TangleValidatorOperatorManager), - "onlyTangleValidatorOperatorManager: not from credible squaring task manager" - ); - _; - } - - constructor( - IAVSDirectory _avsDirectory, - IRegistryCoordinator _registryCoordinator, - IStakeRegistry _stakeRegistry, - ITangleValidatorTaskManager _TangleValidatorOperatorManager - ) - ServiceManagerBase( - _avsDirectory, - _registryCoordinator, - _stakeRegistry - ) - { - TangleValidatorOperatorManager = _TangleValidatorOperatorManager; - } - - /// @notice Called in the event of a slashing event from the Tangle. - function slash( - address operatorAddr - ) external onlyTangleValidatorOperatorManager { - // slasher.freezeOperator(operatorAddr); - } -} diff --git a/avs/tangle-avs/contracts/src/TangleValidatorTaskManager.sol b/avs/tangle-avs/contracts/src/TangleValidatorTaskManager.sol deleted file mode 100644 index f05815a..0000000 --- a/avs/tangle-avs/contracts/src/TangleValidatorTaskManager.sol +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-License-Identifier: UNLICENSED -pragma solidity ^0.8.20; - -import "@openzeppelin-upgrades/contracts/proxy/utils/Initializable.sol"; -import "@openzeppelin-upgrades/contracts/access/OwnableUpgradeable.sol"; -import "eigenlayer-contracts/src/contracts/permissions/Pausable.sol"; -import "eigenlayer-middleware/src/interfaces/IServiceManager.sol"; -import {BLSApkRegistry} from "eigenlayer-middleware/src/BLSApkRegistry.sol"; -import {RegistryCoordinator} from "eigenlayer-middleware/src/RegistryCoordinator.sol"; -import {BLSSignatureChecker, IRegistryCoordinator} from "eigenlayer-middleware/src/BLSSignatureChecker.sol"; -import {OperatorStateRetriever} from "eigenlayer-middleware/src/OperatorStateRetriever.sol"; -import "eigenlayer-middleware/src/libraries/BN254.sol"; -import "./ITangleValidatorTaskManager.sol"; - -contract TangleValidatorTaskManager is - Initializable, - OwnableUpgradeable, - Pausable, - OperatorStateRetriever, - ITangleValidatorTaskManager -{ - constructor( - IRegistryCoordinator _registryCoordinator - ) {} - - function initialize( - IPauserRegistry _pauserRegistry, - address initialOwner - ) public initializer { - _initializePauser(_pauserRegistry, UNPAUSE_ALL); - _transferOwnership(initialOwner); - } - - function reportSlashingEvent( - TangleSlashingEvent calldata slashingEvent - ) external override onlyPauser { - // if ( - // IServiceManager( - // address( - // BLSRegistryCoordinatorWithIndices( - // address(registryCoordinator) - // ).serviceManager() - // ) - // ).slasher().isFrozen(operatorAddress) == false - // ) { - // // TODO: Verify the slashing event - // BLSRegistryCoordinatorWithIndices( - // address(registryCoordinator) - // ).serviceManager().freezeOperator(operatorAddress); - // } - } -} diff --git a/avs/tangle-avs/src/lib.rs b/avs/tangle-avs/src/lib.rs deleted file mode 100644 index b740c42..0000000 --- a/avs/tangle-avs/src/lib.rs +++ /dev/null @@ -1,27 +0,0 @@ -use alloy_sol_types::sol; - -pub mod operator; - -sol!( - #[allow(missing_docs)] - #[derive(Debug)] - #[sol(rpc)] - TangleValidatorTaskManager, - "contracts/out/TangleValidatorTaskManager.sol/TangleValidatorTaskManager.json" -); - -sol!( - #[allow(missing_docs)] - #[derive(Debug)] - #[sol(rpc)] - TangleValidatorServiceManager, - "contracts/out/TangleValidatorServiceManager.sol/TangleValidatorServiceManager.json" -); - -sol!( - #[allow(missing_docs)] - #[derive(Debug)] - #[sol(rpc)] - ITangleValidatorTaskManager, - "contracts/out/ITangleValidatorTaskManager.sol/ITangleValidatorTaskManager.json" -); diff --git a/avs/tangle-avs/src/operator.rs b/avs/tangle-avs/src/operator.rs deleted file mode 100644 index bf1f042..0000000 --- a/avs/tangle-avs/src/operator.rs +++ /dev/null @@ -1,344 +0,0 @@ -use alloy_contract::private::Ethereum; -use alloy_primitives::{Address, Bytes, ChainId, Signature, B256}; -use alloy_provider::{Provider, RootProvider}; -use alloy_signer_local::PrivateKeySigner; -use alloy_transport::BoxTransport; -use eigen_utils::avs_registry::reader::AvsRegistryChainReaderTrait; -use eigen_utils::avs_registry::writer::AvsRegistryChainWriterTrait; -use eigen_utils::avs_registry::AvsRegistryContractManager; -use eigen_utils::crypto::bls::KeyPair; -use eigen_utils::el_contracts::writer::ElWriter; -use eigen_utils::el_contracts::ElChainContractManager; -use eigen_utils::node_api::NodeApi; -use eigen_utils::types::AvsError; -use eigen_utils::Config; -use k256::ecdsa::SigningKey; -use log::error; -use std::future::Future; -use std::pin::Pin; -use std::str::FromStr; -use thiserror::Error; - -const AVS_NAME: &str = "incredible-squaring"; -const SEM_VER: &str = "0.0.1"; - -/// Error type specific to the Operator for the Tangle AVS -#[derive(Debug, Error)] -pub enum OperatorError { - #[error("Error in Address: {0}")] - AddressError(String), - #[error("Cannot create HTTP ethclient: {0}")] - HttpEthClientError(String), - #[error("Cannot create WS ethclient: {0}")] - WsEthClientError(String), - #[error("Cannot parse BLS private key: {0}")] - BlsPrivateKeyError(String), - #[error("Cannot parse ECDSA private key: {0}")] - EcdsaPrivateKeyError(String), - #[error("Cannot get chainId: {0}")] - ChainIdError(String), - #[error("Error using Contract Manager: {0}")] - ContractManagerError(String), - #[error("Error creating AvsWriter: {0}")] - AvsWriterError(String), - #[error("Error creating AvsReader: {0}")] - AvsReaderError(String), - #[error("Error creating AvsSubscriber: {0}")] - AvsSubscriberError(String), - #[error("Cannot create AggregatorRpcClient: {0}")] - AggregatorRpcClientError(String), - #[error("Cannot get operator id: {0}")] - OperatorIdError(String), - #[error("Error in Operator Address: {0}")] - OperatorAddressError(String), - #[error("Error while Starting Operator: {0}")] - OperatorStartError(String), - #[error( - "Operator is not registered. Register using the operator-cli before starting operator." - )] - OperatorNotRegistered, - #[error("Error in metrics server: {0}")] - MetricsServerError(String), - #[error("Error in Service Manager Address: {0}")] - ServiceManagerAddressError(String), - #[error("Error in Task Handling Process: {0}")] - TaskError(String), - #[error("Error in websocket subscription: {0}")] - WebsocketSubscriptionError(String), - #[error("AVS SDK error")] - AvsSdkError(#[from] AvsError), - #[error("Wallet error")] - WalletError(#[from] alloy_signer_local::LocalSignerError), - #[error("Node API error: {0}")] - NodeApiError(String), -} - -/// Tangle AVS Operator Struct -#[allow(dead_code)] -pub struct Operator { - config: NodeConfig, - node_api: NodeApi, - avs_registry_contract_manager: AvsRegistryContractManager, - operator_id: [u8; 32], - operator_addr: Address, - tangle_validator_service_manager_addr: Address, -} - -/// Tangle AVS Node Config Struct - Contains all the configurations relevant to the AVS' Target Chain -#[derive(Debug, Clone)] -pub struct NodeConfig { - pub node_api_ip_port_address: String, - pub eth_rpc_url: String, - pub eth_ws_url: String, - pub bls_private_key_store_path: String, - pub ecdsa_private_key_store_path: String, - pub avs_registry_coordinator_address: String, - pub operator_state_retriever_address: String, - pub eigen_metrics_ip_port_address: String, - pub tangle_validator_service_manager_address: String, - pub delegation_manager_address: String, - pub avs_directory_address: String, - pub operator_address: String, - pub enable_metrics: bool, - pub enable_node_api: bool, - pub metadata_url: String, -} - -#[derive(Clone)] -pub struct EigenTangleProvider { - pub provider: RootProvider, -} - -impl Provider for EigenTangleProvider { - fn root(&self) -> &RootProvider { - &self.provider - } -} - -#[derive(Clone)] -pub struct EigenTangleSigner { - signer: PrivateKeySigner, - chain_id: Option, -} - -impl EigenTangleSigner { - pub fn new(signer: PrivateKeySigner, chain_id: Option) -> Self { - Self { signer, chain_id } - } -} - -impl alloy_signer::Signer for EigenTangleSigner { - fn sign_hash<'life0, 'life1, 'async_trait>( - &'life0 self, - hash: &'life1 B256, - ) -> Pin> + Send + 'async_trait>> - where - 'life0: 'async_trait, - 'life1: 'async_trait, - Self: 'async_trait, - { - let signer = self.signer.clone(); - - let signature_future = async move { signer.sign_hash(hash).await }; - - Box::pin(signature_future) - } - - fn address(&self) -> Address { - self.signer.address() - } - - fn chain_id(&self) -> Option { - self.chain_id - } - - fn set_chain_id(&mut self, chain_id: Option) { - self.chain_id = chain_id; - } -} - -impl Config for NodeConfig { - type TH = BoxTransport; - type TW = BoxTransport; - type PH = EigenTangleProvider; - type PW = EigenTangleProvider; - type S = EigenTangleSigner; -} - -#[derive(Debug, Clone)] -pub struct SetupConfig { - pub registry_coordinator_addr: Address, - pub operator_state_retriever_addr: Address, - pub delegate_manager_addr: Address, - pub avs_directory_addr: Address, - pub eth_client_http: T::PH, - pub eth_client_ws: T::PW, - pub signer: T::S, -} - -impl Operator { - /// Creates a new Operator from the given config, providers, and signer - pub async fn new_from_config( - config: NodeConfig, - eth_client_http: T::PH, - eth_client_ws: T::PW, - signer: T::S, - ) -> Result { - let node_api = NodeApi::new(AVS_NAME, SEM_VER, &config.node_api_ip_port_address); - - log::info!("Reading BLS key"); - let bls_key_password = - std::env::var("OPERATOR_BLS_KEY_PASSWORD").unwrap_or_else(|_| "".to_string()); - let bls_keypair = KeyPair::read_private_key_from_file( - &config.bls_private_key_store_path, - &bls_key_password, - ) - .map_err(OperatorError::from)?; - - log::info!("Reading ECDSA key"); - let ecdsa_key_password = - std::env::var("OPERATOR_ECDSA_KEY_PASSWORD").unwrap_or_else(|_| "".to_string()); - let ecdsa_secret_key = eigen_utils::crypto::ecdsa::read_key( - &config.ecdsa_private_key_store_path, - &ecdsa_key_password, - ) - .map_err(|e| OperatorError::EcdsaPrivateKeyError(e.to_string()))?; - let ecdsa_signing_key = SigningKey::from(&ecdsa_secret_key); - - let setup_config = SetupConfig:: { - registry_coordinator_addr: Address::from_str(&config.avs_registry_coordinator_address) - .map_err(|e| OperatorError::AddressError(e.to_string()))?, - operator_state_retriever_addr: Address::from_str( - &config.operator_state_retriever_address, - ) - .map_err(|e| OperatorError::AddressError(e.to_string()))?, - delegate_manager_addr: Address::from_str(&config.delegation_manager_address) - .map_err(|e| OperatorError::AddressError(e.to_string()))?, - avs_directory_addr: Address::from_str(&config.avs_directory_address) - .map_err(|e| OperatorError::AddressError(e.to_string()))?, - eth_client_http: eth_client_http.clone(), - eth_client_ws: eth_client_ws.clone(), - signer: signer.clone(), - }; - - let avs_registry_contract_manager = AvsRegistryContractManager::build( - Address::from_str(&config.tangle_validator_service_manager_address) - .map_err(|e| OperatorError::AddressError(e.to_string()))?, - setup_config.registry_coordinator_addr, - setup_config.operator_state_retriever_addr, - setup_config.delegate_manager_addr, - setup_config.avs_directory_addr, - eth_client_http.clone(), - eth_client_ws.clone(), - signer.clone(), - ) - .await?; - - let operator_addr = Address::from_str(&config.operator_address) - .map_err(|err| OperatorError::OperatorAddressError(err.to_string()))?; - - let operator_id = avs_registry_contract_manager - .get_operator_id(operator_addr) - .await?; - - let tangle_validator_service_manager_addr = - Address::from_str(&config.tangle_validator_service_manager_address) - .map_err(|err| OperatorError::ServiceManagerAddressError(err.to_string()))?; - - log::info!("Building Eigenlayer Contract Manager..."); - let eigenlayer_contract_manager: ElChainContractManager = ElChainContractManager::build( - setup_config.delegate_manager_addr, - setup_config.avs_directory_addr, - eth_client_http.clone(), - eth_client_ws.clone(), - signer.clone(), - ) - .await - .map_err(|e| OperatorError::ContractManagerError(e.to_string()))?; - - // Register Operator with EigenLayer - let register_operator = eigen_utils::types::Operator { - address: operator_addr, - earnings_receiver_address: operator_addr, - delegation_approver_address: Address::from([0u8; 20]), - staker_opt_out_window_blocks: 50400u32, // About 7 days in blocks on Ethereum - metadata_url: config.metadata_url.clone(), - }; - let eigenlayer_register_result = eigenlayer_contract_manager - .register_as_operator(register_operator) - .await - .map_err(|e| OperatorError::ContractManagerError(e.to_string()))? - .status(); - log::info!( - "Eigenlayer Registration result: {:?}", - eigenlayer_register_result - ); - - // Register Operator with AVS - let quorum_nums = Bytes::from([0x00]); - let register_result = avs_registry_contract_manager - .register_operator( - &ecdsa_signing_key, - &bls_keypair, - quorum_nums, - config.eth_rpc_url.clone(), - ) - .await; - log::info!("AVS Registration result: {:?}", register_result); - - let answer = avs_registry_contract_manager - .is_operator_registered(operator_addr) - .await - .map_err(|e| OperatorError::ContractManagerError(e.to_string()))?; - log::info!("Is operator registered: {:?}", answer); - - let operator = Operator { - config: config.clone(), - node_api, - avs_registry_contract_manager, - operator_id: [0u8; 32], - operator_addr, - tangle_validator_service_manager_addr, - }; - - log::info!( - "Operator info: operatorId={}, operatorAddr={}, operatorG1Pubkey={:?}, operatorG2Pubkey={:?}", - hex::encode(operator_id), - config.operator_address, - bls_keypair.get_pub_key_g1(), - bls_keypair.get_pub_key_g2(), - ); - - Ok(operator) - } - - /// Queries the Chain for the Operator's registration status on the AVS - pub async fn is_registered(&self) -> Result { - let operator_is_registered = self - .avs_registry_contract_manager - .is_operator_registered(self.operator_addr) - .await?; - log::info!("Operator registration status: {:?}", operator_is_registered); - Ok(operator_is_registered) - } - - /// Starts the operator, running the Tangle Validator and optionally the Node API - pub async fn start(&self) -> Result<(), OperatorError> { - log::info!("Starting operator."); - self.is_registered().await?; - - if self.config.enable_node_api { - if let Err(e) = self.node_api.start().await { - return Err(OperatorError::NodeApiError(e.to_string())); - } - } - - log::info!("Starting Tangle Validator..."); - // gadget_executor::run_tangle_validator() - // .await - // .map_err(|e| OperatorError::OperatorStartError(e.to_string()))?; - // TODO: Start Tangle Validator without gadget executor - - Ok(()) - } -} diff --git a/contracts/src/lib.rs b/contracts/src/lib.rs index 0f36b1d..45353a2 100644 --- a/contracts/src/lib.rs +++ b/contracts/src/lib.rs @@ -1,220 +1,316 @@ -use alloy_sol_types::sol; - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - AVSDirectory, - "./out/AVSDirectory.sol/AVSDirectory.json" -); - -sol!( - #[allow(missing_docs)] - #[derive(Debug)] - #[sol(rpc)] - BlsApkRegistry, - "./out/BLSApkRegistry.sol/BLSApkRegistry.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - DelegationManager, - "./out/DelegationManager.sol/DelegationManager.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - EigenPod, - "./lib/eigenlayer-middleware/out/EigenPod.sol/EigenPod.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - EigenPodManager, - "./out/EigenPodManager.sol/EigenPodManager.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - EigenStrategy, - "./lib/eigenlayer-middleware/lib/eigenlayer-contracts/out/EigenStrategy.sol/EigenStrategy.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - EmptyContract, - "./lib/eigenlayer-middleware/out/EmptyContract.sol/EmptyContract.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - ERC20Mock, - "./lib/eigenlayer-middleware/lib/eigenlayer-contracts/out/ERC20Mock.sol/ERC20Mock.json" -); - -sol!( - #[allow(missing_docs)] - #[derive(Debug)] - #[sol(rpc)] - IBlsApkRegistry, - "./out/IBLSApkRegistry.sol/IBLSApkRegistry.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IAVSDirectory, - "./out/IAVSDirectory.sol/IAVSDirectory.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IDelegationManager, - "./out/IDelegationManager.sol/IDelegationManager.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IERC20, - "./out/IERC20.sol/IERC20.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IIndexRegistry, - "./out/IIndexRegistry.sol/IIndexRegistry.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IndexRegistry, - "./lib/eigenlayer-middleware/out/IndexRegistry.sol/IndexRegistry.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IStakeRegistry, - "./out/IStakeRegistry.sol/IStakeRegistry.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - ISlasher, - "./out/ISlasher.sol/ISlasher.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IStrategy, - "./out/IStrategy.sol/IStrategy.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IStrategyManager, - "./out/IStrategyManager.sol/IStrategyManager.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - OperatorStateRetriever, - "./out/OperatorStateRetriever.sol/OperatorStateRetriever.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - PauserRegistry, - "./lib/eigenlayer-middleware/out/IPauserRegistry.sol/IPauserRegistry.json" -); - -sol!( - #[allow(missing_docs, clippy::too_many_arguments)] - #[sol(rpc)] - RegistryCoordinator, - "./out/RegistryCoordinator.sol/RegistryCoordinator.json" -); - -sol!( - #[allow(missing_docs, clippy::too_many_arguments)] - #[sol(rpc)] - IRegistryCoordinator, - "./out/IRegistryCoordinator.sol/IRegistryCoordinator.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - ProxyAdmin, - "./lib/eigenlayer-middleware/out/ProxyAdmin.sol/ProxyAdmin.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - ServiceManagerBase, - "./out/ServiceManagerBase.sol/ServiceManagerBase.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - StakeRegistry, - "./out/StakeRegistry.sol/StakeRegistry.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - StrategyBaseTVLLimits, - "./lib/eigenlayer-middleware/lib/eigenlayer-contracts/out/StrategyBaseTVLLimits.sol/StrategyBaseTVLLimits.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - StrategyManager, - "./out/StrategyManager.sol/StrategyManager.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - TransparentUpgradeableProxy, - "./lib/eigenlayer-middleware/out/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - EIP1271SignatureUtils, - "./out/EIP1271SignatureUtils.sol/EIP1271SignatureUtils.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IETHPOSDeposit, - "./out/IETHPOSDeposit.sol/IETHPOSDeposit.json" -); - -sol!( - #[allow(missing_docs)] - #[sol(rpc)] - IBeacon, - "./out/IBeacon.sol/IBeacon.json" -); +pub use avs_directory::AVSDirectory; +pub use bls_apk_registry::BlsApkRegistry; +pub use delegation_manager::{DelegationManager, IDelegationManager::OperatorDetails}; +pub use eigen_pod::EigenPod; +pub use eigen_pod_manager::EigenPodManager; +pub use eigen_strategy::EigenStrategy; +pub use eip1271_signature_utils::EIP1271SignatureUtils; +pub use empty_contract::EmptyContract; +pub use erc20_mock::ERC20Mock; +pub use i_avs_directory::IAVSDirectory; +pub use i_beacon::IBeacon; +pub use i_bls_apk_registry::IBlsApkRegistry; +pub use i_delegation_manager::IDelegationManager; +pub use i_index_registry::IIndexRegistry; +pub use i_registry_coordinator::IRegistryCoordinator; +pub use i_slasher::ISlasher; +pub use i_stake_registry::IStakeRegistry; +pub use i_strategy::IStrategy; +pub use i_strategy_manager::IStrategyManager; +pub use ierc20::IERC20; +pub use ieth_pos_deposit::IETHPOSDeposit; +pub use index_registry::IndexRegistry; +pub use operator_state_retriever::OperatorStateRetriever; +pub use pauser_registry::PauserRegistry; +pub use proxy_admin::ProxyAdmin; +pub use registry_coordinator::{ + IBLSApkRegistry::PubkeyRegistrationParams, IRegistryCoordinator::OperatorInfo, + IRegistryCoordinator::OperatorSetParam, ISignatureUtils::SignatureWithSaltAndExpiry, + IStakeRegistry::StrategyParams, RegistryCoordinator, BN254 as Bn254, +}; +pub use service_manager_base::ServiceManagerBase; +pub use stake_registry::StakeRegistry; +pub use strategy_base_tvl_limits::StrategyBaseTVLLimits; +pub use strategy_manager::StrategyManager; +pub use transparent_upgradeable_proxy::TransparentUpgradeableProxy; + +mod avs_directory { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + AVSDirectory, + "./out/AVSDirectory.sol/AVSDirectory.json" + ); +} + +mod bls_apk_registry { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[derive(Debug)] + #[sol(rpc)] + BlsApkRegistry, + "./out/BLSApkRegistry.sol/BLSApkRegistry.json" + ); +} + +mod delegation_manager { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + DelegationManager, + "./out/DelegationManager.sol/DelegationManager.json" + ); +} + +mod eigen_pod { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + EigenPod, + "./lib/eigenlayer-middleware/out/EigenPod.sol/EigenPod.json" + ); +} + +mod eigen_pod_manager { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + EigenPodManager, + "./out/EigenPodManager.sol/EigenPodManager.json" + ); +} + +mod eigen_strategy { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + EigenStrategy, + "./lib/eigenlayer-middleware/lib/eigenlayer-contracts/out/EigenStrategy.sol/EigenStrategy.json" + ); +} + +mod empty_contract { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + EmptyContract, + "./lib/eigenlayer-middleware/out/EmptyContract.sol/EmptyContract.json" + ); +} + +mod erc20_mock { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + ERC20Mock, + "./lib/eigenlayer-middleware/lib/eigenlayer-contracts/out/ERC20Mock.sol/ERC20Mock.json" + ); +} + +mod i_bls_apk_registry { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[derive(Debug)] + #[sol(rpc)] + IBlsApkRegistry, + "./out/IBLSApkRegistry.sol/IBLSApkRegistry.json" + ); +} + +mod ierc20 { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IERC20, + "./out/IERC20.sol/IERC20.json" + ); +} + +mod index_registry { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IndexRegistry, + "./lib/eigenlayer-middleware/out/IndexRegistry.sol/IndexRegistry.json" + ); +} + +mod i_slasher { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + ISlasher, + "./out/ISlasher.sol/ISlasher.json" + ); +} + +mod i_strategy { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IStrategy, + "./out/IStrategy.sol/IStrategy.json" + ); +} + +mod i_strategy_manager { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IStrategyManager, + "./out/IStrategyManager.sol/IStrategyManager.json" + ); +} + +mod operator_state_retriever { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + OperatorStateRetriever, + "./out/OperatorStateRetriever.sol/OperatorStateRetriever.json" + ); +} + +mod pauser_registry { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + PauserRegistry, + "./lib/eigenlayer-middleware/out/IPauserRegistry.sol/IPauserRegistry.json" + ); +} + +mod registry_coordinator { + alloy_sol_types::sol!( + #[allow(missing_docs, clippy::too_many_arguments)] + #[sol(rpc)] + RegistryCoordinator, + "./out/RegistryCoordinator.sol/RegistryCoordinator.json" + ); +} + +mod proxy_admin { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + ProxyAdmin, + "./lib/eigenlayer-middleware/out/ProxyAdmin.sol/ProxyAdmin.json" + ); +} + +mod service_manager_base { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + ServiceManagerBase, + "./out/ServiceManagerBase.sol/ServiceManagerBase.json" + ); +} + +mod stake_registry { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + StakeRegistry, + "./out/StakeRegistry.sol/StakeRegistry.json" + ); +} + +mod strategy_base_tvl_limits { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + StrategyBaseTVLLimits, + "./lib/eigenlayer-middleware/lib/eigenlayer-contracts/out/StrategyBaseTVLLimits.sol/StrategyBaseTVLLimits.json" + ); +} + +mod strategy_manager { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + StrategyManager, + "./out/StrategyManager.sol/StrategyManager.json" + ); +} + +mod transparent_upgradeable_proxy { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + TransparentUpgradeableProxy, + "./lib/eigenlayer-middleware/out/TransparentUpgradeableProxy.sol/TransparentUpgradeableProxy.json" + ); +} + +mod eip1271_signature_utils { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + EIP1271SignatureUtils, + "./out/EIP1271SignatureUtils.sol/EIP1271SignatureUtils.json" + ); +} + +mod ieth_pos_deposit { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IETHPOSDeposit, + "./out/IETHPOSDeposit.sol/IETHPOSDeposit.json" + ); +} + +mod i_beacon { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IBeacon, + "./out/IBeacon.sol/IBeacon.json" + ); +} + +mod i_avs_directory { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IAVSDirectory, + "./out/IAVSDirectory.sol/IAVSDirectory.json" + ); +} + +mod i_delegation_manager { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IDelegationManager, + "./out/IDelegationManager.sol/IDelegationManager.json" + ); +} + +mod i_index_registry { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IIndexRegistry, + "./out/IIndexRegistry.sol/IIndexRegistry.json" + ); +} + +mod i_stake_registry { + alloy_sol_types::sol!( + #[allow(missing_docs)] + #[sol(rpc)] + IStakeRegistry, + "./out/IStakeRegistry.sol/IStakeRegistry.json" + ); +} + +mod i_registry_coordinator { + alloy_sol_types::sol!( + #[allow(missing_docs, clippy::too_many_arguments)] + #[sol(rpc)] + IRegistryCoordinator, + "./out/IRegistryCoordinator.sol/IRegistryCoordinator.json" + ); +} diff --git a/src/lib.rs b/src/lib.rs index e39ffa8..c7b4e08 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -2,4 +2,4 @@ pub use eigen_contracts; pub use eigen_utils; pub use fireblocks_client; pub use incredible_squaring_avs; -pub use tangle_avs; +pub use test_utils; diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index b97bf34..0685f51 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -15,10 +15,6 @@ path = "src/lib.rs" name = "incredible_squaring" path = "src/bin/incredible_squaring.rs" -[[bin]] -name = "tangle" -path = "src/bin/tangle.rs" - [dependencies] alloy-primitives.workspace = true alloy-provider.workspace = true @@ -29,7 +25,6 @@ alloy-transport-ws.workspace = true eigen-contracts.workspace = true eigen-utils.workspace = true incredible-squaring-avs.workspace = true -tangle-avs.workspace = true k256 = { workspace = true, features = ["expose-field"] } tokio.workspace = true anvil.workspace = true diff --git a/test-utils/src/anvil/testnet/incredible_squaring.rs b/test-utils/src/anvil/testnet/incredible_squaring.rs index 6332867..3064329 100644 --- a/test-utils/src/anvil/testnet/incredible_squaring.rs +++ b/test-utils/src/anvil/testnet/incredible_squaring.rs @@ -3,10 +3,7 @@ use alloy_primitives::{address, Address, Bytes, Keccak256, U256}; use alloy_provider::ProviderBuilder; use alloy_sol_types::{abi, SolValue}; use anvil::spawn; -use eigen_contracts::{ - RegistryCoordinator::{OperatorSetParam, StrategyParams}, - *, -}; +use eigen_contracts::{OperatorSetParam, StrategyParams, *}; use incredible_squaring_avs::avs::{ IncredibleSquaringServiceManager, IncredibleSquaringTaskManager, }; @@ -424,15 +421,16 @@ pub async fn run_incredible_squaring_testnet() -> ContractAddresses { }); } // Set to 0 for each quorum - let mut quorums_minimum_stake = Vec::::new(); + let mut quorums_minimum_stake = Vec::>::new(); let mut quorums_strategy_params = Vec::>::new(); for j in 0..number_of_quorums { quorums_strategy_params.push(Vec::::new()); - quorums_minimum_stake.push(0); + let minimum_stake = alloy_primitives::Uint::<96, 2>::from(0); + quorums_minimum_stake.push(minimum_stake); for _k in 0..number_of_strategies { quorums_strategy_params[j].push(StrategyParams { strategy: strategies[j], - multiplier: 1, + multiplier: alloy_primitives::aliases::U96::from(1), }); } } diff --git a/test-utils/src/anvil/testnet/mod.rs b/test-utils/src/anvil/testnet/mod.rs index 07d8149..284a9a8 100644 --- a/test-utils/src/anvil/testnet/mod.rs +++ b/test-utils/src/anvil/testnet/mod.rs @@ -1,2 +1 @@ pub mod incredible_squaring; -pub mod tangle; diff --git a/test-utils/src/anvil/testnet/tangle.rs b/test-utils/src/anvil/testnet/tangle.rs deleted file mode 100644 index dcf37a5..0000000 --- a/test-utils/src/anvil/testnet/tangle.rs +++ /dev/null @@ -1,576 +0,0 @@ -#![allow(dead_code)] -use crate::encode_params; -use alloy_primitives::{address, Address, Bytes, Keccak256, U256}; -use alloy_provider::ProviderBuilder; -use alloy_sol_types::{abi, SolValue}; -use anvil::spawn; -use eigen_contracts::{ - RegistryCoordinator::{OperatorSetParam, StrategyParams}, - *, -}; -use tangle_avs::{TangleValidatorServiceManager, TangleValidatorTaskManager}; - -/// The Password used when reading and writing BLS Keys. This value should match the value set for -/// the `OPERATOR_BLS_KEY_PASSWORD` Environment Variable. -/// # Script -/// This can be done automatically with the -/// default value below using the following script: -/// ```bash -/// . ./test-utils/scripts/env_setup.sh -/// ``` -pub static BLS_PASSWORD: &str = "BLS_PASSWORD"; - -/// The Password used when reading and writing ECDSA Keys. This value should match the value set for -/// the `OPERATOR_ECDSA_KEY_PASSWORD` Environment Variable. -/// # Script -/// This can be done automatically with the -/// default value below using the following script: -/// ```bash -/// . ./test-utils/scripts/env_setup.sh -/// ``` -pub static ECDSA_PASSWORD: &str = "ECDSA_PASSWORD"; - -/// The number of blocks the task response window is set to. -pub static TASK_RESPONSE_WINDOW_BLOCK: u32 = 10; - -/// The Account Address that will be used for Aggregating Task Responses -pub static AGGREGATOR_ADDR: Address = address!("a0Ee7A142d267C1f36714E4a8F75612F20a79720"); - -/// The Account Address that will be used for Generating Tasks -pub static TASK_GENERATOR_ADDR: Address = address!("a0Ee7A142d267C1f36714E4a8F75612F20a79720"); - -/// Struct containing the addresses of the smart contracts necessary for setting up an Operator -pub struct ContractAddresses { - pub service_manager: Address, - pub registry_coordinator: Address, - pub operator_state_retriever: Address, - pub delegation_manager: Address, - pub avs_directory: Address, - pub operator: Address, -} - -/// Spawns and runs an Anvil node, deploying the Smart Contracts that are relevant to the Tangle AVS to it. -/// -/// NOTE: This function will Panic upon contract deployment failure. -pub async fn run_tangle_testnet() -> ContractAddresses { - // Initialize the logger - let _ = env_logger::try_init(); - - let (api, handle) = spawn( - anvil::NodeConfig::test() - .with_port(8545) - .with_print_logs(true) - .disable_block_gas_limit(true) - .with_steps_tracing(true), - ) - .await; - api.anvil_auto_impersonate_account(true).await.unwrap(); - - let provider = ProviderBuilder::new() - .on_builtin(&handle.ws_endpoint()) - .await - .unwrap(); - - let accounts = handle.dev_wallets().collect::>(); - let from = accounts[0].address(); - - let dev_account = accounts[0].address(); - - // Deploy initial contracts that don't depend on others - - let istrategy_manager = IStrategyManager::deploy(provider.clone()).await.unwrap(); - let &_strategy_manager_addr = istrategy_manager.address(); - - let idelegation_manager = IDelegationManager::deploy(provider.clone()).await.unwrap(); - let &delegation_manager_addr = idelegation_manager.address(); - - let iavs_directory = IAVSDirectory::deploy(provider.clone()).await.unwrap(); - let &_avs_directory_addr = iavs_directory.address(); - - let proxy_admin = ProxyAdmin::deploy_builder(provider.clone()) - .from(dev_account) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap() - .contract_address - .unwrap(); - let proxy_admin_addr = proxy_admin; - - let pauser_registry = PauserRegistry::deploy(provider.clone()).await.unwrap(); - let &pauser_registry_addr = pauser_registry.address(); - - let base_strategy = StrategyBaseTVLLimits::deploy(provider.clone(), Default::default()) - .await - .unwrap(); - let &base_strategy_addr = base_strategy.address(); - - let erc20_mock = ERC20Mock::deploy(provider.clone()).await.unwrap(); - let &erc20_mock_addr = erc20_mock.address(); - - let ierc20 = IERC20::new(erc20_mock_addr, provider.clone()); - let &ierc20_addr = ierc20.address(); - - // Begin deploying with Proxies - - // Function with signature initialize(uint256,uint256,address,address) and selector 0x019e2729. - let function_signature = "initialize(uint256,uint256,address,address)"; - let encoded_data = encode_params!( - function_signature, - 1, - 100, - ierc20_addr, - pauser_registry_addr - ); - - let strategy_proxy = TransparentUpgradeableProxy::deploy( - provider.clone(), - base_strategy_addr, - proxy_admin_addr, - encoded_data, - ) - .await - .unwrap(); - let &strategy_proxy_addr = strategy_proxy.address(); - - let erc20_mock_strategy = StrategyBaseTVLLimits::deploy(provider.clone(), strategy_proxy_addr) - .await - .unwrap(); - let &erc20_mock_strategy_addr = erc20_mock_strategy.address(); - - let strategies = vec![erc20_mock_strategy_addr]; - - let add_strategies = istrategy_manager - .addStrategiesToDepositWhitelist(strategies.clone(), vec![false]) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(add_strategies.status()); - - // Deploy Incredible Squaring Contracts - let number_of_strategies = strategies.len(); - log::info!("Number of Strategies: {:?}", number_of_strategies); - - let tangle_validator_proxy_admin = ProxyAdmin::deploy_builder(provider.clone()) - .from(dev_account) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(tangle_validator_proxy_admin.status()); - - let tangle_validator_proxy_admin = tangle_validator_proxy_admin.contract_address.unwrap(); - let tangle_validator_proxy_admin_addr = tangle_validator_proxy_admin; - let tangle_validator_proxy_admin = - ProxyAdmin::new(tangle_validator_proxy_admin_addr, provider.clone()); - - let pausers = [dev_account, dev_account]; - - let tangle_validator_pauser_registry = PauserRegistry::deploy(provider.clone()).await.unwrap(); - let &_tangle_validator_pauser_registry_addr = tangle_validator_pauser_registry.address(); - - let empty_contract = EmptyContract::deploy(provider.clone()).await.unwrap(); - let &empty_contract_addr = empty_contract.address(); - - let tangle_validator_service_manager = TangleValidatorServiceManager::new( - *TransparentUpgradeableProxy::deploy( - provider.clone(), - empty_contract_addr, - tangle_validator_proxy_admin_addr, - Bytes::from(""), - ) - .await - .unwrap() - .address(), - provider.clone(), - ); - let &tangle_validator_service_manager_addr = tangle_validator_service_manager.address(); - - let tangle_validator_task_manager = TangleValidatorTaskManager::new( - *TransparentUpgradeableProxy::deploy( - provider.clone(), - empty_contract_addr, - tangle_validator_proxy_admin_addr, - Bytes::from(""), - ) - .await - .unwrap() - .address(), - provider.clone(), - ); - let &tangle_validator_task_manager_addr = tangle_validator_task_manager.address(); - - let registry_coordinator = RegistryCoordinator::new( - *TransparentUpgradeableProxy::deploy( - provider.clone(), - empty_contract_addr, - tangle_validator_proxy_admin_addr, - Bytes::from(""), - ) - .await - .unwrap() - .address(), - provider.clone(), - ); - let ®istry_coordinator_addr = registry_coordinator.address(); - - let bls_apk_registry = IBlsApkRegistry::new( - *TransparentUpgradeableProxy::deploy( - provider.clone(), - empty_contract_addr, - tangle_validator_proxy_admin_addr, - Bytes::from(""), - ) - .await - .unwrap() - .address(), - provider.clone(), - ); - let &bls_apk_registry_addr = bls_apk_registry.address(); - - let index_registry = IIndexRegistry::new( - *TransparentUpgradeableProxy::deploy( - provider.clone(), - empty_contract_addr, - tangle_validator_proxy_admin_addr, - Bytes::from(""), - ) - .await - .unwrap() - .address(), - provider.clone(), - ); - let &index_registry_addr = index_registry.address(); - - let stake_registry = IStakeRegistry::new( - *TransparentUpgradeableProxy::deploy( - provider.clone(), - empty_contract_addr, - tangle_validator_proxy_admin_addr, - Bytes::from(""), - ) - .await - .unwrap() - .address(), - provider.clone(), - ); - let &stake_registry_addr = stake_registry.address(); - - let operator_state_retriever = OperatorStateRetriever::deploy(provider.clone()) - .await - .unwrap(); - let &operator_state_retriever_addr = operator_state_retriever.address(); - - let eth_pos = IETHPOSDeposit::deploy(provider.clone()).await.unwrap(); - let ð_pos_addr = eth_pos.address(); - - let eigen_pod_beacon = IBeacon::deploy(provider.clone()).await.unwrap(); - let &eigen_pod_beacon_addr = eigen_pod_beacon.address(); - - let strategy_manager = StrategyManager::new( - *TransparentUpgradeableProxy::deploy( - provider.clone(), - empty_contract_addr, - tangle_validator_proxy_admin_addr, - Bytes::from(""), - ) - .await - .unwrap() - .address(), - provider.clone(), - ); - let &strategy_manager_addr = strategy_manager.address(); - - let eigen_pod_manager = EigenPodManager::deploy( - provider.clone(), - eth_pos_addr, - eigen_pod_beacon_addr, - strategy_manager_addr, - from, - delegation_manager_addr, - ) - .await - .unwrap(); - let &eigen_pod_manager_addr = eigen_pod_manager.address(); - - let slasher_addr = dev_account; - let delegation_manager = DelegationManager::deploy( - provider.clone(), - strategy_manager_addr, - slasher_addr, - eigen_pod_manager_addr, - ) - .await - .unwrap(); - let &delegation_manager_addr = delegation_manager.address(); - - let strategy_manager_implementation = StrategyManager::deploy( - provider.clone(), - delegation_manager_addr, - eigen_pod_manager_addr, - slasher_addr, - ) - .await - .unwrap(); - let &strategy_manager_implementation_addr = strategy_manager_implementation.address(); - let strategy_manager_upgrade = tangle_validator_proxy_admin - .upgrade(strategy_manager_addr, strategy_manager_implementation_addr) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(strategy_manager_upgrade.status()); - - let strategy_manager_initialization = strategy_manager - .initialize(pausers[0], pausers[0], pauser_registry_addr, U256::from(0)) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(strategy_manager_initialization.status()); - - let avs_directory = AVSDirectory::deploy(provider.clone(), delegation_manager_addr) - .await - .unwrap(); - let &avs_directory_addr = avs_directory.address(); - - // Now, deploy the implementation contracts using the proxy contracts as inputs - let stake_registry_implementation = StakeRegistry::deploy( - provider.clone(), - registry_coordinator_addr, - delegation_manager_addr, - ) - .await - .unwrap(); - let &stake_registry_implementation_addr = stake_registry_implementation.address(); - let stake_registry_upgrade = tangle_validator_proxy_admin - .upgrade(stake_registry_addr, stake_registry_implementation_addr) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(stake_registry_upgrade.status()); - - let bls_apk_registry_implementation = - BlsApkRegistry::deploy(provider.clone(), registry_coordinator_addr) - .await - .unwrap(); - let &bls_apk_registry_implementation_addr = bls_apk_registry_implementation.address(); - let bls_apk_registry_upgrade = tangle_validator_proxy_admin - .upgrade(bls_apk_registry_addr, bls_apk_registry_implementation_addr) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(bls_apk_registry_upgrade.status()); - - let index_registry_implementation = - IndexRegistry::deploy(provider.clone(), registry_coordinator_addr) - .await - .unwrap(); - let &index_registry_implementation_addr = index_registry_implementation.address(); - let index_registry_upgrade = tangle_validator_proxy_admin - .upgrade(index_registry_addr, index_registry_implementation_addr) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(index_registry_upgrade.status()); - - let registry_coordinator_implementation = RegistryCoordinator::deploy( - provider.clone(), - tangle_validator_service_manager_addr, - stake_registry_addr, - bls_apk_registry_addr, - index_registry_addr, - ) - .await - .unwrap(); - let ®istry_coordinator_implementation_addr = registry_coordinator_implementation.address(); - - let number_of_quorums = 1; - // For each quorum we want to set up, we must define QuorumOperatorSetParam, minimumStakeForQuorum, and strategyParams - let mut quorum_operator_set_params = Vec::::new(); - for i in 0..number_of_quorums { - log::info!("Deploying quorum {}", i); - quorum_operator_set_params.push(OperatorSetParam { - maxOperatorCount: 10000, - kickBIPsOfOperatorStake: 15000, - kickBIPsOfTotalStake: 100, - }); - } - // Set to 0 for each quorum - let mut quorums_minimum_stake = Vec::::new(); - let mut quorums_strategy_params = Vec::>::new(); - for j in 0..number_of_quorums { - quorums_strategy_params.push(Vec::::new()); - quorums_minimum_stake.push(0); - for _k in 0..number_of_strategies { - quorums_strategy_params[j].push(StrategyParams { - strategy: strategies[j], - multiplier: 1, - }); - } - } - - // Function with signature initialize(address,address,address,address,uint256,(uint32,uint16,uint16)[],uint96[],(address,uint96)[][]) and selector 0xdd8283f3. - let function_signature = "initialize(address,address,address,address,uint256,(uint32,uint16,uint16)[],uint96[],(address,uint96)[][])"; - let _encoded_data = encode_params!( - function_signature, - pausers[0], - pausers[0], - pausers[0], - pausers[1], - 0, - quorum_operator_set_params, - quorums_minimum_stake, - quorums_strategy_params - ); - - let registry_coordinator_upgrade = tangle_validator_proxy_admin - .upgrade( - registry_coordinator_addr, - registry_coordinator_implementation_addr, - ) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(registry_coordinator_upgrade.status()); - - let registry_coordinator_initialization = registry_coordinator - .initialize( - pausers[0], - pausers[0], - pausers[0], - pausers[1], - U256::from(0), - quorum_operator_set_params, - quorums_minimum_stake, - quorums_strategy_params, - ) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(registry_coordinator_initialization.status()); - - let tangle_validator_service_manager_implementation = TangleValidatorServiceManager::deploy( - provider.clone(), - avs_directory_addr, - registry_coordinator_addr, - stake_registry_addr, - tangle_validator_task_manager_addr, - ) - .await - .unwrap(); - let &tangle_validator_service_manager_implementation_addr = - tangle_validator_service_manager_implementation.address(); - let tangle_validator_service_manager_upgrade = tangle_validator_proxy_admin - .upgrade( - tangle_validator_service_manager_addr, - tangle_validator_service_manager_implementation_addr, - ) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(tangle_validator_service_manager_upgrade.status()); - - // Function with signature initialize(address,address) and selector 0x485cc955 - let function_signature = "initialize(address,address)"; - let encoded_data = encode_params!(function_signature, pauser_registry_addr, pausers[0]); - - let tangle_validator_task_manager_implementation = - TangleValidatorTaskManager::deploy_builder(provider.clone(), registry_coordinator_addr) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(tangle_validator_task_manager_implementation.status()); - - let tangle_validator_task_manager_implementation_addr = - tangle_validator_task_manager_implementation - .contract_address - .unwrap(); - - let tangle_validator_task_manager_upgrade = tangle_validator_proxy_admin - .upgradeAndCall( - tangle_validator_task_manager_addr, - tangle_validator_task_manager_implementation_addr, - encoded_data, - ) - .send() - .await - .unwrap() - .get_receipt() - .await - .unwrap(); - assert!(tangle_validator_task_manager_upgrade.status()); - - log::info!("ERC20MOCK ADDRESS: {:?}", erc20_mock_addr); - log::info!("ERC20MOCK STRATEGY ADDRESS: {:?}", erc20_mock_strategy_addr); - log::info!( - "TANGLE VALIDATOR TASK MANAGER ADDRESS: {:?}", - tangle_validator_task_manager_addr - ); - log::info!( - "TANGLE VALIDATOR TASK MANAGER IMPLEMENTATION ADDRESS: {:?}", - tangle_validator_task_manager_implementation_addr - ); - log::info!( - "TANGLE VALIDATOR SERVICE MANAGER ADDRESS: {:?}", - tangle_validator_service_manager_addr - ); - log::info!( - "TANGLE VALIDATOR SERVICE MANAGER IMPLEMENTATION ADDRESS: {:?}", - tangle_validator_service_manager_implementation_addr - ); - log::info!( - "REGISTRY COORDINATOR ADDRESS: {:?}", - registry_coordinator_addr - ); - log::info!( - "REGISTRY COORDINATOR IMPLEMENTATION ADDRESS: {:?}", - registry_coordinator_implementation_addr - ); - log::info!( - "OPERATOR STATE RETRIEVER ADDRESS: {:?}", - operator_state_retriever_addr - ); - log::info!("DELEGATION MANAGER ADDRESS: {:?}", delegation_manager_addr); - - ContractAddresses { - service_manager: tangle_validator_service_manager_addr, - registry_coordinator: registry_coordinator_addr, - operator_state_retriever: operator_state_retriever_addr, - delegation_manager: delegation_manager_addr, - avs_directory: avs_directory_addr, - operator: from, - } -} diff --git a/test-utils/src/bin/tangle.rs b/test-utils/src/bin/tangle.rs deleted file mode 100644 index a297faf..0000000 --- a/test-utils/src/bin/tangle.rs +++ /dev/null @@ -1,133 +0,0 @@ -#![allow(dead_code)] - -use alloy_primitives::ChainId; -use alloy_provider::Provider; -use alloy_provider::ProviderBuilder; -use alloy_signer_local::PrivateKeySigner; -use alloy_transport_ws::WsConnect; -use k256::ecdsa::SigningKey; -use k256::elliptic_curve::SecretKey; -use tangle_avs::operator::*; -use test_utils::anvil::testnet::tangle::*; - -#[tokio::main] -async fn main() { - let _ = env_logger::try_init(); - run_tangle_testnet().await; -} - -/// Sets up an Operator, given the [ContractAddresses] for the running Testnet you would like utilize -async fn operator_setup( - contract_addresses: ContractAddresses, -) -> Result, OperatorError> { - let http_endpoint = "http://127.0.0.1:8545"; - let ws_endpoint = "ws://127.0.0.1:8545"; - let node_config = NodeConfig { - node_api_ip_port_address: "127.0.0.1:9808".to_string(), - eth_rpc_url: http_endpoint.to_string(), - eth_ws_url: ws_endpoint.to_string(), - bls_private_key_store_path: "./keystore/bls".to_string(), - ecdsa_private_key_store_path: "./keystore/ecdsa".to_string(), - avs_registry_coordinator_address: contract_addresses.registry_coordinator.to_string(), - eigen_metrics_ip_port_address: "127.0.0.1:9100".to_string(), - tangle_validator_service_manager_address: contract_addresses.service_manager.to_string(), - delegation_manager_address: contract_addresses.delegation_manager.to_string(), - operator_address: contract_addresses.operator.to_string(), - enable_metrics: false, - enable_node_api: false, - operator_state_retriever_address: contract_addresses.operator_state_retriever.to_string(), - avs_directory_address: contract_addresses.avs_directory.to_string(), - metadata_url: - "https://github.com/webb-tools/eigensdk-rs/blob/main/test-utils/metadata.json" - .to_string(), - }; - - log::info!("Creating HTTP Provider..."); - - let http_provider = ProviderBuilder::new() - .with_recommended_fillers() - .on_http( - http_endpoint - .parse::() - .map_err(|e| OperatorError::HttpEthClientError(e.to_string()))?, - ) - .root() - .clone() - .boxed(); - - log::info!("Creating WS Provider..."); - - let ws_provider = ProviderBuilder::new() - .with_recommended_fillers() - .on_ws(WsConnect::new(ws_endpoint)) - .await - .map_err(|e| OperatorError::WsEthClientError(e.to_string()))? - .root() - .clone() - .boxed(); - - log::info!("Now setting up Operator!"); - - let chain_id = http_provider - .get_chain_id() - .await - .map_err(|e| OperatorError::HttpEthClientError(e.to_string()))?; - - let hex_key = - hex::decode("ac0974bec39a17e36ba4a6b4d238ff944bacb478cbed5efcae784d7bf4f2ff80").unwrap(); - let secret_key = SecretKey::from_slice(&hex_key).unwrap(); - let signing_key = SigningKey::from(secret_key.clone()); - let signer = EigenTangleSigner::new( - PrivateKeySigner::from_signing_key(signing_key), - Some(ChainId::from(chain_id)), - ); - - Operator::::new_from_config( - node_config.clone(), - EigenTangleProvider { - provider: http_provider, - }, - EigenTangleProvider { - provider: ws_provider, - }, - signer, - ) - .await -} - -#[cfg(test)] -mod tests { - use super::*; - use std::env; - - fn env_init() { - if env::var("RUST_LOG").is_err() { - env::set_var("RUST_LOG", "info"); - } - env::set_var("BLS_PASSWORD", "BLS_PASSWORD"); - env::set_var("ECDSA_PASSWORD", "ECDSA_PASSWORD"); - let _ = env_logger::try_init(); - } - - #[tokio::test] - async fn test_tangle_testnet_deployment() { - env_init(); - let _ = run_tangle_testnet().await; - } - - #[tokio::test] - async fn test_tangle_full() { - env_init(); - - // Runs new Anvil Testnet - used for deploying programmatically in rust - let contract_addresses = run_tangle_testnet().await; - - // Sets up the Operator - let operator = operator_setup(contract_addresses).await.unwrap(); - - // Check that the operator has registered successfully - assert!(operator.is_registered().await.unwrap()); - - log::info!("Operator Successfully Registered. The Tangle Validator would now start."); - } -} diff --git a/test-utils/src/lib.rs b/test-utils/src/lib.rs index 288d376..41db00f 100644 --- a/test-utils/src/lib.rs +++ b/test-utils/src/lib.rs @@ -13,7 +13,7 @@ mod tests { env_logger::init(); // ---------------- BLS ---------------- - let bls_pair = KeyPair::gen_random().unwrap(); + let bls_pair = KeyPair::gen_random(); bls_pair .save_to_file("./keystore/bls", BLS_PASSWORD) .unwrap(); diff --git a/utils/Cargo.toml b/utils/Cargo.toml index 9c281c3..71e64f7 100644 --- a/utils/Cargo.toml +++ b/utils/Cargo.toml @@ -43,6 +43,5 @@ rand.workspace = true uuid = { workspace = true, features = ["v4", "serde"] } sha3 = "0.10.8" k256.workspace = true -#gadget-common.workspace = true aes = "0.8.4" ctr = "0.9.2" diff --git a/utils/src/avs_registry/reader.rs b/utils/src/avs_registry/reader.rs index 86bdfc6..2c3048a 100644 --- a/utils/src/avs_registry/reader.rs +++ b/utils/src/avs_registry/reader.rs @@ -202,7 +202,13 @@ impl AvsRegistryChainReaderTrait for AvsRegistryContractManager { let stake_registry = StakeRegistry::new(self.stake_registry_addr, self.eth_client_http.clone()); - let quorums = bitmap_to_quorum_ids(&quorum_bitmap); + let quorum_bitmap_limbs = quorum_bitmap.as_limbs(); + let quorums = bitmap_to_quorum_ids(&U256::from_limbs([ + quorum_bitmap_limbs[0], + quorum_bitmap_limbs[1], + quorum_bitmap_limbs[2], + 0, + ])); let mut quorum_stakes = HashMap::new(); for quorum in quorums { let stake = stake_registry diff --git a/utils/src/avs_registry/writer.rs b/utils/src/avs_registry/writer.rs index 4acbe3d..99d8582 100644 --- a/utils/src/avs_registry/writer.rs +++ b/utils/src/avs_registry/writer.rs @@ -9,8 +9,9 @@ use alloy_provider::Provider; use alloy_rpc_types::TransactionReceipt; use alloy_signer::k256::ecdsa; use alloy_signer::Signer as alloySigner; -use eigen_contracts::RegistryCoordinator; -use eigen_contracts::RegistryCoordinator::SignatureWithSaltAndExpiry; +use eigen_contracts::{ + Bn254, PubkeyRegistrationParams, RegistryCoordinator, SignatureWithSaltAndExpiry, +}; use k256::ecdsa::VerifyingKey; use rand::Rng; @@ -81,16 +82,16 @@ impl AvsRegistryChainWriterTrait for AvsRegistryContractManager { let g1_pubkey_bn254 = bls_key_pair.get_pub_key_g1(); let g2_pubkey_bn254 = bls_key_pair.get_pub_key_g2(); - let pubkey_reg_params = RegistryCoordinator::PubkeyRegistrationParams { - pubkeyRegistrationSignature: RegistryCoordinator::G1Point { + let pubkey_reg_params = PubkeyRegistrationParams { + pubkeyRegistrationSignature: Bn254::G1Point { X: signed_msg.x, Y: signed_msg.y, }, - pubkeyG1: RegistryCoordinator::G1Point { + pubkeyG1: Bn254::G1Point { X: g1_pubkey_bn254.x, Y: g1_pubkey_bn254.y, }, - pubkeyG2: RegistryCoordinator::G2Point { + pubkeyG2: Bn254::G2Point { X: g2_pubkey_bn254.x, Y: g2_pubkey_bn254.y, //X: [g2_pubkey_bn254.x[1], g2_pubkey_bn254.x[0]], @@ -194,16 +195,16 @@ impl AvsRegistryChainWriterTrait for AvsRegistryContractManager { let g1_pubkey_bn254 = bls_key_pair.get_pub_key_g1(); let g2_pubkey_bn254 = bls_key_pair.get_pub_key_g2(); - let pubkey_reg_params = RegistryCoordinator::PubkeyRegistrationParams { - pubkeyRegistrationSignature: RegistryCoordinator::G1Point { + let pubkey_reg_params = PubkeyRegistrationParams { + pubkeyRegistrationSignature: Bn254::G1Point { X: signed_msg.g1_point.x, Y: signed_msg.g1_point.y, }, - pubkeyG1: RegistryCoordinator::G1Point { + pubkeyG1: Bn254::G1Point { X: g1_pubkey_bn254.x, Y: g1_pubkey_bn254.y, }, - pubkeyG2: RegistryCoordinator::G2Point { + pubkeyG2: Bn254::G2Point { X: g2_pubkey_bn254.x, Y: g2_pubkey_bn254.y, }, @@ -235,12 +236,11 @@ impl AvsRegistryChainWriterTrait for AvsRegistryContractManager { let mut signature = operator_signature.as_bytes(); signature[64] += 27; - let operator_signature_with_salt_and_expiry = - RegistryCoordinator::SignatureWithSaltAndExpiry { - signature: Bytes::from(signature), - salt: operator_to_avs_registration_sig_salt, - expiry: operator_to_avs_registration_sig_expiry, - }; + let operator_signature_with_salt_and_expiry = SignatureWithSaltAndExpiry { + signature: Bytes::from(signature), + salt: operator_to_avs_registration_sig_salt, + expiry: operator_to_avs_registration_sig_expiry, + }; let registry_coordinator = RegistryCoordinator::new(self.registry_coordinator_addr, self.eth_client_http.clone()); diff --git a/utils/src/el_contracts/writer.rs b/utils/src/el_contracts/writer.rs index dd47103..1f169d3 100644 --- a/utils/src/el_contracts/writer.rs +++ b/utils/src/el_contracts/writer.rs @@ -4,8 +4,7 @@ use crate::Config; use alloy_primitives::{Address, U256}; use alloy_rpc_types::TransactionReceipt; use async_trait::async_trait; -use eigen_contracts::DelegationManager; -use eigen_contracts::StrategyManager; +use eigen_contracts::{DelegationManager, OperatorDetails, StrategyManager}; use super::{reader::ElReader, ElChainContractManager}; @@ -34,7 +33,7 @@ impl ElWriter for ElChainContractManager { ) -> Result { log::info!("registering operator {} to EigenLayer", operator.address); - let op_details = DelegationManager::OperatorDetails { + let op_details = OperatorDetails { __deprecated_earningsReceiver: operator.earnings_receiver_address, stakerOptOutWindowBlocks: operator.staker_opt_out_window_blocks, delegationApprover: operator.delegation_approver_address, @@ -67,7 +66,7 @@ impl ElWriter for ElChainContractManager { operator.address ); - let op_details = DelegationManager::OperatorDetails { + let op_details = OperatorDetails { __deprecated_earningsReceiver: operator.earnings_receiver_address, stakerOptOutWindowBlocks: operator.staker_opt_out_window_blocks, delegationApprover: operator.delegation_approver_address, diff --git a/utils/src/types.rs b/utils/src/types.rs index 319eb24..9eaef26 100644 --- a/utils/src/types.rs +++ b/utils/src/types.rs @@ -12,7 +12,6 @@ use ark_serialize::CanonicalSerialize; use ark_serialize::Compress; use serde::{Deserialize, Serialize}; use std::collections::HashMap; - use thiserror::Error; use crate::crypto::bls::KeyPair; @@ -258,4 +257,6 @@ pub enum AvsError { SerdeJsonError(#[from] serde_json::Error), #[error("Transaction with (hash: {0}) not found")] TransactionNotFound(alloy_primitives::TxHash), + #[error("error in pending transaction")] + PendingTransactionError(#[from] alloy_provider::PendingTransactionError), } From 2cf973ab6ce038b67cdf33e2700e1a067b4775b0 Mon Sep 17 00:00:00 2001 From: Tjemmmic Date: Fri, 20 Sep 2024 15:34:01 -0500 Subject: [PATCH 8/8] Removed remnants of Tangle AVS --- .github/workflows/validate_pr.yml | 1 - .gitmodules | 6 ------ README.md | 12 +----------- contracts/build.rs | 1 - test-utils/README.md | 16 +++------------- test-utils/scripts/avs_rebuild_contracts.sh | 2 -- test-utils/scripts/build.sh | 4 +--- test-utils/scripts/clean.sh | 4 +--- utils/build.rs | 1 - 9 files changed, 6 insertions(+), 41 deletions(-) diff --git a/.github/workflows/validate_pr.yml b/.github/workflows/validate_pr.yml index fa4a09a..d26f2bb 100644 --- a/.github/workflows/validate_pr.yml +++ b/.github/workflows/validate_pr.yml @@ -89,7 +89,6 @@ jobs: matrix: package: [ test-utils, - tangle-avs, incredible-squaring-avs, eigen-utils, ] diff --git a/.gitmodules b/.gitmodules index b1b4ca9..8e90f34 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,3 @@ [submodule "avs/incredible-squaring-avs/contracts/lib/eigenlayer-middleware"] path = avs/incredible-squaring-avs/contracts/lib/eigenlayer-middleware url = https://github.com/Layr-Labs/eigenlayer-middleware -[submodule "avs/tangle-avs/contracts/lib/forge-std"] - path = avs/tangle-avs/contracts/lib/forge-std - url = https://github.com/foundry-rs/forge-std -[submodule "avs/tangle-avs/contracts/lib/eigenlayer-middleware"] - path = avs/tangle-avs/contracts/lib/eigenlayer-middleware - url = https://github.com/Layr-Labs/eigenlayer-middleware diff --git a/README.md b/README.md index 95d1d39..bcbdddb 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,6 @@ It should be noted that this SDK is still being actively developed and has not u ## Features - **Full Eigenlayer Integration**: Provides all the robust functionalities of eigensdk-go, now with the performance benefits of Rust. -- **Seamless Tangle Interoperability**: Easily integrates Tangle into Eigenlayer AVSs, allowing a Tangle Validator to live in an AVS. - **Unlimited Customization**: Equipped with all the tools needed to build custom AVSs, including those that leverage our advanced Gadget capabilities. - **High Performance**: Developed with Rust to deliver superior efficiency and speed, ensuring your applications run optimally. - **Enhanced Type Safety**: Takes advantage of Rust's strong type system to create more reliable and maintainable code. @@ -100,16 +99,12 @@ To run the tests from the command line, you can run the following commands in th 3. Run the test for the AVS you would like to test. -Tangle AVS -```bash -cargo test -p test-utils test_tangle_full -``` Incredible Squaring AVS ```bash cargo test -p test-utils test_incredible_squaring_full ``` -These full tests start a local Anvil testnet, deploy all the required contracts to it, and then start an operator. +The full test starts a local Anvil testnet, deploys all the required contracts to it, and then starts an operator. ### Running the Testnets as binaries @@ -125,11 +120,6 @@ Incredible Squaring AVS's Testnet ./target/release/incredible-squaring ``` -Tangle AVS'sTestnet -```bash -./target/release/tangle -``` - --- ## Contributing diff --git a/contracts/build.rs b/contracts/build.rs index 40c4ee1..51a20fb 100644 --- a/contracts/build.rs +++ b/contracts/build.rs @@ -8,7 +8,6 @@ fn main() { "./lib/eigenlayer-middleware/lib/eigenlayer-contracts", "./lib/eigenlayer-middleware", "./", - "./../avs/tangle-avs/contracts", "./../avs/incredible-squaring-avs/contracts", ]; diff --git a/test-utils/README.md b/test-utils/README.md index 534f2c3..8ee8859 100644 --- a/test-utils/README.md +++ b/test-utils/README.md @@ -39,28 +39,18 @@ To rebuild the contracts in the AVS directory: ### Test Binaries -To run the included Testnets as binaries, build the project and then run the testnet you need: +To run the included Testnet as a binary, build the project and then run the testnet: ```bash cargo build -r ./target/release/incredible-squaring ``` -or -```bash -cargo build -r -./target/release/tangle -``` + --- ### Cargo tests -To run the tests for the included AVSs (from the test-utils directory): - -#### Tangle -```bash -# To run the testnet and test connecting an Operator to it -cargo test -p test-utils test_tangle_full -``` +To run the test for the included AVS (from the test-utils directory): #### Incredible Squaring ```bash diff --git a/test-utils/scripts/avs_rebuild_contracts.sh b/test-utils/scripts/avs_rebuild_contracts.sh index 8578fdf..937be44 100755 --- a/test-utils/scripts/avs_rebuild_contracts.sh +++ b/test-utils/scripts/avs_rebuild_contracts.sh @@ -2,7 +2,6 @@ # Define the directories DIR1="./avs/incredible-squaring-avs/contracts" -DIR2="./avs/tangle-avs/contracts" # Function to run forge commands in a directory run_forge_commands() { @@ -16,6 +15,5 @@ run_forge_commands() { # Run forge commands in both directories run_forge_commands "$DIR1" -run_forge_commands "$DIR2" echo "Rebuilt all AVS Smart Contracts!" \ No newline at end of file diff --git a/test-utils/scripts/build.sh b/test-utils/scripts/build.sh index c699246..a7f1ed9 100755 --- a/test-utils/scripts/build.sh +++ b/test-utils/scripts/build.sh @@ -5,7 +5,6 @@ DIR0="./contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts" DIR1="./contracts/lib/eigenlayer-middleware" DIR2="./contracts" DIR3="./avs/incredible-squaring-avs/contracts" -DIR4="./avs/tangle-avs/contracts" # Function to run forge commands in a directory run_forge_commands() { @@ -20,5 +19,4 @@ run_forge_commands() { run_forge_commands "$DIR0" run_forge_commands "$DIR1" run_forge_commands "$DIR2" -run_forge_commands "$DIR3" -run_forge_commands "$DIR4" \ No newline at end of file +run_forge_commands "$DIR3" \ No newline at end of file diff --git a/test-utils/scripts/clean.sh b/test-utils/scripts/clean.sh index 8342a7e..19e8120 100755 --- a/test-utils/scripts/clean.sh +++ b/test-utils/scripts/clean.sh @@ -5,7 +5,6 @@ DIR0="./contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts" DIR1="./contracts/lib/eigenlayer-middleware" DIR2="./contracts" DIR3="./avs/incredible-squaring-avs/contracts" -DIR4="./avs/tangle-avs/contracts" # Function to run forge commands in a directory run_forge_commands() { @@ -20,5 +19,4 @@ run_forge_commands() { run_forge_commands "$DIR0" run_forge_commands "$DIR1" run_forge_commands "$DIR2" -run_forge_commands "$DIR3" -run_forge_commands "$DIR4" \ No newline at end of file +run_forge_commands "$DIR3" \ No newline at end of file diff --git a/utils/build.rs b/utils/build.rs index 868dc34..0413d26 100644 --- a/utils/build.rs +++ b/utils/build.rs @@ -8,7 +8,6 @@ fn main() { "./../contracts/lib/eigenlayer-middleware/lib/eigenlayer-contracts", "./../contracts/lib/eigenlayer-middleware", "./../contracts", - "./../avs/tangle-avs/contracts", "./../avs/incredible-squaring-avs/contracts", ];