diff --git a/Cargo.lock b/Cargo.lock index b6da868..2b40193 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -593,6 +593,55 @@ dependencies = [ "winapi", ] +[[package]] +name = "anstream" +version = "0.6.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23a1e53f0f5d86382dafe1cf314783b2044280f406e7e1506368220ad11b1338" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8365de52b16c035ff4fcafe0092ba9390540e3e352870ac09933bebcaa2c8c56" + +[[package]] +name = "anstyle-parse" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +dependencies = [ + "windows-sys 0.59.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2109dbce0e72be3ec00bed26e6a7479ca384ad226efdd66db8fa2e3a38c83125" +dependencies = [ + "anstyle", + "windows-sys 0.59.0", +] + [[package]] name = "anyhow" version = "1.0.86" @@ -1659,7 +1708,7 @@ checksum = "8645b3de2f017bf86cbd7fb572eb0f6a3b8ac7eb3ae8b902d2449262f792cde5" dependencies = [ "cargo_metadata", "fs2", - "gadget-blueprint-proc-macro-core 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "gadget-blueprint-proc-macro-core 0.1.2", "rustdoc-types", "serde_json", "typed-builder", @@ -1984,6 +2033,47 @@ dependencies = [ "vec_map", ] +[[package]] +name = "clap" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap_builder" +version = "4.5.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +dependencies = [ + "anstream", + "anstyle", + "clap_lex", + "strsim 0.11.1", + "terminal_size", +] + +[[package]] +name = "clap_derive" +version = "4.5.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "syn 2.0.79", +] + +[[package]] +name = "clap_lex" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" + [[package]] name = "cmake" version = "0.1.51" @@ -2072,6 +2162,12 @@ dependencies = [ "tracing-error", ] +[[package]] +name = "colorchoice" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" + [[package]] name = "combine" version = "4.6.7" @@ -4040,11 +4136,10 @@ dependencies = [ [[package]] name = "gadget-blueprint-proc-macro" -version = "0.1.2" -source = "git+https://github.com/webb-tools/gadget#69710ac573d9efd91796839ca10e4628dd39e1f3" +version = "0.2.3" +source = "git+https://github.com/webb-tools/gadget#33a95cfcd8e23417550c6af664734698efd9bc18" dependencies = [ - "alloy-contract", - "gadget-blueprint-proc-macro-core 0.1.2 (git+https://github.com/webb-tools/gadget)", + "gadget-blueprint-proc-macro-core 0.1.5", "indexmap 2.5.0", "itertools 0.13.0", "proc-macro2", @@ -4066,8 +4161,8 @@ dependencies = [ [[package]] name = "gadget-blueprint-proc-macro-core" -version = "0.1.2" -source = "git+https://github.com/webb-tools/gadget#69710ac573d9efd91796839ca10e4628dd39e1f3" +version = "0.1.5" +source = "git+https://github.com/webb-tools/gadget#33a95cfcd8e23417550c6af664734698efd9bc18" dependencies = [ "cid", "ethereum-types", @@ -4076,8 +4171,8 @@ dependencies = [ [[package]] name = "gadget-context-derive" -version = "0.1.1" -source = "git+https://github.com/webb-tools/gadget#69710ac573d9efd91796839ca10e4628dd39e1f3" +version = "0.1.3" +source = "git+https://github.com/webb-tools/gadget#33a95cfcd8e23417550c6af664734698efd9bc18" dependencies = [ "proc-macro2", "quote", @@ -4086,20 +4181,20 @@ dependencies = [ [[package]] name = "gadget-io" -version = "0.0.2" -source = "git+https://github.com/webb-tools/gadget#69710ac573d9efd91796839ca10e4628dd39e1f3" +version = "0.0.4" +source = "git+https://github.com/webb-tools/gadget#33a95cfcd8e23417550c6af664734698efd9bc18" dependencies = [ "cfg-if", + "clap 4.5.20", "hex", "multiaddr", "parity-scale-codec", "sc-keystore", "scale-info", "serde", - "sp-application-crypto 38.0.0", - "sp-core 34.0.0", - "sp-keystore 0.40.0", - "structopt", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", "tokio", "tracing", @@ -4108,8 +4203,8 @@ dependencies = [ [[package]] name = "gadget-sdk" -version = "0.1.2" -source = "git+https://github.com/webb-tools/gadget#69710ac573d9efd91796839ca10e4628dd39e1f3" +version = "0.2.3" +source = "git+https://github.com/webb-tools/gadget#33a95cfcd8e23417550c6af664734698efd9bc18" dependencies = [ "alloy-contract", "alloy-network", @@ -4120,6 +4215,7 @@ dependencies = [ "alloy-signer-local", "alloy-sol-types", "alloy-transport", + "alloy-transport-http", "ark-bn254", "ark-ec", "ark-ff 0.4.2", @@ -4128,12 +4224,15 @@ dependencies = [ "auto_impl", "backon", "bincode", + "bollard", + "clap 4.5.20", "ed25519-zebra 4.0.3", "eigensdk", "elliptic-curve", "failure", "futures", "gadget-blueprint-proc-macro", + "gadget-blueprint-proc-macro-core 0.1.5", "gadget-context-derive", "gadget-io", "getrandom", @@ -4150,23 +4249,27 @@ dependencies = [ "prometheus", "rand", "round-based", + "scale-info", "schnorrkel", "serde", "serde_json", - "sp-core 34.0.0", - "sp-io 38.0.0", + "sp-core", + "sp-io", "sqlx", - "structopt", "subxt", "subxt-core", "subxt-signer", + "symbiotic-rs", "sysinfo", "tangle-subxt", "thiserror", "tokio", + "tokio-retry", + "tokio-stream", "tracing", "tracing-subscriber 0.3.18", "url", + "uuid 1.10.0", "w3f-bls", ] @@ -5006,6 +5109,12 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4" +[[package]] +name = "is_terminal_polyfill" +version = "1.70.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" + [[package]] name = "itertools" version = "0.10.5" @@ -8513,16 +8622,16 @@ dependencies = [ [[package]] name = "sc-keystore" -version = "33.0.0" +version = "28.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebd4b5b5713006117641c049cb082e8a439dd6ac5e7b171e5cef5ce1c9f8af8" +checksum = "3ef7283da5d643ef89ed094e1b23451ec70386a9474d337cdaa0ef81870bb2d4" dependencies = [ "array-bytes", "parking_lot", "serde_json", - "sp-application-crypto 38.0.0", - "sp-core 34.0.0", - "sp-keystore 0.40.0", + "sp-application-crypto", + "sp-core", + "sp-keystore", "thiserror", ] @@ -9333,24 +9442,11 @@ dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-core 31.0.0", - "sp-io 33.0.0", + "sp-core", + "sp-io", "sp-std", ] -[[package]] -name = "sp-application-crypto" -version = "38.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8133012faa5f75b2f0b1619d9f720c1424ac477152c143e5f7dbde2fe1a958" -dependencies = [ - "parity-scale-codec", - "scale-info", - "serde", - "sp-core 34.0.0", - "sp-io 38.0.0", -] - [[package]] name = "sp-arithmetic" version = "25.0.0" @@ -9401,59 +9497,12 @@ dependencies = [ "serde", "sp-crypto-hashing", "sp-debug-derive", - "sp-externalities 0.27.0", - "sp-runtime-interface 26.0.0", + "sp-externalities", + "sp-runtime-interface", "sp-std", - "sp-storage 20.0.0", + "sp-storage", "ss58-registry", - "substrate-bip39 0.5.0", - "thiserror", - "tracing", - "w3f-bls", - "zeroize", -] - -[[package]] -name = "sp-core" -version = "34.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c961a5e33fb2962fa775c044ceba43df9c6f917e2c35d63bfe23738468fa76a7" -dependencies = [ - "array-bytes", - "bitflags 1.3.2", - "blake2", - "bounded-collections", - "bs58", - "dyn-clonable", - "ed25519-zebra 4.0.3", - "futures", - "hash-db", - "hash256-std-hasher", - "impl-serde", - "itertools 0.11.0", - "k256", - "libsecp256k1", - "log", - "merlin", - "parity-bip39", - "parity-scale-codec", - "parking_lot", - "paste", - "primitive-types", - "rand", - "scale-info", - "schnorrkel", - "secp256k1", - "secrecy", - "serde", - "sp-crypto-hashing", - "sp-debug-derive", - "sp-externalities 0.29.0", - "sp-runtime-interface 28.0.0", - "sp-std", - "sp-storage 21.0.0", - "ss58-registry", - "substrate-bip39 0.6.0", + "substrate-bip39", "thiserror", "tracing", "w3f-bls", @@ -9494,18 +9543,7 @@ dependencies = [ "environmental", "parity-scale-codec", "sp-std", - "sp-storage 20.0.0", -] - -[[package]] -name = "sp-externalities" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a904407d61cb94228c71b55a9d3708e9d6558991f9e83bd42bd91df37a159d30" -dependencies = [ - "environmental", - "parity-scale-codec", - "sp-storage 21.0.0", + "sp-storage", ] [[package]] @@ -9522,42 +9560,15 @@ dependencies = [ "polkavm-derive 0.9.1", "rustversion", "secp256k1", - "sp-core 31.0.0", + "sp-core", "sp-crypto-hashing", - "sp-externalities 0.27.0", - "sp-keystore 0.37.0", - "sp-runtime-interface 26.0.0", - "sp-state-machine 0.38.0", + "sp-externalities", + "sp-keystore", + "sp-runtime-interface", + "sp-state-machine", "sp-std", - "sp-tracing 16.0.0", - "sp-trie 32.0.0", - "tracing", - "tracing-core", -] - -[[package]] -name = "sp-io" -version = "38.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ef7eb561bb4839cc8424ce58c5ea236cbcca83f26fcc0426d8decfe8aa97d4" -dependencies = [ - "bytes", - "docify", - "ed25519-dalek", - "libsecp256k1", - "log", - "parity-scale-codec", - "polkavm-derive 0.9.1", - "rustversion", - "secp256k1", - "sp-core 34.0.0", - "sp-crypto-hashing", - "sp-externalities 0.29.0", - "sp-keystore 0.40.0", - "sp-runtime-interface 28.0.0", - "sp-state-machine 0.43.0", - "sp-tracing 17.0.1", - "sp-trie 37.0.0", + "sp-tracing", + "sp-trie", "tracing", "tracing-core", ] @@ -9570,20 +9581,8 @@ checksum = "bdbab8b61bd61d5f8625a0c75753b5d5a23be55d3445419acd42caf59cf6236b" dependencies = [ "parity-scale-codec", "parking_lot", - "sp-core 31.0.0", - "sp-externalities 0.27.0", -] - -[[package]] -name = "sp-keystore" -version = "0.40.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0248b4d784cb4a01472276928977121fa39d977a5bb24793b6b15e64b046df42" -dependencies = [ - "parity-scale-codec", - "parking_lot", - "sp-core 34.0.0", - "sp-externalities 0.29.0", + "sp-core", + "sp-externalities", ] [[package]] @@ -9614,10 +9613,10 @@ dependencies = [ "scale-info", "serde", "simple-mermaid", - "sp-application-crypto 33.0.0", + "sp-application-crypto", "sp-arithmetic", - "sp-core 31.0.0", - "sp-io 33.0.0", + "sp-core", + "sp-io", "sp-std", "sp-weights", ] @@ -9633,32 +9632,12 @@ dependencies = [ "parity-scale-codec", "polkavm-derive 0.8.0", "primitive-types", - "sp-externalities 0.27.0", - "sp-runtime-interface-proc-macro", - "sp-std", - "sp-storage 20.0.0", - "sp-tracing 16.0.0", - "sp-wasm-interface 20.0.0", - "static_assertions", -] - -[[package]] -name = "sp-runtime-interface" -version = "28.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985eb981f40c689c6a0012c937b68ed58dabb4341d06f2dfe4dfd5ed72fa4017" -dependencies = [ - "bytes", - "impl-trait-for-tuples", - "parity-scale-codec", - "polkavm-derive 0.9.1", - "primitive-types", - "sp-externalities 0.29.0", + "sp-externalities", "sp-runtime-interface-proc-macro", "sp-std", - "sp-storage 21.0.0", - "sp-tracing 17.0.1", - "sp-wasm-interface 21.0.1", + "sp-storage", + "sp-tracing", + "sp-wasm-interface", "static_assertions", ] @@ -9688,35 +9667,14 @@ dependencies = [ "parking_lot", "rand", "smallvec", - "sp-core 31.0.0", - "sp-externalities 0.27.0", + "sp-core", + "sp-externalities", "sp-panic-handler", "sp-std", - "sp-trie 32.0.0", + "sp-trie", "thiserror", "tracing", - "trie-db 0.28.0", -] - -[[package]] -name = "sp-state-machine" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "930104d6ae882626e8880d9b1578da9300655d337a3ffb45e130c608b6c89660" -dependencies = [ - "hash-db", - "log", - "parity-scale-codec", - "parking_lot", - "rand", - "smallvec", - "sp-core 34.0.0", - "sp-externalities 0.29.0", - "sp-panic-handler", - "sp-trie 37.0.0", - "thiserror", - "tracing", - "trie-db 0.29.1", + "trie-db", ] [[package]] @@ -9739,19 +9697,6 @@ dependencies = [ "sp-std", ] -[[package]] -name = "sp-storage" -version = "21.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99c82989b3a4979a7e1ad848aad9f5d0b4388f1f454cc131766526601ab9e8f8" -dependencies = [ - "impl-serde", - "parity-scale-codec", - "ref-cast", - "serde", - "sp-debug-derive", -] - [[package]] name = "sp-tracing" version = "16.0.0" @@ -9765,18 +9710,6 @@ dependencies = [ "tracing-subscriber 0.2.25", ] -[[package]] -name = "sp-tracing" -version = "17.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf641a1d17268c8fcfdb8e0fa51a79c2d4222f4cfda5f3944dbdbc384dced8d5" -dependencies = [ - "parity-scale-codec", - "tracing", - "tracing-core", - "tracing-subscriber 0.3.18", -] - [[package]] name = "sp-trie" version = "32.0.0" @@ -9793,36 +9726,12 @@ dependencies = [ "rand", "scale-info", "schnellru", - "sp-core 31.0.0", - "sp-externalities 0.27.0", + "sp-core", + "sp-externalities", "sp-std", "thiserror", "tracing", - "trie-db 0.28.0", - "trie-root", -] - -[[package]] -name = "sp-trie" -version = "37.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6282aef9f4b6ecd95a67a45bcdb67a71f4a4155c09a53c10add4ffe823db18cd" -dependencies = [ - "ahash 0.8.11", - "hash-db", - "lazy_static", - "memory-db", - "nohash-hasher", - "parity-scale-codec", - "parking_lot", - "rand", - "scale-info", - "schnellru", - "sp-core 34.0.0", - "sp-externalities 0.29.0", - "thiserror", - "tracing", - "trie-db 0.29.1", + "trie-db", "trie-root", ] @@ -9840,18 +9749,6 @@ dependencies = [ "wasmtime", ] -[[package]] -name = "sp-wasm-interface" -version = "21.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b066baa6d57951600b14ffe1243f54c47f9c23dd89c262e17ca00ae8dca58be9" -dependencies = [ - "anyhow", - "impl-trait-for-tuples", - "log", - "parity-scale-codec", -] - [[package]] name = "sp-weights" version = "30.0.0" @@ -10200,7 +10097,7 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" dependencies = [ - "clap", + "clap 2.34.0", "lazy_static", "structopt-derive", ] @@ -10253,19 +10150,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "substrate-bip39" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca58ffd742f693dc13d69bdbb2e642ae239e0053f6aab3b104252892f856700a" -dependencies = [ - "hmac 0.12.1", - "pbkdf2 0.12.2", - "schnorrkel", - "sha2 0.10.8", - "zeroize", -] - [[package]] name = "subtle" version = "2.6.1" @@ -10351,7 +10235,7 @@ dependencies = [ "scale-value", "serde", "serde_json", - "sp-core 31.0.0", + "sp-core", "sp-crypto-hashing", "sp-runtime", "subxt-metadata", @@ -10445,6 +10329,17 @@ dependencies = [ "zip", ] +[[package]] +name = "symbiotic-rs" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02f31217207638b7cba9751cedb9ddb612478423d7bf8700091cf1f9970bbc5f" +dependencies = [ + "alloy-contract", + "alloy-sol-types", + "serde", +] + [[package]] name = "syn" version = "1.0.109" @@ -10593,9 +10488,9 @@ dependencies = [ [[package]] name = "tangle-subxt" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6021db4ae4f20114d6ab52365a3dce19c884dbfe1f4aba546639e53ed6ad052" +checksum = "20bf7f8d29cfdb72ea840a6d58d9191b3573dc0309f1b94eee25848498f89c1a" dependencies = [ "parity-scale-codec", "scale-info", @@ -10650,6 +10545,16 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "terminal_size" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +dependencies = [ + "rustix 0.38.34", + "windows-sys 0.59.0", +] + [[package]] name = "testcontainers" version = "0.20.1" @@ -10821,6 +10726,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-retry" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f" +dependencies = [ + "pin-project", + "rand", + "tokio", +] + [[package]] name = "tokio-rustls" version = "0.24.1" @@ -10855,9 +10771,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", @@ -11116,7 +11032,6 @@ dependencies = [ "sharded-slab", "smallvec", "thread_local", - "time", "tracing", "tracing-core", "tracing-log 0.2.0", @@ -11136,18 +11051,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "trie-db" -version = "0.29.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c992b4f40c234a074d48a757efeabb1a6be88af84c0c23f7ca158950cb0ae7f" -dependencies = [ - "hash-db", - "log", - "rustc-hex", - "smallvec", -] - [[package]] name = "trie-root" version = "0.18.0" @@ -11374,6 +11277,12 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "uuid" version = "0.8.2"