From 8bf80d9e7420b6100c0ddb92169fa3991461ebb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCn=20=C3=96zerk?= Date: Mon, 16 Jan 2023 18:51:47 +0300 Subject: [PATCH] Update sdk (#99) working --- Cargo.lock | 1818 ++++++++++++++++++++++++++++-------------- Cargo.toml | 2 +- src/commands/farm.rs | 1 - src/commands/init.rs | 10 +- src/config.rs | 74 +- src/utils.rs | 8 + 6 files changed, 1266 insertions(+), 647 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c9fde679..5fedfd1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -40,7 +40,7 @@ dependencies = [ "actix-service", "actix-utils", "ahash 0.7.6", - "base64", + "base64 0.13.0", "bitflags", "brotli", "bytes", @@ -197,7 +197,16 @@ version = "0.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" dependencies = [ - "gimli", + "gimli 0.26.2", +] + +[[package]] +name = "addr2line" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97" +dependencies = [ + "gimli 0.27.0", ] [[package]] @@ -583,47 +592,6 @@ version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e22d1f4b888c298a027c99dc9048015fac177587de20fc30232a057dfbe24a21" -[[package]] -name = "async-channel" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "once_cell", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5262ed948da60dd8956c6c5aca4d4163593dddb7b32d73267c93dab7b2e98940" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-lock", - "blocking", - "futures-lite", - "num_cpus", - "once_cell", -] - [[package]] name = "async-io" version = "1.7.0" @@ -661,12 +629,6 @@ dependencies = [ "futures-micro", ] -[[package]] -name = "async-task" -version = "4.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a40729d2133846d9ed0ea60a8b9541bccddab49cd30f0715a1da672fe9a2524" - [[package]] name = "async-trait" version = "0.1.58" @@ -730,16 +692,16 @@ dependencies = [ [[package]] name = "backtrace" -version = "0.3.66" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cab84319d616cfb654d03394f38ab7e6f0919e181b1b57e1fd15e7fb4077d9a7" +checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca" dependencies = [ - "addr2line", + "addr2line 0.19.0", "cc", "cfg-if", "libc", - "miniz_oxide", - "object", + "miniz_oxide 0.6.2", + "object 0.30.2", "rustc-demangle", ] @@ -767,6 +729,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + [[package]] name = "base64ct" version = "1.5.3" @@ -908,20 +876,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -[[package]] -name = "blocking" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6ccb65d468978a086b69884437ded69a90faab3bbe6e67f242173ea728acccc" -dependencies = [ - "async-channel", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "once_cell", -] - [[package]] name = "brotli" version = "3.3.4" @@ -1150,7 +1104,7 @@ checksum = "f6ed9c8b2d17acb8110c46f1da5bf4a696d745e1474a16db0cd2b49cd0249bf2" dependencies = [ "core2", "multibase", - "multihash", + "multihash 0.16.2", "serde", "unsigned-varint", ] @@ -1258,6 +1212,17 @@ dependencies = [ "tracing-error", ] +[[package]] +name = "comfy-table" +version = "6.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e7b787b0dc42e8111badfdbe4c3059158ccb2db8780352fa1b01e8ccf45cc4d" +dependencies = [ + "strum", + "strum_macros", + "unicode-width", +] + [[package]] name = "concurrent-queue" version = "1.2.3" @@ -1329,7 +1294,7 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "core-payments-domain-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "domain-pallet-executive", "domain-runtime-primitives", @@ -1421,7 +1386,7 @@ dependencies = [ "cranelift-codegen-shared", "cranelift-entity", "cranelift-isle", - "gimli", + "gimli 0.26.2", "log", "regalloc2", "smallvec", @@ -1521,6 +1486,39 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "cross-domain-message-gossip" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" +dependencies = [ + "futures 0.3.25", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-network", + "sc-network-gossip", + "sc-transaction-pool-api", + "sc-utils", + "sp-blockchain", + "sp-core", + "sp-domains", + "sp-runtime", + "tracing", +] + +[[package]] +name = "crossbeam" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2801af0d36612ae591caa9568261fddce32ce6e08a7275ea334a06a4ad021a2c" +dependencies = [ + "cfg-if", + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + [[package]] name = "crossbeam-channel" version = "0.5.6" @@ -1556,6 +1554,16 @@ dependencies = [ "scopeguard", ] +[[package]] +name = "crossbeam-queue" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1cfb3ea8a53f37c40dea2c7bedcbd88bdfae54f5e2175d6ecaff1c988353add" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + [[package]] name = "crossbeam-utils" version = "0.8.10" @@ -2019,19 +2027,132 @@ dependencies = [ ] [[package]] -name = "dns-parser" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4d33be9473d06f75f58220f71f7a9317aca647dc061dbd3c361b0bef505fbea" +name = "domain-block-builder" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ - "byteorder", - "quick-error", + "parity-scale-codec", + "sc-client-api", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-core", + "sp-inherents", + "sp-runtime", + "sp-state-machine", + "tracing", +] + +[[package]] +name = "domain-client-consensus-relay-chain" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" +dependencies = [ + "async-trait", + "parking_lot 0.12.1", + "sc-consensus", + "sc-utils", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-runtime", + "substrate-prometheus-endpoint", +] + +[[package]] +name = "domain-client-executor" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" +dependencies = [ + "blake2", + "crossbeam", + "domain-block-builder", + "domain-client-executor-gossip", + "domain-runtime-primitives", + "futures 0.3.25", + "futures-timer", + "merkletree", + "parity-scale-codec", + "parking_lot 0.12.1", + "rand 0.8.5", + "rand_chacha 0.3.1", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-transaction-pool-api", + "sc-utils", + "schnorrkel", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-slots", + "sp-core", + "sp-domain-digests", + "sp-domain-tracker", + "sp-domains", + "sp-keystore", + "sp-runtime", + "sp-trie", + "subspace-core-primitives", + "subspace-fraud-proof", + "subspace-runtime-primitives", + "subspace-wasm-tools", + "system-runtime-primitives", + "thiserror", + "tokio", + "tracing", +] + +[[package]] +name = "domain-client-executor-gossip" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" +dependencies = [ + "futures 0.3.25", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-network", + "sc-network-common", + "sc-network-gossip", + "sc-utils", + "sp-core", + "sp-domains", + "sp-runtime", + "tracing", +] + +[[package]] +name = "domain-client-message-relayer" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" +dependencies = [ + "cross-domain-message-gossip", + "domain-runtime-primitives", + "futures 0.3.25", + "parity-scale-codec", + "parking_lot 0.12.1", + "sc-client-api", + "sc-consensus", + "sc-network", + "sc-network-gossip", + "sc-utils", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-core", + "sp-domain-tracker", + "sp-domains", + "sp-messenger", + "sp-runtime", + "tracing", ] [[package]] name = "domain-pallet-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-executive", "frame-support", @@ -2048,7 +2169,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "parity-scale-codec", "sp-api", @@ -2057,6 +2178,63 @@ dependencies = [ "sp-std", ] +[[package]] +name = "domain-service" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" +dependencies = [ + "clap", + "cross-domain-message-gossip", + "domain-client-consensus-relay-chain", + "domain-client-executor", + "domain-client-executor-gossip", + "domain-client-message-relayer", + "domain-runtime-primitives", + "frame-benchmarking", + "frame-benchmarking-cli", + "futures 0.3.25", + "hex-literal", + "jsonrpsee", + "log", + "pallet-transaction-payment-rpc", + "sc-chain-spec", + "sc-client-api", + "sc-consensus", + "sc-executor", + "sc-network", + "sc-rpc", + "sc-rpc-api", + "sc-rpc-spec-v2", + "sc-service", + "sc-telemetry", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sc-utils", + "serde", + "sp-api", + "sp-block-builder", + "sp-blockchain", + "sp-consensus", + "sp-consensus-slots", + "sp-core", + "sp-domain-tracker", + "sp-domains", + "sp-inherents", + "sp-keystore", + "sp-messenger", + "sp-offchain", + "sp-runtime", + "sp-session", + "sp-transaction-pool", + "subspace-core-primitives", + "subspace-fraud-proof", + "subspace-runtime-primitives", + "subspace-transaction-pool", + "substrate-build-script-utils", + "substrate-frame-rpc-system", + "system-runtime-primitives", +] + [[package]] name = "downcast" version = "0.11.0" @@ -2319,7 +2497,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures", + "futures 0.3.25", ] [[package]] @@ -2401,7 +2579,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b22349c6a11563a202d95772a68e0fcf56119e74ea8a2a19cf2301460fcd0df5" dependencies = [ "either", - "futures", + "futures 0.3.25", "futures-timer", "log", "num-traits", @@ -2436,7 +2614,7 @@ checksum = "f82b0f4c27ad9f8bfd1f3208d882da2b09c301bc1c828fd3a00d0216d2fbbff6" dependencies = [ "crc32fast", "libz-sys", - "miniz_oxide", + "miniz_oxide 0.5.3", ] [[package]] @@ -2457,7 +2635,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", ] @@ -2481,7 +2659,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-support", "frame-system", @@ -2502,16 +2680,63 @@ dependencies = [ ] [[package]] -name = "frame-executive" +name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ + "Inflector", + "array-bytes", + "chrono", + "clap", + "comfy-table", + "frame-benchmarking", "frame-support", "frame-system", + "gethostname", + "handlebars", + "itertools 0.10.3", + "lazy_static", + "linked-hash-map", + "log", "parity-scale-codec", - "scale-info", - "sp-core", - "sp-io", + "rand 0.8.5", + "rand_pcg", + "sc-block-builder", + "sc-cli", + "sc-client-api", + "sc-client-db", + "sc-executor", + "sc-service", + "sc-sysinfo", + "serde", + "serde_json", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-database", + "sp-externalities", + "sp-inherents", + "sp-keystore", + "sp-runtime", + "sp-state-machine", + "sp-std", + "sp-storage", + "sp-trie", + "thiserror", + "thousands", +] + +[[package]] +name = "frame-executive" +version = "4.0.0-dev" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-io", "sp-runtime", "sp-std", "sp-tracing", @@ -2532,7 +2757,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "bitflags", "frame-metadata", @@ -2564,7 +2789,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "Inflector", "cfg-expr", @@ -2578,7 +2803,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2590,7 +2815,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "proc-macro2", "quote", @@ -2600,7 +2825,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-support", "log", @@ -2618,7 +2843,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-benchmarking", "frame-support", @@ -2633,7 +2858,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "sp-api", @@ -2661,6 +2886,12 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +[[package]] +name = "futures" +version = "0.1.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" + [[package]] name = "futures" version = "0.3.25" @@ -2784,6 +3015,7 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6" dependencies = [ + "futures 0.1.31", "futures-channel", "futures-core", "futures-io", @@ -2841,10 +3073,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -2889,6 +3119,12 @@ dependencies = [ "stable_deref_trait", ] +[[package]] +name = "gimli" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793" + [[package]] name = "globset" version = "0.4.9" @@ -2975,6 +3211,20 @@ dependencies = [ "tracing", ] +[[package]] +name = "handlebars" +version = "4.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "035ef95d03713f2c347a72547b7cd38cbc9af7cd51e6099fb62d586d4a6dee3a" +dependencies = [ + "log", + "pest", + "pest_derive", + "serde", + "serde_json", + "thiserror", +] + [[package]] name = "hash-db" version = "0.15.2" @@ -3041,6 +3291,12 @@ dependencies = [ "serde", ] +[[package]] +name = "hex-literal" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0" + [[package]] name = "hex_fmt" version = "0.3.0" @@ -3243,24 +3499,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "if-watch" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065c008e570a43c00de6aed9714035e5ea6a498c255323db9091722af6ee67dd" -dependencies = [ - "async-io", - "core-foundation", - "fnv", - "futures", - "if-addrs", - "ipnet", - "log", - "rtnetlink", - "system-configuration", - "windows", -] - [[package]] name = "if-watch" version = "3.0.0" @@ -3270,7 +3508,7 @@ dependencies = [ "async-io", "core-foundation", "fnv", - "futures", + "futures 0.3.25", "if-addrs", "ipnet", "log", @@ -3703,33 +3941,33 @@ checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" [[package]] name = "libp2p" -version = "0.49.0" +version = "0.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec878fda12ebec479186b3914ebc48ff180fa4c51847e11a1a68bf65249e02c1" +checksum = "2e0a0d2f693675f49ded13c5d510c48b78069e23cbd9108d7ccd59f6dc568819" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "futures-timer", "getrandom 0.2.7", "instant", - "lazy_static", - "libp2p-core 0.37.0", - "libp2p-dns 0.37.0", - "libp2p-identify 0.40.0", - "libp2p-kad 0.41.0", - "libp2p-mdns 0.41.0", - "libp2p-metrics 0.10.0", + "libp2p-core 0.38.0", + "libp2p-dns 0.38.0", + "libp2p-identify 0.41.1", + "libp2p-kad 0.42.1", + "libp2p-mdns 0.42.0", + "libp2p-metrics 0.11.0", "libp2p-mplex", - "libp2p-noise 0.40.0", - "libp2p-ping 0.40.1", - "libp2p-request-response 0.22.1", - "libp2p-swarm 0.40.1", - "libp2p-swarm-derive 0.30.1", - "libp2p-tcp 0.37.0", + "libp2p-noise 0.41.0", + "libp2p-ping 0.41.0", + "libp2p-quic 0.7.0-alpha", + "libp2p-request-response 0.23.0", + "libp2p-swarm 0.41.1", + "libp2p-tcp 0.38.0", "libp2p-wasm-ext", - "libp2p-websocket 0.39.0", - "libp2p-yamux 0.41.0", - "multiaddr 0.14.0", + "libp2p-webrtc 0.4.0-alpha", + "libp2p-websocket 0.40.0", + "libp2p-yamux 0.42.0", + "multiaddr 0.16.0", "parking_lot 0.12.1", "pin-project", "smallvec", @@ -3737,31 +3975,31 @@ dependencies = [ [[package]] name = "libp2p" -version = "0.50.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.51.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "futures-timer", "getrandom 0.2.7", "instant", - "libp2p-core 0.38.0", - "libp2p-dns 0.38.0", + "libp2p-core 0.39.0", + "libp2p-dns 0.39.0", "libp2p-gossipsub", - "libp2p-identify 0.41.0", - "libp2p-kad 0.42.0", - "libp2p-mdns 0.42.0", - "libp2p-metrics 0.11.0", - "libp2p-noise 0.41.0", - "libp2p-ping 0.41.0", - "libp2p-quic", - "libp2p-request-response 0.23.0", - "libp2p-swarm 0.41.1", - "libp2p-tcp 0.38.0", - "libp2p-webrtc", - "libp2p-websocket 0.40.0", - "libp2p-yamux 0.42.0", - "multiaddr 0.16.0", + "libp2p-identify 0.42.0", + "libp2p-kad 0.43.0", + "libp2p-mdns 0.43.0", + "libp2p-metrics 0.12.0", + "libp2p-noise 0.42.0", + "libp2p-ping 0.42.0", + "libp2p-quic 0.7.0-alpha.2", + "libp2p-request-response 0.24.0", + "libp2p-swarm 0.42.0", + "libp2p-tcp 0.39.0", + "libp2p-webrtc 0.4.0-alpha.2", + "libp2p-websocket 0.41.0", + "libp2p-yamux 0.43.0", + "multiaddr 0.17.0", "parking_lot 0.12.1", "pin-project", "smallvec", @@ -3778,13 +4016,13 @@ dependencies = [ "ed25519-dalek", "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", "lazy_static", "log", "multiaddr 0.14.0", - "multihash", + "multihash 0.16.2", "multistream-select 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.12.1", "pin-project", @@ -3803,27 +4041,61 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.38.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6a8fcd392ff67af6cc3f03b1426c41f7f26b6b9aff2dc632c1c56dd649e571f" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", "log", "multiaddr 0.16.0", - "multihash", - "multistream-select 0.12.1 (git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35)", + "multihash 0.16.2", + "multistream-select 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell", "parking_lot 0.12.1", "pin-project", "prost", "prost-build", "rand 0.8.5", - "rw-stream-sink 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35)", + "rw-stream-sink 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sec1", + "sha2 0.10.2", + "smallvec", + "thiserror", + "unsigned-varint", + "void", + "zeroize", +] + +[[package]] +name = "libp2p-core" +version = "0.39.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" +dependencies = [ + "asn1_der", + "bs58", + "ed25519-dalek", + "either", + "fnv", + "futures 0.3.25", + "futures-timer", + "instant", + "log", + "multiaddr 0.17.0", + "multihash 0.17.0", + "multistream-select 0.12.1 (git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d)", + "once_cell", + "parking_lot 0.12.1", + "pin-project", + "prost", + "prost-build", + "rand 0.8.5", + "rw-stream-sink 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d)", "sec1", "serde", "sha2 0.10.2", @@ -3836,12 +4108,12 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2322c9fb40d99101def6a01612ee30500c89abbbecb6297b3cd252903a4c1720" +checksum = "8e42a271c1b49f789b92f7fc87749fa79ce5c7bdc88cbdfacb818a4bca47fec5" dependencies = [ - "futures", - "libp2p-core 0.37.0", + "futures 0.3.25", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "smallvec", @@ -3850,11 +4122,11 @@ dependencies = [ [[package]] name = "libp2p-dns" -version = "0.38.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.39.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ - "futures", - "libp2p-core 0.38.0", + "futures 0.3.25", + "libp2p-core 0.39.0", "log", "parking_lot 0.12.1", "smallvec", @@ -3863,24 +4135,24 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.44.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "asynchronous-codec", - "base64", + "base64 0.20.0", "byteorder", "bytes", "fnv", - "futures", + "futures 0.3.25", "hex_fmt", "instant", - "libp2p-core 0.38.0", - "libp2p-swarm 0.41.1", + "libp2p-core 0.39.0", + "libp2p-swarm 0.42.0", "log", "prometheus-client", "prost", "prost-build", - "prost-codec 0.3.0", + "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d)", "rand 0.8.5", "regex", "serde", @@ -3893,20 +4165,20 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.40.0" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf9a121f699e8719bda2e6e9e9b6ddafc6cff4602471d6481c1067930ccb29b" +checksum = "c052d0026f4817b44869bfb6810f4e1112f43aec8553f2cb38881c524b563abf" dependencies = [ "asynchronous-codec", - "futures", + "futures 0.3.25", "futures-timer", - "libp2p-core 0.37.0", - "libp2p-swarm 0.40.1", + "libp2p-core 0.38.0", + "libp2p-swarm 0.41.1", "log", "lru 0.8.1", "prost", "prost-build", - "prost-codec 0.2.0", + "prost-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec", "thiserror", "void", @@ -3914,19 +4186,19 @@ dependencies = [ [[package]] name = "libp2p-identify" -version = "0.41.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.42.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "asynchronous-codec", - "futures", + "futures 0.3.25", "futures-timer", - "libp2p-core 0.38.0", - "libp2p-swarm 0.41.1", + "libp2p-core 0.39.0", + "libp2p-swarm 0.42.0", "log", "lru 0.8.1", "prost", "prost-build", - "prost-codec 0.3.0", + "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d)", "smallvec", "thiserror", "void", @@ -3934,20 +4206,20 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.41.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6721c200e2021f6c3fab8b6cf0272ead8912d871610ee194ebd628cecf428f22" +checksum = "2766dcd2be8c87d5e1f35487deb22d765f49c6ae1251b3633efe3b25698bd3d2" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", "bytes", "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", - "libp2p-core 0.37.0", - "libp2p-swarm 0.40.1", + "libp2p-core 0.38.0", + "libp2p-swarm 0.41.1", "log", "prost", "prost-build", @@ -3962,19 +4234,19 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.43.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "arrayvec 0.7.2", "asynchronous-codec", "bytes", "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", - "libp2p-core 0.38.0", - "libp2p-swarm 0.41.1", + "libp2p-core 0.39.0", + "libp2p-swarm 0.42.0", "log", "prost", "prost-build", @@ -3990,34 +4262,34 @@ dependencies = [ [[package]] name = "libp2p-mdns" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "761704e727f7d68d58d7bc2231eafae5fc1b9814de24290f126df09d4bd37a15" +checksum = "04f378264aade9872d6ccd315c0accc18be3a35d15fc1b9c36e5b6f983b62b5b" dependencies = [ "data-encoding", - "dns-parser", - "futures", - "if-watch 2.0.0", - "libp2p-core 0.37.0", - "libp2p-swarm 0.40.1", + "futures 0.3.25", + "if-watch", + "libp2p-core 0.38.0", + "libp2p-swarm 0.41.1", "log", "rand 0.8.5", "smallvec", "socket2", "tokio", + "trust-dns-proto", "void", ] [[package]] name = "libp2p-mdns" -version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.43.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "data-encoding", - "futures", - "if-watch 3.0.0", - "libp2p-core 0.38.0", - "libp2p-swarm 0.41.1", + "futures 0.3.25", + "if-watch", + "libp2p-core 0.39.0", + "libp2p-swarm 0.42.0", "log", "rand 0.8.5", "smallvec", @@ -4029,42 +4301,42 @@ dependencies = [ [[package]] name = "libp2p-metrics" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ee31b08e78b7b8bfd1c4204a9dd8a87b4fcdf6dafc57eb51701c1c264a81cb9" +checksum = "5ad8a64f29da86005c86a4d2728b8a0719e9b192f4092b609fd8790acb9dec55" dependencies = [ - "libp2p-core 0.37.0", - "libp2p-identify 0.40.0", - "libp2p-kad 0.41.0", - "libp2p-ping 0.40.1", - "libp2p-swarm 0.40.1", + "libp2p-core 0.38.0", + "libp2p-identify 0.41.1", + "libp2p-kad 0.42.1", + "libp2p-ping 0.41.0", + "libp2p-swarm 0.41.1", "prometheus-client", ] [[package]] name = "libp2p-metrics" -version = "0.11.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.12.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ - "libp2p-core 0.38.0", + "libp2p-core 0.39.0", "libp2p-gossipsub", - "libp2p-identify 0.41.0", - "libp2p-kad 0.42.0", - "libp2p-ping 0.41.0", - "libp2p-swarm 0.41.1", + "libp2p-identify 0.42.0", + "libp2p-kad 0.43.0", + "libp2p-ping 0.42.0", + "libp2p-swarm 0.42.0", "prometheus-client", ] [[package]] name = "libp2p-mplex" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "692664acfd98652de739a8acbb0a0d670f1d67190a49be6b4395e22c37337d89" +checksum = "03805b44107aa013e7cbbfa5627b31c36cbedfdfb00603c0311998882bc4bace" dependencies = [ "asynchronous-codec", "bytes", - "futures", - "libp2p-core 0.37.0", + "futures 0.3.25", + "libp2p-core 0.38.0", "log", "nohash-hasher", "parking_lot 0.12.1", @@ -4075,35 +4347,36 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "048155686bd81fe6cb5efdef0c6290f25ad32a0a42e8f4f72625cf6a505a206f" +checksum = "a978cb57efe82e892ec6f348a536bfbd9fee677adbe5689d7a93ad3a9bffbf2e" dependencies = [ "bytes", "curve25519-dalek 3.2.0", - "futures", - "lazy_static", - "libp2p-core 0.37.0", + "futures 0.3.25", + "libp2p-core 0.38.0", "log", + "once_cell", "prost", "prost-build", "rand 0.8.5", "sha2 0.10.2", "snow", "static_assertions", + "thiserror", "x25519-dalek 1.1.1", "zeroize", ] [[package]] name = "libp2p-noise" -version = "0.41.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.42.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "bytes", "curve25519-dalek 3.2.0", - "futures", - "libp2p-core 0.38.0", + "futures 0.3.25", + "libp2p-core 0.39.0", "log", "once_cell", "prost", @@ -4119,15 +4392,15 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.40.1" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7228b9318d34689521349a86eb39a3c3a802c9efc99a0568062ffb80913e3f91" +checksum = "929fcace45a112536e22b3dcfd4db538723ef9c3cb79f672b98be2cc8e25f37f" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", "instant", - "libp2p-core 0.37.0", - "libp2p-swarm 0.40.1", + "libp2p-core 0.38.0", + "libp2p-swarm 0.41.1", "log", "rand 0.8.5", "void", @@ -4135,14 +4408,14 @@ dependencies = [ [[package]] name = "libp2p-ping" -version = "0.41.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.42.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", "instant", - "libp2p-core 0.38.0", - "libp2p-swarm 0.41.1", + "libp2p-core 0.39.0", + "libp2p-swarm 0.42.0", "log", "rand 0.8.5", "void", @@ -4151,14 +4424,35 @@ dependencies = [ [[package]] name = "libp2p-quic" version = "0.7.0-alpha" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01e7c867e95c8130667b24409d236d37598270e6da69b3baf54213ba31ffca59" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "futures-timer", - "if-watch 3.0.0", + "if-watch", "libp2p-core 0.38.0", - "libp2p-tls", + "libp2p-tls 0.1.0-alpha", + "log", + "parking_lot 0.12.1", + "quinn-proto", + "rand 0.8.5", + "rustls 0.20.7", + "thiserror", + "tokio", +] + +[[package]] +name = "libp2p-quic" +version = "0.7.0-alpha.2" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" +dependencies = [ + "bytes", + "futures 0.3.25", + "futures-timer", + "if-watch", + "libp2p-core 0.39.0", + "libp2p-tls 0.1.0-alpha.2", "log", "parking_lot 0.12.1", "quinn-proto", @@ -4170,16 +4464,16 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.22.1" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8827af16a017b65311a410bb626205a9ad92ec0473967618425039fa5231adc1" +checksum = "3236168796727bfcf4927f766393415361e2c644b08bedb6a6b13d957c9a4884" dependencies = [ "async-trait", "bytes", - "futures", + "futures 0.3.25", "instant", - "libp2p-core 0.37.0", - "libp2p-swarm 0.40.1", + "libp2p-core 0.38.0", + "libp2p-swarm 0.41.1", "log", "rand 0.8.5", "smallvec", @@ -4188,15 +4482,15 @@ dependencies = [ [[package]] name = "libp2p-request-response" -version = "0.23.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.24.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "async-trait", "bytes", - "futures", + "futures 0.3.25", "instant", - "libp2p-core 0.38.0", - "libp2p-swarm 0.41.1", + "libp2p-core 0.39.0", + "libp2p-swarm 0.42.0", "log", "rand 0.8.5", "smallvec", @@ -4205,36 +4499,38 @@ dependencies = [ [[package]] name = "libp2p-swarm" -version = "0.40.1" +version = "0.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46d13df7c37807965d82930c0e4b04a659efcb6cca237373b206043db5398ecf" +checksum = "b2a35472fe3276b3855c00f1c032ea8413615e030256429ad5349cdf67c6e1a0" dependencies = [ "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", - "libp2p-core 0.37.0", + "libp2p-core 0.38.0", + "libp2p-swarm-derive 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "log", "pin-project", "rand 0.8.5", "smallvec", "thiserror", + "tokio", "void", ] [[package]] name = "libp2p-swarm" -version = "0.41.1" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.42.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "either", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "instant", - "libp2p-core 0.38.0", - "libp2p-swarm-derive 0.31.0", + "libp2p-core 0.39.0", + "libp2p-swarm-derive 0.31.0 (git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d)", "log", "pin-project", "rand 0.8.5", @@ -4246,9 +4542,9 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" -version = "0.30.1" +version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0eddc4497a8b5a506013c40e8189864f9c3a00db2b25671f428ae9007f3ba32" +checksum = "9d527d5827582abd44a6d80c07ff8b50b4ee238a8979e05998474179e79dc400" dependencies = [ "heck", "quote", @@ -4258,7 +4554,7 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" version = "0.31.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "heck", "quote", @@ -4267,15 +4563,15 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9839d96761491c6d3e238e70554b856956fca0ab60feb9de2cd08eed4473fa92" +checksum = "b4b257baf6df8f2df39678b86c578961d48cc8b68642a12f0f763f56c8e5858d" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", - "if-watch 2.0.0", + "if-watch", "libc", - "libp2p-core 0.37.0", + "libp2p-core 0.38.0", "log", "socket2", "tokio", @@ -4283,14 +4579,14 @@ dependencies = [ [[package]] name = "libp2p-tcp" -version = "0.38.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.39.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", - "if-watch 3.0.0", + "if-watch", "libc", - "libp2p-core 0.38.0", + "libp2p-core 0.39.0", "log", "socket2", "tokio", @@ -4299,9 +4595,10 @@ dependencies = [ [[package]] name = "libp2p-tls" version = "0.1.0-alpha" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7905ce0d040576634e8a3229a7587cc8beab83f79db6023800f1792895defa8" dependencies = [ - "futures", + "futures 0.3.25", "futures-rustls", "libp2p-core 0.38.0", "rcgen 0.10.0", @@ -4313,15 +4610,32 @@ dependencies = [ "yasna", ] +[[package]] +name = "libp2p-tls" +version = "0.1.0-alpha.2" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" +dependencies = [ + "futures 0.3.25", + "futures-rustls", + "libp2p-core 0.39.0", + "rcgen 0.10.0", + "ring", + "rustls 0.20.7", + "thiserror", + "webpki 0.22.0", + "x509-parser 0.14.0", + "yasna", +] + [[package]] name = "libp2p-wasm-ext" -version = "0.37.0" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b5b8e7a73e379e47b1b77f8a82c4721e97eca01abcd18e9cd91a23ca6ce97" +checksum = "1bb1a35299860e0d4b3c02a3e74e3b293ad35ae0cee8a056363b0c862d082069" dependencies = [ - "futures", + "futures 0.3.25", "js-sys", - "libp2p-core 0.37.0", + "libp2p-core 0.38.0", "parity-send-wrapper", "wasm-bindgen", "wasm-bindgen-futures", @@ -4330,22 +4644,53 @@ dependencies = [ [[package]] name = "libp2p-webrtc" version = "0.4.0-alpha" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdb6cd86dd68cba72308ea05de1cebf3ba0ae6e187c40548167955d4e3970f6a" dependencies = [ "async-trait", "asynchronous-codec", "bytes", - "futures", + "futures 0.3.25", "futures-timer", "hex", - "if-watch 3.0.0", + "if-watch", "libp2p-core 0.38.0", "libp2p-noise 0.41.0", "log", - "multihash", + "multihash 0.16.2", + "prost", + "prost-build", + "prost-codec 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.8.5", + "rcgen 0.9.3", + "serde", + "stun", + "thiserror", + "tinytemplate", + "tokio", + "tokio-util", + "webrtc", +] + +[[package]] +name = "libp2p-webrtc" +version = "0.4.0-alpha.2" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" +dependencies = [ + "async-trait", + "asynchronous-codec", + "bytes", + "futures 0.3.25", + "futures-timer", + "hex", + "if-watch", + "libp2p-core 0.39.0", + "libp2p-noise 0.42.0", + "log", + "multihash 0.17.0", "prost", "prost-build", - "prost-codec 0.3.0", + "prost-codec 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d)", "rand 0.8.5", "rcgen 0.9.3", "serde", @@ -4359,14 +4704,14 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.39.0" +version = "0.40.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3758ae6f89b2531a24b6d9f5776bda6a626b60a57600d7185d43dfa75ca5ecc4" +checksum = "1d705506030d5c0aaf2882437c70dab437605f21c5f9811978f694e6917a3b54" dependencies = [ "either", - "futures", + "futures 0.3.25", "futures-rustls", - "libp2p-core 0.37.0", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "quicksink", @@ -4378,17 +4723,17 @@ dependencies = [ [[package]] name = "libp2p-websocket" -version = "0.40.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.41.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "either", - "futures", + "futures 0.3.25", "futures-rustls", - "libp2p-core 0.38.0", + "libp2p-core 0.39.0", "log", "parking_lot 0.12.1", "quicksink", - "rw-stream-sink 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35)", + "rw-stream-sink 0.3.0 (git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d)", "soketto", "url", "webpki-roots", @@ -4396,12 +4741,12 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30f079097a21ad017fc8139460630286f02488c8c13b26affb46623aa20d8845" +checksum = "4f63594a0aa818642d9d4915c791945053877253f08a3626f13416b5cd928a29" dependencies = [ - "futures", - "libp2p-core 0.37.0", + "futures 0.3.25", + "libp2p-core 0.38.0", "log", "parking_lot 0.12.1", "thiserror", @@ -4410,11 +4755,11 @@ dependencies = [ [[package]] name = "libp2p-yamux" -version = "0.42.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +version = "0.43.0" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ - "futures", - "libp2p-core 0.38.0", + "futures 0.3.25", + "libp2p-core 0.39.0", "log", "parking_lot 0.12.1", "thiserror", @@ -4428,7 +4773,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95b09eff1b35ed3b33b877ced3a691fc7a481919c7e29c53c906226fcf55e2a1" dependencies = [ "arrayref", - "base64", + "base64 0.13.0", "digest 0.9.0", "hmac-drbg", "libsecp256k1-core", @@ -4613,6 +4958,12 @@ dependencies = [ "libc", ] +[[package]] +name = "maplit" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + [[package]] name = "match_cfg" version = "0.1.0" @@ -4716,6 +5067,23 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b879f617ec392ad9c11a50356ca373009c52363c0953b34c2e1b2234037a26a9" +[[package]] +name = "merkletree" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d348b5b0d1707be1c8a727b7078daa08e2a3051d63b35715a19c35a324d2aaac" +dependencies = [ + "anyhow", + "arrayref", + "log", + "memmap2", + "positioned-io", + "rayon", + "serde", + "tempfile", + "typenum", +] + [[package]] name = "merlin" version = "2.0.1" @@ -4761,6 +5129,15 @@ dependencies = [ "adler", ] +[[package]] +name = "miniz_oxide" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa" +dependencies = [ + "adler", +] + [[package]] name = "mio" version = "0.8.4" @@ -4810,7 +5187,7 @@ dependencies = [ "bs58", "byteorder", "data-encoding", - "multihash", + "multihash 0.16.2", "percent-encoding", "serde", "static_assertions", @@ -4828,7 +5205,25 @@ dependencies = [ "byteorder", "data-encoding", "multibase", - "multihash", + "multihash 0.16.2", + "percent-encoding", + "serde", + "static_assertions", + "unsigned-varint", + "url", +] + +[[package]] +name = "multiaddr" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" +dependencies = [ + "arrayref", + "byteorder", + "data-encoding", + "multibase", + "multihash 0.17.0", "percent-encoding", "serde", "static_assertions", @@ -4856,13 +5251,26 @@ dependencies = [ "blake2b_simd", "blake2s_simd", "blake3", + "core2", + "digest 0.10.3", + "multihash-derive", + "sha2 0.10.2", + "sha3", + "unsigned-varint", +] + +[[package]] +name = "multihash" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "835d6ff01d610179fbce3de1694d007e500bf33a7f29689838941d6bf783ae40" +dependencies = [ "core2", "digest 0.10.3", "multihash-derive", "serde", "serde-big-array", "sha2 0.10.2", - "sha3", "unsigned-varint", ] @@ -4893,7 +5301,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8552ab875c1313b97b8d20cb857b9fd63e2d1d6a0a1b53ce9821e575405f27a" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "log", "pin-project", "smallvec", @@ -4903,10 +5311,10 @@ dependencies = [ [[package]] name = "multistream-select" version = "0.12.1" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "log", "pin-project", "smallvec", @@ -4942,6 +5350,15 @@ dependencies = [ "syn", ] +[[package]] +name = "names" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146" +dependencies = [ + "rand 0.8.5", +] + [[package]] name = "names" version = "0.14.0" @@ -4996,7 +5413,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "65b4b14489ab424703c092062176d52ba55485a89c076b4f9db05092b7223aa6" dependencies = [ "bytes", - "futures", + "futures 0.3.25", "log", "netlink-packet-core", "netlink-sys", @@ -5010,9 +5427,8 @@ version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92b654097027250401127914afb37cb1f311df6610a9891ff07a757e94199027" dependencies = [ - "async-io", "bytes", - "futures", + "futures 0.3.25", "libc", "log", "tokio", @@ -5165,6 +5581,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "object" +version = "0.30.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b8c786513eb403643f2a88c244c2aaa270ef2153f55094587d0c48a3cf22a83" +dependencies = [ + "memchr", +] + [[package]] name = "oid-registry" version = "0.4.0" @@ -5210,7 +5635,7 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5265,7 +5690,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-benchmarking", "frame-support", @@ -5280,7 +5705,7 @@ dependencies = [ [[package]] name = "pallet-domain-registry" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5301,7 +5726,7 @@ dependencies = [ [[package]] name = "pallet-domain-tracker" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5320,7 +5745,7 @@ dependencies = [ [[package]] name = "pallet-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5336,7 +5761,7 @@ dependencies = [ [[package]] name = "pallet-executor-registry" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5353,7 +5778,7 @@ dependencies = [ [[package]] name = "pallet-feeds" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5369,7 +5794,7 @@ dependencies = [ [[package]] name = "pallet-grandpa-finality-verifier" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "finality-grandpa", "frame-support", @@ -5389,7 +5814,7 @@ dependencies = [ [[package]] name = "pallet-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5409,7 +5834,7 @@ dependencies = [ [[package]] name = "pallet-object-store" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5424,7 +5849,7 @@ dependencies = [ [[package]] name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5439,7 +5864,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5452,7 +5877,7 @@ dependencies = [ [[package]] name = "pallet-runtime-configs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5463,7 +5888,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5487,7 +5912,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-support", "frame-system", @@ -5501,7 +5926,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-benchmarking", "frame-support", @@ -5519,7 +5944,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5531,7 +5956,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-support", "frame-system", @@ -5547,7 +5972,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5563,7 +5988,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5575,7 +6000,7 @@ dependencies = [ [[package]] name = "pallet-transporter" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "frame-system", @@ -5591,7 +6016,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-benchmarking", "frame-support", @@ -5724,20 +6149,20 @@ checksum = "0c520e05135d6e763148b6426a837e239041653ba7becd2e538c076c738025fc" [[package]] name = "pbkdf2" -version = "0.4.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "216eaa586a190f0a738f2f918511eecfa90f13295abec0e457cdebcceda80cbd" +checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.8.0", + "crypto-mac 0.11.1", ] [[package]] name = "pbkdf2" -version = "0.8.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" +checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" dependencies = [ - "crypto-mac 0.11.1", + "digest 0.10.3", ] [[package]] @@ -5746,31 +6171,65 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "03c64931a1a212348ec4f3b4362585eca7159d0d09cbdf4a7f74f02173596fd4" dependencies = [ - "base64", + "base64 0.13.0", ] [[package]] name = "pem-rfc7468" version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +dependencies = [ + "base64ct", +] + +[[package]] +name = "percent-encoding" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" + +[[package]] +name = "pest" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +dependencies = [ + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" dependencies = [ - "base64ct", + "pest", + "pest_generator", ] [[package]] -name = "percent-encoding" -version = "2.1.0" +name = "pest_generator" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] [[package]] -name = "pest" +name = "pest_meta" version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" +checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" dependencies = [ - "ucd-trie", + "maplit", + "pest", + "sha-1 0.8.2", ] [[package]] @@ -5837,6 +6296,12 @@ version = "0.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae" +[[package]] +name = "platforms" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8d0eef3571242013a0d5dc84861c3ae4a652e56e12adf8bdc26ff5f8cb34c94" + [[package]] name = "polling" version = "2.2.0" @@ -5890,6 +6355,17 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81bdd679d533107e090c2704a35982fc06302e30898e63ffa26a81155c012e92" +[[package]] +name = "positioned-io" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09b9485cf7f528baf34edd811ec8283a168864912e11d0b7d3e0510738761114" +dependencies = [ + "byteorder", + "libc", + "winapi", +] + [[package]] name = "ppv-lite86" version = "0.2.16" @@ -6063,9 +6539,9 @@ dependencies = [ [[package]] name = "prost-codec" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "011ae9ff8359df7915f97302d591cdd9e0e27fbd5a4ddc5bd13b71079bb20987" +checksum = "0dc34979ff898b6e141106178981ce2596c387ea6e62533facfc61a37fc879c0" dependencies = [ "asynchronous-codec", "bytes", @@ -6077,7 +6553,7 @@ dependencies = [ [[package]] name = "prost-codec" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ "asynchronous-codec", "bytes", @@ -6179,7 +6655,6 @@ dependencies = [ "rand_chacha 0.2.2", "rand_core 0.5.1", "rand_hc", - "rand_pcg", ] [[package]] @@ -6252,11 +6727,11 @@ dependencies = [ [[package]] name = "rand_pcg" -version = "0.2.1" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" +checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" dependencies = [ - "rand_core 0.5.1", + "rand_core 0.6.4", ] [[package]] @@ -6451,6 +6926,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "rpassword" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6678cf63ab3491898c0d021b493c94c9b221d91295294a2a5746eacbe5928322" +dependencies = [ + "libc", + "rtoolbox", + "winapi", +] + [[package]] name = "rtcp" version = "0.7.1" @@ -6468,8 +6954,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322c53fd76a18698f1c27381d58091de3a043d356aa5bd0d510608b565f469a0" dependencies = [ - "async-global-executor", - "futures", + "futures 0.3.25", "log", "netlink-packet-route", "netlink-proto", @@ -6478,6 +6963,16 @@ dependencies = [ "tokio", ] +[[package]] +name = "rtoolbox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "034e22c514f5c0cb8a10ff341b9b048b5ceb21591f31c8f44c43b960f9b3524a" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "rtp" version = "0.6.8" @@ -6557,7 +7052,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" dependencies = [ - "base64", + "base64 0.13.0", "log", "ring", "sct 0.6.1", @@ -6594,7 +7089,7 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7522c9de787ff061458fe9a829dc790a3f5b22dc571694fc5883f448b94d9a9" dependencies = [ - "base64", + "base64 0.13.0", ] [[package]] @@ -6609,7 +7104,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26338f5e09bb721b85b135ea05af7767c90b52f6de4f087d4f4a3a9d64e7dc04" dependencies = [ - "futures", + "futures 0.3.25", "pin-project", "static_assertions", ] @@ -6617,9 +7112,9 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.3.0" -source = "git+https://github.com/libp2p/rust-libp2p?rev=be0b62a78fe9d72811b9eda742137cc8ddc4da35#be0b62a78fe9d72811b9eda742137cc8ddc4da35" +source = "git+https://github.com/subspace/rust-libp2p?rev=b700d0c9a12f984936b44f634e79c9f3ee5e342d#b700d0c9a12f984936b44f634e79c9f3ee5e342d" dependencies = [ - "futures", + "futures 0.3.25", "pin-project", "static_assertions", ] @@ -6642,7 +7137,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "log", "sp-core", @@ -6653,9 +7148,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-scale-codec", @@ -6676,7 +7171,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -6692,11 +7187,9 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "impl-trait-for-tuples", "memmap2", - "parity-scale-codec", "sc-chain-spec-derive", "sc-network-common", "sc-telemetry", @@ -6709,7 +7202,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6717,14 +7210,53 @@ dependencies = [ "syn", ] +[[package]] +name = "sc-cli" +version = "0.10.0-dev" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" +dependencies = [ + "array-bytes", + "chrono", + "clap", + "fdlimit", + "futures 0.3.25", + "libp2p 0.50.0", + "log", + "names 0.13.0", + "parity-scale-codec", + "rand 0.8.5", + "regex", + "rpassword", + "sc-client-api", + "sc-client-db", + "sc-keystore", + "sc-network", + "sc-network-common", + "sc-service", + "sc-telemetry", + "sc-tracing", + "sc-utils", + "serde", + "serde_json", + "sp-blockchain", + "sp-core", + "sp-keyring", + "sp-keystore", + "sp-panic-handler", + "sp-runtime", + "sp-version", + "thiserror", + "tiny-bip39", + "tokio", +] + [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "fnv", - "futures", - "hash-db", + "futures 0.3.25", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -6741,14 +7273,13 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-storage", - "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "hash-db", "kvdb", @@ -6772,12 +7303,12 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", - "libp2p 0.49.0", + "libp2p 0.50.0", "log", "mockall", "parking_lot 0.12.1", @@ -6797,7 +7328,7 @@ dependencies = [ [[package]] name = "sc-consensus-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "async-trait", "parity-scale-codec", @@ -6812,10 +7343,10 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "log", "parity-scale-codec", @@ -6830,17 +7361,16 @@ dependencies = [ "sp-inherents", "sp-runtime", "sp-state-machine", - "thiserror", ] [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "async-trait", "fork-tree", - "futures", + "futures 0.3.25", "futures-timer", "log", "lru 0.8.1", @@ -6877,10 +7407,10 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "async-oneshot", - "futures", + "futures 0.3.25", "futures-timer", "jsonrpsee", "log", @@ -6906,7 +7436,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -6930,7 +7460,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -6943,7 +7473,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "log", "sc-allocator", @@ -6956,7 +7486,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "cfg-if", "libc", @@ -6973,15 +7503,14 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "ansi_term", - "futures", + "futures 0.3.25", "futures-timer", "log", "sc-client-api", "sc-network-common", - "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", ] @@ -6989,7 +7518,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "array-bytes", "async-trait", @@ -7004,30 +7533,25 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "array-bytes", "async-trait", "asynchronous-codec", - "bitflags", + "backtrace", "bytes", - "cid", "either", "fnv", - "fork-tree", - "futures", + "futures 0.3.25", "futures-timer", "ip_network", - "libp2p 0.49.0", - "linked-hash-map", - "linked_hash_set", + "libp2p 0.50.0", "log", "lru 0.8.1", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "prost", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-client-api", "sc-consensus", @@ -7051,11 +7575,11 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "cid", - "futures", - "libp2p 0.49.0", + "futures 0.3.25", + "libp2p 0.50.0", "log", "prost", "prost-build", @@ -7065,20 +7589,19 @@ dependencies = [ "sp-runtime", "thiserror", "unsigned-varint", - "void", ] [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", "bitflags", "bytes", - "futures", + "futures 0.3.25", "futures-timer", - "libp2p 0.49.0", + "libp2p 0.50.0", "linked_hash_set", "parity-scale-codec", "prost-build", @@ -7094,14 +7617,32 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-network-gossip" +version = "0.10.0-dev" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" +dependencies = [ + "ahash 0.7.6", + "futures 0.3.25", + "futures-timer", + "libp2p 0.50.0", + "log", + "lru 0.8.1", + "sc-network-common", + "sc-peerset", + "sp-runtime", + "substrate-prometheus-endpoint", + "tracing", +] + [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "array-bytes", - "futures", - "libp2p 0.49.0", + "futures 0.3.25", + "libp2p 0.50.0", "log", "parity-scale-codec", "prost", @@ -7118,13 +7659,13 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "array-bytes", "async-trait", "fork-tree", - "futures", - "libp2p 0.49.0", + "futures 0.3.25", + "libp2p 0.50.0", "log", "lru 0.8.1", "mockall", @@ -7150,17 +7691,17 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "array-bytes", - "futures", - "hex", - "libp2p 0.49.0", + "futures 0.3.25", + "libp2p 0.50.0", "log", "parity-scale-codec", "pin-project", "sc-network-common", "sc-peerset", + "sc-utils", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", @@ -7169,21 +7710,21 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "array-bytes", "bytes", "fnv", - "futures", + "futures 0.3.25", "futures-timer", "hyper", "hyper-rustls", - "libp2p 0.49.0", + "libp2p 0.50.0", "num_cpus", "once_cell", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "sc-client-api", "sc-network-common", "sc-peerset", @@ -7199,10 +7740,10 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", - "libp2p 0.49.0", + "futures 0.3.25", + "libp2p 0.50.0", "log", "sc-utils", "serde_json", @@ -7212,7 +7753,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7221,10 +7762,9 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", - "hash-db", + "futures 0.3.25", "jsonrpsee", "log", "parity-scale-codec", @@ -7251,13 +7791,10 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", "jsonrpsee", - "log", "parity-scale-codec", - "parking_lot 0.12.1", "sc-chain-spec", "sc-transaction-pool-api", "scale-info", @@ -7266,7 +7803,6 @@ dependencies = [ "sp-core", "sp-rpc", "sp-runtime", - "sp-tracing", "sp-version", "thiserror", ] @@ -7274,9 +7810,8 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", "http", "jsonrpsee", "log", @@ -7290,39 +7825,45 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", + "array-bytes", + "futures 0.3.25", + "futures-util", "hex", "jsonrpsee", + "log", "parity-scale-codec", + "parking_lot 0.12.1", "sc-chain-spec", + "sc-client-api", "sc-transaction-pool-api", "serde", "sp-api", "sp-blockchain", "sp-core", "sp-runtime", + "sp-version", "thiserror", + "tokio-stream", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", "directories", "exit-future", - "futures", + "futures 0.3.25", "futures-timer", - "hash-db", "jsonrpsee", "log", "parity-scale-codec", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -7350,19 +7891,15 @@ dependencies = [ "serde", "serde_json", "sp-api", - "sp-application-crypto", - "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-core", "sp-externalities", - "sp-inherents", "sp-keystore", "sp-runtime", "sp-session", "sp-state-machine", "sp-storage", - "sp-tracing", "sp-transaction-pool", "sp-transaction-storage-proof", "sp-trie", @@ -7379,19 +7916,18 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "log", "parity-scale-codec", "parking_lot 0.12.1", - "sc-client-api", "sp-core", ] [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=a2bf9956d6093a51440a16ab72f60d4a4ef71a0a#a2bf9956d6093a51440a16ab72f60d4a4ef71a0a" dependencies = [ "sc-chain-spec", "sc-service", @@ -7404,12 +7940,12 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", + "futures 0.3.25", "libc", "log", - "rand 0.7.3", + "rand 0.8.5", "rand_pcg", "regex", "sc-telemetry", @@ -7423,15 +7959,16 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "chrono", - "futures", - "libp2p 0.49.0", + "futures 0.3.25", + "libp2p 0.50.0", "log", "parking_lot 0.12.1", "pin-project", - "rand 0.7.3", + "rand 0.8.5", + "sc-utils", "serde", "serde_json", "thiserror", @@ -7441,7 +7978,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "ansi_term", "atty", @@ -7472,7 +8009,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7483,10 +8020,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "futures-timer", "linked-hash-map", "log", @@ -7509,10 +8046,10 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "log", "serde", "sp-blockchain", @@ -7523,9 +8060,10 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", + "backtrace", + "futures 0.3.25", "futures-timer", "lazy_static", "log", @@ -7804,6 +8342,18 @@ dependencies = [ "serde", ] +[[package]] +name = "sha-1" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +dependencies = [ + "block-buffer 0.7.3", + "digest 0.8.1", + "fake-simd", + "opaque-debug 0.2.3", +] + [[package]] name = "sha-1" version = "0.9.8" @@ -7987,21 +8537,21 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2" dependencies = [ - "base64", + "base64 0.13.0", "bytes", "flate2", - "futures", + "futures 0.3.25", "http", "httparse", "log", "rand 0.8.5", - "sha-1", + "sha-1 0.9.8", ] [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "hash-db", "log", @@ -8019,7 +8569,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "blake2", "proc-macro-crate", @@ -8031,7 +8581,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "scale-info", @@ -8044,14 +8594,13 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "integer-sqrt", "num-traits", "parity-scale-codec", "scale-info", "serde", - "sp-debug-derive", "sp-std", "static_assertions", ] @@ -8059,7 +8608,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", "parity-scale-codec", @@ -8071,7 +8620,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "sp-api", @@ -8083,9 +8632,9 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures", + "futures 0.3.25", "log", "lru 0.8.1", "parity-scale-codec", @@ -8101,11 +8650,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", - "futures", - "futures-timer", + "futures 0.3.25", "log", "parity-scale-codec", "sp-core", @@ -8120,13 +8668,11 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "scale-info", "serde", - "sp-arithmetic", - "sp-runtime", "sp-std", "sp-timestamp", ] @@ -8134,7 +8680,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "async-trait", "log", @@ -8162,16 +8708,15 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "array-bytes", "base58", "bitflags", "blake2", - "byteorder", "dyn-clonable", "ed25519-zebra", - "futures", + "futures 0.3.25", "hash-db", "hash256-std-hasher", "impl-serde", @@ -8179,11 +8724,10 @@ dependencies = [ "libsecp256k1", "log", "merlin 2.0.1", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", "primitive-types", - "rand 0.7.3", + "rand 0.8.5", "regex", "scale-info", "schnorrkel", @@ -8200,14 +8744,13 @@ dependencies = [ "substrate-bip39", "thiserror", "tiny-bip39", - "wasmi", "zeroize", ] [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "blake2", "byteorder", @@ -8221,7 +8764,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "proc-macro2", "quote", @@ -8232,7 +8775,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -8241,7 +8784,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "proc-macro2", "quote", @@ -8251,7 +8794,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "parity-scale-codec", "sp-api", @@ -8263,7 +8806,7 @@ dependencies = [ [[package]] name = "sp-domain-tracker" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "parity-scale-codec", "sp-api", @@ -8274,7 +8817,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "merlin 2.0.1", "parity-scale-codec", @@ -8298,7 +8841,7 @@ dependencies = [ [[package]] name = "sp-executor-registry" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "parity-scale-codec", "sp-domains", @@ -8308,7 +8851,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "environmental", "parity-scale-codec", @@ -8319,7 +8862,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "finality-grandpa", "log", @@ -8337,7 +8880,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8351,16 +8894,15 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "bytes", + "ed25519", "ed25519-dalek", - "futures", - "hash-db", + "futures 0.3.25", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.12.1", "secp256k1", "sp-core", "sp-externalities", @@ -8370,18 +8912,28 @@ dependencies = [ "sp-std", "sp-tracing", "sp-trie", - "sp-wasm-interface", "tracing", "tracing-core", ] +[[package]] +name = "sp-keyring" +version = "7.0.0" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" +dependencies = [ + "lazy_static", + "sp-core", + "sp-runtime", + "strum", +] + [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", - "futures", + "futures 0.3.25", "merlin 2.0.1", "parity-scale-codec", "parking_lot 0.12.1", @@ -8395,7 +8947,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "thiserror", "zstd", @@ -8404,7 +8956,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "frame-support", "parity-scale-codec", @@ -8419,7 +8971,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "sp-api", "sp-std", @@ -8430,7 +8982,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "sp-api", "sp-core", @@ -8440,7 +8992,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "backtrace", "lazy_static", @@ -8450,7 +9002,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "rustc-hash", "serde", @@ -8460,7 +9012,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "either", "hash256-std-hasher", @@ -8468,7 +9020,7 @@ dependencies = [ "log", "parity-scale-codec", "paste", - "rand 0.7.3", + "rand 0.8.5", "scale-info", "serde", "sp-application-crypto", @@ -8482,7 +9034,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -8500,7 +9052,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "Inflector", "proc-macro-crate", @@ -8512,7 +9064,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "scale-info", @@ -8526,7 +9078,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "scale-info", @@ -8538,14 +9090,13 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "hash-db", "log", - "num-traits", "parity-scale-codec", "parking_lot 0.12.1", - "rand 0.7.3", + "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", @@ -8554,18 +9105,17 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-root", ] [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8578,13 +9128,12 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", "futures-timer", "log", "parity-scale-codec", - "sp-api", "sp-inherents", "sp-runtime", "sp-std", @@ -8594,7 +9143,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "sp-std", @@ -8606,7 +9155,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "sp-api", "sp-runtime", @@ -8615,7 +9164,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "async-trait", "log", @@ -8631,7 +9180,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "ahash 0.7.6", "hash-db", @@ -8654,7 +9203,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "impl-serde", "parity-scale-codec", @@ -8671,7 +9220,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -8682,7 +9231,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "impl-trait-for-tuples", "log", @@ -8695,9 +9244,8 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "impl-trait-for-tuples", "parity-scale-codec", "scale-info", "serde", @@ -8838,7 +9386,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" dependencies = [ - "base64", + "base64 0.13.0", "crc", "lazy_static", "md-5", @@ -8854,7 +9402,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "merkle_light", "parity-scale-codec", @@ -8876,7 +9424,7 @@ dependencies = [ "derive_builder 0.12.0", "dirs", "fdlimit", - "futures", + "futures 0.3.25", "indicatif", "libp2p-core 0.37.0", "serde", @@ -8897,7 +9445,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "ark-bls12-381", "ark-ff", @@ -8925,7 +9473,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "anyhow", "async-trait", @@ -8938,10 +9486,11 @@ dependencies = [ "dirs", "event-listener-primitives", "fdlimit", - "futures", + "futures 0.3.25", "hex", "jemallocator", "jsonrpsee", + "lru 0.8.1", "memmap2", "num-traits", "parity-db", @@ -8973,11 +9522,11 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "async-trait", "fs2", - "futures", + "futures 0.3.25", "libc", "parity-scale-codec", "rand 0.8.5", @@ -8988,14 +9537,13 @@ dependencies = [ "subspace-solving", "subspace-verification", "thiserror", - "tokio", "tracing", ] [[package]] name = "subspace-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "hash-db", "parity-scale-codec", @@ -9007,13 +9555,14 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-trie", + "subspace-wasm-tools", "tracing", ] [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "actix-web", "anyhow", @@ -9023,9 +9572,9 @@ dependencies = [ "clap", "derive_more", "event-listener-primitives", - "futures", + "futures 0.3.25", "hex", - "libp2p 0.50.0", + "libp2p 0.51.0", "lru 0.8.1", "nohash-hasher", "parity-db", @@ -9046,7 +9595,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "hex", "serde", @@ -9058,7 +9607,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -9110,7 +9659,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "parity-scale-codec", "serde", @@ -9123,7 +9672,7 @@ dependencies = [ [[package]] name = "subspace-sdk" version = "0.1.0" -source = "git+https://github.com/subspace/subspace-sdk?rev=04b5b6eba336691bbdc2e7b402fafcd9e561598c#04b5b6eba336691bbdc2e7b402fafcd9e561598c" +source = "git+https://github.com/subspace/subspace-sdk?rev=ec490c16505cbfb9f706ccd42b59a48383b6a3a5#ec490c16505cbfb9f706ccd42b59a48383b6a3a5" dependencies = [ "anyhow", "async-trait", @@ -9133,38 +9682,52 @@ dependencies = [ "bytesize", "bytesize-serde", "core-payments-domain-runtime", + "cross-domain-message-gossip", "derivative", "derive_builder 0.12.0", "derive_more", + "domain-client-message-relayer", "domain-runtime-primitives", + "domain-service", "event-listener-primitives", "frame-support", - "futures", + "frame-system-rpc-runtime-api", + "futures 0.3.25", "jsonrpsee-core", "libp2p-core 0.37.0", - "names", + "names 0.14.0", + "pallet-transaction-payment-rpc-runtime-api", "parity-db", "pin-project", "sc-chain-spec", "sc-client-api", "sc-consensus-slots", + "sc-consensus-subspace", "sc-consensus-subspace-rpc", "sc-executor", "sc-network", "sc-network-common", + "sc-rpc", "sc-rpc-api", "sc-service", "sc-state-db", "sc-subspace-chain-specs", "sc-telemetry", + "sc-utils", "serde", "serde_json", + "sp-api", + "sp-block-builder", "sp-blockchain", "sp-consensus", "sp-consensus-subspace", "sp-core", "sp-domains", + "sp-objects", + "sp-offchain", "sp-runtime", + "sp-session", + "sp-transaction-pool", "sp-version", "ss58-registry", "subspace-archiving", @@ -9187,14 +9750,14 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "backoff", "derive_more", "domain-runtime-primitives", "frame-support", "frame-system-rpc-runtime-api", - "futures", + "futures 0.3.25", "jsonrpsee", "pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc-runtime-api", @@ -9238,6 +9801,7 @@ dependencies = [ "subspace-fraud-proof", "subspace-networking", "subspace-runtime-primitives", + "subspace-transaction-pool", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", "thiserror", @@ -9248,17 +9812,40 @@ dependencies = [ [[package]] name = "subspace-solving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "merlin 2.0.1", "schnorrkel", "subspace-core-primitives", ] +[[package]] +name = "subspace-transaction-pool" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" +dependencies = [ + "domain-runtime-primitives", + "futures 0.3.25", + "jsonrpsee", + "sc-client-api", + "sc-service", + "sc-transaction-pool", + "sc-transaction-pool-api", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-domains", + "sp-runtime", + "sp-transaction-pool", + "subspace-fraud-proof", + "substrate-prometheus-endpoint", + "tracing", +] + [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "merlin 2.0.1", "parity-scale-codec", @@ -9275,7 +9862,11 @@ dependencies = [ [[package]] name = "subspace-wasm-tools" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" +dependencies = [ + "sc-executor-common", + "sp-domains", +] [[package]] name = "substrate-bip39" @@ -9290,20 +9881,26 @@ dependencies = [ "zeroize", ] +[[package]] +name = "substrate-build-script-utils" +version = "3.0.0" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" +dependencies = [ + "platforms", +] + [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "frame-system-rpc-runtime-api", - "futures", + "futures 0.3.25", "jsonrpsee", "log", "parity-scale-codec", - "sc-client-api", "sc-rpc-api", "sc-transaction-pool-api", - "serde_json", "sp-api", "sp-block-builder", "sp-blockchain", @@ -9314,9 +9911,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ - "futures-util", "hyper", "log", "prometheus", @@ -9327,7 +9923,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/subspace/substrate?rev=4682b676af9087e8b5c946c383f75d74633d6809#4682b676af9087e8b5c946c383f75d74633d6809" +source = "git+https://github.com/subspace/substrate?rev=100d6c90d4122578006a47c1dcaf155b9c685f34#100d6c90d4122578006a47c1dcaf155b9c685f34" dependencies = [ "ansi_term", "build-helper", @@ -9403,7 +9999,7 @@ dependencies = [ [[package]] name = "system-domain-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "core-payments-domain-runtime", "domain-pallet-executive", @@ -9447,7 +10043,7 @@ dependencies = [ [[package]] name = "system-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=f0228154ed110c5138dc5769b2cbe3e4f23ca221#f0228154ed110c5138dc5769b2cbe3e4f23ca221" +source = "git+https://github.com/subspace/subspace?rev=1b9431371104b156f68f3a416084b9ea8f3a812f#1b9431371104b156f68f3a416084b9ea8f3a812f" dependencies = [ "parity-scale-codec", "sp-api", @@ -9528,6 +10124,12 @@ dependencies = [ "syn", ] +[[package]] +name = "thousands" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3bf63baf9f5039dadc247375c29eb13706706cfde997d0330d05aa63a77d8820" + [[package]] name = "thread_local" version = "1.1.4" @@ -9586,17 +10188,17 @@ dependencies = [ [[package]] name = "tiny-bip39" -version = "0.8.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc59cb9dfc85bb312c3a78fd6aa8a8582e310b0fa885d5bb877f6dcc601839d" +checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" dependencies = [ "anyhow", - "hmac 0.8.1", + "hmac 0.12.1", "once_cell", - "pbkdf2 0.4.0", - "rand 0.7.3", + "pbkdf2 0.11.0", + "rand 0.8.5", "rustc-hash", - "sha2 0.9.9", + "sha2 0.10.2", "thiserror", "unicode-normalization", "wasm-bindgen", @@ -9983,8 +10585,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" dependencies = [ "async-trait", - "base64", - "futures", + "base64 0.13.0", + "futures 0.3.25", "log", "md-5", "rand 0.8.5", @@ -10331,7 +10933,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures", + "futures 0.3.25", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -10394,7 +10996,7 @@ dependencies = [ "indexmap", "libc", "log", - "object", + "object 0.29.0", "once_cell", "paste", "psm", @@ -10426,7 +11028,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ece42fa4676a263f7558cdaaf5a71c2592bebcbac22a0580e33cf3406c103da2" dependencies = [ "anyhow", - "base64", + "base64 0.13.0", "bincode", "directories-next", "file-per-thread-logger", @@ -10451,9 +11053,9 @@ dependencies = [ "cranelift-frontend", "cranelift-native", "cranelift-wasm", - "gimli", + "gimli 0.26.2", "log", - "object", + "object 0.29.0", "target-lexicon", "thiserror", "wasmparser", @@ -10468,10 +11070,10 @@ checksum = "c7af06848df28b7661471d9a80d30a973e0f401f2e3ed5396ad7e225ed217047" dependencies = [ "anyhow", "cranelift-entity", - "gimli", + "gimli 0.26.2", "indexmap", "log", - "object", + "object 0.29.0", "serde", "target-lexicon", "thiserror", @@ -10485,14 +11087,14 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9028fb63a54185b3c192b7500ef8039c7bb8d7f62bfc9e7c258483a33a3d13bb" dependencies = [ - "addr2line", + "addr2line 0.17.0", "anyhow", "bincode", "cfg-if", "cpp_demangle", - "gimli", + "gimli 0.26.2", "log", - "object", + "object 0.29.0", "rustc-demangle", "rustix", "serde", @@ -10510,7 +11112,7 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25e82d4ef93296785de7efca92f7679dc67fe68a13b625a5ecc8d7503b377a37" dependencies = [ - "object", + "object 0.29.0", "once_cell", "rustix", ] @@ -10676,7 +11278,7 @@ dependencies = [ "rustls 0.19.1", "sec1", "serde", - "sha-1", + "sha-1 0.9.8", "sha2 0.9.9", "signature", "subtle", @@ -10775,7 +11377,7 @@ dependencies = [ "log", "rtcp", "rtp", - "sha-1", + "sha-1 0.9.8", "subtle", "thiserror", "tokio", @@ -11067,7 +11669,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" dependencies = [ "asn1-rs 0.3.1", - "base64", + "base64 0.13.0", "data-encoding", "der-parser 7.0.0", "lazy_static", @@ -11086,7 +11688,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ "asn1-rs 0.5.1", - "base64", + "base64 0.13.0", "data-encoding", "der-parser 8.1.0", "lazy_static", @@ -11103,7 +11705,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5d9ba232399af1783a58d8eb26f6b5006fbefe2dc9ef36bd283324792d03ea5" dependencies = [ - "futures", + "futures 0.3.25", "log", "nohash-hasher", "parking_lot 0.12.1", diff --git a/Cargo.toml b/Cargo.toml index 9fc416fc..b32c3b96 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ tracing-error = "0.2.0" tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } whoami = "1.2.3" -subspace-sdk = { git = "https://github.com/subspace/subspace-sdk", rev = "04b5b6eba336691bbdc2e7b402fafcd9e561598c" } +subspace-sdk = { git = "https://github.com/subspace/subspace-sdk", rev = "ec490c16505cbfb9f706ccd42b59a48383b6a3a5" } [patch.crates-io] # TODO: Remove once chacha20poly1305 0.10 appears in libp2p's dependencies diff --git a/src/commands/farm.rs b/src/commands/farm.rs index dd4b3a3d..6167a68e 100644 --- a/src/commands/farm.rs +++ b/src/commands/farm.rs @@ -47,7 +47,6 @@ pub(crate) async fn farm(is_verbose: bool) -> Result<(Farmer, Node, SingleInstan ChainConfig::Gemini3b => chain_spec::gemini_3b().expect("cannot extract the gemini3b chain spec from SDK"), }; - let node = node_config .node .build(node_config.directory, chain) diff --git a/src/commands/init.rs b/src/commands/init.rs index 029b3244..d1f00d23 100644 --- a/src/commands/init.rs +++ b/src/commands/init.rs @@ -10,7 +10,7 @@ use crate::config::{ use crate::utils::{ cache_directory_getter, get_user_input, node_directory_getter, node_name_parser, plot_directory_getter, plot_directory_parser, print_ascii_art, print_version, - reward_address_parser, size_parser, + reward_address_parser, size_parser, yes_or_no_parser, }; /// implementation of the `init` command @@ -86,6 +86,12 @@ fn get_config_from_user_inputs() -> Result { ChainConfig::from_str, )?; + let is_executor = get_user_input( + "Do you want to be an executor? y/n (defaults to no): ", + Some(false), + yes_or_no_parser, + )?; + let (farmer, node) = match chain { ChainConfig::Gemini3b => ( FarmerConfig::gemini_3b( @@ -94,7 +100,7 @@ fn get_config_from_user_inputs() -> Result { plot_size, CacheDescription::new(cache_directory_getter(), bytesize::ByteSize::gb(1))?, ), - NodeConfig::gemini_3b(node_directory_getter(), node_name), + NodeConfig::gemini_3b(node_directory_getter(), node_name, is_executor), ), }; diff --git a/src/config.rs b/src/config.rs index d9d34238..b10bb7c1 100644 --- a/src/config.rs +++ b/src/config.rs @@ -7,7 +7,8 @@ use color_eyre::eyre::{eyre, Result}; use color_eyre::Report; use serde::{Deserialize, Serialize}; use subspace_sdk::farmer::{CacheDescription, Config as SdkFarmerConfig, Farmer}; -use subspace_sdk::node::{self, Config as SdkNodeConfig, Node}; +use subspace_sdk::node::domains::core::ConfigBuilder; +use subspace_sdk::node::{self, domains, Config as SdkNodeConfig, Node}; use subspace_sdk::PublicKey; use tracing::instrument; @@ -32,40 +33,43 @@ pub(crate) struct NodeConfig { } impl NodeConfig { - pub fn gemini_3b(directory: PathBuf, node_name: String) -> Self { - Self { - directory, - node: Node::builder() - .role(node::Role::Authority) - .network( - node::NetworkBuilder::new() - .listen_addresses(vec![ - "/ip6/::/tcp/30333".parse().expect("hardcoded value is true"), - "/ip4/0.0.0.0/tcp/30333".parse().expect("hardcoded value is true"), - ]) - .name(node_name) - .enable_mdns(true), - ) - .rpc( - node::RpcBuilder::new() - .http("127.0.0.1:9933".parse().expect("hardcoded value is true")) - .ws("127.0.0.1:9944".parse().expect("hardcoded value is true")) - .cors(vec![ - "http://localhost:*".to_owned(), - "http://127.0.0.1:*".to_owned(), - "https://localhost:*".to_owned(), - "https://127.0.0.1:*".to_owned(), - "https://polkadot.js.org".to_owned(), - ]), - ) - .dsn(node::DsnBuilder::new().listen_addresses(vec![ - "/ip6/::/tcp/30433".parse().expect("hardcoded value is true"), - "/ip4/0.0.0.0/tcp/30433".parse().expect("hardcoded value is true"), - ])) - .execution_strategy(node::ExecutionStrategy::AlwaysWasm) - .offchain_worker(node::OffchainWorkerBuilder::new().enabled(true)) - .configuration(), + pub fn gemini_3b(directory: PathBuf, node_name: String, is_executor: bool) -> Self { + let mut node = Node::builder() + .role(node::Role::Authority) + .network( + node::NetworkBuilder::new() + .listen_addresses(vec![ + "/ip6/::/tcp/30333".parse().expect("hardcoded value is true"), + "/ip4/0.0.0.0/tcp/30333".parse().expect("hardcoded value is true"), + ]) + .name(node_name) + .enable_mdns(true), + ) + .rpc( + node::RpcBuilder::new() + .http("127.0.0.1:9933".parse().expect("hardcoded value is true")) + .ws("127.0.0.1:9944".parse().expect("hardcoded value is true")) + .cors(vec![ + "http://localhost:*".to_owned(), + "http://127.0.0.1:*".to_owned(), + "https://localhost:*".to_owned(), + "https://127.0.0.1:*".to_owned(), + "https://polkadot.js.org".to_owned(), + ]), + ) + .dsn(node::DsnBuilder::new().listen_addresses(vec![ + "/ip6/::/tcp/30433".parse().expect("hardcoded value is true"), + "/ip4/0.0.0.0/tcp/30433".parse().expect("hardcoded value is true"), + ])) + .execution_strategy(node::ExecutionStrategy::AlwaysWasm) + .offchain_worker(node::OffchainWorkerBuilder::new().enabled(true)); + + if is_executor { + node = node + .system_domain(domains::ConfigBuilder::new().core(ConfigBuilder::new().build())); } + + Self { directory, node: node.configuration() } } } @@ -184,7 +188,7 @@ mod test { ByteSize::gb(1), CacheDescription::new("cache", ByteSize::gb(1)).unwrap(), ), - node: NodeConfig::gemini_3b("node".into(), "serializable-node".to_owned()), + node: NodeConfig::gemini_3b("node".into(), "serializable-node".to_owned(), false), chain: ChainConfig::Gemini3b, }) .unwrap(); diff --git a/src/utils.rs b/src/utils.rs index cf5e12c1..eb512ae0 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -113,6 +113,14 @@ pub(crate) fn size_parser(size: &str) -> Result { } } +pub(crate) fn yes_or_no_parser(answer: &str) -> Result { + match answer.to_lowercase().as_str() { + "y" | "yes" => Ok(true), + "n" | "no" => Ok(false), + _ => Err(eyre!("could not interpret your answer. Please provide `y` or `n`.")), + } +} + /// generates a plot path from the given path pub(crate) fn plot_directory_getter() -> PathBuf { data_dir_getter().join("plots")