From 8e881dcedbf666c537360eb2a80eb7de3539d3aa Mon Sep 17 00:00:00 2001 From: Nazar Mokrynskyi Date: Fri, 5 Jul 2024 11:56:50 +0300 Subject: [PATCH] Update Subspace to upcoming `gemini-3h-2024-jul-05` release --- Cargo.lock | 1524 +++++++++++++++++++--------------- Cargo.toml | 96 ++- src/backend.rs | 8 +- src/backend/farmer.rs | 25 +- src/backend/networking.rs | 2 +- src/backend/node.rs | 24 +- src/frontend/running/farm.rs | 3 +- src/main.rs | 2 + 8 files changed, 959 insertions(+), 725 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0bdd0135..214e8edd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -49,7 +49,7 @@ dependencies = [ "encoding_rs", "flate2", "futures-core", - "h2 0.3.26", + "h2", "http 0.2.12", "httparse", "httpdate", @@ -59,7 +59,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite 0.2.14", - "rand", + "rand 0.8.5", "sha1", "smallvec", "tokio", @@ -143,9 +143,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.6.0" +version = "4.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cf67dadb19d7c95e5a299e2dda24193b89d5d4f33a3b9800888ede9e19aa32" +checksum = "1988c02af8d2b718c05bc4aeb6a66395b7cdf32858c2c71131e5637a8c05a9ff" dependencies = [ "actix-codec", "actix-http", @@ -184,9 +184,9 @@ dependencies = [ [[package]] name = "actix-web-codegen" -version = "4.2.2" +version = "4.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5" +checksum = "f591380e2e68490b5dfaf1dd1aa0ebe78d84ba7067078512b4ea6e4492d622b8" dependencies = [ "actix-router", "proc-macro2", @@ -388,9 +388,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.83" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25bdb32cbbdce2b519a9cd7df3a678443100e265d5e25ca763b7572a5104f5f3" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "approx" @@ -691,7 +691,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", "rayon", ] @@ -708,12 +708,6 @@ dependencies = [ "sha3", ] -[[package]] -name = "array-bytes" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" - [[package]] name = "array-bytes" version = "6.2.3" @@ -822,8 +816,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "258b52a1aa741b9f09783b2d86cf0aeeb617bbf847f6933340a39644227acbdb" dependencies = [ - "event-listener 5.3.0", - "event-listener-strategy 0.5.2", + "event-listener 5.3.1", + "event-listener-strategy", "futures-core", "pin-project-lite 0.2.14", ] @@ -846,7 +840,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" dependencies = [ "concurrent-queue", - "event-listener-strategy 0.5.2", + "event-listener-strategy", "futures-core", "pin-project-lite 0.2.14", ] @@ -896,12 +890,12 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.3.0" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" +checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18" dependencies = [ - "event-listener 4.0.3", - "event-listener-strategy 0.4.0", + "event-listener 5.3.1", + "event-listener-strategy", "pin-project-lite 0.2.14", ] @@ -928,7 +922,7 @@ dependencies = [ "nuid", "once_cell", "portable-atomic", - "rand", + "rand 0.8.5", "regex", "ring 0.17.8", "rustls-native-certs 0.7.0", @@ -969,7 +963,7 @@ dependencies = [ "async-task", "blocking", "cfg-if", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-lite", "rustix 0.38.34", "tracing", @@ -1121,7 +1115,7 @@ dependencies = [ "getrandom 0.2.15", "instant", "pin-project-lite 0.2.14", - "rand", + "rand 0.8.5", "tokio", ] @@ -1154,7 +1148,7 @@ dependencies = [ "dleq_vrf", "fflonk", "merlin", - "rand_chacha", + "rand_chacha 0.3.1", "rand_core 0.6.4", "ring 0.1.0", "sha2 0.10.8", @@ -1227,7 +1221,7 @@ dependencies = [ "log", "objc2", "once_cell", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "png", "windows 0.56.0", "zbus", @@ -1686,6 +1680,19 @@ dependencies = [ "unsigned-varint 0.7.2", ] +[[package]] +name = "cid" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3" +dependencies = [ + "core2", + "multibase", + "multihash 0.18.1", + "serde", + "unsigned-varint 0.7.2", +] + [[package]] name = "cipher" version = "0.2.5" @@ -1706,15 +1713,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ckb-merkle-mountain-range" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56ccb671c5921be8a84686e6212ca184cb1d7c51cadcdbfcbd1cc3f042f5dfb8" -dependencies = [ - "cfg-if", -] - [[package]] name = "clap" version = "3.2.25" @@ -1734,19 +1732,19 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" +checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d" dependencies = [ "clap_builder", - "clap_derive 4.5.4", + "clap_derive 4.5.8", ] [[package]] name = "clap_builder" -version = "4.5.2" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" +checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708" dependencies = [ "anstream", "anstyle", @@ -1769,9 +1767,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.4" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" +checksum = "2bac35c6dafb060fd4d275d9a4ffae97917c13a6327903a8be2153cd964f7085" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -1862,7 +1860,7 @@ dependencies = [ "fflonk", "getrandom_or_panic", "merlin", - "rand_chacha", + "rand_chacha 0.3.1", ] [[package]] @@ -2129,7 +2127,7 @@ dependencies = [ "anes", "cast", "ciborium", - "clap 4.5.4", + "clap 4.5.8", "criterion-plot", "futures", "is-terminal", @@ -2165,19 +2163,27 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ + "domain-block-preprocessor", + "fp-account", "futures", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", + "sc-client-api", + "sc-executor", "sc-network", "sc-network-gossip", "sc-transaction-pool-api", "sc-utils", + "sp-api", "sp-blockchain", "sp-core", + "sp-domains", "sp-messenger", "sp-runtime", + "subspace-runtime-primitives", + "thiserror", "tracing", ] @@ -2450,15 +2456,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.65", ] [[package]] @@ -2647,7 +2653,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -2659,6 +2665,7 @@ dependencies = [ "sp-block-fees", "sp-blockchain", "sp-core", + "sp-domain-sudo", "sp-domains", "sp-executive", "sp-externalities", @@ -2677,8 +2684,9 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ + "fixed-hash", "fp-account", "frame-support", "frame-system", @@ -2755,10 +2763,19 @@ dependencies = [ "elliptic-curve", "rfc6979", "serdect", - "signature", + "signature 2.2.0", "spki", ] +[[package]] +name = "ed25519" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" +dependencies = [ + "signature 1.6.4", +] + [[package]] name = "ed25519" version = "2.2.3" @@ -2766,7 +2783,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8", - "signature", + "signature 2.2.0", +] + +[[package]] +name = "ed25519-dalek" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d" +dependencies = [ + "curve25519-dalek 3.2.0", + "ed25519 1.5.3", + "rand 0.7.3", + "serde", + "sha2 0.9.9", + "zeroize", ] [[package]] @@ -2776,26 +2807,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871" dependencies = [ "curve25519-dalek 4.1.2", - "ed25519", + "ed25519 2.2.3", "rand_core 0.6.4", "serde", "sha2 0.10.8", - "signature", + "signature 2.2.0", "subtle 2.5.0", "zeroize", ] [[package]] name = "ed25519-zebra" -version = "3.1.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c24f403d068ad0b359e577a77f92392118be3f3c927538f2bb544a5ecd828c6" +checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9" dependencies = [ - "curve25519-dalek 3.2.0", - "hashbrown 0.12.3", + "curve25519-dalek 4.1.2", + "ed25519 2.2.3", + "hashbrown 0.14.5", "hex", "rand_core 0.6.4", - "sha2 0.9.9", + "sha2 0.10.8", "zeroize", ] @@ -2866,9 +2898,9 @@ dependencies = [ [[package]] name = "enum-iterator" -version = "1.5.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd242f399be1da0a5354aa462d57b4ab2b4ee0683cc552f7c007d2d12d36e94" +checksum = "c280b9e6b3ae19e152d8e31cf47f18389781e119d4013a2a2bb0180e5facc635" dependencies = [ "enum-iterator-derive", ] @@ -2948,20 +2980,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" -dependencies = [ - "concurrent-queue", - "parking", - "pin-project-lite 0.2.14", -] - -[[package]] -name = "event-listener" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" dependencies = [ "concurrent-queue", "parking", @@ -2979,23 +3000,13 @@ dependencies = [ "smallvec", ] -[[package]] -name = "event-listener-strategy" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" -dependencies = [ - "event-listener 4.0.3", - "pin-project-lite 0.2.14", -] - [[package]] name = "event-listener-strategy" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1" dependencies = [ - "event-listener 5.3.0", + "event-listener 5.3.1", "pin-project-lite 0.2.14", ] @@ -3136,7 +3147,7 @@ dependencies = [ "log", "num-traits", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "scale-info", ] @@ -3147,7 +3158,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534" dependencies = [ "byteorder", - "rand", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -3226,7 +3237,7 @@ checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b" [[package]] name = "fork-tree" version = "12.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", ] @@ -3240,10 +3251,20 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "forwarded-header-value" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8835f84f38484cc86f110a805655697908257fb9a7af005234060891557198e9" +dependencies = [ + "nonempty", + "thiserror", +] + [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=0596ed9c113fa130d39e54ca3f21a3d0e0aed3be#0596ed9c113fa130d39e54ca3f21a3d0e0aed3be" +source = "git+https://github.com/subspace/frontier?rev=172dedbe8f5f66bd17b768d144433c3d95806a3d#172dedbe8f5f66bd17b768d144433c3d95806a3d" dependencies = [ "hex", "impl-serde", @@ -3256,7 +3277,6 @@ dependencies = [ "sp-io", "sp-runtime", "sp-runtime-interface", - "sp-std", ] [[package]] @@ -3268,7 +3288,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "frame-support", "frame-support-procedural", @@ -3305,10 +3325,10 @@ dependencies = [ [[package]] name = "frame-support" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "aquamarine", - "array-bytes 6.2.3", + "array-bytes", "bitflags 1.3.2", "docify", "environmental", @@ -3346,14 +3366,14 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "23.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "Inflector", "cfg-expr", "derive-syn-parse 0.2.0", "expander", "frame-support-procedural-tools", - "itertools 0.10.5", + "itertools 0.11.0", "macro_magic", "proc-macro-warning", "proc-macro2", @@ -3365,7 +3385,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "10.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 3.1.0", @@ -3377,7 +3397,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "11.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "proc-macro2", "quote", @@ -3387,7 +3407,7 @@ dependencies = [ [[package]] name = "frame-system" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "cfg-if", "docify", @@ -3407,7 +3427,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", "sp-api", @@ -3444,9 +3464,9 @@ dependencies = [ [[package]] name = "fs4" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73969b81e8bc90a3828d913dd3973d80771bfb9d7fbe1a78a79122aad456af15" +checksum = "f7e180ac76c23b45e767bd7ae9579bc0bb458618c4bc71835926e098e61d15f8" dependencies = [ "rustix 0.38.34", "windows-sys 0.52.0", @@ -3599,10 +3619,6 @@ name = "futures-timer" version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24" -dependencies = [ - "gloo-timers", - "send_wrapper", -] [[package]] name = "futures-util" @@ -3739,7 +3755,7 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "rand", + "rand 0.8.5", "rand_core 0.6.4", ] @@ -3855,52 +3871,6 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -[[package]] -name = "gloo-net" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43aaa242d1239a8822c15c645f02166398da4f8b5c4bae795c1f5b44e9eee173" -dependencies = [ - "futures-channel", - "futures-core", - "futures-sink", - "gloo-utils", - "http 0.2.12", - "js-sys", - "pin-project", - "serde", - "serde_json", - "thiserror", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "gloo-timers" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b995a66bb87bebce9a0f4a95aed01daca4872c050bfcb21653361c03bc35e5c" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", -] - -[[package]] -name = "gloo-utils" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b5555354113b18c547c1d3a98fbf7fb32a9ff4f6fa112ce823a21641a0ba3aa" -dependencies = [ - "js-sys", - "serde", - "serde_json", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "gobject-sys" version = "0.18.0" @@ -3924,10 +3894,10 @@ dependencies = [ "futures-timer", "no-std-compat", "nonzero_ext", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "portable-atomic", "quanta", - "rand", + "rand 0.8.5", "smallvec", "spinning_top", ] @@ -4086,25 +4056,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "h2" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" -dependencies = [ - "atomic-waker", - "bytes", - "fnv", - "futures-core", - "futures-sink", - "http 1.1.0", - "indexmap 2.2.6", - "slab", - "tokio", - "tokio-util", - "tracing", -] - [[package]] name = "half" version = "2.4.1" @@ -4243,7 +4194,7 @@ dependencies = [ "idna 0.4.0", "ipnet", "once_cell", - "rand", + "rand 0.8.5", "socket2 0.5.7", "thiserror", "tinyvec", @@ -4264,8 +4215,8 @@ dependencies = [ "ipconfig", "lru-cache", "once_cell", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "resolv-conf", "smallvec", "thiserror", @@ -4414,9 +4365,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwlocality" -version = "1.0.0-alpha.3" +version = "1.0.0-alpha.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07d49e928d0dfa8603bf9ee1161248a91854eda4a31ab4db9313e0b56ac7f3c6" +checksum = "29e2cf498912fab0cb98cae17170e146235dc01b0b6150594d295578f103932e" dependencies = [ "arrayvec", "bitflags 2.5.0", @@ -4458,7 +4409,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.26", + "h2", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -4481,7 +4432,6 @@ dependencies = [ "bytes", "futures-channel", "futures-util", - "h2 0.4.5", "http 1.1.0", "http-body 1.0.0", "httparse", @@ -4525,24 +4475,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "hyper-rustls" -version = "0.27.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" -dependencies = [ - "futures-util", - "http 1.1.0", - "hyper 1.3.1", - "hyper-util", - "log", - "rustls 0.23.8", - "rustls-pki-types", - "tokio", - "tokio-rustls 0.26.0", - "tower-service", -] - [[package]] name = "hyper-util" version = "0.1.3" @@ -4669,7 +4601,7 @@ dependencies = [ "http 0.2.12", "hyper 0.14.28", "log", - "rand", + "rand 0.8.5", "tokio", "url", "xmltree", @@ -4958,11 +4890,8 @@ version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95a130d27083a4001b7b2d72a19f08786299550f76c9bd5307498dce2c2b20fa" dependencies = [ - "jsonrpsee-client-transport", "jsonrpsee-core 0.23.1", - "jsonrpsee-http-client", "jsonrpsee-types 0.23.1", - "jsonrpsee-wasm-client", "jsonrpsee-ws-client", ] @@ -4973,9 +4902,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "039db9fe25cd63b7221c3f8788c1ef4ea07987d40ec25a1e7d7a3c3e3e3fd130" dependencies = [ "base64 0.22.1", - "futures-channel", "futures-util", - "gloo-net", "http 1.1.0", "jsonrpsee-core 0.23.1", "pin-project", @@ -5003,8 +4930,8 @@ dependencies = [ "futures-util", "hyper 0.14.28", "jsonrpsee-types 0.22.5", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -5022,12 +4949,8 @@ dependencies = [ "anyhow", "async-trait", "beef", - "bytes", "futures-timer", "futures-util", - "http 1.1.0", - "http-body 1.0.0", - "http-body-util", "jsonrpsee-types 0.23.1", "pin-project", "rustc-hash", @@ -5037,32 +4960,6 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "wasm-bindgen-futures", -] - -[[package]] -name = "jsonrpsee-http-client" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb25cab482c8512c4f3323a5c90b95a3b8f7c90681a87bf7a68b942d52f08933" -dependencies = [ - "async-trait", - "base64 0.22.1", - "http-body 1.0.0", - "hyper 1.3.1", - "hyper-rustls 0.27.2", - "hyper-util", - "jsonrpsee-core 0.23.1", - "jsonrpsee-types 0.23.1", - "rustls 0.23.8", - "rustls-platform-verifier", - "serde", - "serde_json", - "thiserror", - "tokio", - "tower", - "tracing", - "url", ] [[package]] @@ -5128,17 +5025,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "jsonrpsee-wasm-client" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8a6dfa0c35c8549fa8e003ce0bbcf37b051ab7ef85fce587e8f0ed7881c84d" -dependencies = [ - "jsonrpsee-client-transport", - "jsonrpsee-core 0.23.1", - "jsonrpsee-types 0.23.1", -] - [[package]] name = "jsonrpsee-ws-client" version = "0.23.1" @@ -5197,7 +5083,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2" dependencies = [ "kvdb", - "parking_lot 0.12.2", + "parking_lot 0.12.3", ] [[package]] @@ -5235,9 +5121,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" -version = "0.1.37" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81eb4061c0582dedea1cbc7aff2240300dd6982e0239d1c99e65c1dbf4a30ba7" +checksum = "23aa6811d3bd4deb8a84dde645f943476d13b248d818edcf8ce0b2f37f036b44" dependencies = [ "cc", "libc", @@ -5355,7 +5241,7 @@ dependencies = [ "libp2p-swarm 0.44.2", "quick-protobuf", "quick-protobuf-codec 0.2.0", - "rand", + "rand 0.8.5", "tracing", ] @@ -5400,10 +5286,10 @@ dependencies = [ "multihash 0.17.0", "multistream-select 0.12.1", "once_cell", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", "quick-protobuf", - "rand", + "rand 0.8.5", "rw-stream-sink 0.3.0", "smallvec", "thiserror", @@ -5427,10 +5313,10 @@ dependencies = [ "multihash 0.19.1", "multistream-select 0.13.0", "once_cell", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", "quick-protobuf", - "rand", + "rand 0.8.5", "rw-stream-sink 0.4.0", "serde", "smallvec", @@ -5449,9 +5335,9 @@ dependencies = [ "futures", "libp2p-core 0.39.2", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "smallvec", - "trust-dns-resolver", + "trust-dns-resolver 0.22.0", ] [[package]] @@ -5465,7 +5351,7 @@ dependencies = [ "hickory-resolver", "libp2p-core 0.41.2", "libp2p-identity 0.2.8", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "smallvec", "tracing", ] @@ -5493,7 +5379,7 @@ dependencies = [ "prometheus-client 0.22.2", "quick-protobuf", "quick-protobuf-codec 0.3.1", - "rand", + "rand 0.8.5", "regex", "serde", "sha2 0.10.8", @@ -5554,12 +5440,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "log", "multiaddr 0.17.1", "multihash 0.17.0", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.8", "thiserror", "zeroize", @@ -5572,11 +5458,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ "bs58 0.5.1", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "hkdf", "multihash 0.19.1", "quick-protobuf", - "rand", + "rand 0.8.5", "serde", "sha2 0.10.8", "thiserror", @@ -5603,7 +5489,7 @@ dependencies = [ "libp2p-swarm 0.42.2", "log", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.8", "smallvec", "thiserror", @@ -5632,7 +5518,7 @@ dependencies = [ "libp2p-swarm 0.44.2", "quick-protobuf", "quick-protobuf-codec 0.3.1", - "rand", + "rand 0.8.5", "serde", "sha2 0.10.8", "smallvec", @@ -5655,11 +5541,11 @@ dependencies = [ "libp2p-identity 0.1.3", "libp2p-swarm 0.42.2", "log", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.4.10", "tokio", - "trust-dns-proto", + "trust-dns-proto 0.22.0", "void", ] @@ -5676,7 +5562,7 @@ dependencies = [ "libp2p-core 0.41.2", "libp2p-identity 0.2.8", "libp2p-swarm 0.44.2", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.5.7", "tokio", @@ -5731,7 +5617,7 @@ dependencies = [ "log", "once_cell", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.8", "snow", "static_assertions", @@ -5756,7 +5642,7 @@ dependencies = [ "multihash 0.19.1", "once_cell", "quick-protobuf", - "rand", + "rand 0.8.5", "sha2 0.10.8", "snow", "static_assertions", @@ -5779,7 +5665,7 @@ dependencies = [ "libp2p-core 0.39.2", "libp2p-swarm 0.42.2", "log", - "rand", + "rand 0.8.5", "void", ] @@ -5796,7 +5682,7 @@ dependencies = [ "libp2p-core 0.41.2", "libp2p-identity 0.2.8", "libp2p-swarm 0.44.2", - "rand", + "rand 0.8.5", "tracing", "void", ] @@ -5831,9 +5717,9 @@ dependencies = [ "libp2p-identity 0.1.3", "libp2p-tls 0.1.0", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "quinn-proto 0.9.6", - "rand", + "rand 0.8.5", "rustls 0.20.9", "thiserror", "tokio", @@ -5852,9 +5738,9 @@ dependencies = [ "libp2p-core 0.41.2", "libp2p-identity 0.2.8", "libp2p-tls 0.3.0", - "parking_lot 0.12.2", - "quinn", - "rand", + "parking_lot 0.12.3", + "quinn 0.10.2", + "rand 0.8.5", "ring 0.16.20", "rustls 0.21.12", "socket2 0.5.7", @@ -5875,7 +5761,7 @@ dependencies = [ "libp2p-core 0.39.2", "libp2p-identity 0.1.3", "libp2p-swarm 0.42.2", - "rand", + "rand 0.8.5", "smallvec", ] @@ -5893,7 +5779,7 @@ dependencies = [ "libp2p-core 0.41.2", "libp2p-identity 0.2.8", "libp2p-swarm 0.44.2", - "rand", + "rand 0.8.5", "smallvec", "tracing", "void", @@ -5914,7 +5800,7 @@ dependencies = [ "libp2p-identity 0.1.3", "libp2p-swarm-derive 0.32.0", "log", - "rand", + "rand 0.8.5", "smallvec", "tokio", "void", @@ -5937,7 +5823,7 @@ dependencies = [ "lru 0.12.3", "multistream-select 0.13.0", "once_cell", - "rand", + "rand 0.8.5", "smallvec", "tokio", "tracing", @@ -6079,7 +5965,7 @@ dependencies = [ "futures-rustls 0.22.2", "libp2p-core 0.39.2", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "quicksink", "rw-stream-sink 0.3.0", "soketto 0.7.1", @@ -6138,7 +6024,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand", + "rand 0.8.5", "serde", "sha2 0.9.9", "typenum", @@ -6232,6 +6118,59 @@ dependencies = [ "keystream", ] +[[package]] +name = "litep2p" +version = "0.5.0" +source = "git+https://github.com/subspace/litep2p?rev=331240c0184e9e8939ef9b113963dc58b43e2f92#331240c0184e9e8939ef9b113963dc58b43e2f92" +dependencies = [ + "async-trait", + "bs58 0.4.0", + "bytes", + "cid 0.10.1", + "ed25519-dalek 1.0.1", + "futures", + "futures-timer", + "hex-literal", + "indexmap 2.2.6", + "libc", + "mockall 0.12.1", + "multiaddr 0.17.1", + "multihash 0.17.0", + "network-interface", + "nohash-hasher", + "parking_lot 0.12.3", + "pin-project", + "prost 0.11.9", + "prost-build 0.11.9", + "quinn 0.9.4", + "rand 0.8.5", + "rcgen 0.10.0", + "ring 0.16.20", + "rustls 0.20.9", + "serde", + "sha2 0.10.8", + "simple-dns", + "smallvec", + "snow", + "socket2 0.5.7", + "static_assertions", + "thiserror", + "tokio", + "tokio-stream", + "tokio-tungstenite", + "tokio-util", + "tracing", + "trust-dns-resolver 0.23.2", + "uint", + "unsigned-varint 0.7.2", + "url", + "webpki", + "x25519-dalek 2.0.1", + "x509-parser 0.15.1", + "yasna", + "zeroize", +] + [[package]] name = "local-channel" version = "0.1.5" @@ -6384,15 +6323,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "matchers" version = "0.1.0" @@ -6492,9 +6422,9 @@ dependencies = [ [[package]] name = "mimalloc" -version = "0.1.41" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f41a2280ded0da56c8cf898babb86e8f10651a34adcfff190ae9a1159c6908d" +checksum = "68914350ae34959d83f732418d51e2427a794055d0b9529f48259ac07af65633" dependencies = [ "libmimalloc-sys", ] @@ -6549,9 +6479,9 @@ dependencies = [ "hashlink", "lioness", "log", - "parking_lot 0.12.2", - "rand", - "rand_chacha", + "parking_lot 0.12.3", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_distr", "subtle 2.5.0", "thiserror", @@ -6561,7 +6491,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "29.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "futures", "log", @@ -6580,7 +6510,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "jsonrpsee 0.22.5", "parity-scale-codec", @@ -6602,14 +6532,29 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", - "predicates", + "mockall_derive 0.11.4", + "predicates 2.1.5", "predicates-tree", ] [[package]] -name = "mockall_derive" -version = "0.11.4" +name = "mockall" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "lazy_static", + "mockall_derive 0.12.1", + "predicates 3.1.0", + "predicates-tree", +] + +[[package]] +name = "mockall_derive" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb" dependencies = [ @@ -6619,6 +6564,18 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "mockall_derive" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.65", +] + [[package]] name = "multiaddr" version = "0.17.1" @@ -6685,6 +6642,23 @@ dependencies = [ "unsigned-varint 0.7.2", ] +[[package]] +name = "multihash" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815" +dependencies = [ + "blake2b_simd", + "blake2s_simd", + "blake3", + "core2", + "digest 0.10.7", + "multihash-derive", + "sha2 0.10.8", + "sha3", + "unsigned-varint 0.7.2", +] + [[package]] name = "multihash" version = "0.19.1" @@ -6778,7 +6752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc" dependencies = [ "clap 3.2.25", - "rand", + "rand 0.8.5", ] [[package]] @@ -6879,6 +6853,18 @@ dependencies = [ "tokio", ] +[[package]] +name = "network-interface" +version = "1.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4a43439bf756eed340bdf8feba761e2d50c7d47175d87545cd5cbe4a137c4d1" +dependencies = [ + "cc", + "libc", + "thiserror", + "winapi", +] + [[package]] name = "nix" version = "0.24.3" @@ -6910,11 +6896,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc522a19199a0795776406619aa6aa78e1e55690fbeb3181b8db5265fd0e89ce" dependencies = [ "data-encoding", - "ed25519", - "ed25519-dalek", + "ed25519 2.2.3", + "ed25519-dalek 2.1.1", "getrandom 0.2.15", "log", - "rand", + "rand 0.8.5", "signatory", ] @@ -6940,6 +6926,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nonempty" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9e591e719385e6ebaeb5ce5d3887f7d5676fceca6411d1925ccc95745f3d6f7" + [[package]] name = "nonzero_ext" version = "0.3.0" @@ -6968,7 +6960,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc895af95856f929163a0aa20c26a78d26bfdc839f51b9d5aa7a5b79e52b7e83" dependencies = [ - "rand", + "rand 0.8.5", ] [[package]] @@ -7185,9 +7177,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "open" -version = "5.1.3" +version = "5.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb49fbd5616580e9974662cb96a3463da4476e649a7e4b258df0de065db0657" +checksum = "9d2c909a3fce3bd80efef4cd1c6c056bd9376a8fe06fcfdbebaf32cb485a7e37" dependencies = [ "is-wsl", "libc", @@ -7251,7 +7243,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pallet-balances" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "docify", "frame-support", @@ -7266,7 +7258,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "27.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "frame-benchmarking", "frame-support", @@ -7284,7 +7276,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "frame-support", "frame-system", @@ -7300,7 +7292,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "30.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "jsonrpsee 0.22.5", "pallet-transaction-payment-rpc-runtime-api", @@ -7316,7 +7308,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7357,7 +7349,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9" dependencies = [ "bitcoin_hashes", - "rand", + "rand 0.8.5", "rand_core 0.6.4", "serde", "unicode-normalization", @@ -7377,8 +7369,8 @@ dependencies = [ "log", "lz4", "memmap2 0.5.10", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "siphasher", "snap", "winapi", @@ -7442,9 +7434,9 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e4af0ca4f6caed20e900d564c242b8e5d4903fdacf31d3daf527b66fe6f42fb" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", "parking_lot_core 0.9.10", @@ -7644,6 +7636,16 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "polkadot-ckb-merkle-mountain-range" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a4b44320e5f7ce2c18227537a3032ae5b2c476a7e8eddba45333e1011fc31b92" +dependencies = [ + "cfg-if", + "itertools 0.10.5", +] + [[package]] name = "polkavm" version = "0.9.3" @@ -7782,6 +7784,16 @@ dependencies = [ "regex", ] +[[package]] +name = "predicates" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" +dependencies = [ + "anstyle", + "predicates-core", +] + [[package]] name = "predicates-core" version = "1.0.6" @@ -7818,6 +7830,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "prettyplease" +version = "0.2.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +dependencies = [ + "proc-macro2", + "syn 2.0.65", +] + [[package]] name = "primitive-types" version = "0.12.2" @@ -7913,7 +7935,7 @@ dependencies = [ "fnv", "lazy_static", "memchr", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "thiserror", ] @@ -7925,7 +7947,7 @@ checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "prometheus-client-derive-encode", ] @@ -7937,7 +7959,7 @@ checksum = "c1ca959da22a332509f2a73ae9e5f23f9dcfc31fd3a54d71f159495bd5909baa" dependencies = [ "dtoa", "itoa", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "prometheus-client-derive-encode", ] @@ -7985,15 +8007,36 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", + "prettyplease 0.1.11", "prost 0.11.9", - "prost-types", + "prost-types 0.11.9", "regex", "syn 1.0.109", "tempfile", "which", ] +[[package]] +name = "prost-build" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +dependencies = [ + "bytes", + "heck 0.5.0", + "itertools 0.12.1", + "log", + "multimap", + "once_cell", + "petgraph", + "prettyplease 0.2.20", + "prost 0.12.6", + "prost-types 0.12.6", + "regex", + "syn 2.0.65", + "tempfile", +] + [[package]] name = "prost-derive" version = "0.11.9" @@ -8029,6 +8072,15 @@ dependencies = [ "prost 0.11.9", ] +[[package]] +name = "prost-types" +version = "0.12.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +dependencies = [ + "prost 0.12.6", +] + [[package]] name = "psm" version = "0.1.21" @@ -8128,6 +8180,24 @@ dependencies = [ "pin-project-lite 0.1.12", ] +[[package]] +name = "quinn" +version = "0.9.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e" +dependencies = [ + "bytes", + "pin-project-lite 0.2.14", + "quinn-proto 0.9.6", + "quinn-udp 0.3.2", + "rustc-hash", + "rustls 0.20.9", + "thiserror", + "tokio", + "tracing", + "webpki", +] + [[package]] name = "quinn" version = "0.10.2" @@ -8138,7 +8208,7 @@ dependencies = [ "futures-io", "pin-project-lite 0.2.14", "quinn-proto 0.10.6", - "quinn-udp", + "quinn-udp 0.4.1", "rustc-hash", "rustls 0.21.12", "thiserror", @@ -8153,7 +8223,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", - "rand", + "rand 0.8.5", "ring 0.16.20", "rustc-hash", "rustls 0.20.9", @@ -8171,7 +8241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a" dependencies = [ "bytes", - "rand", + "rand 0.8.5", "ring 0.16.20", "rustc-hash", "rustls 0.21.12", @@ -8181,6 +8251,19 @@ dependencies = [ "tracing", ] +[[package]] +name = "quinn-udp" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4" +dependencies = [ + "libc", + "quinn-proto 0.9.6", + "socket2 0.4.10", + "tracing", + "windows-sys 0.42.0", +] + [[package]] name = "quinn-udp" version = "0.4.1" @@ -8209,6 +8292,19 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "rand" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +dependencies = [ + "getrandom 0.1.16", + "libc", + "rand_chacha 0.2.2", + "rand_core 0.5.1", + "rand_hc", +] + [[package]] name = "rand" version = "0.8.5" @@ -8216,10 +8312,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha", + "rand_chacha 0.3.1", "rand_core 0.6.4", ] +[[package]] +name = "rand_chacha" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +dependencies = [ + "ppv-lite86", + "rand_core 0.5.1", +] + [[package]] name = "rand_chacha" version = "0.3.1" @@ -8255,7 +8361,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand", + "rand 0.8.5", +] + +[[package]] +name = "rand_hc" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +dependencies = [ + "rand_core 0.5.1", ] [[package]] @@ -8938,7 +9053,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "23.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "log", "sp-core", @@ -8949,7 +9064,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.34.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "futures", "futures-timer", @@ -8971,7 +9086,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", "sp-api", @@ -8985,10 +9100,10 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "27.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +version = "28.0.0" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "docify", "log", "memmap2 0.9.4", @@ -9007,12 +9122,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-state-machine", + "sp-tracing", ] [[package]] name = "sc-chain-spec-derive" version = "11.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -9023,13 +9139,13 @@ dependencies = [ [[package]] name = "sc-client-api" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "fnv", "futures", "log", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -9050,7 +9166,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.35.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "hash-db", "kvdb", @@ -9059,7 +9175,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sc-client-api", "sc-state-db", "schnellru", @@ -9075,17 +9191,16 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-lock", "async-trait", "futures", - "futures-timer", - "libp2p-identity 0.1.3", "log", - "mockall", - "parking_lot 0.12.2", + "mockall 0.11.4", + "parking_lot 0.12.3", "sc-client-api", + "sc-network-types", "sc-utils", "serde", "sp-api", @@ -9102,7 +9217,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "futures", @@ -9125,14 +9240,14 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-trait", "futures", "parity-scale-codec", - "parking_lot 0.12.2", - "rand", - "rand_chacha", + "parking_lot 0.12.3", + "rand 0.8.5", + "rand_chacha 0.3.1", "rayon", "sc-client-api", "sc-consensus", @@ -9165,14 +9280,14 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-oneshot", "futures", "futures-timer", "jsonrpsee 0.22.5", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sc-client-api", "sc-consensus-subspace", "sc-rpc", @@ -9198,7 +9313,7 @@ dependencies = [ [[package]] name = "sc-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "sc-client-api", "sc-executor", @@ -9218,10 +9333,10 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.32.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sc-executor-common", "sc-executor-polkavm", "sc-executor-wasmtime", @@ -9241,7 +9356,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.29.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "polkavm", "sc-allocator", @@ -9254,7 +9369,7 @@ dependencies = [ [[package]] name = "sc-executor-polkavm" version = "0.29.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "log", "polkavm", @@ -9265,13 +9380,13 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.29.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rustix 0.36.17", "sc-allocator", "sc-executor-common", @@ -9283,7 +9398,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "ansi_term", "futures", @@ -9300,10 +9415,10 @@ dependencies = [ [[package]] name = "sc-keystore" version = "25.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", - "parking_lot 0.12.2", + "array-bytes", + "parking_lot 0.12.3", "serde_json", "sp-application-crypto", "sp-core", @@ -9314,22 +9429,22 @@ dependencies = [ [[package]] name = "sc-mixnet" version = "0.4.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 4.2.0", + "array-bytes", "arrayvec", "blake2 0.10.6", "bytes", "futures", "futures-timer", - "libp2p-identity 0.1.3", "log", "mixnet", "multiaddr 0.17.1", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sc-client-api", "sc-network", + "sc-network-types", "sc-transaction-pool-api", "sp-api", "sp-consensus", @@ -9343,13 +9458,14 @@ dependencies = [ [[package]] name = "sc-network" version = "0.34.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "async-channel 1.9.0", "async-trait", "asynchronous-codec 0.6.2", "bytes", + "cid 0.9.0", "either", "fnv", "futures", @@ -9357,16 +9473,22 @@ dependencies = [ "ip_network", "libp2p 0.51.4", "linked_hash_set", + "litep2p", "log", - "mockall", + "mockall 0.11.4", + "once_cell", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "partial_sort", "pin-project", - "rand", + "prost 0.12.6", + "prost-build 0.12.6", + "rand 0.8.5", "sc-client-api", "sc-network-common", + "sc-network-types", "sc-utils", + "schnellru", "serde", "serde_json", "smallvec", @@ -9379,42 +9501,24 @@ dependencies = [ "tokio", "tokio-stream", "unsigned-varint 0.7.2", + "void", "wasm-timer", "zeroize", ] -[[package]] -name = "sc-network-bitswap" -version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" -dependencies = [ - "async-channel 1.9.0", - "cid", - "futures", - "libp2p-identity 0.1.3", - "log", - "prost 0.12.6", - "prost-build", - "sc-client-api", - "sc-network", - "sp-blockchain", - "sp-runtime", - "thiserror", - "unsigned-varint 0.7.2", -] - [[package]] name = "sc-network-common" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "bitflags 1.3.2", "futures", "libp2p-identity 0.1.3", "parity-scale-codec", - "prost-build", + "prost-build 0.12.6", "sc-consensus", + "sc-network-types", "sp-consensus", "sp-consensus-grandpa", "sp-runtime", @@ -9423,7 +9527,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.34.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "ahash 0.8.11", "futures", @@ -9433,6 +9537,7 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-sync", + "sc-network-types", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", @@ -9442,18 +9547,18 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "async-channel 1.9.0", "futures", - "libp2p-identity 0.1.3", "log", "parity-scale-codec", "prost 0.12.6", - "prost-build", + "prost-build 0.12.6", "sc-client-api", "sc-network", + "sc-network-types", "sp-blockchain", "sp-core", "sp-runtime", @@ -9463,9 +9568,9 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "async-channel 1.9.0", "async-trait", "fork-tree", @@ -9473,14 +9578,15 @@ dependencies = [ "futures-timer", "libp2p 0.51.4", "log", - "mockall", + "mockall 0.11.4", "parity-scale-codec", "prost 0.12.6", - "prost-build", + "prost-build 0.12.6", "sc-client-api", "sc-consensus", "sc-network", "sc-network-common", + "sc-network-types", "sc-utils", "schnellru", "smallvec", @@ -9499,9 +9605,9 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "futures", "libp2p 0.51.4", "log", @@ -9509,18 +9615,35 @@ dependencies = [ "sc-network", "sc-network-common", "sc-network-sync", + "sc-network-types", "sc-utils", "sp-consensus", "sp-runtime", "substrate-prometheus-endpoint", ] +[[package]] +name = "sc-network-types" +version = "0.10.0" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" +dependencies = [ + "bs58 0.5.1", + "ed25519-dalek 2.1.1", + "libp2p-identity 0.1.3", + "litep2p", + "multiaddr 0.17.1", + "multihash 0.17.0", + "rand 0.8.5", + "thiserror", + "zeroize", +] + [[package]] name = "sc-offchain" version = "29.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "bytes", "fnv", "futures", @@ -9532,11 +9655,12 @@ dependencies = [ "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "sc-client-api", "sc-network", "sc-network-common", + "sc-network-types", "sc-transaction-pool-api", "sc-utils", "sp-api", @@ -9552,14 +9676,14 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "atomic", "core_affinity", "derive_more", "futures", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rayon", "sc-client-api", "sc-consensus-slots", @@ -9583,7 +9707,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.17.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9592,13 +9716,13 @@ dependencies = [ [[package]] name = "sc-rpc" version = "29.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "futures", "jsonrpsee 0.22.5", "log", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -9624,7 +9748,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.33.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "jsonrpsee 0.22.5", "parity-scale-codec", @@ -9644,12 +9768,14 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "11.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ + "forwarded-header-value", "futures", "governor", "http 0.2.12", "hyper 0.14.28", + "ip_network", "jsonrpsee 0.22.5", "log", "serde_json", @@ -9662,22 +9788,23 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.34.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "futures", "futures-util", "hex", "jsonrpsee 0.22.5", "log", "parity-scale-codec", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "sc-chain-spec", "sc-client-api", "sc-rpc", "sc-transaction-pool-api", "sc-utils", + "schnellru", "serde", "sp-api", "sp-blockchain", @@ -9693,7 +9820,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.35.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "directories", @@ -9703,9 +9830,9 @@ dependencies = [ "jsonrpsee 0.22.5", "log", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -9714,11 +9841,11 @@ dependencies = [ "sc-informant", "sc-keystore", "sc-network", - "sc-network-bitswap", "sc-network-common", "sc-network-light", "sc-network-sync", "sc-network-transactions", + "sc-network-types", "sc-rpc", "sc-rpc-server", "sc-rpc-spec-v2", @@ -9757,20 +9884,20 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.30.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "log", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sp-core", ] [[package]] name = "sc-storage-monitor" version = "0.16.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "clap 4.5.4", + "clap 4.5.8", "fs4 0.7.0", "log", "sp-core", @@ -9781,14 +9908,14 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-channel 1.9.0", "async-trait", "derive_more", "futures", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sc-client-api", "sc-network", "sc-network-common", @@ -9806,18 +9933,18 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" [[package]] name = "sc-sysinfo" version = "27.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "derive_more", "futures", "libc", "log", - "rand", + "rand 0.8.5", "rand_pcg", "regex", "sc-telemetry", @@ -9832,15 +9959,16 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "15.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "chrono", "futures", "libp2p 0.51.4", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", + "sc-network", "sc-utils", "serde", "serde_json", @@ -9851,7 +9979,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "ansi_term", "chrono", @@ -9860,7 +9988,7 @@ dependencies = [ "libc", "log", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "regex", "rustc-hash", "sc-client-api", @@ -9874,14 +10002,14 @@ dependencies = [ "sp-tracing", "thiserror", "tracing", - "tracing-log 0.1.4", - "tracing-subscriber 0.2.25", + "tracing-log", + "tracing-subscriber", ] [[package]] name = "sc-tracing-proc-macro" version = "11.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "proc-macro-crate 3.1.0", "proc-macro2", @@ -9892,7 +10020,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "futures", @@ -9900,7 +10028,7 @@ dependencies = [ "linked-hash-map", "log", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sc-client-api", "sc-transaction-pool-api", "sc-utils", @@ -9919,7 +10047,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "futures", @@ -9935,14 +10063,14 @@ dependencies = [ [[package]] name = "sc-utils" version = "14.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-channel 1.9.0", "futures", "futures-timer", "lazy_static", "log", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "prometheus", "sp-arithmetic", ] @@ -10100,12 +10228,6 @@ version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -[[package]] -name = "send_wrapper" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f638d531eccd6e23b980caf34876660d38e265409d8e99b397ab71eb3612fad0" - [[package]] name = "seq-macro" version = "0.3.5" @@ -10114,9 +10236,9 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "226b61a0d411b2ba5ff6d7f73a476ac4f8bb900373459cd00fab8512828ba395" +checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" dependencies = [ "serde_derive", ] @@ -10141,9 +10263,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.202" +version = "1.0.203" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6048858004bcff69094cd972ed40a32500f153bd3be9f716b2eed2e8217c4838" +checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" dependencies = [ "proc-macro2", "quote", @@ -10152,9 +10274,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.117" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -10306,10 +10428,16 @@ checksum = "c1e303f8205714074f6068773f0e29527e0453937fe837c9717d066635b65f31" dependencies = [ "pkcs8", "rand_core 0.6.4", - "signature", + "signature 2.2.0", "zeroize", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" + [[package]] name = "signature" version = "2.2.0" @@ -10339,6 +10467,15 @@ version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" +[[package]] +name = "simple-dns" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694" +dependencies = [ + "bitflags 2.5.0", +] + [[package]] name = "simple-mermaid" version = "0.1.1" @@ -10437,7 +10574,7 @@ dependencies = [ "http 0.2.12", "httparse", "log", - "rand", + "rand 0.8.5", "sha-1", ] @@ -10452,14 +10589,14 @@ dependencies = [ "futures", "httparse", "log", - "rand", + "rand 0.8.5", "sha1", ] [[package]] name = "sp-api" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "hash-db", "log", @@ -10481,7 +10618,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "15.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "Inflector", "blake2 0.10.6", @@ -10495,7 +10632,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "30.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", "scale-info", @@ -10508,7 +10645,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "23.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "docify", "integer-sqrt", @@ -10541,7 +10678,7 @@ dependencies = [ [[package]] name = "sp-auto-id" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10555,7 +10692,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "sp-api", "sp-inherents", @@ -10565,7 +10702,7 @@ dependencies = [ [[package]] name = "sp-block-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -10577,15 +10714,16 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "futures", "log", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "schnellru", "sp-api", "sp-consensus", + "sp-core", "sp-database", "sp-runtime", "sp-state-machine", @@ -10595,7 +10733,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.32.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "futures", @@ -10610,7 +10748,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "13.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "lazy_static", "parity-scale-codec", @@ -10630,7 +10768,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "13.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "finality-grandpa", "log", @@ -10647,7 +10785,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.32.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", "scale-info", @@ -10658,7 +10796,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-trait", "log", @@ -10685,9 +10823,9 @@ dependencies = [ [[package]] name = "sp-core" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "array-bytes 6.2.3", + "array-bytes", "bandersnatch_vrfs", "bitflags 1.3.2", "blake2 0.10.6", @@ -10699,17 +10837,17 @@ dependencies = [ "hash-db", "hash256-std-hasher", "impl-serde", - "itertools 0.10.5", + "itertools 0.11.0", "k256", "libsecp256k1", "log", "merlin", "parity-bip39", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "paste", "primitive-types", - "rand", + "rand 0.8.5", "scale-info", "schnorrkel", "secp256k1", @@ -10732,7 +10870,7 @@ dependencies = [ [[package]] name = "sp-crypto-ec-utils" version = "0.10.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "ark-bls12-377", "ark-bls12-377-ext", @@ -10751,8 +10889,8 @@ dependencies = [ [[package]] name = "sp-crypto-hashing" -version = "0.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +version = "0.1.0" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "blake2b_simd", "byteorder", @@ -10764,8 +10902,8 @@ dependencies = [ [[package]] name = "sp-crypto-hashing-proc-macro" -version = "0.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +version = "0.1.0" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "quote", "sp-crypto-hashing", @@ -10775,16 +10913,16 @@ dependencies = [ [[package]] name = "sp-database" version = "10.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "kvdb", - "parking_lot 0.12.2", + "parking_lot 0.12.3", ] [[package]] name = "sp-debug-derive" version = "14.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "proc-macro2", "quote", @@ -10794,16 +10932,27 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "parity-scale-codec", "sp-runtime", ] +[[package]] +name = "sp-domain-sudo" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" +dependencies = [ + "async-trait", + "parity-scale-codec", + "sp-api", + "sp-inherents", +] + [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "blake2 0.10.6", "domain-runtime-primitives", @@ -10812,8 +10961,8 @@ dependencies = [ "hexlit", "memory-db", "parity-scale-codec", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "rs_merkle", "scale-info", "serde", @@ -10835,7 +10984,7 @@ dependencies = [ [[package]] name = "sp-domains-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", @@ -10870,7 +11019,7 @@ dependencies = [ [[package]] name = "sp-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-trait", "parity-scale-codec", @@ -10880,7 +11029,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.25.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "environmental", "parity-scale-codec", @@ -10889,9 +11038,11 @@ dependencies = [ [[package]] name = "sp-genesis-builder" -version = "0.7.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +version = "0.8.0" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ + "parity-scale-codec", + "scale-info", "serde_json", "sp-api", "sp-runtime", @@ -10900,7 +11051,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10913,10 +11064,10 @@ dependencies = [ [[package]] name = "sp-io" version = "30.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "bytes", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "libsecp256k1", "log", "parity-scale-codec", @@ -10939,10 +11090,10 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.34.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "sp-core", "sp-externalities", ] @@ -10950,7 +11101,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "11.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "thiserror", "zstd 0.12.4", @@ -10959,7 +11110,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-trait", "frame-support", @@ -10981,7 +11132,7 @@ dependencies = [ [[package]] name = "sp-messenger-host-functions" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "domain-block-preprocessor", "parity-scale-codec", @@ -11000,7 +11151,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.6.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -11010,7 +11161,7 @@ dependencies = [ [[package]] name = "sp-mixnet" version = "0.4.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", "scale-info", @@ -11021,11 +11172,11 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ - "ckb-merkle-mountain-range", "log", "parity-scale-codec", + "polkadot-ckb-merkle-mountain-range", "scale-info", "serde", "sp-api", @@ -11038,7 +11189,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "sp-api", "subspace-core-primitives", @@ -11048,7 +11199,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "sp-api", "sp-core", @@ -11058,7 +11209,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "13.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "backtrace", "lazy_static", @@ -11068,7 +11219,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "rustc-hash", "serde", @@ -11078,16 +11229,17 @@ dependencies = [ [[package]] name = "sp-runtime" version = "31.0.1" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "docify", "either", "hash256-std-hasher", "impl-trait-for-tuples", "log", + "num-traits", "parity-scale-codec", "paste", - "rand", + "rand 0.8.5", "scale-info", "serde", "simple-mermaid", @@ -11102,7 +11254,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "24.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11121,7 +11273,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "17.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "Inflector", "expander", @@ -11134,7 +11286,7 @@ dependencies = [ [[package]] name = "sp-session" version = "27.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", "scale-info", @@ -11148,7 +11300,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11161,13 +11313,13 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.35.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "hash-db", "log", "parity-scale-codec", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "smallvec", "sp-core", "sp-externalities", @@ -11181,14 +11333,14 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "10.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "aes-gcm", "curve25519-dalek 4.1.2", - "ed25519-dalek", + "ed25519-dalek 2.1.1", "hkdf", "parity-scale-codec", - "rand", + "rand 0.8.5", "scale-info", "sha2 0.10.8", "sp-api", @@ -11205,12 +11357,12 @@ dependencies = [ [[package]] name = "sp-std" version = "14.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" [[package]] name = "sp-storage" version = "19.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11222,7 +11374,7 @@ dependencies = [ [[package]] name = "sp-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "parity-scale-codec", "scale-info", @@ -11239,7 +11391,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "parity-scale-codec", @@ -11251,18 +11403,18 @@ dependencies = [ [[package]] name = "sp-tracing" version = "16.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", "tracing", "tracing-core", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] name = "sp-transaction-pool" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "sp-api", "sp-runtime", @@ -11271,7 +11423,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "26.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "async-trait", "parity-scale-codec", @@ -11285,7 +11437,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "29.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "ahash 0.8.11", "hash-db", @@ -11293,8 +11445,8 @@ dependencies = [ "memory-db", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "scale-info", "schnellru", "sp-core", @@ -11308,7 +11460,7 @@ dependencies = [ [[package]] name = "sp-version" version = "29.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11325,7 +11477,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "13.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11336,7 +11488,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "20.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11348,7 +11500,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "27.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "bounded-collections", "parity-scale-codec", @@ -11361,7 +11513,7 @@ dependencies = [ [[package]] name = "space-acres" -version = "0.1.24" +version = "0.1.25" dependencies = [ "anyhow", "arc-swap", @@ -11371,28 +11523,27 @@ dependencies = [ "backoff", "betrayer", "bytesize", - "clap 4.5.4", + "clap 4.5.8", "dark-light", "dirs 5.0.1", "duct", "event-listener-primitives", "file-rotate", "frame-system", - "fs4 0.8.3", + "fs4 0.8.4", "futures", "futures-timer", "gtk4", "hex", "image", "indoc", - "libp2p-identity 0.1.3", "mimalloc", "names", "native-dialog", "open", "pallet-balances", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "relm4", "relm4-components", "relm4-icons", @@ -11403,6 +11554,7 @@ dependencies = [ "sc-consensus-subspace", "sc-informant", "sc-network", + "sc-network-types", "sc-rpc", "sc-service", "sc-storage-monitor", @@ -11437,7 +11589,7 @@ dependencies = [ "thread-priority", "tokio", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber", "winres", ] @@ -11553,11 +11705,11 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.26.2" +version = "0.26.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" dependencies = [ - "heck 0.4.1", + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -11567,7 +11719,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "parity-scale-codec", "rayon", @@ -11580,7 +11732,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "blake3", "bytes", @@ -11589,7 +11741,7 @@ dependencies = [ "kzg", "num-traits", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rayon", "rust-kzg-blst", "scale-info", @@ -11604,7 +11756,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "kzg", "rust-kzg-blst", @@ -11614,7 +11766,7 @@ dependencies = [ [[package]] name = "subspace-fake-runtime-api" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "domain-runtime-primitives", "frame-support", @@ -11645,7 +11797,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "anyhow", "async-lock", @@ -11657,13 +11809,13 @@ dependencies = [ "blake3", "bytes", "bytesize", - "clap 4.5.4", + "clap 4.5.8", "criterion", "derive_more", - "event-listener 5.3.0", + "event-listener 5.3.1", "event-listener-primitives", "fdlimit", - "fs4 0.8.3", + "fs4 0.8.4", "futures", "hex", "hwlocality", @@ -11671,10 +11823,10 @@ dependencies = [ "mimalloc", "num_cpus", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", "prometheus-client 0.22.2", - "rand", + "rand 0.8.5", "rayon", "schnellru", "schnorrkel", @@ -11696,8 +11848,9 @@ dependencies = [ "thiserror", "thread-priority", "tokio", + "tokio-stream", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber", "ulid", "zeroize", ] @@ -11705,7 +11858,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-lock", "async-trait", @@ -11716,8 +11869,8 @@ dependencies = [ "hex", "libc", "parity-scale-codec", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "rayon", "schnorrkel", "serde", @@ -11736,7 +11889,7 @@ dependencies = [ [[package]] name = "subspace-metrics" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "actix-web", "prometheus", @@ -11747,13 +11900,13 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-mutex", "async-trait", "backoff", "bytes", - "clap 4.5.4", + "clap 4.5.8", "derive_more", "either", "event-listener-primitives", @@ -11765,10 +11918,10 @@ dependencies = [ "memmap2 0.9.4", "nohash-hasher", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", "prometheus-client 0.22.2", - "rand", + "rand 0.8.5", "schnellru", "serde", "serde_json", @@ -11777,7 +11930,7 @@ dependencies = [ "thiserror", "tokio", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber", "unsigned-varint 0.8.0", "void", ] @@ -11785,11 +11938,11 @@ dependencies = [ [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "chacha20", "derive_more", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "rayon", "seq-macro", "sha2 0.10.8", @@ -11800,7 +11953,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "aes", "subspace-core-primitives", @@ -11810,7 +11963,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "hex", "parity-scale-codec", @@ -11823,7 +11976,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "frame-support", "frame-system", @@ -11838,7 +11991,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "async-trait", "cross-domain-message-gossip", @@ -11852,7 +12005,7 @@ dependencies = [ "pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "prometheus-client 0.22.2", "prost 0.12.6", "sc-basic-authorship", @@ -11916,7 +12069,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=870bc43614db409cfa588ca57b1be9bbd3aa7155#870bc43614db409cfa588ca57b1be9bbd3aa7155" +source = "git+https://github.com/subspace/subspace?rev=95b4183fe1d5de7ac96a6961e42ac7053e3360f4#95b4183fe1d5de7ac96a6961e42ac7053e3360f4" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -11929,7 +12082,7 @@ dependencies = [ [[package]] name = "substrate-bip39" version = "0.4.7" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "hmac 0.12.1", "pbkdf2", @@ -11954,7 +12107,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "28.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11973,7 +12126,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.17.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6#6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" +source = "git+https://github.com/subspace/polkadot-sdk?rev=0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef#0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" dependencies = [ "hyper 0.14.28", "log", @@ -12146,18 +12299,18 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "1.0.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", @@ -12273,7 +12426,7 @@ dependencies = [ "libc", "mio", "num_cpus", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project-lite 0.2.14", "signal-hook-registry", "socket2 0.5.7", @@ -12336,6 +12489,21 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "tokio-tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" +dependencies = [ + "futures-util", + "log", + "rustls 0.21.12", + "rustls-native-certs 0.6.3", + "tokio", + "tokio-rustls 0.24.1", + "tungstenite", +] + [[package]] name = "tokio-util" version = "0.7.11" @@ -12504,17 +12672,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tracing-log" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -12526,55 +12683,23 @@ dependencies = [ "tracing-core", ] -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "parking_lot 0.11.2", - "regex", - "serde", - "serde_json", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log 0.1.4", - "tracing-serde", -] - [[package]] name = "tracing-subscriber" version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", + "parking_lot 0.12.3", "regex", "sharded-slab", "smallvec", "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] @@ -12599,12 +12724,11 @@ dependencies = [ [[package]] name = "trie-db" -version = "0.28.0" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" +checksum = "0c992b4f40c234a074d48a757efeabb1a6be88af84c0c23f7ca158950cb0ae7f" dependencies = [ "hash-db", - "hashbrown 0.13.2", "log", "rustc-hex", "smallvec", @@ -12635,7 +12759,7 @@ dependencies = [ "idna 0.2.3", "ipnet", "lazy_static", - "rand", + "rand 0.8.5", "smallvec", "socket2 0.4.10", "thiserror", @@ -12645,6 +12769,31 @@ dependencies = [ "url", ] +[[package]] +name = "trust-dns-proto" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374" +dependencies = [ + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner 0.6.0", + "futures-channel", + "futures-io", + "futures-util", + "idna 0.4.0", + "ipnet", + "once_cell", + "rand 0.8.5", + "smallvec", + "thiserror", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "trust-dns-resolver" version = "0.22.0" @@ -12656,13 +12805,34 @@ dependencies = [ "ipconfig", "lazy_static", "lru-cache", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "resolv-conf", "smallvec", "thiserror", "tokio", "tracing", - "trust-dns-proto", + "trust-dns-proto 0.22.0", +] + +[[package]] +name = "trust-dns-resolver" +version = "0.23.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6" +dependencies = [ + "cfg-if", + "futures-util", + "ipconfig", + "lru-cache", + "once_cell", + "parking_lot 0.12.3", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror", + "tokio", + "tracing", + "trust-dns-proto 0.23.2", ] [[package]] @@ -12688,6 +12858,26 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" +[[package]] +name = "tungstenite" +version = "0.20.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" +dependencies = [ + "byteorder", + "bytes", + "data-encoding", + "http 0.2.12", + "httparse", + "log", + "rand 0.8.5", + "rustls 0.21.12", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "twox-hash" version = "1.6.3" @@ -12696,7 +12886,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.7", - "rand", + "rand 0.8.5", "static_assertions", ] @@ -12736,7 +12926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34778c17965aa2a08913b57e1f34db9b4a63f5de31768b55bf20d2795f921259" dependencies = [ "getrandom 0.2.15", - "rand", + "rand 0.8.5", "serde", "web-time", ] @@ -12788,6 +12978,7 @@ dependencies = [ "bytes", "futures-io", "futures-util", + "tokio-util", ] [[package]] @@ -12825,6 +13016,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf-8" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" + [[package]] name = "utf8parse" version = "0.2.1" @@ -12886,8 +13083,8 @@ dependencies = [ "arrayref", "constcat", "digest 0.10.7", - "rand", - "rand_chacha", + "rand 0.8.5", + "rand_chacha 0.3.1", "rand_core 0.6.4", "sha2 0.10.8", "sha3", @@ -13201,7 +13398,7 @@ dependencies = [ "memfd", "memoffset 0.8.0", "paste", - "rand", + "rand 0.8.5", "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", @@ -13419,6 +13616,21 @@ dependencies = [ "windows-targets 0.52.5", ] +[[package]] +name = "windows-sys" +version = "0.42.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -13810,8 +14022,8 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.2", - "rand", + "parking_lot 0.12.3", + "rand 0.8.5", "static_assertions", ] @@ -13824,9 +14036,9 @@ dependencies = [ "futures", "log", "nohash-hasher", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", "static_assertions", ] @@ -13840,9 +14052,9 @@ dependencies = [ "instant", "log", "nohash-hasher", - "parking_lot 0.12.2", + "parking_lot 0.12.3", "pin-project", - "rand", + "rand 0.8.5", "static_assertions", ] @@ -13872,14 +14084,14 @@ dependencies = [ "async-trait", "blocking", "enumflags2", - "event-listener 5.3.0", + "event-listener 5.3.1", "futures-core", "futures-sink", "futures-util", "hex", "nix 0.28.0", "ordered-stream", - "rand", + "rand 0.8.5", "serde", "serde_repr", "sha1", @@ -13939,9 +14151,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde" dependencies = [ "zeroize_derive", ] diff --git a/Cargo.toml b/Cargo.toml index 64b38c81..9726cdcd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -2,7 +2,7 @@ name = "space-acres" description = "Space Acres is an opinionated GUI application for farming on Subspace Network" license = "0BSD" -version = "0.1.24" +version = "0.1.25" authors = ["Nazar Mokrynskyi "] repository = "https://github.com/subspace/space-acres" edition = "2021" @@ -35,77 +35,76 @@ product-icon = "res/windows/space-acres.ico" product-name = "Space Acres" [dependencies] -anyhow = "1.0.83" +anyhow = "1.0.86" arc-swap = "1.7.1" -async-lock = "3.3.0" +async-lock = "3.4.0" async-oneshot = "0.5.9" async-trait = "0.1.80" backoff = { version = "0.4.0", features = ["futures", "tokio"] } betrayer = { version = "0.2.0" } bytesize = "1.3.0" -clap = { version = "4.5.4", features = ["derive"] } +clap = { version = "4.5.8", features = ["derive"] } dark-light = "1.1.1" dirs = "5.0.1" duct = "0.13.7" event-listener-primitives = "2.0.1" -file-rotate = "0.7.5" -frame-system = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -fs4 = "0.8.3" +file-rotate = "0.7.6" +frame-system = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +fs4 = "0.8.4" futures = "0.3.30" futures-timer = "3.0.3" gtk = { version = "0.7.3", package = "gtk4" } hex = "0.4.3" image = { version = "0.25.1", default-features = false, features = ["png"] } indoc = "2.0.5" -# Substrate uses old version of libp2p -libp2p-identity-substate = { version = "0.1.3", package = "libp2p-identity" } mimalloc = "0.1.41" names = "0.14.0" -open = "5.1.2" -pallet-balances = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } +open = "5.2.0" +pallet-balances = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } parity-scale-codec = "3.6.12" -parking_lot = "0.12.2" +parking_lot = "0.12.3" relm4 = "0.7.0-rc.1" relm4-components = { version = "0.7.0-rc.1", default-features = false } relm4-icons = { version = "0.7.0-alpha.2", features = ["checkmark", "cross", "grid-filled", "menu-large", "pause", "processor", "puzzle-piece", "size-horizontally", "ssd", "wallet2", "warning"] } reqwest = { version = "0.12.4", default-features = false, features = ["json", "rustls-tls"] } -sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sc-client-db = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sc-consensus-slots = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -sc-informant = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sc-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -sc-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } +sc-client-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-client-db = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-consensus-slots = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +sc-informant = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-network = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-network-types = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-rpc = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-service = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-storage-monitor = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +sc-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } schnellru = "0.2.3" semver = "1.0.23" -serde = { version = "1.0.202", features = ["derive"] } -serde_json = "1.0.117" +serde = { version = "1.0.203", features = ["derive"] } +serde_json = "1.0.120" simple_moving_average = "1.0.2" -sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sp-blockchain = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sp-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -sp-objects = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6", default-features = false } -subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "870bc43614db409cfa588ca57b1be9bbd3aa7155" } +sp-api = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sp-blockchain = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sp-consensus = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +sp-core = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +sp-objects = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +sp-runtime = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef", default-features = false } +subspace-archiving = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-fake-runtime-api = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "95b4183fe1d5de7ac96a6961e42ac7053e3360f4" } supports-color = "3.0.0" -thiserror = "1.0.60" +thiserror = "1.0.61" thread-priority = "1.1.0" tokio = { version = "1.38.0", features = ["fs", "time"] } tracing = "0.1.40" @@ -192,6 +191,11 @@ panic = "unwind" inherits = "release" lto = "fat" +# TODO: Remove fork when https://github.com/paritytech/polkadot-sdk/issues/4856 and/or https://github.com/paritytech/litep2p/issues/161 +# are resolved (our fork removes WebRTC support by default in order to avoid OpenSSL dependency) +[patch.crates-io] +litep2p = { git = "https://github.com/subspace/litep2p", rev = "331240c0184e9e8939ef9b113963dc58b43e2f92" } + [patch."https://github.com/paritytech/polkadot-sdk.git"] # TODO: https://github.com/paritytech/arkworks-substrate depends on Substrate's git commit and requires override -sp-crypto-ec-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "6da3c45e1d5b3c1f09b5e54152b8848149f9d5e6" } +sp-crypto-ec-utils = { git = "https://github.com/subspace/polkadot-sdk", rev = "0cbfcb0232bbf71ac5b14cc8c99bf043cec420ef" } diff --git a/src/backend.rs b/src/backend.rs index 3e455741..64c66324 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -30,13 +30,13 @@ use std::sync::{Arc, Weak}; use std::time::Duration; use subspace_core_primitives::crypto::kzg::{embedded_kzg_settings, Kzg}; use subspace_core_primitives::{BlockNumber, Piece, PieceIndex, PublicKey}; +use subspace_farmer::farm::plotted_pieces::PlottedPieces; use subspace_farmer::farmer_cache::{FarmerCache, FarmerCacheWorker}; -use subspace_farmer::single_disk_farm::SingleDiskFarm; -use subspace_farmer::utils::farmer_piece_getter::{ +use subspace_farmer::farmer_piece_getter::piece_validator::SegmentCommitmentPieceValidator; +use subspace_farmer::farmer_piece_getter::{ DsnCacheRetryPolicy, FarmerPieceGetter, WeakFarmerPieceGetter, }; -use subspace_farmer::utils::piece_validator::SegmentCommitmentPieceValidator; -use subspace_farmer::utils::plotted_pieces::PlottedPieces; +use subspace_farmer::single_disk_farm::SingleDiskFarm; use subspace_farmer::utils::run_future_in_dedicated_thread; use subspace_farmer_components::PieceGetter; use subspace_networking::libp2p::identity::ed25519::{Keypair, SecretKey}; diff --git a/src/backend/farmer.rs b/src/backend/farmer.rs index c7e6f212..b97e246e 100644 --- a/src/backend/farmer.rs +++ b/src/backend/farmer.rs @@ -4,7 +4,7 @@ pub(super) mod maybe_node_client; use crate::backend::farmer::maybe_node_client::MaybeNodeClient; use crate::backend::utils::{Handler, HandlerFn}; use crate::backend::PieceGetterWrapper; -use crate::PosTable; +use crate::{PosTable, PosTableLegacy}; use anyhow::anyhow; use async_lock::{Mutex as AsyncMutex, RwLock as AsyncRwLock}; use event_listener_primitives::HandlerId; @@ -23,6 +23,7 @@ use std::{fmt, fs}; use subspace_core_primitives::crypto::kzg::Kzg; use subspace_core_primitives::{PublicKey, Record, SectorIndex}; use subspace_erasure_coding::ErasureCoding; +use subspace_farmer::farm::plotted_pieces::PlottedPieces; use subspace_farmer::farm::{ FarmingNotification, PlottedSectors, SectorPlottingDetails, SectorUpdate, }; @@ -32,7 +33,6 @@ use subspace_farmer::plotter::cpu::CpuPlotter; use subspace_farmer::single_disk_farm::{ SingleDiskFarm, SingleDiskFarmError, SingleDiskFarmOptions, }; -use subspace_farmer::utils::plotted_pieces::PlottedPieces; use subspace_farmer::utils::{ create_plotting_thread_pool_manager, recommended_number_of_farming_threads, run_future_in_dedicated_thread, thread_pool_core_indices, AsyncJoinOnDrop, @@ -295,8 +295,17 @@ where )?; let global_mutex = Arc::default(); - let plotter = Arc::new(CpuPlotter::<_, PosTable>::new( - piece_getter, + let legacy_cpu_plotter = Arc::new(CpuPlotter::<_, PosTableLegacy>::new( + piece_getter.clone(), + Arc::clone(&downloading_semaphore), + plotting_thread_pool_manager.clone(), + record_encoding_concurrency, + Arc::clone(&global_mutex), + kzg.clone(), + erasure_coding.clone(), + )); + let modern_cpu_plotter = Arc::new(CpuPlotter::<_, PosTable>::new( + piece_getter.clone(), downloading_semaphore, plotting_thread_pool_manager.clone(), record_encoding_concurrency, @@ -325,7 +334,8 @@ where let max_pieces_in_sector = farmer_app_info.protocol_info.max_pieces_in_sector; let kzg = kzg.clone(); let erasure_coding = erasure_coding.clone(); - let plotter = Arc::clone(&plotter); + let plotter_legacy = Arc::clone(&legacy_cpu_plotter); + let plotter = Arc::clone(&modern_cpu_plotter); let global_mutex = Arc::clone(&global_mutex); let faster_read_sector_record_chunks_mode_barrier = Arc::clone(&faster_read_sector_record_chunks_mode_barrier); @@ -333,7 +343,7 @@ where Arc::clone(&faster_read_sector_record_chunks_mode_concurrency); async move { - let farm_fut = SingleDiskFarm::new::<_, _, PosTable>( + let farm_fut = SingleDiskFarm::new::<_, PosTableLegacy, PosTable>( SingleDiskFarmOptions { directory: disk_farm.directory.clone(), farmer_app_info, @@ -341,6 +351,8 @@ where max_pieces_in_sector, node_client, reward_address, + plotter_legacy, + plotter, kzg, erasure_coding, cache_percentage: CACHE_PERCENTAGE.get(), @@ -351,7 +363,6 @@ where read_sector_record_chunks_mode: None, faster_read_sector_record_chunks_mode_barrier, faster_read_sector_record_chunks_mode_concurrency, - plotter, create: true, }, farm_index, diff --git a/src/backend/networking.rs b/src/backend/networking.rs index 23230580..d2bde092 100644 --- a/src/backend/networking.rs +++ b/src/backend/networking.rs @@ -4,9 +4,9 @@ use std::fmt; use std::hash::Hash; use std::path::Path; use std::sync::{Arc, Weak}; +use subspace_farmer::farm::plotted_pieces::PlottedPieces; use subspace_farmer::farmer_cache::FarmerCache; use subspace_farmer::node_client::NodeClientExt; -use subspace_farmer::utils::plotted_pieces::PlottedPieces; use subspace_farmer::KNOWN_PEERS_CACHE_SIZE; use subspace_networking::libp2p::identity::ed25519::Keypair; use subspace_networking::libp2p::kad::RecordKey; diff --git a/src/backend/node.rs b/src/backend/node.rs index 37c59dd4..569d53ed 100644 --- a/src/backend/node.rs +++ b/src/backend/node.rs @@ -17,7 +17,7 @@ use sc_client_db::PruningMode; use sc_consensus_slots::SlotProportion; use sc_informant::OutputFormat; use sc_network::config::{Ed25519Secret, NodeKeyConfig, NonReservedPeerMode, SetConfig, SyncMode}; -use sc_service::{BlocksPruning, Configuration, GenericChainSpec}; +use sc_service::{BlocksPruning, Configuration, GenericChainSpec, NoExtension}; use sc_storage_monitor::{StorageMonitorParams, StorageMonitorService}; use serde_json::Value; use sp_core::crypto::Ss58AddressFormat; @@ -25,7 +25,7 @@ use sp_core::storage::StorageKey; use sp_core::H256; use sp_runtime::traits::Header; use std::fmt; -use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4}; +use std::net::{Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4}; use std::path::PathBuf; use std::sync::atomic::{AtomicBool, Ordering}; use std::sync::Arc; @@ -290,7 +290,7 @@ fn get_total_account_balance( } pub(super) fn load_chain_specification(chain_spec: &'static [u8]) -> Result { - GenericChainSpec::<()>::from_json_bytes(chain_spec) + GenericChainSpec::::from_json_bytes(chain_spec) .map(|chain_spec| ChainSpec(Box::new(chain_spec))) } @@ -377,18 +377,22 @@ fn create_consensus_chain_config( transaction_pool: Default::default(), network: SubstrateNetworkConfiguration { listen_on: vec![ - sc_network::Multiaddr::from(IpAddr::V4(Ipv4Addr::UNSPECIFIED)) - .with(sc_network::multiaddr::Protocol::Tcp(substrate_port)), - sc_network::Multiaddr::from(IpAddr::V6(Ipv6Addr::UNSPECIFIED)) - .with(sc_network::multiaddr::Protocol::Tcp(substrate_port)), + sc_network::Multiaddr::from(sc_network::multiaddr::Protocol::Ip4( + Ipv4Addr::UNSPECIFIED, + )) + .with(sc_network::multiaddr::Protocol::Tcp(substrate_port)), + sc_network::Multiaddr::from(sc_network::multiaddr::Protocol::Ip6( + Ipv6Addr::UNSPECIFIED, + )) + .with(sc_network::multiaddr::Protocol::Tcp(substrate_port)), ], public_addresses: Vec::new(), bootstrap_nodes: chain_spec.0.boot_nodes().to_vec(), node_key: NodeKeyConfig::Ed25519(Ed25519Secret::Input( - libp2p_identity_substate::ed25519::SecretKey::try_from_bytes( + sc_network_types::ed25519::SecretKey::try_from_bytes( keypair.secret().as_ref().to_vec(), ) - .expect("Correct keypair, just libp2p version is different; qed"), + .expect("Correct secret; qed"), )), default_peers_set: SetConfig { // Substrate's default @@ -420,6 +424,8 @@ fn create_consensus_chain_config( methods: Default::default(), // Substrate's default rate_limit: None, + rate_limit_whitelisted_ips: vec![], + rate_limit_trust_proxy_headers: false, max_subscriptions_per_connection: 1024, message_buffer_capacity_per_connection: 64, disable_batch_requests: false, diff --git a/src/frontend/running/farm.rs b/src/frontend/running/farm.rs index 903d802f..3434ad80 100644 --- a/src/frontend/running/farm.rs +++ b/src/frontend/running/farm.rs @@ -9,9 +9,8 @@ use std::sync::Arc; use std::time::Duration; use subspace_core_primitives::SectorIndex; use subspace_farmer::farm::{ - FarmingNotification, SectorExpirationDetails, SectorPlottingDetails, SectorUpdate, + FarmingError, FarmingNotification, SectorExpirationDetails, SectorPlottingDetails, SectorUpdate, }; -use subspace_farmer::single_disk_farm::FarmingError; use tracing::error; /// Experimentally found number that is good for default window size to not have horizontal scroll diff --git a/src/main.rs b/src/main.rs index 3c6df80a..f1da5e12 100644 --- a/src/main.rs +++ b/src/main.rs @@ -33,6 +33,7 @@ use std::thread::available_parallelism; use std::{env, fs, io, process}; use subspace_farmer::utils::{run_future_in_dedicated_thread, AsyncJoinOnDrop}; use subspace_proof_of_space::chia::ChiaTable; +use subspace_proof_of_space::chia_legacy::ChiaTableLegacy; use tracing::{error, info, warn}; use tracing_subscriber::filter::LevelFilter; use tracing_subscriber::prelude::*; @@ -86,6 +87,7 @@ const ABOUT_IMAGE: &[u8] = include_bytes!("../res/about.png"); #[cfg(any(target_os = "macos", target_os = "linux"))] const TRAY_ICON: &[u8] = include_bytes!("../res/linux/space-acres.png"); +type PosTableLegacy = ChiaTableLegacy; type PosTable = ChiaTable; #[derive(Debug)]