From 32e026b4a9aefe1063c95315633dc319f1578d27 Mon Sep 17 00:00:00 2001 From: Parth Desai Date: Sun, 4 Feb 2024 18:56:44 +0530 Subject: [PATCH 1/5] upgrade pulsar to gemini-3h-2024-feb-01 release --- Cargo.lock | 3837 ++++++++--------- Cargo.toml | 82 +- pulsar/Cargo.toml | 2 +- pulsar/src/commands/init.rs | 2 +- pulsar/src/config.rs | 16 +- pulsar/src/tests.rs | 2 +- rust-toolchain.toml | 2 +- sdk/dsn/Cargo.toml | 12 +- sdk/dsn/src/builder.rs | 31 +- sdk/farmer/Cargo.toml | 16 +- sdk/farmer/src/lib.rs | 38 +- sdk/node/Cargo.toml | 80 +- sdk/node/src/builder.rs | 14 +- sdk/node/src/chain_spec.rs | 181 +- sdk/node/src/domains/builder.rs | 27 +- .../src/domains/domain_instance_starter.rs | 15 +- sdk/node/src/domains/evm_chain_spec.rs | 64 +- .../domains/evm_domain_executor_dispatch.rs | 19 - sdk/node/src/domains/mod.rs | 1 - sdk/node/src/lib.rs | 68 +- sdk/subspace-sdk/Cargo.toml | 4 +- sdk/subspace-sdk/examples/mini-farmer.rs | 8 +- sdk/subspace-sdk/examples/sync.rs | 16 +- sdk/substrate/Cargo.toml | 17 +- sdk/substrate/src/lib.rs | 118 +- sdk/substrate/src/types.rs | 2 +- sdk/traits/Cargo.toml | 8 +- sdk/utils/Cargo.toml | 32 +- sdk/utils/src/lib.rs | 13 +- 29 files changed, 2088 insertions(+), 2639 deletions(-) delete mode 100644 sdk/node/src/domains/evm_domain_executor_dispatch.rs diff --git a/Cargo.lock b/Cargo.lock index ec631353..0fdba8dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -31,17 +31,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.4.0" +version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92ef85799cba03f76e4f7c10f533e66d87c9a7e7055f3391f09000ad8351bc9" +checksum = "129d4c88e98860e1758c5de288d1632b07970a16d59bdf7b8d66053d582bb71f" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.3", - "base64 0.21.5", - "bitflags 2.4.0", + "ahash 0.8.7", + "base64 0.21.7", + "bitflags 2.4.2", "brotli", "bytes", "bytestring", @@ -65,7 +65,7 @@ dependencies = [ "tokio", "tokio-util", "tracing", - "zstd 0.12.4", + "zstd 0.13.0", ] [[package]] @@ -75,14 +75,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb" dependencies = [ "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "actix-router" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d66ff4d247d2b160861fa2866457e85706833527840e4133f8f49aa423a38799" +checksum = "d22475596539443685426b6bdadb926ad0ecaefdfc5fb05e5e3441f15463c511" dependencies = [ "bytestring", "http", @@ -141,9 +141,9 @@ dependencies = [ [[package]] name = "actix-web" -version = "4.4.0" +version = "4.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4a5b5e29603ca8c94a77c65cf874718ceb60292c5a5c3e5f4ace041af462b9" +checksum = "e43428f3bf11dee6d166b00ec2df4e3aa8cc1606aaa0b7433c146852e2f4e03b" dependencies = [ "actix-codec", "actix-http", @@ -154,7 +154,7 @@ dependencies = [ "actix-service", "actix-utils", "actix-web-codegen", - "ahash 0.8.3", + "ahash 0.8.7", "bytes", "bytestring", "cfg-if", @@ -188,7 +188,7 @@ dependencies = [ "actix-router", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -206,7 +206,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ - "gimli 0.28.0", + "gimli 0.28.1", ] [[package]] @@ -215,25 +215,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aead" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" -dependencies = [ - "generic-array 0.14.7", -] - -[[package]] -name = "aead" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b613b8e1e3cf911a086f53f03bf286f52fd7a7258e4fa606f0ef220d39d8877" -dependencies = [ - "generic-array 0.14.7", - "rand_core 0.6.4", -] - [[package]] name = "aead" version = "0.5.2" @@ -244,29 +225,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[package]] -name = "aes" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "884391ef1066acaa41e766ba8f596341b96e93ce34f9a43e7d24bf0a0eaf0561" -dependencies = [ - "aes-soft", - "aesni", - "cipher 0.2.5", -] - -[[package]] -name = "aes" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e8b47f52ea9bae42228d07ec09eb676433d7c4ed1ebdf0f1d1c29ed446f1ab8" -dependencies = [ - "cfg-if", - "cipher 0.3.0", - "cpufeatures", - "opaque-debug 0.3.0", -] - [[package]] name = "aes" version = "0.8.3" @@ -280,80 +238,47 @@ dependencies = [ [[package]] name = "aes-gcm" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df5f85a83a7d8b0442b6aa7b504b8212c1733da07b98aae43d4bc21b2cb3cdf6" -dependencies = [ - "aead 0.4.3", - "aes 0.7.5", - "cipher 0.3.0", - "ctr 0.8.0", - "ghash 0.4.4", - "subtle", -] - -[[package]] -name = "aes-gcm" -version = "0.10.2" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "209b47e8954a928e1d72e86eca7000ebb6655fe1436d33eefc2201cad027e237" +checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1" dependencies = [ - "aead 0.5.2", - "aes 0.8.3", + "aead", + "aes", "cipher 0.4.4", - "ctr 0.9.2", - "ghash 0.5.0", - "subtle", -] - -[[package]] -name = "aes-soft" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" -dependencies = [ - "cipher 0.2.5", - "opaque-debug 0.3.0", -] - -[[package]] -name = "aesni" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" -dependencies = [ - "cipher 0.2.5", - "opaque-debug 0.3.0", + "ctr", + "ghash", + "subtle 2.5.0", ] [[package]] name = "ahash" -version = "0.7.6" +version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" +checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", + "zerocopy", ] [[package]] name = "aho-corasick" -version = "1.0.5" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] @@ -411,9 +336,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.5.0" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", @@ -425,43 +350,43 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46" +checksum = "2faccea4cc4ab4a667ce676a30e8ec13922a692c99bb8f5b11f1502c72e04220" [[package]] name = "anstyle-parse" -version = "0.2.1" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.0" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "2.1.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58f54d10c6dfa51283a066ceab3ec1ab78d13fae00aa49243a45e4571fb79dfd" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "anyhow" -version = "1.0.75" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" [[package]] name = "approx" @@ -474,23 +399,40 @@ dependencies = [ [[package]] name = "aquamarine" -version = "0.3.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df752953c49ce90719c7bf1fc587bc8227aed04732ea0c0f85e5397d7fdbd1a1" +checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e" dependencies = [ "include_dir", "itertools", "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] -name = "arc-swap" -version = "1.6.0" +name = "ark-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-bls12-377-ext" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-models-ext", + "ark-std", +] [[package]] name = "ark-bls12-381" @@ -504,6 +446,45 @@ dependencies = [ "ark-std", ] +[[package]] +name = "ark-bls12-381-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c" +dependencies = [ + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-models-ext", + "ark-serialize", + "ark-std", +] + +[[package]] +name = "ark-bw6-761" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-bw6-761-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2" +dependencies = [ + "ark-bw6-761", + "ark-ec", + "ark-ff", + "ark-models-ext", + "ark-std", +] + [[package]] name = "ark-ec" version = "0.4.2" @@ -518,9 +499,35 @@ dependencies = [ "hashbrown 0.13.2", "itertools", "num-traits", + "rayon", "zeroize", ] +[[package]] +name = "ark-ed-on-bls12-377" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6" +dependencies = [ + "ark-bls12-377", + "ark-ec", + "ark-ff", + "ark-std", +] + +[[package]] +name = "ark-ed-on-bls12-377-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ff", + "ark-models-ext", + "ark-std", +] + [[package]] name = "ark-ed-on-bls12-381-bandersnatch" version = "0.4.0" @@ -533,6 +540,19 @@ dependencies = [ "ark-std", ] +[[package]] +name = "ark-ed-on-bls12-381-bandersnatch-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346" +dependencies = [ + "ark-ec", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ff", + "ark-models-ext", + "ark-std", +] + [[package]] name = "ark-ff" version = "0.4.2" @@ -576,6 +596,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ark-models-ext" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2" +dependencies = [ + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-std", + "derivative", +] + [[package]] name = "ark-poly" version = "0.4.2" @@ -591,21 +624,22 @@ dependencies = [ [[package]] name = "ark-scale" -version = "0.0.10" +version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393" +checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179" dependencies = [ "ark-ec", "ark-ff", "ark-serialize", "ark-std", "parity-scale-codec", + "scale-info", ] [[package]] name = "ark-secret-scalar" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" +source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" dependencies = [ "ark-ec", "ark-ff", @@ -613,7 +647,7 @@ dependencies = [ "ark-std", "ark-transcript", "digest 0.10.7", - "rand_core 0.6.4", + "getrandom_or_panic", "zeroize", ] @@ -648,12 +682,13 @@ checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185" dependencies = [ "num-traits", "rand 0.8.5", + "rayon", ] [[package]] name = "ark-transcript" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" +source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" dependencies = [ "ark-ff", "ark-serialize", @@ -665,21 +700,21 @@ dependencies = [ [[package]] name = "array-bytes" -version = "6.1.0" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b1c5a481ec30a5abd8dfbd94ab5cf1bb4e9a66be7f1b3b322f2f1170c200fd" +checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6" [[package]] -name = "arrayref" -version = "0.3.7" +name = "array-bytes" +version = "6.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0" [[package]] -name = "arrayvec" -version = "0.5.2" +name = "arrayref" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" [[package]] name = "arrayvec" @@ -687,29 +722,13 @@ version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" -[[package]] -name = "asn1-rs" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ff05a702273012438132f449575dbc804e27b2f3cbe3069aa237d26c98fa33" -dependencies = [ - "asn1-rs-derive 0.1.0", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror", - "time", -] - [[package]] name = "asn1-rs" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0" dependencies = [ - "asn1-rs-derive 0.4.0", + "asn1-rs-derive", "asn1-rs-impl", "displaydoc", "nom", @@ -719,18 +738,6 @@ dependencies = [ "time", ] -[[package]] -name = "asn1-rs-derive" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db8b7511298d5b7784b40b092d9e9dcd3a627a5707e4b5e507931ab0d44eeebf" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "synstructure", -] - [[package]] name = "asn1-rs-derive" version = "0.4.0" @@ -773,18 +780,18 @@ dependencies = [ [[package]] name = "async-io" -version = "2.2.1" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6d3b15875ba253d1110c740755e246537483f152fa334f91abd7fe84c88b3ff" +checksum = "8f97ab0c5b00a7cdbe5a371b9a782ee7be1316095885c8a4ea1daf490eb0ef65" dependencies = [ - "async-lock 3.1.2", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", "futures-lite", "parking", "polling", - "rustix 0.38.13", + "rustix 0.38.30", "slab", "tracing", "windows-sys 0.52.0", @@ -801,11 +808,11 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.1.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dea8b3453dd7cc96711834b75400d671b73e3656975fa68d9f277163b7f7e316" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", "event-listener-strategy", "pin-project-lite 0.2.13", ] @@ -821,9 +828,9 @@ dependencies = [ [[package]] name = "async-oneshot" -version = "0.5.0" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ec7c75bcbcb0139e9177f30692fd617405ca4e0c27802e128d53171f7042e2c" +checksum = "ae47de2a02d543205f3f5457a90b6ecbc9494db70557bd29590ec8f1ddff5463" dependencies = [ "futures-micro", ] @@ -847,18 +854,18 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "async-trait" -version = "0.1.74" +version = "0.1.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" +checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -893,21 +900,6 @@ version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c59bdb34bc650a32731b31bd8f0829cc15d24a708ee31559e0bb34f2bc320cba" -[[package]] -name = "atomic-polyfill" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2bce30dfe09ef0bfaef228b9d414faaf7e563035494d7fe092dba54b300f4" -dependencies = [ - "critical-section", -] - -[[package]] -name = "atomic-waker" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" - [[package]] name = "attohttpc" version = "0.24.1" @@ -919,27 +911,15 @@ dependencies = [ "url", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "auto_impl" -version = "1.1.0" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fee3da8ef1276b0bee5dd1c7258010d8fffd31801447323115a25560e1327b89" +checksum = "823b8bb275161044e2ac7a25879cb3e2480cb403e3943022c7c769c599b756aa" dependencies = [ - "proc-macro-error", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.48", ] [[package]] @@ -1009,7 +989,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" dependencies = [ "futures-core", - "getrandom 0.2.11", + "getrandom 0.2.12", "instant", "pin-project-lite 0.2.13", "rand 0.8.5", @@ -1027,14 +1007,14 @@ dependencies = [ "cfg-if", "libc", "miniz_oxide", - "object 0.32.1", + "object 0.32.2", "rustc-demangle", ] [[package]] name = "bandersnatch_vrfs" -version = "0.0.1" -source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" +version = "0.0.4" +source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" dependencies = [ "ark-bls12-381", "ark-ec", @@ -1044,11 +1024,13 @@ dependencies = [ "ark-std", "dleq_vrf", "fflonk", - "merlin 3.0.0", + "merlin", "rand_chacha 0.3.1", "rand_core 0.6.4", "ring 0.1.0", "sha2 0.10.8", + "sp-ark-bls12-381", + "sp-ark-ed-on-bls12-381-bandersnatch", "zeroize", ] @@ -1084,9 +1066,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" +checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" [[package]] name = "base64ct" @@ -1112,6 +1094,25 @@ dependencies = [ "serde", ] +[[package]] +name = "bip39" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f" +dependencies = [ + "bitcoin_hashes", + "rand 0.8.5", + "rand_core 0.6.4", + "serde", + "unicode-normalization", +] + +[[package]] +name = "bitcoin_hashes" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" + [[package]] name = "bitflags" version = "1.3.2" @@ -1120,9 +1121,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.0" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" [[package]] name = "bitvec" @@ -1136,6 +1137,18 @@ dependencies = [ "wyz", ] +[[package]] +name = "blake2" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330" +dependencies = [ + "byte-tools", + "crypto-mac 0.7.0", + "digest 0.8.1", + "opaque-debug 0.2.3", +] + [[package]] name = "blake2" version = "0.10.6" @@ -1152,7 +1165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "constant_time_eq", ] @@ -1163,37 +1176,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94230421e395b9920d23df13ea5d77a20e1725331f90fbbf6df6040b33f756ae" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "constant_time_eq", ] [[package]] name = "blake3" -version = "1.4.1" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "199c42ab6972d92c9f8995f086273d25c42fc0f7b2a1fcefba465c1352d25ba5" +checksum = "0231f06152bf547e9c2b5194f247cd97aacf6dcd8b15d8e5ec0663f64580da87" dependencies = [ "arrayref", - "arrayvec 0.7.4", + "arrayvec", "cc", "cfg-if", "constant_time_eq", - "digest 0.10.7", "rayon", ] -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding 0.1.5", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - [[package]] name = "block-buffer" version = "0.9.0" @@ -1212,31 +1212,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[package]] -name = "block-modes" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57a0e8073e8baa88212fb5823574c02ebccb395136ba9a164ab89379ec6072f0" -dependencies = [ - "block-padding 0.2.1", - "cipher 0.2.5", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", -] - -[[package]] -name = "block-padding" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" - [[package]] name = "block-padding" version = "0.3.3" @@ -1249,7 +1224,7 @@ dependencies = [ [[package]] name = "blst" version = "0.3.11" -source = "git+https://github.com/supranational/blst.git#442e175b57d8f532416d2be934d008ba7c05faaa" +source = "git+https://github.com/supranational/blst.git#0d46eefa45fc1e57aceb42bba0e84eab3a7a9725" dependencies = [ "cc", "glob", @@ -1259,9 +1234,9 @@ dependencies = [ [[package]] name = "bounded-collections" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b05133427c07c4776906f673ccf36c21b102c9829c641a5b56bd151d44fd6" +checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd" dependencies = [ "log", "parity-scale-codec", @@ -1271,9 +1246,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "3.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "516074a47ef4bce09577a3b379392300159ce5b1ba2e501ff1c819950066100f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1282,9 +1257,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.4" +version = "2.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b6561fd3f895a11e8f72af2cb7d22e08366bebc2b6b57f7744c4bda27034744" +checksum = "4e2e4afe60d7dd600fdd3de8d0f08c2b7ec039712e3b6137ff98b7004e82de4f" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1307,9 +1282,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.6.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a" +checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc" dependencies = [ "memchr", "serde", @@ -1326,9 +1301,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.13.0" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" [[package]] name = "byte-slice-cast" @@ -1344,9 +1319,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" [[package]] name = "bytemuck" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +checksum = "ed2490600f404f2b94c167e31d3ed1d5f3c225a0f3b80230053b3e0b7b962bd9" [[package]] name = "byteorder" @@ -1381,13 +1356,23 @@ dependencies = [ [[package]] name = "bytestring" -version = "1.3.0" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238e4886760d98c4f899360c834fa93e62cf7f721ac3c2da375cbdf4b8679aae" +checksum = "74d80203ea6b29df88012294f62733de21cfeab47f17b41af3a38bc30a03ee72" dependencies = [ "bytes", ] +[[package]] +name = "c2-chacha" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80" +dependencies = [ + "cipher 0.2.5", + "ppv-lite86", +] + [[package]] name = "camino" version = "1.1.6" @@ -1399,9 +1384,9 @@ dependencies = [ [[package]] name = "cargo-platform" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479" +checksum = "ceed8ef69d8518a5dda55c07425450b58a4e1946f4951eab6d7191ee86c2443d" dependencies = [ "serde", ] @@ -1414,7 +1399,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a" dependencies = [ "camino", "cargo-platform", - "semver 1.0.18", + "semver 1.0.21", "serde", "serde_json", "thiserror", @@ -1436,22 +1421,11 @@ dependencies = [ "libc", ] -[[package]] -name = "ccm" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca1a8fbc20b50ac9673ff014abfb2b5f4085ee1a850d408f14a159c5853ac7" -dependencies = [ - "aead 0.3.2", - "cipher 0.2.5", - "subtle", -] - [[package]] name = "cfg-expr" -version = "0.15.5" +version = "0.15.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03915af431787e6ffdcc74c645077518c6b6e01f80b761e0fbbfa288536311b3" +checksum = "6100bc57b6209840798d95cb2775684849d332f7bd788db2a8c8caf7ef82a41a" dependencies = [ "smallvec", ] @@ -1468,6 +1442,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" +[[package]] +name = "chacha" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862" +dependencies = [ + "byteorder", + "keystream", +] + [[package]] name = "chacha20" version = "0.9.1" @@ -1485,7 +1469,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35" dependencies = [ - "aead 0.5.2", + "aead", "chacha20", "cipher 0.4.4", "poly1305", @@ -1494,23 +1478,23 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.30" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +checksum = "9f13690e35a5e4ace198e7beea2895d29f3a9cc55015fcebe6336bd2010af9eb" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] name = "ciborium" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" dependencies = [ "ciborium-io", "ciborium-ll", @@ -1519,15 +1503,15 @@ dependencies = [ [[package]] name = "ciborium-io" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" [[package]] name = "ciborium-ll" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" dependencies = [ "ciborium-io", "half", @@ -1555,15 +1539,6 @@ dependencies = [ "generic-array 0.14.7", ] -[[package]] -name = "cipher" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" -dependencies = [ - "generic-array 0.14.7", -] - [[package]] name = "cipher" version = "0.4.4" @@ -1575,11 +1550,20 @@ 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 = "4.4.3" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84ed82781cea27b43c9b106a979fe450a13a31aab0500595fb3fc06616de08e6" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", @@ -1587,9 +1571,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.4.2" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb9faaa7c2ef94b2743a21f5a29e6f0010dff4caa69ac8e9d6cf8b6fa74da08" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" dependencies = [ "anstream", "anstyle", @@ -1599,21 +1583,21 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.4.2" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "clap_lex" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "cmake" @@ -1651,9 +1635,9 @@ dependencies = [ [[package]] name = "color-spantrace" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ba75b3d9449ecdccb27ecbc479fdc0b87fa2dd43d2f8298f9bf0e59aacc8dce" +checksum = "cd6be1b2a7e382e2b98b43b2adcca6bb0e465af0bdd38123873ae61eb17a72c2" dependencies = [ "once_cell", "owo-colors", @@ -1670,7 +1654,7 @@ checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "common" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895" +source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" dependencies = [ "ark-ec", "ark-ff", @@ -1678,7 +1662,8 @@ dependencies = [ "ark-serialize", "ark-std", "fflonk", - "merlin 3.0.0", + "getrandom_or_panic", + "merlin", "rand_chacha 0.3.1", ] @@ -1690,24 +1675,24 @@ checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101" [[package]] name = "concurrent-queue" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ec6771ecfa0762d24683ee5a32ad78487a3d3afdc0fb8cae19d2c5deb50b7c" +checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363" dependencies = [ "crossbeam-utils", ] [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -1748,29 +1733,27 @@ dependencies = [ [[package]] name = "const-oid" -version = "0.9.5" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" [[package]] name = "const-random" -version = "0.1.15" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368a7a772ead6ce7e1de82bfb04c485f3db8ec744f72925af5735e29a22cc18e" +checksum = "5aaf16c9c2c612020bcfd042e170f6e32de9b9d75adb5277cdbbd2e2c8c8299a" dependencies = [ "const-random-macro", - "proc-macro-hack", ] [[package]] name = "const-random-macro" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d7d6ab3c3a2282db210df5f02c4dab6e0a7057af0fb7ebd4070f30fe05c0ddb" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", - "proc-macro-hack", "tiny-keccak", ] @@ -1780,6 +1763,12 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2" +[[package]] +name = "constcat" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08" + [[package]] name = "convert_case" version = "0.4.0" @@ -1799,9 +1788,9 @@ dependencies = [ [[package]] name = "core-foundation" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" +checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" dependencies = [ "core-foundation-sys", "libc", @@ -1809,9 +1798,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.4" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f" [[package]] name = "core2" @@ -1844,9 +1833,9 @@ dependencies = [ [[package]] name = "cpufeatures" -version = "0.2.9" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" +checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" dependencies = [ "libc", ] @@ -1949,21 +1938,6 @@ dependencies = [ "wasmtime-types", ] -[[package]] -name = "crc" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86ec7a15cbe22e59248fc7eadb1907dab5ba09372595da4d73dd805ed4417dfe" -dependencies = [ - "crc-catalog", -] - -[[package]] -name = "crc-catalog" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" - [[package]] name = "crc32fast" version = "1.3.2" @@ -2018,7 +1992,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "futures", "parity-scale-codec", @@ -2036,46 +2010,37 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "176dc175b78f56c0f321911d9c8eb2b77a78a4860b9c19db83835fea1a46649b" dependencies = [ - "cfg-if", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg", - "cfg-if", "crossbeam-utils", - "memoffset 0.9.0", - "scopeguard", ] [[package]] name = "crossbeam-utils" -version = "0.8.16" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" -dependencies = [ - "cfg-if", -] +checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" [[package]] name = "crossterm" @@ -2110,25 +2075,13 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" [[package]] name = "crypto-bigint" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" -dependencies = [ - "generic-array 0.14.7", - "rand_core 0.6.4", - "subtle", - "zeroize", -] - -[[package]] -name = "crypto-bigint" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" dependencies = [ "generic-array 0.14.7", "rand_core 0.6.4", - "subtle", + "subtle 2.5.0", "zeroize", ] @@ -2145,31 +2098,32 @@ dependencies = [ [[package]] name = "crypto-mac" -version = "0.8.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" +checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" dependencies = [ - "generic-array 0.14.7", - "subtle", + "generic-array 0.12.4", + "subtle 1.0.0", ] [[package]] name = "crypto-mac" -version = "0.11.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" +checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ "generic-array 0.14.7", - "subtle", + "subtle 2.5.0", ] [[package]] -name = "ctr" -version = "0.8.0" +name = "crypto-mac" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "049bb91fb4aaf0e3c7efa6cd5ef877dbbbd15b39dad06d9948de4ec8a75761ea" +checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ - "cipher 0.3.0", + "generic-array 0.14.7", + "subtle 2.5.0", ] [[package]] @@ -2177,29 +2131,16 @@ name = "ctr" version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835" -dependencies = [ - "cipher 0.4.4", -] - -[[package]] -name = "cty" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" - -[[package]] -name = "curve25519-dalek" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216" -dependencies = [ - "byteorder", - "digest 0.8.1", - "rand_core 0.5.1", - "subtle", - "zeroize", +dependencies = [ + "cipher 0.4.4", ] +[[package]] +name = "cty" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" + [[package]] name = "curve25519-dalek" version = "3.2.0" @@ -2209,7 +2150,7 @@ dependencies = [ "byteorder", "digest 0.9.0", "rand_core 0.5.1", - "subtle", + "subtle 2.5.0", "zeroize", ] @@ -2226,26 +2167,26 @@ dependencies = [ "fiat-crypto", "platforms", "rustc_version", - "subtle", + "subtle 2.5.0", "zeroize", ] [[package]] name = "curve25519-dalek-derive" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "cxx" -version = "1.0.107" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe98ba1789d56fb3db3bee5e032774d4f421b685de7ba703643584ba24effbe" +checksum = "8de00f15a6fa069c99b88c5c78c4541d0e7899a33b86f7480e23df2431fce0bc" dependencies = [ "cc", "cxxbridge-flags", @@ -2255,9 +2196,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.107" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ce20f6b8433da4841b1dadfb9468709868022d829d5ca1f2ffbda928455ea3" +checksum = "0a71e1e631fa2f2f5f92e8b0d860a00c198c6771623a6cefcc863e3554f0d8d6" dependencies = [ "cc", "codespan-reporting", @@ -2265,24 +2206,24 @@ dependencies = [ "proc-macro2", "quote", "scratch", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "cxxbridge-flags" -version = "1.0.107" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20888d9e1d2298e2ff473cee30efe7d5036e437857ab68bbfea84c74dba91da2" +checksum = "6f3fed61d56ba497c4efef9144dfdbaa25aa58f2f6b3a7cf441d4591c583745c" [[package]] name = "cxxbridge-macro" -version = "1.0.107" +version = "1.0.115" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa16a70dd58129e4dfffdff535fb1bce66673f7bbeec4a5a1765a504e1ccd84" +checksum = "8908e380a8efd42150c017b0cfa31509fc49b6d47f7cb6b33e93ffb8f4e3661e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -2322,15 +2263,15 @@ dependencies = [ [[package]] name = "data-encoding" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" +checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" [[package]] name = "data-encoding-macro" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c904b33cc60130e1aeea4956ab803d08a3f4a0ca82d64ed757afac3891f2bb99" +checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" dependencies = [ "data-encoding", "data-encoding-macro-internal", @@ -2338,9 +2279,9 @@ dependencies = [ [[package]] name = "data-encoding-macro-internal" -version = "0.1.11" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fdf3fce3ce863539ec1d7fd1b6dcc3c645663376b43ed376bbf887733e4f772" +checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" dependencies = [ "data-encoding", "syn 1.0.109", @@ -2353,7 +2294,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ "const-oid", - "pem-rfc7468", "zeroize", ] @@ -2367,27 +2307,13 @@ dependencies = [ "zeroize", ] -[[package]] -name = "der-parser" -version = "7.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe398ac75057914d7d07307bf67dc7f3f574a26783b4fc7805a20ffa9f506e82" -dependencies = [ - "asn1-rs 0.3.1", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", -] - [[package]] name = "der-parser" version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e" dependencies = [ - "asn1-rs 0.5.2", + "asn1-rs", "displaydoc", "nom", "num-bigint", @@ -2397,9 +2323,12 @@ dependencies = [ [[package]] name = "deranged" -version = "0.3.8" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946" +checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" +dependencies = [ + "powerfmt", +] [[package]] name = "derivative" @@ -2423,34 +2352,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" -dependencies = [ - "derive_builder_macro 0.11.2", -] - [[package]] name = "derive_builder" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" dependencies = [ - "derive_builder_macro 0.12.0", -] - -[[package]] -name = "derive_builder_core" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn 1.0.109", + "derive_builder_macro", ] [[package]] @@ -2465,23 +2373,13 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "derive_builder_macro" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" -dependencies = [ - "derive_builder_core 0.11.2", - "syn 1.0.109", -] - [[package]] name = "derive_builder_macro" version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" dependencies = [ - "derive_builder_core 0.12.0", + "derive_builder_core", "syn 1.0.109", ] @@ -2531,16 +2429,16 @@ dependencies = [ "block-buffer 0.10.4", "const-oid", "crypto-common", - "subtle", + "subtle 2.5.0", ] [[package]] name = "directories" -version = "4.0.1" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.1", ] [[package]] @@ -2559,7 +2457,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", ] [[package]] @@ -2573,6 +2471,18 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.48.0", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -2592,13 +2502,13 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "dleq_vrf" version = "0.0.2" -source = "git+https://github.com/w3f/ring-vrf?rev=f4fe253#f4fe2534ccc6d916cd10d9c16891e673728ec8b4" +source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e" dependencies = [ "ark-ec", "ark-ff", @@ -2607,25 +2517,24 @@ dependencies = [ "ark-serialize", "ark-std", "ark-transcript", - "arrayvec 0.7.4", - "rand_core 0.6.4", + "arrayvec", "zeroize", ] [[package]] name = "docify" -version = "0.2.1" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "029de870d175d11969524d91a3fb2cbf6d488b853bff99d41cf65e533ac7d9d2" +checksum = "7cc4fd38aaa9fb98ac70794c82a00360d1e165a87fbf96a8a91f9dfc602aaee2" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.2.1" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac43324656a1b05eb0186deb51f27d2d891c704c37f34de281ef6297ba193e5" +checksum = "63fa215f3a0d40fb2a221b3aa90d8e1fbb8379785a990cb60d62ac71ebdc6460" dependencies = [ "common-path", "derive-syn-parse", @@ -2633,16 +2542,16 @@ dependencies = [ "proc-macro2", "quote", "regex", - "syn 2.0.39", + "syn 2.0.48", "termcolor", - "toml 0.7.8", + "toml 0.8.8", "walkdir", ] [[package]] name = "domain-block-builder" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -2659,7 +2568,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -2668,6 +2577,7 @@ dependencies = [ "sc-executor", "sc-executor-common", "sp-api", + "sp-block-fees", "sp-blockchain", "sp-core", "sp-domains", @@ -2677,6 +2587,7 @@ dependencies = [ "sp-runtime", "sp-state-machine", "sp-timestamp", + "sp-version", "subspace-core-primitives", "subspace-runtime-primitives", "tracing", @@ -2685,7 +2596,7 @@ dependencies = [ [[package]] name = "domain-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-trait", "sc-consensus", @@ -2699,7 +2610,7 @@ dependencies = [ [[package]] name = "domain-client-message-relayer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-channel", "cross-domain-message-gossip", @@ -2708,6 +2619,7 @@ dependencies = [ "sc-client-api", "sc-state-db", "sc-utils", + "scale-info", "sp-api", "sp-blockchain", "sp-consensus", @@ -2720,7 +2632,7 @@ dependencies = [ [[package]] name = "domain-client-operator" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "domain-block-builder", "domain-block-preprocessor", @@ -2758,29 +2670,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "domain-client-subnet-gossip" -version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" -dependencies = [ - "futures", - "parity-scale-codec", - "parking_lot 0.12.1", - "sc-network", - "sc-network-common", - "sc-network-gossip", - "sc-utils", - "sp-core", - "sp-domains", - "sp-runtime", - "subspace-runtime-primitives", - "tracing", -] - [[package]] name = "domain-eth-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "clap", "domain-runtime-primitives", @@ -2795,8 +2688,8 @@ dependencies = [ "futures", "jsonrpsee", "pallet-transaction-payment-rpc", + "parity-scale-codec", "sc-client-api", - "sc-executor", "sc-network-sync", "sc-rpc", "sc-service", @@ -2815,7 +2708,7 @@ dependencies = [ [[package]] name = "domain-pallet-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-benchmarking", "frame-executive", @@ -2834,8 +2727,10 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ + "frame-support", + "frame-system", "parity-scale-codec", "scale-info", "sp-api", @@ -2850,7 +2745,7 @@ dependencies = [ [[package]] name = "domain-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-trait", "cross-domain-message-gossip", @@ -2858,7 +2753,6 @@ dependencies = [ "domain-client-consensus-relay-chain", "domain-client-message-relayer", "domain-client-operator", - "domain-client-subnet-gossip", "domain-runtime-primitives", "futures", "jsonrpsee", @@ -2869,6 +2763,7 @@ dependencies = [ "sc-client-api", "sc-consensus", "sc-executor", + "sc-informant", "sc-network", "sc-network-common", "sc-network-sync", @@ -2890,6 +2785,7 @@ dependencies = [ "sp-core", "sp-domains", "sp-domains-fraud-proof", + "sp-io", "sp-messenger", "sp-offchain", "sp-runtime", @@ -2900,6 +2796,7 @@ dependencies = [ "substrate-build-script-utils", "substrate-frame-rpc-system", "substrate-prometheus-endpoint", + "tokio", "tracing", ] @@ -2938,34 +2835,22 @@ dependencies = [ [[package]] name = "dyn-clone" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbfc4744c1b8f2a09adc0e55242f60b1af195d88596bd8700be74418c056c555" +checksum = "545b22097d44f8a9581187cdf93de7a71e4722bf51200cfaba810865b49a495d" [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" -dependencies = [ - "der 0.6.1", - "elliptic-curve 0.12.3", - "rfc6979 0.3.1", - "signature 1.6.4", -] - -[[package]] -name = "ecdsa" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4" +checksum = "ee27f32b5c5292967d2d4a9d7f1e0b0aed2c15daded5a60300e4abb9d8020bca" dependencies = [ "der 0.7.8", "digest 0.10.7", - "elliptic-curve 0.13.5", - "rfc6979 0.4.0", - "signature 2.1.0", - "spki 0.7.2", + "elliptic-curve", + "rfc6979", + "signature 2.2.0", + "spki 0.7.3", ] [[package]] @@ -2979,12 +2864,12 @@ dependencies = [ [[package]] name = "ed25519" -version = "2.2.2" +version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60f6d271ca33075c88028be6f04d502853d63a5ece419d269c15315d4fc1cf1d" +checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ "pkcs8 0.10.2", - "signature 2.1.0", + "signature 2.2.0", ] [[package]] @@ -3003,15 +2888,16 @@ dependencies = [ [[package]] name = "ed25519-dalek" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7277392b266383ef8396db7fdeb1e77b6c52fed775f5df15bb24f35b72156980" +checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek 4.1.1", - "ed25519 2.2.2", + "ed25519 2.2.3", "rand_core 0.6.4", "serde", "sha2 0.10.8", + "subtle 2.5.0", "zeroize", ] @@ -3037,42 +2923,20 @@ checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elliptic-curve" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" -dependencies = [ - "base16ct 0.1.1", - "crypto-bigint 0.4.9", - "der 0.6.1", - "digest 0.10.7", - "ff 0.12.1", - "generic-array 0.14.7", - "group 0.12.1", - "hkdf", - "pem-rfc7468", - "pkcs8 0.9.0", - "rand_core 0.6.4", - "sec1 0.3.0", - "subtle", - "zeroize", -] - -[[package]] -name = "elliptic-curve" -version = "0.13.5" +version = "0.13.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b" +checksum = "b5e6043086bf7973472e0c7dff2142ea0b680d30e18d9cc40f267efbf222bd47" dependencies = [ "base16ct 0.2.0", - "crypto-bigint 0.5.3", + "crypto-bigint", "digest 0.10.7", - "ff 0.13.0", + "ff", "generic-array 0.14.7", - "group 0.13.0", + "group", "pkcs8 0.10.2", "rand_core 0.6.4", "sec1 0.7.3", - "subtle", + "subtle 2.5.0", "zeroize", ] @@ -3112,14 +2976,14 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "env_logger" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" +checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" dependencies = [ "humantime", "is-terminal", @@ -3142,23 +3006,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" dependencies = [ - "cc", "libc", + "windows-sys 0.52.0", ] [[package]] @@ -3178,20 +3031,20 @@ dependencies = [ [[package]] name = "ethereum" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a89fb87a9e103f71b903b80b670200b54cc67a07578f070681f1fffb7396fb7" +checksum = "2e04d24d20b8ff2235cffbf242d5092de3aa45f77c5270ddbfadd2778ca13fea" dependencies = [ "bytes", "ethereum-types", - "hash-db 0.15.2", + "hash-db", "hash256-std-hasher", "parity-scale-codec", "rlp", "scale-info", "serde", "sha3", - "triehash", + "trie-root", ] [[package]] @@ -3218,9 +3071,9 @@ checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" [[package]] name = "event-listener" -version = "4.0.0" +version = "4.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "770d968249b5d99410d61f5bf89057f3199a077a04d087092f58e7d10692baae" +checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e" dependencies = [ "concurrent-queue", "parking", @@ -3244,14 +3097,15 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3" dependencies = [ - "event-listener 4.0.0", + "event-listener 4.0.3", "pin-project-lite 0.2.13", ] [[package]] name = "evm" -version = "0.39.1" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +version = "0.41.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "767f43e9630cc36cf8ff2777cbb0121b055f0d1fd6eaaa13b46a1808f0d0e7e9" dependencies = [ "auto_impl", "environmental", @@ -3270,8 +3124,9 @@ dependencies = [ [[package]] name = "evm-core" -version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1da6cedc5cedb4208e59467106db0d1f50db01b920920589f8e672c02fdc04f" dependencies = [ "parity-scale-codec", "primitive-types", @@ -3282,7 +3137,7 @@ dependencies = [ [[package]] name = "evm-domain-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "domain-pallet-executive", "domain-runtime-primitives", @@ -3294,6 +3149,7 @@ dependencies = [ "frame-system-rpc-runtime-api", "pallet-balances", "pallet-base-fee", + "pallet-block-fees", "pallet-domain-id", "pallet-ethereum", "pallet-evm", @@ -3302,14 +3158,12 @@ dependencies = [ "pallet-evm-precompile-sha3fips", "pallet-evm-precompile-simple", "pallet-messenger", - "pallet-operator-rewards", "pallet-sudo", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", "pallet-transporter", "parity-scale-codec", - "sc-executor", "scale-info", "sp-api", "sp-block-builder", @@ -3331,8 +3185,9 @@ dependencies = [ [[package]] name = "evm-gasometer" -version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1dc0eb591abc5cd7b05bef6a036c2bb6c66ab6c5e0c5ce94bfe377ab670b1fd7" dependencies = [ "environmental", "evm-core", @@ -3342,8 +3197,9 @@ dependencies = [ [[package]] name = "evm-runtime" -version = "0.39.0" -source = "git+https://github.com/rust-blockchain/evm?rev=b7b82c7e1fc57b7449d6dfa6826600de37cc1e65#b7b82c7e1fc57b7449d6dfa6826600de37cc1e65" +version = "0.41.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84bbe09b64ae13a29514048c1bb6fda6374ac0b4f6a1f15a443348ab88ef42cd" dependencies = [ "auto_impl", "environmental", @@ -3367,29 +3223,23 @@ version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7" dependencies = [ - "blake2", + "blake2 0.10.6", "fs-err", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "eyre" -version = "0.6.8" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb" +checksum = "b6267a1fa6f59179ea4afc8e50fd8612a3cc60bc858f786ff877a4a8cb042799" dependencies = [ "indenter", "once_cell", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fallible-iterator" version = "0.2.0" @@ -3398,14 +3248,14 @@ checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" [[package]] name = "fastrand" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] name = "fc-api" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "async-trait", "fp-storage", @@ -3417,7 +3267,7 @@ dependencies = [ [[package]] name = "fc-consensus" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "async-trait", "fp-consensus", @@ -3433,7 +3283,7 @@ dependencies = [ [[package]] name = "fc-db" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "async-trait", "fc-api", @@ -3452,7 +3302,7 @@ dependencies = [ [[package]] name = "fc-mapping-sync" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "fc-db", "fc-storage", @@ -3473,7 +3323,7 @@ dependencies = [ [[package]] name = "fc-rpc" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "ethereum", "ethereum-types", @@ -3513,6 +3363,7 @@ dependencies = [ "sp-consensus", "sp-consensus-aura", "sp-core", + "sp-externalities", "sp-inherents", "sp-io", "sp-runtime", @@ -3527,7 +3378,7 @@ dependencies = [ [[package]] name = "fc-rpc-core" version = "1.1.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "ethereum", "ethereum-types", @@ -3540,7 +3391,7 @@ dependencies = [ [[package]] name = "fc-storage" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "ethereum", "ethereum-types", @@ -3574,16 +3425,6 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ff" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" -dependencies = [ - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "ff" version = "0.13.0" @@ -3591,27 +3432,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core 0.6.4", - "subtle", + "subtle 2.5.0", ] [[package]] name = "fflonk" version = "0.1.0" -source = "git+https://github.com/w3f/fflonk#26a5045b24e169cffc1f9328ca83d71061145c40" +source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35" dependencies = [ "ark-ec", "ark-ff", "ark-poly", "ark-serialize", "ark-std", - "merlin 3.0.0", + "merlin", ] [[package]] name = "fiat-crypto" -version = "0.2.1" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0870c84016d4b481be5c9f323c24f65e31e901ae618f0e80f4308fb00de1d2d" +checksum = "27573eac26f4dd11e2b1916c3fe1baa56407c83c71a773a8ba17ec0bca03b6b7" [[package]] name = "file-per-thread-logger" @@ -3625,14 +3466,14 @@ dependencies = [ [[package]] name = "filetime" -version = "0.2.22" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "windows-sys 0.52.0", ] [[package]] @@ -3671,9 +3512,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.27" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ "crc32fast", "libz-sys", @@ -3698,16 +3539,16 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", ] [[package]] name = "form_urlencoded" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -3715,7 +3556,7 @@ dependencies = [ [[package]] name = "fp-account" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "hex", "impl-serde", @@ -3734,7 +3575,7 @@ dependencies = [ [[package]] name = "fp-consensus" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "ethereum", "parity-scale-codec", @@ -3746,7 +3587,7 @@ dependencies = [ [[package]] name = "fp-ethereum" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "ethereum", "ethereum-types", @@ -3759,11 +3600,11 @@ dependencies = [ [[package]] name = "fp-evm" version = "3.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "evm", "frame-support", - "num_enum 0.6.1", + "num_enum", "parity-scale-codec", "scale-info", "serde", @@ -3775,7 +3616,7 @@ dependencies = [ [[package]] name = "fp-rpc" version = "3.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "ethereum", "ethereum-types", @@ -3792,7 +3633,7 @@ dependencies = [ [[package]] name = "fp-self-contained" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "frame-support", "parity-scale-codec", @@ -3804,7 +3645,7 @@ dependencies = [ [[package]] name = "fp-storage" version = "2.0.0" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "parity-scale-codec", "serde", @@ -3819,7 +3660,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-support", "frame-support-procedural", @@ -3844,7 +3685,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-support", "frame-system", @@ -3874,9 +3715,10 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "aquamarine", + "array-bytes 6.2.2", "bitflags 1.3.2", "docify", "environmental", @@ -3914,7 +3756,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "Inflector", "cfg-expr", @@ -3926,37 +3768,39 @@ dependencies = [ "proc-macro-warning", "proc-macro2", "quote", - "syn 2.0.39", + "sp-core-hashing", + "syn 2.0.48", ] [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "cfg-if", + "docify", "frame-support", "log", "parity-scale-codec", @@ -3973,7 +3817,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-benchmarking", "frame-support", @@ -3988,7 +3832,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", "sp-api", @@ -3997,7 +3841,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-support", "parity-scale-codec", @@ -4008,9 +3852,12 @@ dependencies = [ [[package]] name = "fs-err" -version = "2.9.0" +version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0845fa252299212f0389d64ba26f34fa32cfe41588355f21ed507c59a0f64541" +checksum = "88a41f105fe1d5b6b34b2055e3dc59bb79b46b48b2040b9e6c7b4b5de097aa41" +dependencies = [ + "autocfg", +] [[package]] name = "fs2" @@ -4022,23 +3869,13 @@ dependencies = [ "winapi", ] -[[package]] -name = "fs4" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47" -dependencies = [ - "rustix 0.38.13", - "windows-sys 0.48.0", -] - [[package]] name = "fs4" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7" dependencies = [ - "rustix 0.38.13", + "rustix 0.38.30", "windows-sys 0.48.0", ] @@ -4108,9 +3945,9 @@ checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" -version = "2.0.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3831c2651acb5177cbd83943f3d9c8912c5ad03c76afcc0e9511ba568ec5ebb" +checksum = "445ba825b27408685aaecefd65178908c36c6e96aaf6d8599419d46e624192ba" dependencies = [ "futures-core", "pin-project-lite 0.2.13", @@ -4124,7 +3961,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -4144,7 +3981,7 @@ checksum = "d2411eed028cdf8c8034eaf21f9915f956b6c3abec4d4c7949ee67f0721127bd" dependencies = [ "futures-io", "rustls 0.20.9", - "webpki 0.22.1", + "webpki", ] [[package]] @@ -4154,7 +3991,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28" dependencies = [ "futures-io", - "rustls 0.21.9", + "rustls 0.21.10", ] [[package]] @@ -4260,9 +4097,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "libc", @@ -4270,13 +4107,13 @@ dependencies = [ ] [[package]] -name = "ghash" -version = "0.4.4" +name = "getrandom_or_panic" +version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1583cc1656d7839fd3732b80cf4f38850336cdb9b8ded1cd399ca62958de3c99" +checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9" dependencies = [ - "opaque-debug 0.3.0", - "polyval 0.5.3", + "rand 0.8.5", + "rand_core 0.6.4", ] [[package]] @@ -4286,7 +4123,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d930750de5717d2dd0b8c0d42c076c0e884c81a73e6cab859bbd2339c71e3e40" dependencies = [ "opaque-debug 0.3.0", - "polyval 0.6.1", + "polyval", ] [[package]] @@ -4302,9 +4139,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.0" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "glob" @@ -4314,15 +4151,15 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d" +checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" dependencies = [ "aho-corasick", "bstr", - "fnv", "log", - "regex", + "regex-automata 0.4.5", + "regex-syntax 0.8.2", ] [[package]] @@ -4370,33 +4207,22 @@ dependencies = [ "web-sys", ] -[[package]] -name = "group" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" -dependencies = [ - "ff 0.12.1", - "rand_core 0.6.4", - "subtle", -] - [[package]] name = "group" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "ff 0.13.0", + "ff", "rand_core 0.6.4", - "subtle", + "subtle 2.5.0", ] [[package]] name = "h2" -version = "0.3.21" +version = "0.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" +checksum = "bb2c4422095b67ee78da96fbb51a4cc413b3b25883c7717ff7ca1ab31022c9c9" dependencies = [ "bytes", "fnv", @@ -4404,7 +4230,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap 1.9.3", + "indexmap 2.2.1", "slab", "tokio", "tokio-util", @@ -4413,15 +4239,13 @@ dependencies = [ [[package]] name = "half" -version = "1.8.2" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" - -[[package]] -name = "hash-db" -version = "0.15.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23bd4e7b5eda0d0f3a307e8b381fdc8ba9000f26fbe912250c0a4cc3956364a" +checksum = "bc52e53916c08643f1b56ec082790d1e86a32e58dc5268f897f313fbae7b4872" +dependencies = [ + "cfg-if", + "crunchy", +] [[package]] name = "hash-db" @@ -4444,7 +4268,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.6", + "ahash 0.7.7", ] [[package]] @@ -4453,26 +4277,35 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", ] [[package]] name = "hashbrown" -version = "0.14.0" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a" +checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "allocator-api2", ] +[[package]] +name = "hashlink" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +dependencies = [ + "hashbrown 0.14.3", +] + [[package]] name = "hdrhistogram" version = "7.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "byteorder", "flate2", "nom", @@ -4487,18 +4320,9 @@ checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hermit-abi" -version = "0.3.2" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" [[package]] name = "hex" @@ -4575,9 +4399,9 @@ dependencies = [ [[package]] name = "hkdf" -version = "0.12.3" +version = "0.12.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437" +checksum = "7b5f8eb2ad728638ea2c7d47a21db23b7b58a72ed6a38256b8a1849f15fbbdf7" dependencies = [ "hmac 0.12.1", ] @@ -4598,7 +4422,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ - "crypto-mac 0.11.1", + "crypto-mac 0.11.0", "digest 0.9.0", ] @@ -4624,11 +4448,11 @@ dependencies = [ [[package]] name = "home" -version = "0.5.5" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" +checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -4644,9 +4468,9 @@ dependencies = [ [[package]] name = "http" -version = "0.2.9" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" +checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" dependencies = [ "bytes", "fnv", @@ -4655,9 +4479,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ "bytes", "http", @@ -4691,24 +4515,23 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hwlocality" version = "1.0.0-alpha.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6020affad7f95b46f12607a8714aa70bd02c8df3b3abf9ef5c8cd2f7ae57a033" +source = "git+https://github.com/HadrienG2/hwlocality?rev=0f248573bcad584960fe20293c826203a265b833#0f248573bcad584960fe20293c826203a265b833" dependencies = [ - "arrayvec 0.7.4", - "bitflags 2.4.0", + "arrayvec", + "bitflags 2.4.2", "derive_more", "errno", "hwlocality-sys", "libc", - "num_enum 0.7.2", + "num_enum", "thiserror", + "windows-sys 0.52.0", ] [[package]] name = "hwlocality-sys" version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ecc1a90eeca65f95f08a7d32132cd4d35c9ee95ed89e32d0342a4bf7b5d644" +source = "git+https://github.com/HadrienG2/hwlocality?rev=0f248573bcad584960fe20293c826203a265b833#0f248573bcad584960fe20293c826203a265b833" dependencies = [ "autotools", "cmake", @@ -4724,9 +4547,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.27" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", @@ -4739,7 +4562,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite 0.2.13", - "socket2 0.4.9", + "socket2 0.5.5", "tokio", "tower-service", "tracing", @@ -4748,19 +4571,19 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ "futures-util", "http", "hyper", "log", - "rustls 0.21.9", + "rustls 0.21.10", "rustls-native-certs", "tokio", "tokio-rustls", - "webpki-roots 0.23.1", + "webpki-roots 0.25.3", ] [[package]] @@ -4777,16 +4600,16 @@ dependencies = [ [[package]] name = "iana-time-zone" -version = "0.1.57" +version = "0.1.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows 0.48.0", + "windows-core 0.52.0", ] [[package]] @@ -4825,6 +4648,16 @@ dependencies = [ "unicode-normalization", ] +[[package]] +name = "idna" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +dependencies = [ + "unicode-bidi", + "unicode-normalization", +] + [[package]] name = "if-addrs" version = "0.10.2" @@ -4851,14 +4684,14 @@ dependencies = [ "rtnetlink", "system-configuration", "tokio", - "windows 0.51.1", + "windows", ] [[package]] name = "igd-next" -version = "0.14.2" +version = "0.14.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57e065e90a518ab5fedf79aa1e4b784e10f8e484a834f6bda85c42633a2cb7af" +checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" dependencies = [ "async-trait", "attohttpc", @@ -4949,12 +4782,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.0.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" +checksum = "433de089bd45971eecf4668ee0ee8f4cec17db4f8bd8f7bc3197a6ce37aa7d9b" dependencies = [ "equivalent", - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -4977,7 +4810,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5" dependencies = [ - "block-padding 0.3.3", + "block-padding", "generic-array 0.14.7", ] @@ -4999,32 +4832,13 @@ dependencies = [ "num-traits", ] -[[package]] -name = "interceptor" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8a11ae2da61704edada656798b61c94b35ecac2c58eb955156987d5e6be90b" -dependencies = [ - "async-trait", - "bytes", - "log", - "rand 0.8.5", - "rtcp", - "rtp", - "thiserror", - "tokio", - "waitgroup", - "webrtc-srtp", - "webrtc-util", -] - [[package]] name = "io-lifetimes" version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", "windows-sys 0.48.0", ] @@ -5049,9 +4863,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.8.0" +version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" +checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" [[package]] name = "is-docker" @@ -5064,13 +4878,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ - "hermit-abi 0.3.2", - "rustix 0.38.13", - "windows-sys 0.48.0", + "hermit-abi", + "rustix 0.38.30", + "windows-sys 0.52.0", ] [[package]] @@ -5100,24 +4914,24 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.9" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" [[package]] name = "jobserver" -version = "0.1.26" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] [[package]] name = "js-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +checksum = "9a1d36f1235bc969acba30b7f5990b864423a6068a10f7c90ae8f0112e3a59d1" dependencies = [ "wasm-bindgen", ] @@ -5161,7 +4975,7 @@ dependencies = [ "tokio-rustls", "tokio-util", "tracing", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", ] [[package]] @@ -5171,7 +4985,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803" dependencies = [ "anyhow", - "arrayvec 0.7.4", + "arrayvec", "async-lock 2.8.0", "async-trait", "beef", @@ -5219,7 +5033,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a" dependencies = [ "heck", - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -5286,26 +5100,32 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.1" +version = "0.13.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc" +checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" dependencies = [ "cfg-if", - "ecdsa 0.16.8", - "elliptic-curve 0.13.5", + "ecdsa", + "elliptic-curve", "once_cell", "sha2 0.10.8", ] [[package]] name = "keccak" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" +checksum = "ecc2af9a1119c51f12a14607e783cb977bde58bc069ff0c3da1095e635d70654" dependencies = [ "cpufeatures", ] +[[package]] +name = "keystream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28" + [[package]] name = "kvdb" version = "0.13.0" @@ -5348,9 +5168,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.152" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7" + +[[package]] +name = "libm" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" [[package]] name = "libmimalloc-sys" @@ -5365,14 +5191,14 @@ dependencies = [ [[package]] name = "libp2p" -version = "0.51.3" +version = "0.51.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f210d259724eae82005b5c48078619b7745edb7b76de370b03f8ba59ea103097" +checksum = "f35eae38201a993ece6bdc823292d6abd1bffed1c4d0f4a3517d2bd8e1d917fe" dependencies = [ "bytes", "futures", "futures-timer", - "getrandom 0.2.11", + "getrandom 0.2.12", "instant", "libp2p-allow-block-list 0.1.1", "libp2p-connection-limits 0.1.0", @@ -5390,7 +5216,6 @@ dependencies = [ "libp2p-swarm 0.42.2", "libp2p-tcp 0.39.0", "libp2p-wasm-ext", - "libp2p-webrtc", "libp2p-websocket", "libp2p-yamux 0.43.1", "multiaddr 0.17.1", @@ -5406,7 +5231,7 @@ dependencies = [ "either", "futures", "futures-timer", - "getrandom 0.2.11", + "getrandom 0.2.12", "instant", "libp2p-allow-block-list 0.3.0", "libp2p-autonat", @@ -5625,14 +5450,14 @@ version = "0.46.1" source = "git+https://github.com/subspace/rust-libp2p?rev=d6339da35589d86bae6ecb25a5121c02f2e5b90e#d6339da35589d86bae6ecb25a5121c02f2e5b90e" dependencies = [ "asynchronous-codec 0.7.0", - "base64 0.21.5", + "base64 0.21.7", "byteorder", "bytes", "either", "fnv", "futures", "futures-ticker", - "getrandom 0.2.11", + "getrandom 0.2.12", "hex_fmt", "instant", "libp2p-core 0.41.1", @@ -5685,7 +5510,7 @@ dependencies = [ "libp2p-core 0.41.1", "libp2p-identity 0.2.8", "libp2p-swarm 0.44.0", - "lru 0.12.1", + "lru 0.12.2", "quick-protobuf", "quick-protobuf-codec 0.3.0", "smallvec", @@ -5701,7 +5526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce" dependencies = [ "bs58 0.4.0", - "ed25519-dalek 2.0.0", + "ed25519-dalek 2.1.0", "log", "multiaddr 0.17.1", "multihash 0.17.0", @@ -5719,7 +5544,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "999ec70441b2fb35355076726a6bc466c932e9bdc66f6a11c6c0aa17c7ab9be0" dependencies = [ "bs58 0.5.0", - "ed25519-dalek 2.0.0", + "ed25519-dalek 2.1.0", "hkdf", "multihash 0.19.1", "quick-protobuf", @@ -5737,7 +5562,7 @@ version = "0.43.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39d5ef876a2b2323d63c258e63c2f8e36f205fe5a11f0b3095d59635650790ff" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "asynchronous-codec 0.6.2", "bytes", "either", @@ -5764,7 +5589,7 @@ name = "libp2p-kad" version = "0.45.2" source = "git+https://github.com/subspace/rust-libp2p?rev=d6339da35589d86bae6ecb25a5121c02f2e5b90e#d6339da35589d86bae6ecb25a5121c02f2e5b90e" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "asynchronous-codec 0.7.0", "bytes", "either", @@ -5802,7 +5627,7 @@ dependencies = [ "log", "rand 0.8.5", "smallvec", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", "trust-dns-proto", "void", @@ -5972,7 +5797,7 @@ dependencies = [ "libp2p-tls 0.1.0", "log", "parking_lot 0.12.1", - "quinn-proto 0.9.4", + "quinn-proto 0.9.6", "rand 0.8.5", "rustls 0.20.9", "thiserror", @@ -5995,7 +5820,7 @@ dependencies = [ "quinn", "rand 0.8.5", "ring 0.16.20", - "rustls 0.21.9", + "rustls 0.21.10", "socket2 0.5.5", "thiserror", "tokio", @@ -6099,7 +5924,7 @@ dependencies = [ "heck", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6114,7 +5939,7 @@ dependencies = [ "libc", "libp2p-core 0.39.2", "log", - "socket2 0.4.9", + "socket2 0.4.10", "tokio", ] @@ -6148,7 +5973,7 @@ dependencies = [ "ring 0.16.20", "rustls 0.20.9", "thiserror", - "webpki 0.22.1", + "webpki", "x509-parser 0.14.0", "yasna", ] @@ -6164,8 +5989,8 @@ dependencies = [ "libp2p-identity 0.2.8", "rcgen 0.11.3", "ring 0.16.20", - "rustls 0.21.9", - "rustls-webpki 0.101.7", + "rustls 0.21.10", + "rustls-webpki", "thiserror", "x509-parser 0.15.1", "yasna", @@ -6200,37 +6025,6 @@ dependencies = [ "wasm-bindgen-futures", ] -[[package]] -name = "libp2p-webrtc" -version = "0.4.0-alpha.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dba48592edbc2f60b4bc7c10d65445b0c3964c07df26fdf493b6880d33be36f8" -dependencies = [ - "async-trait", - "asynchronous-codec 0.6.2", - "bytes", - "futures", - "futures-timer", - "hex", - "if-watch", - "libp2p-core 0.39.2", - "libp2p-identity 0.1.3", - "libp2p-noise 0.42.2", - "log", - "multihash 0.17.0", - "quick-protobuf", - "quick-protobuf-codec 0.1.0", - "rand 0.8.5", - "rcgen 0.9.3", - "serde", - "stun", - "thiserror", - "tinytemplate", - "tokio", - "tokio-util", - "webrtc", -] - [[package]] name = "libp2p-websocket" version = "0.41.0" @@ -6272,7 +6066,18 @@ dependencies = [ "libp2p-core 0.41.1", "thiserror", "tracing", - "yamux 0.12.0", + "yamux 0.12.1", +] + +[[package]] +name = "libredox" +version = "0.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +dependencies = [ + "bitflags 2.4.2", + "libc", + "redox_syscall 0.4.1", ] [[package]] @@ -6302,7 +6107,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451" dependencies = [ "crunchy", "digest 0.9.0", - "subtle", + "subtle 2.5.0", ] [[package]] @@ -6325,9 +6130,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.12" +version = "1.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" +checksum = "037731f5d3aaa87a5675e895b63ddff1a87624bc29f77004ea829809654e48f6" dependencies = [ "cc", "pkg-config", @@ -6375,39 +6180,44 @@ checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "linux-raw-sys" -version = "0.3.8" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" +checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" [[package]] -name = "linux-raw-sys" -version = "0.4.7" +name = "lioness" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9" +dependencies = [ + "arrayref", + "blake2 0.8.1", + "chacha", + "keystream", +] [[package]] name = "local-channel" -version = "0.1.3" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f303ec0e94c6c54447f84f3b0ef7af769858a9c4ef56ef2a986d3dcd4c3fc9c" +checksum = "b6cbc85e69b8df4b8bb8b89ec634e7189099cea8927a276b7384ce5488e53ec8" dependencies = [ "futures-core", "futures-sink", - "futures-util", "local-waker", ] [[package]] name = "local-waker" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e34f76eb3611940e0e7d53a9aaa4e6a3151f69541a282fd0dad5571420c53ff1" +checksum = "4d873d7c67ce09b42110d801813efbc9364414e356be9935700d368351657487" [[package]] name = "lock_api" -version = "0.4.10" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ "autocfg", "scopeguard", @@ -6430,20 +6240,11 @@ dependencies = [ [[package]] name = "lru" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a83fb7698b3643a0e34f9ae6f2e8f0178c0fd42f8b59d493aa271ff3a5bf21" -dependencies = [ - "hashbrown 0.14.0", -] - -[[package]] -name = "lru" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2994eeba8ed550fd9b47a0b38f0242bc3344e496483c6180b69139cc2fa5d1d7" +checksum = "db2c024b41519440580066ba82aab04092b333e09066a5eb86c7c4890df31f22" dependencies = [ - "hashbrown 0.14.0", + "hashbrown 0.14.3", ] [[package]] @@ -6486,50 +6287,50 @@ dependencies = [ [[package]] name = "macro_magic" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9" +checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d" dependencies = [ "macro_magic_core", "macro_magic_macros", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "macro_magic_core" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00" +checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d" dependencies = [ "const-random", "derive-syn-parse", "macro_magic_core_macros", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "macro_magic_core_macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c12469fc165526520dff2807c2975310ab47cf7190a45b99b49a7dc8befab17b" +checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "macro_magic_macros" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a" +checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3" dependencies = [ "macro_magic_core", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -6570,36 +6371,27 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "matrixmultiply" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090126dc04f95dc0d1c1c91f61bdd474b3930ca064c1edc8a849da2c6cbe1e77" +checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2" dependencies = [ "autocfg", "rawpointer", ] -[[package]] -name = "md-5" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" -dependencies = [ - "digest 0.10.7", -] - [[package]] name = "memchr" -version = "2.6.3" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" [[package]] name = "memfd" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc89ccdc6e10d6907450f753537ebc5c5d3460d2e4e62ea74bd571db62c0f9e" +checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64" dependencies = [ - "rustix 0.37.23", + "rustix 0.38.30", ] [[package]] @@ -6613,9 +6405,9 @@ dependencies = [ [[package]] name = "memmap2" -version = "0.7.1" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f49388d20533534cd19360ad3d6a7dadc885944aa802ba3995040c5ec11288c6" +checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" dependencies = [ "libc", ] @@ -6638,34 +6430,13 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "memory-db" version = "0.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "808b50db46293432a45e63bc15ea51e0ab4c0a1647b8eb114e31a3e698dd6fbe" dependencies = [ - "hash-db 0.16.0", -] - -[[package]] -name = "merlin" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42" -dependencies = [ - "byteorder", - "keccak", - "rand_core 0.5.1", - "zeroize", + "hash-db", ] [[package]] @@ -6712,9 +6483,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.9" +version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0" +checksum = "8f3d0b296e374a4e6f3c7b0a1f5a51d748a0d34c85e7dc48fc3fa9a87657fe09" dependencies = [ "libc", "log", @@ -6722,6 +6493,66 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "mixnet" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a" +dependencies = [ + "arrayref", + "arrayvec", + "bitflags 1.3.2", + "blake2 0.10.6", + "c2-chacha", + "curve25519-dalek 4.1.1", + "either", + "hashlink", + "lioness", + "log", + "parking_lot 0.12.1", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_distr", + "subtle 2.5.0", + "thiserror", + "zeroize", +] + +[[package]] +name = "mmr-gadget" +version = "4.0.0-dev" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" +dependencies = [ + "futures", + "log", + "parity-scale-codec", + "sc-client-api", + "sc-offchain", + "sp-api", + "sp-blockchain", + "sp-consensus", + "sp-consensus-beefy", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", +] + +[[package]] +name = "mmr-rpc" +version = "4.0.0-dev" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" +dependencies = [ + "anyhow", + "jsonrpsee", + "parity-scale-codec", + "serde", + "sp-api", + "sp-blockchain", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", +] + [[package]] name = "mockall" version = "0.11.4" @@ -6863,7 +6694,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", @@ -7028,7 +6859,6 @@ dependencies = [ "bitflags 1.3.2", "cfg-if", "libc", - "memoffset 0.6.5", ] [[package]] @@ -7103,7 +6933,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a652d9771a63711fd3c3deb670acfbe5c30a4072e664d7a3bf5a9e1056ac72c3" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "itoa", ] @@ -7142,11 +6972,12 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ "autocfg", + "libm", ] [[package]] @@ -7155,38 +6986,17 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", ] -[[package]] -name = "num_enum" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" -dependencies = [ - "num_enum_derive 0.6.1", -] - [[package]] name = "num_enum" version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845" dependencies = [ - "num_enum_derive 0.7.2", -] - -[[package]] -name = "num_enum_derive" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" -dependencies = [ - "proc-macro-crate", - "proc-macro2", - "quote", - "syn 2.0.39", + "num_enum_derive", ] [[package]] @@ -7195,9 +7005,10 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b" dependencies = [ + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7220,39 +7031,30 @@ dependencies = [ [[package]] name = "object" -version = "0.32.1" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" +checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" dependencies = [ "memchr", ] -[[package]] -name = "oid-registry" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38e20717fa0541f39bd146692035c37bedfa532b3e5071b35761082407546b2a" -dependencies = [ - "asn1-rs 0.3.1", -] - [[package]] name = "oid-registry" version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff" dependencies = [ - "asn1-rs 0.5.2", + "asn1-rs", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" dependencies = [ - "atomic-polyfill", "critical-section", + "portable-atomic", ] [[package]] @@ -7290,10 +7092,16 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-support", "frame-system", @@ -7317,32 +7125,10 @@ version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" -[[package]] -name = "p256" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" -dependencies = [ - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2 0.10.8", -] - -[[package]] -name = "p384" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc8c5bf642dde52bb9e87c0ecd8ca5a76faac2eeed98dedb7c717997e1080aa" -dependencies = [ - "ecdsa 0.14.8", - "elliptic-curve 0.12.3", - "sha2 0.10.8", -] - [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-benchmarking", "frame-support", @@ -7357,7 +7143,7 @@ dependencies = [ [[package]] name = "pallet-base-fee" version = "1.0.0" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "fp-evm", "frame-support", @@ -7368,10 +7154,26 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "pallet-block-fees" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +dependencies = [ + "domain-runtime-primitives", + "frame-support", + "frame-system", + "pallet-transaction-payment", + "parity-scale-codec", + "scale-info", + "sp-block-fees", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-domain-id" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-support", "frame-system", @@ -7384,7 +7186,7 @@ dependencies = [ [[package]] name = "pallet-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -7408,7 +7210,7 @@ dependencies = [ [[package]] name = "pallet-ethereum" version = "4.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "ethereum", "ethereum-types", @@ -7431,7 +7233,7 @@ dependencies = [ [[package]] name = "pallet-evm" version = "6.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "environmental", "evm", @@ -7440,6 +7242,7 @@ dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "hash-db", "hex", "hex-literal", "impl-trait-for-tuples", @@ -7456,19 +7259,18 @@ dependencies = [ [[package]] name = "pallet-evm-chain-id" version = "1.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", - "sp-runtime", ] [[package]] name = "pallet-evm-precompile-modexp" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "fp-evm", "num", @@ -7477,7 +7279,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-sha3fips" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "fp-evm", "tiny-keccak", @@ -7486,7 +7288,7 @@ dependencies = [ [[package]] name = "pallet-evm-precompile-simple" version = "2.0.0-dev" -source = "git+https://github.com/subspace/frontier?rev=37ee45323120b21adc1d69ae7348bd0f7282eeae#37ee45323120b21adc1d69ae7348bd0f7282eeae" +source = "git+https://github.com/subspace/frontier?rev=7627e61d80275a4cf24d06f27491f6c31eadb7b7#7627e61d80275a4cf24d06f27491f6c31eadb7b7" dependencies = [ "fp-evm", "ripemd", @@ -7496,7 +7298,7 @@ dependencies = [ [[package]] name = "pallet-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-benchmarking", "frame-support", @@ -7513,28 +7315,33 @@ dependencies = [ ] [[package]] -name = "pallet-offences-subspace" -version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +name = "pallet-mmr" +version = "4.0.0-dev" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ + "frame-benchmarking", "frame-support", "frame-system", + "log", "parity-scale-codec", "scale-info", - "sp-consensus-subspace", + "sp-core", + "sp-io", + "sp-mmr-primitives", "sp-runtime", "sp-std", ] [[package]] -name = "pallet-operator-rewards" +name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-support", "frame-system", "parity-scale-codec", "scale-info", + "sp-consensus-subspace", "sp-runtime", "sp-std", ] @@ -7542,7 +7349,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-support", "frame-system", @@ -7554,7 +7361,7 @@ dependencies = [ [[package]] name = "pallet-runtime-configs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-support", "frame-system", @@ -7567,7 +7374,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-benchmarking", "frame-support", @@ -7587,10 +7394,26 @@ dependencies = [ "subspace-verification", ] +[[package]] +name = "pallet-subspace-mmr" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +dependencies = [ + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-core", + "sp-mmr-primitives", + "sp-runtime", + "sp-std", + "sp-subspace-mmr", +] + [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "docify", "frame-benchmarking", @@ -7606,8 +7429,9 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ + "docify", "frame-benchmarking", "frame-support", "frame-system", @@ -7625,7 +7449,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-support", "frame-system", @@ -7637,7 +7461,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-support", "frame-system", @@ -7653,7 +7477,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -7669,7 +7493,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7681,7 +7505,7 @@ dependencies = [ [[package]] name = "pallet-transporter" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -7698,7 +7522,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-benchmarking", "frame-support", @@ -7713,11 +7537,11 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f" +checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e" dependencies = [ - "blake2", + "blake2 0.10.6", "crc32fast", "fs2", "hex", @@ -7729,15 +7553,16 @@ dependencies = [ "rand 0.8.5", "siphasher", "snap", + "winapi", ] [[package]] name = "parity-scale-codec" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dec8a8073036902368c2cdc0387e85ff9a37054d7e7c98e592145e0c92cd4fb" +checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe" dependencies = [ - "arrayvec 0.7.4", + "arrayvec", "bitvec", "byte-slice-cast", "bytes", @@ -7748,11 +7573,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "3.6.5" +version = "3.6.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "312270ee71e1cd70289dacf597cab7b207aa107d2f28191c2ae45b2ece18a260" +checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 2.0.0", "proc-macro2", "quote", "syn 1.0.109", @@ -7772,9 +7597,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304" [[package]] name = "parking" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14f2252c834a40ed9bb5422029649578e63aa341ac401f74e719dd1afda8394e" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" [[package]] name = "parking_lot" @@ -7794,7 +7619,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.8", + "parking_lot_core 0.9.9", ] [[package]] @@ -7813,13 +7638,13 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" dependencies = [ "cfg-if", "libc", - "redox_syscall 0.3.5", + "redox_syscall 0.4.1", "smallvec", "windows-targets 0.48.5", ] @@ -7848,16 +7673,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa" dependencies = [ - "crypto-mac 0.11.1", -] - -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest 0.10.7", + "crypto-mac 0.11.0", ] [[package]] @@ -7871,28 +7687,19 @@ dependencies = [ [[package]] name = "pem" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3163d2912b7c3b52d651a055f2c7eec9ba5cd22d26ef75b8dd3a59980b185923" +checksum = "1b8fcc794035347fb64beda2d3b462595dd2753e3f268d89c5aae77e8cf2c310" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "serde", ] -[[package]] -name = "pem-rfc7468" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" -dependencies = [ - "base64ct", -] - [[package]] name = "percent-encoding" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "petgraph" @@ -7901,27 +7708,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" dependencies = [ "fixedbitset", - "indexmap 2.0.0", + "indexmap 2.2.1", ] [[package]] name = "pin-project" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422" +checksum = "0302c4a0442c456bd56f841aee5c3bfd17967563f6fadc9ceb9f9c23cf3807e0" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.3" +version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405" +checksum = "266c042b60c9c76b8d53061e52b2e0d1116abc57cefc8c5cd671619a56ac3690" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -7959,31 +7766,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7" dependencies = [ "der 0.7.8", - "spki 0.7.2", + "spki 0.7.3", ] [[package]] name = "pkg-config" -version = "0.3.27" +version = "0.3.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" +checksum = "2900ede94e305130c13ddd391e0ab7cbaeb783945ae07a279c268cb05109c6cb" [[package]] name = "platforms" -version = "3.1.2" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8" +checksum = "626dec3cac7cc0e1577a2ec3fc496277ec2baa084bebad95bb6fdbfae235f84c" [[package]] name = "polling" -version = "3.3.1" +version = "3.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf63fa624ab313c11656b4cda960bfc46c410187ad493c41f6ba2d8c1e991c9e" +checksum = "545c980a3880efd47b2e262f6a4bb6daad6555cf3367aa9c4e52895f69537a41" dependencies = [ "cfg-if", "concurrent-queue", "pin-project-lite 0.2.13", - "rustix 0.38.13", + "rustix 0.38.30", "tracing", "windows-sys 0.52.0", ] @@ -7996,19 +7803,7 @@ checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf" dependencies = [ "cpufeatures", "opaque-debug 0.3.0", - "universal-hash 0.5.1", -] - -[[package]] -name = "polyval" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8419d2b623c7c0896ff2d5d96e2cb4ede590fed28fcc34934f4c33c036e620a1" -dependencies = [ - "cfg-if", - "cpufeatures", - "opaque-debug 0.3.0", - "universal-hash 0.4.1", + "universal-hash", ] [[package]] @@ -8020,14 +7815,20 @@ dependencies = [ "cfg-if", "cpufeatures", "opaque-debug 0.3.0", - "universal-hash 0.5.1", + "universal-hash", ] [[package]] name = "portable-atomic" -version = "1.5.1" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" + +[[package]] +name = "powerfmt" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b" +checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" [[package]] name = "ppv-lite86" @@ -8077,9 +7878,9 @@ dependencies = [ [[package]] name = "primitive-types" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66" +checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", @@ -8099,6 +7900,24 @@ dependencies = [ "toml 0.5.11", ] +[[package]] +name = "proc-macro-crate" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" +dependencies = [ + "toml_edit 0.20.7", +] + +[[package]] +name = "proc-macro-crate" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +dependencies = [ + "toml_edit 0.21.0", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -8123,28 +7942,22 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.20+deprecated" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068" - [[package]] name = "proc-macro-warning" -version = "0.4.2" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e" +checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "proc-macro2" -version = "1.0.69" +version = "1.0.78" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" +checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" dependencies = [ "unicode-ident", ] @@ -8195,7 +8008,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -8367,7 +8180,7 @@ dependencies = [ "quinn-proto 0.10.6", "quinn-udp", "rustc-hash", - "rustls 0.21.9", + "rustls 0.21.10", "thiserror", "tokio", "tracing", @@ -8375,9 +8188,9 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31999cfc7927c4e212e60fd50934ab40e8e8bfd2d493d6095d2d306bc0764d9" +checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863" dependencies = [ "bytes", "rand 0.8.5", @@ -8388,7 +8201,7 @@ dependencies = [ "thiserror", "tinyvec", "tracing", - "webpki 0.22.1", + "webpki", ] [[package]] @@ -8401,7 +8214,7 @@ dependencies = [ "rand 0.8.5", "ring 0.16.20", "rustc-hash", - "rustls 0.21.9", + "rustls 0.21.10", "slab", "thiserror", "tinyvec", @@ -8423,9 +8236,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" dependencies = [ "proc-macro2", ] @@ -8495,7 +8308,17 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", +] + +[[package]] +name = "rand_distr" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +dependencies = [ + "num-traits", + "rand 0.8.5", ] [[package]] @@ -8524,9 +8347,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" +checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051" dependencies = [ "either", "rayon-core", @@ -8534,27 +8357,14 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.12.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" +checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" dependencies = [ "crossbeam-deque", "crossbeam-utils", ] -[[package]] -name = "rcgen" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6413f3de1edee53342e6138e75b56d32e7bc6e332b3bd62d497b1929d4cfbcdd" -dependencies = [ - "pem 1.1.1", - "ring 0.16.20", - "time", - "x509-parser 0.13.2", - "yasna", -] - [[package]] name = "rcgen" version = "0.10.0" @@ -8573,7 +8383,7 @@ version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6" dependencies = [ - "pem 3.0.2", + "pem 3.0.3", "ring 0.16.20", "time", "yasna", @@ -8590,42 +8400,42 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.3.5" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" dependencies = [ "bitflags 1.3.2", ] [[package]] name = "redox_users" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" +checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", - "redox_syscall 0.2.16", + "getrandom 0.2.12", + "libredox", "thiserror", ] [[package]] name = "ref-cast" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" +checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.20" +version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" +checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -8642,13 +8452,13 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.3", + "regex-automata 0.4.5", "regex-syntax 0.8.2", ] @@ -8663,9 +8473,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" dependencies = [ "aho-corasick", "memchr", @@ -8690,7 +8500,7 @@ version = "0.11.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "37b1ae8d9ac08420c66222fb9096fc5de435c3c48542bc5336c51892cffafb41" dependencies = [ - "base64 0.21.5", + "base64 0.21.7", "bytes", "encoding_rs", "futures-core", @@ -8707,7 +8517,7 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite 0.2.13", - "rustls 0.21.9", + "rustls 0.21.10", "rustls-pemfile", "serde", "serde_json", @@ -8720,7 +8530,7 @@ dependencies = [ "wasm-bindgen", "wasm-bindgen-futures", "web-sys", - "webpki-roots 0.25.2", + "webpki-roots 0.25.3", "winreg", ] @@ -8734,17 +8544,6 @@ dependencies = [ "quick-error", ] -[[package]] -name = "rfc6979" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" -dependencies = [ - "crypto-bigint 0.4.9", - "hmac 0.12.1", - "zeroize", -] - [[package]] name = "rfc6979" version = "0.4.0" @@ -8752,23 +8551,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ "hmac 0.12.1", - "subtle", + "subtle 2.5.0", ] [[package]] name = "ring" version = "0.1.0" -source = "git+https://github.com/w3f/ring-proof?rev=8657210#86572101f4210647984ab4efedba6b3fcc890895" +source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224" dependencies = [ "ark-ec", "ark-ff", "ark-poly", "ark-serialize", "ark-std", - "blake2", + "blake2 0.10.6", "common", "fflonk", - "merlin 3.0.0", + "merlin", ] [[package]] @@ -8788,12 +8587,12 @@ dependencies = [ [[package]] name = "ring" -version = "0.17.5" +version = "0.17.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb0205304757e5d899b9c2e448b867ffd03ae7f988002e47cd24954391394d0b" +checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -8833,24 +8632,13 @@ dependencies = [ [[package]] name = "rs_merkle" -version = "1.4.1" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05225752ca6ede4cb1b73aa37ce3904affd042e98f28246f56f438ebfd47a810" +checksum = "3b241d2e59b74ef9e98d94c78c47623d04c8392abaf82014dfd372a16041128f" dependencies = [ "sha2 0.10.8", ] -[[package]] -name = "rtcp" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1919efd6d4a6a85d13388f9487549bb8e359f17198cc03ffd72f79b553873691" -dependencies = [ - "bytes", - "thiserror", - "webrtc-util", -] - [[package]] name = "rtnetlink" version = "0.10.1" @@ -8866,20 +8654,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "rtp" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2a095411ff00eed7b12e4c6a118ba984d113e1079582570d56a5ee723f11f80" -dependencies = [ - "async-trait", - "bytes", - "rand 0.8.5", - "serde", - "thiserror", - "webrtc-util", -] - [[package]] name = "rust-kzg-blst" version = "0.1.0" @@ -8919,7 +8693,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.18", + "semver 1.0.21", ] [[package]] @@ -8933,9 +8707,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.15" +version = "0.36.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c37f1bd5ef1b5422177b7646cba67430579cfe2ace80f284fee876bca52ad941" +checksum = "305efbd14fde4139eb501df5f136994bb520b033fa9fbdce287507dc23b8c7ed" dependencies = [ "bitflags 1.3.2", "errno", @@ -8947,42 +8721,15 @@ dependencies = [ [[package]] name = "rustix" -version = "0.37.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d69718bf81c6127a49dc64e44a742e8bb9213c0ff8869a22c308f84c1d4ab06" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustix" -version = "0.38.13" +version = "0.38.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +checksum = "322394588aaf33c24007e8bb3238ee3e4c5c09c084ab32bc73890b99ff326bca" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.7", - "windows-sys 0.48.0", -] - -[[package]] -name = "rustls" -version = "0.19.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" -dependencies = [ - "base64 0.13.1", - "log", - "ring 0.16.20", - "sct 0.6.1", - "webpki 0.21.4", + "linux-raw-sys 0.4.13", + "windows-sys 0.52.0", ] [[package]] @@ -8993,20 +8740,20 @@ checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" dependencies = [ "log", "ring 0.16.20", - "sct 0.7.0", - "webpki 0.22.1", + "sct", + "webpki", ] [[package]] name = "rustls" -version = "0.21.9" +version = "0.21.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629648aced5775d558af50b2b4c7b02983a04b312126d45eeead26e7caa498b9" +checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba" dependencies = [ "log", - "ring 0.17.5", - "rustls-webpki 0.101.7", - "sct 0.7.0", + "ring 0.17.7", + "rustls-webpki", + "sct", ] [[package]] @@ -9023,21 +8770,11 @@ dependencies = [ [[package]] name = "rustls-pemfile" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2" -dependencies = [ - "base64 0.21.5", -] - -[[package]] -name = "rustls-webpki" -version = "0.100.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "base64 0.21.7", ] [[package]] @@ -9046,7 +8783,7 @@ version = "0.101.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" dependencies = [ - "ring 0.17.5", + "ring 0.17.7", "untrusted 0.9.0", ] @@ -9079,9 +8816,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.15" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c" [[package]] name = "safe_arch" @@ -9104,7 +8841,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "log", "sp-core", @@ -9115,14 +8852,13 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "futures", "futures-timer", "log", "parity-scale-codec", "sc-block-builder", - "sc-client-api", "sc-proposer-metrics", "sc-telemetry", "sc-transaction-pool-api", @@ -9138,24 +8874,28 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", - "sc-client-api", "sp-api", "sp-block-builder", "sp-blockchain", "sp-core", "sp-inherents", "sp-runtime", + "sp-trie", ] [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ + "array-bytes 6.2.2", + "docify", + "log", "memmap2 0.5.10", + "parity-scale-codec", "sc-chain-spec-derive", "sc-client-api", "sc-executor", @@ -9165,6 +8905,8 @@ dependencies = [ "serde_json", "sp-blockchain", "sp-core", + "sp-genesis-builder", + "sp-io", "sp-runtime", "sp-state-machine", ] @@ -9172,18 +8914,18 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "fnv", "futures", @@ -9203,15 +8945,16 @@ dependencies = [ "sp-state-machine", "sp-statement-store", "sp-storage", + "sp-trie", "substrate-prometheus-endpoint", ] [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "hash-db 0.16.0", + "hash-db", "kvdb", "kvdb-memorydb", "linked-hash-map", @@ -9234,7 +8977,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-lock 2.8.0", "async-trait", @@ -9261,7 +9004,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "futures", @@ -9290,7 +9033,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "futures", @@ -9313,11 +9056,11 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-trait", "futures", - "lru 0.11.1", + "lru 0.12.2", "parity-scale-codec", "parking_lot 0.12.1", "rand 0.8.5", @@ -9353,13 +9096,13 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-oneshot", "futures", "futures-timer", "jsonrpsee", - "lru 0.11.1", + "lru 0.12.2", "parity-scale-codec", "parking_lot 0.12.1", "sc-client-api", @@ -9384,7 +9127,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -9406,7 +9149,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -9418,13 +9161,14 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "anyhow", "cfg-if", "libc", "log", - "rustix 0.36.15", + "parking_lot 0.12.1", + "rustix 0.36.17", "sc-allocator", "sc-executor-common", "sp-runtime-interface", @@ -9435,7 +9179,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "ansi_term", "futures", @@ -9444,6 +9188,7 @@ dependencies = [ "sc-client-api", "sc-network", "sc-network-common", + "sc-network-sync", "sp-blockchain", "sp-runtime", ] @@ -9451,9 +9196,9 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "parking_lot 0.12.1", "serde_json", "sp-application-crypto", @@ -9462,23 +9207,51 @@ dependencies = [ "thiserror", ] +[[package]] +name = "sc-mixnet" +version = "0.1.0-dev" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" +dependencies = [ + "array-bytes 4.2.0", + "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.1", + "sc-client-api", + "sc-network", + "sc-transaction-pool-api", + "sp-api", + "sp-consensus", + "sp-core", + "sp-keystore", + "sp-mixnet", + "sp-runtime", + "thiserror", +] + [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel", "async-trait", "asynchronous-codec 0.6.2", - "atomic", "bytes", "either", "fnv", "futures", "futures-timer", "ip_network", - "libp2p 0.51.3", + "libp2p 0.51.4", "linked_hash_set", "log", "mockall", @@ -9499,6 +9272,8 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "tokio", + "tokio-stream", "unsigned-varint 0.7.2", "wasm-timer", "zeroize", @@ -9507,7 +9282,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-channel", "cid", @@ -9527,7 +9302,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "bitflags 1.3.2", @@ -9544,15 +9319,16 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "futures", "futures-timer", - "libp2p 0.51.3", + "libp2p 0.51.4", "log", "sc-network", "sc-network-common", + "sc-network-sync", "schnellru", "sp-runtime", "substrate-prometheus-endpoint", @@ -9562,9 +9338,9 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel", "futures", "libp2p-identity 0.1.3", @@ -9583,16 +9359,15 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "async-channel", "async-trait", - "atomic", "fork-tree", "futures", "futures-timer", - "libp2p 0.51.3", + "libp2p 0.51.4", "log", "mockall", "parity-scale-codec", @@ -9613,20 +9388,23 @@ dependencies = [ "sp-runtime", "substrate-prometheus-endpoint", "thiserror", + "tokio", + "tokio-stream", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "futures", - "libp2p 0.51.3", + "libp2p 0.51.4", "log", "parity-scale-codec", "sc-network", "sc-network-common", + "sc-network-sync", "sc-utils", "sp-consensus", "sp-runtime", @@ -9636,16 +9414,16 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "bytes", "fnv", "futures", "futures-timer", "hyper", "hyper-rustls", - "libp2p 0.51.3", + "libp2p 0.51.4", "log", "num_cpus", "once_cell", @@ -9670,13 +9448,13 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "atomic", "core_affinity", "derive_more", "futures", - "lru 0.11.1", + "lru 0.12.2", "parity-scale-codec", "parking_lot 0.12.1", "rayon", @@ -9699,7 +9477,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9708,7 +9486,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "futures", "jsonrpsee", @@ -9718,6 +9496,7 @@ dependencies = [ "sc-block-builder", "sc-chain-spec", "sc-client-api", + "sc-mixnet", "sc-rpc-api", "sc-tracing", "sc-transaction-pool-api", @@ -9739,11 +9518,12 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "jsonrpsee", "parity-scale-codec", "sc-chain-spec", + "sc-mixnet", "sc-transaction-pool-api", "scale-info", "serde", @@ -9758,7 +9538,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "http", "jsonrpsee", @@ -9773,9 +9553,9 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "futures", "futures-util", "hex", @@ -9791,6 +9571,7 @@ dependencies = [ "sp-api", "sp-blockchain", "sp-core", + "sp-rpc", "sp-runtime", "sp-version", "thiserror", @@ -9801,7 +9582,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "directories", @@ -9814,7 +9595,6 @@ dependencies = [ "parking_lot 0.12.1", "pin-project", "rand 0.8.5", - "sc-block-builder", "sc-chain-spec", "sc-client-api", "sc-client-db", @@ -9865,7 +9645,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "log", "parity-scale-codec", @@ -9876,12 +9656,11 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "clap", - "fs4 0.6.6", + "fs4", "log", - "sc-client-db", "sp-core", "thiserror", "tokio", @@ -9890,7 +9669,7 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-channel", "async-trait", @@ -9906,7 +9685,7 @@ dependencies = [ "sp-api", "sp-consensus-subspace", "sp-runtime", - "strum_macros 0.25.2", + "strum_macros 0.25.3", "substrate-prometheus-endpoint", "thiserror", "tracing", @@ -9915,21 +9694,14 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" -dependencies = [ - "sc-chain-spec", - "sc-service", - "sc-telemetry", - "serde", - "sp-core", - "sp-runtime", -] +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ + "derive_more", "futures", "libc", "log", @@ -9947,11 +9719,11 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "chrono", "futures", - "libp2p 0.51.3", + "libp2p 0.51.4", "log", "parking_lot 0.12.1", "pin-project", @@ -9966,14 +9738,15 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "ansi_term", - "atty", "chrono", + "is-terminal", "lazy_static", "libc", "log", + "parity-scale-codec", "parking_lot 0.12.1", "regex", "rustc-hash", @@ -9988,25 +9761,25 @@ dependencies = [ "sp-tracing", "thiserror", "tracing", - "tracing-log 0.1.3", + "tracing-log 0.1.4", "tracing-subscriber 0.2.25", ] [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "futures", @@ -10032,7 +9805,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "futures", @@ -10048,7 +9821,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-channel", "futures", @@ -10062,9 +9835,9 @@ dependencies = [ [[package]] name = "scale-info" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35c0a159d0c45c12b20c5a844feb1fe4bea86e28f17b92a5f0c42193634d3782" +checksum = "7f7d66a1128282b7ef025a8ead62a4a9fcf017382ec53b8ffbf4d7bf77bd3c60" dependencies = [ "bitvec", "cfg-if", @@ -10076,11 +9849,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "2.9.0" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "912e55f6d20e0e80d63733872b40e1227c0bce1e1ab81ba67d696339bfd7fd29" +checksum = "abf2c68b89cafb3b8d918dd07b42be0da66ff202cf1155c5739a4e0c1ea0dc19" dependencies = [ - "proc-macro-crate", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn 1.0.109", @@ -10088,11 +9861,11 @@ dependencies = [ [[package]] name = "schannel" -version = "0.1.22" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" +checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -10101,26 +9874,27 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "cfg-if", "hashbrown 0.13.2", ] [[package]] name = "schnorrkel" -version = "0.9.1" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862" +checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0" dependencies = [ + "aead", "arrayref", - "arrayvec 0.5.2", - "curve25519-dalek 2.1.3", - "getrandom 0.1.16", - "merlin 2.0.1", - "rand 0.7.3", - "rand_core 0.5.1", - "sha2 0.8.2", - "subtle", + "arrayvec", + "curve25519-dalek 4.1.1", + "getrandom_or_panic", + "merlin", + "rand_core 0.6.4", + "serde_bytes", + "sha2 0.10.8", + "subtle 2.5.0", "zeroize", ] @@ -10138,22 +9912,12 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152" [[package]] name = "sct" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "sct" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -10162,7 +9926,7 @@ version = "0.1.0" dependencies = [ "anyhow", "derivative", - "derive_builder 0.12.0", + "derive_builder", "derive_more", "futures", "hex", @@ -10187,11 +9951,11 @@ dependencies = [ "async-trait", "bytesize", "derivative", - "derive_builder 0.12.0", + "derive_builder", "derive_more", "futures", "libmimalloc-sys", - "lru 0.11.1", + "lru 0.12.2", "parking_lot 0.12.1", "pin-project", "rayon", @@ -10220,7 +9984,7 @@ dependencies = [ "backoff", "cross-domain-message-gossip", "derivative", - "derive_builder 0.12.0", + "derive_builder", "derive_more", "domain-client-message-relayer", "domain-client-operator", @@ -10240,7 +10004,6 @@ dependencies = [ "sc-client-api", "sc-consensus-slots", "sc-consensus-subspace", - "sc-executor", "sc-network", "sc-network-sync", "sc-rpc-api", @@ -10261,7 +10024,6 @@ dependencies = [ "sp-consensus-subspace", "sp-core", "sp-domains", - "sp-domains-fraud-proof", "sp-messenger", "sp-runtime", "sp-version", @@ -10284,11 +10046,10 @@ version = "0.1.0" dependencies = [ "bytesize", "derivative", - "derive_builder 0.12.0", + "derive_builder", "derive_more", "names", "sc-chain-spec", - "sc-executor", "sc-informant", "sc-network", "sc-service", @@ -10298,7 +10059,7 @@ dependencies = [ "serde", "serde_json", "sp-runtime", - "tokio", + "subspace-service", ] [[package]] @@ -10321,7 +10082,7 @@ dependencies = [ "anyhow", "async-trait", "base58", - "blake2", + "blake2 0.10.6", "bytesize", "bytesize-serde", "derivative", @@ -10354,18 +10115,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "sdp" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d22a5ef407871893fd72b4562ee15e4742269b173959db4b8df6f538c414e13" -dependencies = [ - "rand 0.8.5", - "substring", - "thiserror", - "url", -] - [[package]] name = "sec1" version = "0.3.0" @@ -10376,7 +10125,6 @@ dependencies = [ "der 0.6.1", "generic-array 0.14.7", "pkcs8 0.9.0", - "subtle", "zeroize", ] @@ -10390,24 +10138,24 @@ dependencies = [ "der 0.7.8", "generic-array 0.14.7", "pkcs8 0.10.2", - "subtle", + "subtle 2.5.0", "zeroize", ] [[package]] name = "secp256k1" -version = "0.24.3" +version = "0.28.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +checksum = "3f622567e3b4b38154fb8190bcf6b160d7a4301d70595a49195b48c116007a27" dependencies = [ "secp256k1-sys", ] [[package]] name = "secp256k1-sys" -version = "0.6.1" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb" dependencies = [ "cc", ] @@ -10455,9 +10203,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.18" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" +checksum = "b97ed7a9823b74f99c7742f5336af7be5ecd3eeafcb1507d1fa93347b1d589b0" dependencies = [ "serde", ] @@ -10482,38 +10230,47 @@ checksum = "a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4" [[package]] name = "serde" -version = "1.0.188" +version = "1.0.196" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_arrays" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +checksum = "38636132857f68ec3d5f3eb121166d2af33cb55174c4d5ff645db6165cbef0fd" dependencies = [ - "serde_derive", + "serde", ] [[package]] -name = "serde_arrays" -version = "0.1.0" +name = "serde_bytes" +version = "0.11.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38636132857f68ec3d5f3eb121166d2af33cb55174c4d5ff645db6165cbef0fd" +checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.188" +version = "1.0.196" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "serde_json" -version = "1.0.106" +version = "1.0.113" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +checksum = "69801b70b1c3dac963ecb03a364ba0ceda9cf60c71cfe475e99864759c8b8a79" dependencies = [ "itoa", "ryu", @@ -10522,9 +10279,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96426c9936fd7a0124915f9185ea1d20aa9445cc9821142f0a73bc9207a2e186" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" dependencies = [ "serde", ] @@ -10556,27 +10313,15 @@ dependencies = [ [[package]] name = "sha1" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", "digest 0.10.7", ] -[[package]] -name = "sha2" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha2" version = "0.9.9" @@ -10613,9 +10358,9 @@ dependencies = [ [[package]] name = "sharded-slab" -version = "0.1.4" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" dependencies = [ "lazy_static", ] @@ -10655,16 +10400,12 @@ name = "signature" version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" -dependencies = [ - "digest 0.10.7", - "rand_core 0.6.4", -] [[package]] name = "signature" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500" +checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ "digest 0.10.7", "rand_core 0.6.4", @@ -10683,6 +10424,11 @@ dependencies = [ "wide", ] +[[package]] +name = "simple-mermaid" +version = "0.1.0" +source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b" + [[package]] name = "single-instance" version = "0.3.3" @@ -10719,38 +10465,38 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7" [[package]] name = "smallvec" -version = "1.11.2" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "snap" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "snow" -version = "0.9.4" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e" +checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85" dependencies = [ - "aes-gcm 0.10.2", - "blake2", + "aes-gcm", + "blake2 0.10.6", "chacha20poly1305", "curve25519-dalek 4.1.1", "rand_core 0.6.4", - "ring 0.17.5", + "ring 0.17.7", "rustc_version", "sha2 0.10.8", - "subtle", + "subtle 2.5.0", ] [[package]] name = "socket2" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" +checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d" dependencies = [ "libc", "winapi", @@ -10786,9 +10532,9 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "hash-db 0.16.0", + "hash-db", "log", "parity-scale-codec", "scale-info", @@ -10807,21 +10553,21 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "Inflector", - "blake2", + "blake2 0.10.6", "expander", - "proc-macro-crate", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "sp-application-crypto" version = "23.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", "scale-info", @@ -10834,7 +10580,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "16.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "integer-sqrt", "num-traits", @@ -10845,10 +10591,28 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "sp-ark-bls12-381" +version = "0.4.2" +source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" +dependencies = [ + "ark-bls12-381-ext", + "sp-crypto-ec-utils", +] + +[[package]] +name = "sp-ark-ed-on-bls12-381-bandersnatch" +version = "0.4.2" +source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f" +dependencies = [ + "ark-ed-on-bls12-381-bandersnatch-ext", + "sp-crypto-ec-utils", +] + [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "sp-api", "sp-inherents", @@ -10856,10 +10620,22 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-block-fees" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +dependencies = [ + "async-trait", + "domain-runtime-primitives", + "parity-scale-codec", + "sp-inherents", + "sp-std", +] + [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "futures", "log", @@ -10877,7 +10653,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "futures", @@ -10892,7 +10668,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "parity-scale-codec", @@ -10906,10 +10682,29 @@ dependencies = [ "sp-timestamp", ] +[[package]] +name = "sp-consensus-beefy" +version = "4.0.0-dev" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" +dependencies = [ + "lazy_static", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-application-crypto", + "sp-core", + "sp-io", + "sp-mmr-primitives", + "sp-runtime", + "sp-std", + "strum", +] + [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "finality-grandpa", "log", @@ -10927,7 +10722,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", "scale-info", @@ -10939,7 +10734,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-trait", "log", @@ -10966,30 +10761,30 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "array-bytes", + "array-bytes 6.2.2", "bandersnatch_vrfs", + "bip39", "bitflags 1.3.2", - "blake2", + "blake2 0.10.6", "bounded-collections", "bs58 0.5.0", "dyn-clonable", "ed25519-zebra", "futures", - "hash-db 0.16.0", + "hash-db", "hash256-std-hasher", "impl-serde", - "lazy_static", + "itertools", "libsecp256k1", "log", - "merlin 2.0.1", + "merlin", "parity-scale-codec", "parking_lot 0.12.1", "paste", "primitive-types", "rand 0.8.5", - "regex", "scale-info", "schnorrkel", "secp256k1", @@ -11004,15 +10799,15 @@ dependencies = [ "ss58-registry", "substrate-bip39", "thiserror", - "tiny-bip39", "tracing", + "w3f-bls", "zeroize", ] [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "blake2b_simd", "byteorder", @@ -11025,17 +10820,38 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "quote", "sp-core-hashing", - "syn 2.0.39", + "syn 2.0.48", +] + +[[package]] +name = "sp-crypto-ec-utils" +version = "0.10.0" +source = "git+https://github.com/paritytech/polkadot-sdk#85191e94b5e3d8881b79381243a33bc5c46866c1" +dependencies = [ + "ark-bls12-377", + "ark-bls12-377-ext", + "ark-bls12-381", + "ark-bls12-381-ext", + "ark-bw6-761", + "ark-bw6-761-ext", + "ark-ec", + "ark-ed-on-bls12-377", + "ark-ed-on-bls12-377-ext", + "ark-ed-on-bls12-381-bandersnatch", + "ark-ed-on-bls12-381-bandersnatch-ext", + "ark-scale", + "sp-runtime-interface", + "sp-std", ] [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11044,17 +10860,17 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -11063,12 +10879,12 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ - "blake2", + "blake2 0.10.6", "domain-runtime-primitives", "frame-support", - "hash-db 0.16.0", + "hash-db", "hexlit", "memory-db", "parity-scale-codec", @@ -11085,6 +10901,7 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-trie", + "sp-version", "sp-weights", "subspace-core-primitives", "subspace-runtime-primitives", @@ -11094,12 +10911,12 @@ dependencies = [ [[package]] name = "sp-domains-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", "frame-support", - "hash-db 0.16.0", + "hash-db", "log", "parity-scale-codec", "sc-client-api", @@ -11126,7 +10943,7 @@ dependencies = [ [[package]] name = "sp-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-trait", "parity-scale-codec", @@ -11137,7 +10954,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "environmental", "parity-scale-codec", @@ -11148,7 +10965,7 @@ dependencies = [ [[package]] name = "sp-genesis-builder" version = "0.1.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "serde_json", "sp-api", @@ -11159,7 +10976,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11173,10 +10990,10 @@ dependencies = [ [[package]] name = "sp-io" version = "23.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "bytes", - "ed25519-dalek 2.0.0", + "ed25519-dalek 2.1.0", "libsecp256k1", "log", "parity-scale-codec", @@ -11197,7 +11014,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.27.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -11209,7 +11026,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "thiserror", "zstd 0.12.4", @@ -11218,10 +11035,10 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "frame-support", - "hash-db 0.16.0", + "hash-db", "log", "parity-scale-codec", "scale-info", @@ -11237,7 +11054,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -11245,10 +11062,40 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-mixnet" +version = "0.1.0-dev" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-api", + "sp-application-crypto", + "sp-std", +] + +[[package]] +name = "sp-mmr-primitives" +version = "4.0.0-dev" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" +dependencies = [ + "ckb-merkle-mountain-range", + "log", + "parity-scale-codec", + "scale-info", + "serde", + "sp-api", + "sp-core", + "sp-debug-derive", + "sp-runtime", + "sp-std", + "thiserror", +] + [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "sp-api", "sp-std", @@ -11259,7 +11106,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "sp-api", "sp-core", @@ -11269,7 +11116,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "8.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "backtrace", "lazy_static", @@ -11279,7 +11126,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "rustc-hash", "serde", @@ -11289,8 +11136,9 @@ dependencies = [ [[package]] name = "sp-runtime" version = "24.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ + "docify", "either", "hash256-std-hasher", "impl-trait-for-tuples", @@ -11300,6 +11148,7 @@ dependencies = [ "rand 0.8.5", "scale-info", "serde", + "simple-mermaid", "sp-application-crypto", "sp-arithmetic", "sp-core", @@ -11311,7 +11160,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11329,19 +11178,20 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "Inflector", - "proc-macro-crate", + "expander", + "proc-macro-crate 3.1.0", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", "scale-info", @@ -11356,7 +11206,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11370,9 +11220,9 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.28.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "hash-db 0.16.0", + "hash-db", "log", "parity-scale-codec", "parking_lot 0.12.1", @@ -11391,11 +11241,11 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "aes-gcm 0.10.2", + "aes-gcm", "curve25519-dalek 4.1.1", - "ed25519-dalek 2.0.0", + "ed25519-dalek 2.1.0", "hkdf", "parity-scale-codec", "rand 0.8.5", @@ -11415,12 +11265,12 @@ dependencies = [ [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11430,10 +11280,25 @@ dependencies = [ "sp-std", ] +[[package]] +name = "sp-subspace-mmr" +version = "0.1.0" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +dependencies = [ + "parity-scale-codec", + "scale-info", + "sp-blockchain", + "sp-core", + "sp-externalities", + "sp-runtime", + "sp-runtime-interface", + "sp-std", +] + [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "parity-scale-codec", @@ -11446,7 +11311,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", "sp-std", @@ -11458,7 +11323,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "sp-api", "sp-runtime", @@ -11467,7 +11332,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "async-trait", "parity-scale-codec", @@ -11482,19 +11347,20 @@ dependencies = [ [[package]] name = "sp-trie" version = "22.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "ahash 0.8.3", - "hash-db 0.16.0", - "hashbrown 0.13.2", + "ahash 0.8.7", + "hash-db", "lazy_static", "memory-db", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", + "rand 0.8.5", "scale-info", "schnellru", "sp-core", + "sp-externalities", "sp-std", "thiserror", "tracing", @@ -11505,7 +11371,7 @@ dependencies = [ [[package]] name = "sp-version" version = "22.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11522,18 +11388,18 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "8.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "parity-scale-codec", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11546,14 +11412,14 @@ dependencies = [ [[package]] name = "sp-weights" version = "20.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ + "bounded-collections", "parity-scale-codec", "scale-info", "serde", "smallvec", "sp-arithmetic", - "sp-core", "sp-debug-derive", "sp-std", ] @@ -11585,9 +11451,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.7.2" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a" +checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d" dependencies = [ "base64ct", "der 0.7.8", @@ -11595,9 +11461,9 @@ dependencies = [ [[package]] name = "ss58-registry" -version = "1.43.0" +version = "1.46.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e6915280e2d0db8911e5032a5c275571af6bdded2916abd691a659be25d3439" +checksum = "b1114ee5900b8569bbc8b1a014a942f937b752af4b44f4607430b5f86cedaac0" dependencies = [ "Inflector", "num-format", @@ -11678,40 +11544,21 @@ dependencies = [ [[package]] name = "strum_macros" -version = "0.25.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad8d03b598d3d0fff69bf533ee3ef19b8eeb342729596df84bcc7e1f96ec4059" +checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ "heck", "proc-macro2", "quote", "rustversion", - "syn 2.0.39", -] - -[[package]] -name = "stun" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7e94b1ec00bad60e6410e058b52f1c66de3dc5fe4d62d09b3e52bb7d3b73e25" -dependencies = [ - "base64 0.13.1", - "crc", - "lazy_static", - "md-5", - "rand 0.8.5", - "ring 0.16.20", - "subtle", - "thiserror", - "tokio", - "url", - "webrtc-util", + "syn 2.0.48", ] [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "parity-scale-codec", "rayon", @@ -11724,7 +11571,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "blake3", "derive_more", @@ -11747,7 +11594,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "kzg", "rust-kzg-blst", @@ -11757,14 +11604,14 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "anyhow", - "async-lock 2.8.0", + "async-lock 3.3.0", "async-trait", "atomic", "base58", - "blake2", + "blake2 0.10.6", "blake3", "bytesize", "clap", @@ -11772,14 +11619,13 @@ dependencies = [ "derive_more", "event-listener-primitives", "fdlimit 0.3.0", - "fs4 0.7.0", + "fs4", "futures", "hex", "hwlocality", "jsonrpsee", - "libc", "libmimalloc-sys", - "lru 0.11.1", + "lru 0.12.2", "mimalloc", "num_cpus", "parity-scale-codec", @@ -11808,16 +11654,15 @@ dependencies = [ "tracing", "tracing-subscriber 0.3.18", "ulid", - "windows-sys 0.52.0", "zeroize", ] [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ - "async-lock 2.8.0", + "async-lock 3.3.0", "async-trait", "backoff", "bitvec", @@ -11845,7 +11690,7 @@ dependencies = [ [[package]] name = "subspace-metrics" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "actix-web", "parking_lot 0.12.1", @@ -11857,9 +11702,8 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ - "actix-web", "async-mutex", "async-trait", "backoff", @@ -11873,8 +11717,8 @@ dependencies = [ "futures-timer", "hex", "libp2p 0.53.1", - "lru 0.11.1", - "memmap2 0.7.1", + "lru 0.12.2", + "memmap2 0.9.4", "nohash-hasher", "parity-scale-codec", "parking_lot 0.12.1", @@ -11889,14 +11733,14 @@ dependencies = [ "tokio", "tracing", "tracing-subscriber 0.3.18", - "unsigned-varint 0.7.2", + "unsigned-varint 0.8.0", "void", ] [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "chacha20", "derive_more", @@ -11909,9 +11753,9 @@ dependencies = [ [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ - "aes 0.8.3", + "aes", "subspace-core-primitives", "thiserror", ] @@ -11919,7 +11763,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "hex", "serde", @@ -11931,7 +11775,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -11944,10 +11788,12 @@ dependencies = [ "pallet-balances", "pallet-domains", "pallet-messenger", + "pallet-mmr", "pallet-offences-subspace", "pallet-rewards", "pallet-runtime-configs", "pallet-subspace", + "pallet-subspace-mmr", "pallet-sudo", "pallet-timestamp", "pallet-transaction-fees", @@ -11956,7 +11802,6 @@ dependencies = [ "pallet-transporter", "pallet-utility", "parity-scale-codec", - "sc-executor", "scale-info", "sp-api", "sp-block-builder", @@ -11967,6 +11812,7 @@ dependencies = [ "sp-domains-fraud-proof", "sp-inherents", "sp-messenger", + "sp-mmr-primitives", "sp-objects", "sp-offchain", "sp-runtime", @@ -11983,7 +11829,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "pallet-transaction-payment", "serde", @@ -12000,7 +11846,7 @@ dependencies = [ "anyhow", "clap", "console-subscriber", - "derive_builder 0.12.0", + "derive_builder", "derive_more", "fdlimit 0.2.1", "futures", @@ -12024,16 +11870,17 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "async-trait", - "atomic", "cross-domain-message-gossip", "domain-runtime-primitives", "frame-system-rpc-runtime-api", "futures", "hex", "jsonrpsee", + "mmr-gadget", + "mmr-rpc", "pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc-runtime-api", "parity-scale-codec", @@ -12047,6 +11894,7 @@ dependencies = [ "sc-consensus-subspace", "sc-consensus-subspace-rpc", "sc-executor", + "sc-informant", "sc-network", "sc-network-sync", "sc-offchain", @@ -12071,10 +11919,13 @@ dependencies = [ "sp-domains", "sp-domains-fraud-proof", "sp-externalities", + "sp-io", + "sp-mmr-primitives", "sp-objects", "sp-offchain", "sp-runtime", "sp-session", + "sp-subspace-mmr", "sp-timestamp", "sp-transaction-pool", "static_assertions", @@ -12094,7 +11945,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=bd435100200b3dcce6d6f50534d52e3cd039ca8e#bd435100200b3dcce6d6f50534d52e3cd039ca8e" +source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -12107,12 +11958,11 @@ dependencies = [ [[package]] name = "substrate-bip39" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49eee6965196b32f882dd2ee85a92b1dbead41b04e53907f269de3b0dc04733c" +version = "0.4.5" +source = "git+https://github.com/paritytech/substrate-bip39?rev=03f02a7225d9bc5add92b7657790ee1ac8ab90a4#03f02a7225d9bc5add92b7657790ee1ac8ab90a4" dependencies = [ "hmac 0.11.0", - "pbkdf2 0.8.0", + "pbkdf2", "schnorrkel", "sha2 0.9.9", "zeroize", @@ -12121,12 +11971,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -12145,7 +11995,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ "hyper", "log", @@ -12157,41 +12007,38 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/subspace/polkadot-sdk?rev=c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c#c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" +source = "git+https://github.com/subspace/polkadot-sdk?rev=d6b500960579d73c43fc4ef550b703acfa61c4c8#d6b500960579d73c43fc4ef550b703acfa61c4c8" dependencies = [ - "ansi_term", "build-helper", "cargo_metadata", + "console", "filetime", "parity-wasm", "sp-maybe-compressed-blob", "strum", "tempfile", - "toml 0.7.8", + "toml 0.8.8", "walkdir", "wasm-opt", ] [[package]] -name = "substring" -version = "1.4.5" +name = "subtle" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ee6433ecef213b2e72f587ef64a2f5943e7cd16fbd82dbe8bc07486c534c86" -dependencies = [ - "autocfg", -] +checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "supports-color" -version = "2.0.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89" dependencies = [ "is-terminal", "is_ci", @@ -12210,9 +12057,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.39" +version = "2.0.48" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a" +checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" dependencies = [ "proc-macro2", "quote", @@ -12277,28 +12124,28 @@ dependencies = [ [[package]] name = "target-lexicon" -version = "0.12.11" +version = "0.12.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a" +checksum = "69758bda2e78f098e4ccb393021a0963bb3442eac05f135c30f61b7370bbafae" [[package]] name = "tempfile" -version = "3.8.0" +version = "3.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" dependencies = [ "cfg-if", "fastrand", - "redox_syscall 0.3.5", - "rustix 0.38.13", - "windows-sys 0.48.0", + "redox_syscall 0.4.1", + "rustix 0.38.30", + "windows-sys 0.52.0", ] [[package]] name = "termcolor" -version = "1.2.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -12311,22 +12158,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2" +checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.50" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8" +checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -12350,12 +12197,13 @@ dependencies = [ [[package]] name = "time" -version = "0.3.28" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48" +checksum = "f657ba42c3f86e7680e53c8cd3af8abbe56b5491790b46e22e19c0d57463583e" dependencies = [ "deranged", "itoa", + "powerfmt", "serde", "time-core", "time-macros", @@ -12363,38 +12211,19 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb" +checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a942f44339478ef67935ab2bbaec2fb0322496cf3cbe84b261e06ac3814c572" +checksum = "26197e33420244aeb70c3e8c78376ca46571bc4e701e4791c2cd9f57dcb3a43f" dependencies = [ "time-core", ] -[[package]] -name = "tiny-bip39" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861" -dependencies = [ - "anyhow", - "hmac 0.12.1", - "once_cell", - "pbkdf2 0.11.0", - "rand 0.8.5", - "rustc-hash", - "sha2 0.10.8", - "thiserror", - "unicode-normalization", - "wasm-bindgen", - "zeroize", -] - [[package]] name = "tiny-keccak" version = "2.0.2" @@ -12431,9 +12260,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.34.0" +version = "1.35.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9" +checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104" dependencies = [ "backtrace", "bytes", @@ -12467,7 +12296,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -12476,7 +12305,7 @@ version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ - "rustls 0.21.9", + "rustls 0.21.10", "tokio", ] @@ -12494,9 +12323,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.8" +version = "0.7.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d" +checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" dependencies = [ "bytes", "futures-core", @@ -12525,14 +12354,26 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.19.15", +] + +[[package]] +name = "toml" +version = "0.8.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1a195ec8c9da26928f773888e0742ca3ca1040c6cd859c919c9f59c1954ab35" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit 0.21.0", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -12543,7 +12384,31 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.0.0", + "indexmap 2.2.1", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.20.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" +dependencies = [ + "indexmap 2.2.1", + "toml_datetime", + "winnow", +] + +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.2.1", "serde", "serde_spanned", "toml_datetime", @@ -12558,7 +12423,7 @@ checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" dependencies = [ "async-trait", "axum", - "base64 0.21.5", + "base64 0.21.7", "bytes", "futures-core", "futures-util", @@ -12604,7 +12469,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140" dependencies = [ - "bitflags 2.4.0", + "bitflags 2.4.2", "bytes", "futures-core", "futures-util", @@ -12631,7 +12496,7 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "tracing" version = "0.1.40" -source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#c6bedbe2725830c1e78cbcdb9168de69c98e42fc" +source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#0e4a4bef5e4e8b7435e9e50e8bae25afba25d7d7" dependencies = [ "log", "pin-project-lite 0.2.13", @@ -12642,7 +12507,7 @@ dependencies = [ [[package]] name = "tracing-appender" version = "0.2.3" -source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#c6bedbe2725830c1e78cbcdb9168de69c98e42fc" +source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#0e4a4bef5e4e8b7435e9e50e8bae25afba25d7d7" dependencies = [ "crossbeam-channel", "thiserror", @@ -12653,11 +12518,11 @@ dependencies = [ [[package]] name = "tracing-attributes" version = "0.1.27" -source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#c6bedbe2725830c1e78cbcdb9168de69c98e42fc" +source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#0e4a4bef5e4e8b7435e9e50e8bae25afba25d7d7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -12666,7 +12531,7 @@ version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5c266b9ac83dedf0e0385ad78514949e6d89491269e7065bee51d2bb8ec7373" dependencies = [ - "ahash 0.8.3", + "ahash 0.8.7", "gethostname", "log", "serde", @@ -12674,14 +12539,14 @@ dependencies = [ "time", "tracing", "tracing-core", - "tracing-log 0.1.3", + "tracing-log 0.1.4", "tracing-subscriber 0.3.18", ] [[package]] name = "tracing-core" version = "0.1.32" -source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#c6bedbe2725830c1e78cbcdb9168de69c98e42fc" +source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#0e4a4bef5e4e8b7435e9e50e8bae25afba25d7d7" dependencies = [ "once_cell", "valuable", @@ -12690,7 +12555,7 @@ dependencies = [ [[package]] name = "tracing-error" version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#c6bedbe2725830c1e78cbcdb9168de69c98e42fc" +source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#0e4a4bef5e4e8b7435e9e50e8bae25afba25d7d7" dependencies = [ "tracing", "tracing-subscriber 0.3.18", @@ -12708,19 +12573,19 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +checksum = "f751112709b4e791d8ce53e32c4ed2d353565a795ce84da2285393f41557bdf2" dependencies = [ - "lazy_static", "log", + "once_cell", "tracing-core", ] [[package]] name = "tracing-log" version = "0.2.0" -source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#c6bedbe2725830c1e78cbcdb9168de69c98e42fc" +source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#0e4a4bef5e4e8b7435e9e50e8bae25afba25d7d7" dependencies = [ "log", "once_cell", @@ -12756,14 +12621,14 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.1.3", + "tracing-log 0.1.4", "tracing-serde", ] [[package]] name = "tracing-subscriber" version = "0.3.18" -source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#c6bedbe2725830c1e78cbcdb9168de69c98e42fc" +source = "git+https://github.com/tokio-rs/tracing?branch=v0.1.x#0e4a4bef5e4e8b7435e9e50e8bae25afba25d7d7" dependencies = [ "matchers 0.1.0", "nu-ansi-term", @@ -12783,7 +12648,7 @@ version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642" dependencies = [ - "hash-db 0.16.0", + "hash-db", "hashbrown 0.13.2", "log", "rustc-hex", @@ -12796,17 +12661,7 @@ version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4ed310ef5ab98f5fa467900ed906cb9232dd5376597e00fd4cba2a449d06c0b" dependencies = [ - "hash-db 0.16.0", -] - -[[package]] -name = "triehash" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1631b201eb031b563d2e85ca18ec8092508e262a3196ce9bd10a67ec87b9f5c" -dependencies = [ - "hash-db 0.15.2", - "rlp", + "hash-db", ] [[package]] @@ -12827,7 +12682,7 @@ dependencies = [ "lazy_static", "rand 0.8.5", "smallvec", - "socket2 0.4.9", + "socket2 0.4.10", "thiserror", "tinyvec", "tokio", @@ -12857,34 +12712,15 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" - -[[package]] -name = "tt-call" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" - -[[package]] -name = "turn" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4712ee30d123ec7ae26d1e1b218395a16c87cdbaf4b3925d170d684af62ea5e8" -dependencies = [ - "async-trait", - "base64 0.13.1", - "futures", - "log", - "md-5", - "rand 0.8.5", - "ring 0.16.20", - "stun", - "thiserror", - "tokio", - "webrtc-util", -] +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + +[[package]] +name = "tt-call" +version = "1.0.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df" [[package]] name = "twox-hash" @@ -12900,9 +12736,9 @@ dependencies = [ [[package]] name = "typenum" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uint" @@ -12928,9 +12764,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.13" +version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" +checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" [[package]] name = "unicode-ident" @@ -12955,9 +12791,9 @@ checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.10" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -12965,16 +12801,6 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -[[package]] -name = "universal-hash" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f214e8f697e925001e66ec2c6e37a4ef93f0f78c2eed7814394e10c62025b05" -dependencies = [ - "generic-array 0.14.7", - "subtle", -] - [[package]] name = "universal-hash" version = "0.5.1" @@ -12982,7 +12808,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea" dependencies = [ "crypto-common", - "subtle", + "subtle 2.5.0", ] [[package]] @@ -13005,6 +12831,8 @@ checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" dependencies = [ "asynchronous-codec 0.7.0", "bytes", + "futures-io", + "futures-util", ] [[package]] @@ -13021,12 +12849,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" +checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" dependencies = [ "form_urlencoded", - "idna 0.4.0", + "idna 0.5.0", "percent-encoding", ] @@ -13036,15 +12864,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" -[[package]] -name = "uuid" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d" -dependencies = [ - "getrandom 0.2.11", -] - [[package]] name = "valuable" version = "0.1.0" @@ -13070,12 +12889,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" [[package]] -name = "waitgroup" -version = "0.1.2" +name = "w3f-bls" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1f50000a783467e6c0200f9d10642f4bc424e39efc1b770203e88b488f79292" +checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331" dependencies = [ - "atomic-waker", + "ark-bls12-377", + "ark-bls12-381", + "ark-ec", + "ark-ff", + "ark-serialize", + "ark-serialize-derive", + "arrayref", + "constcat", + "digest 0.10.7", + "rand 0.8.5", + "rand_chacha 0.3.1", + "rand_core 0.6.4", + "sha2 0.10.8", + "sha3", + "thiserror", + "zeroize", ] [[package]] @@ -13111,9 +12945,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +checksum = "b1223296a201415c7fad14792dbefaace9bd52b62d33453ade1c5b5f07555406" dependencies = [ "cfg-if", "wasm-bindgen-macro", @@ -13121,24 +12955,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +checksum = "fcdc935b63408d58a32f8cc9738a0bffd8f05cc7c002086c6ef20b7312ad9dcd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.37" +version = "0.4.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +checksum = "bde2032aeb86bdfaecc8b261eef3cba735cc426c1f3a3416d1e0791be95fc461" dependencies = [ "cfg-if", "js-sys", @@ -13148,9 +12982,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +checksum = "3e4c238561b2d428924c49815533a8b9121c664599558a5d9ec51f8a1740a999" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -13158,22 +12992,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +checksum = "bae1abb6806dc1ad9e560ed242107c0f6c84335f1749dd4e8ddb012ebd5e25a7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.87" +version = "0.2.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +checksum = "4d91413b1c31d7539ba5ef2451af3f0b833a005eb27a631cec32bc0635a8602b" [[package]] name = "wasm-instrument" @@ -13186,9 +13020,9 @@ dependencies = [ [[package]] name = "wasm-opt" -version = "0.114.1" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d005a95f934878a1fb446a816d51c3601a0120ff929005ba3bab3c749cfd1c7" +checksum = "fc942673e7684671f0c5708fc18993569d184265fd5223bb51fc8e5b9b6cfd52" dependencies = [ "anyhow", "libc", @@ -13202,9 +13036,9 @@ dependencies = [ [[package]] name = "wasm-opt-cxx-sys" -version = "0.114.1" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d04e240598162810fad3b2e96fa0dec6dba1eb65a03f3bd99a9248ab8b56caa" +checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e" dependencies = [ "anyhow", "cxx", @@ -13214,9 +13048,9 @@ dependencies = [ [[package]] name = "wasm-opt-sys" -version = "0.114.1" +version = "0.116.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2efd2aaca519d64098c4faefc8b7433a97ed511caf4c9e516384eb6aef1ff4f9" +checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe" dependencies = [ "anyhow", "cc", @@ -13293,12 +13127,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c86437fa68626fe896e5afc69234bb2b5894949083586535f200385adfd71213" dependencies = [ "anyhow", - "base64 0.21.5", + "base64 0.21.7", "bincode", "directories-next", "file-per-thread-logger", "log", - "rustix 0.36.15", + "rustix 0.36.17", "serde", "sha2 0.10.8", "toml 0.5.11", @@ -13394,7 +13228,7 @@ checksum = "6e0554b84c15a27d76281d06838aed94e13a77d7bf604bbbaf548aa20eb93846" dependencies = [ "object 0.30.4", "once_cell", - "rustix 0.36.15", + "rustix 0.36.17", ] [[package]] @@ -13425,7 +13259,7 @@ dependencies = [ "memoffset 0.8.0", "paste", "rand 0.8.5", - "rustix 0.36.15", + "rustix 0.36.17", "wasmtime-asm-macros", "wasmtime-environ", "wasmtime-jit-debug", @@ -13446,9 +13280,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.64" +version = "0.3.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +checksum = "58cd2333b6e0be7a39605f0e255892fd7418a682d8da8fe042fe25128794d2ed" dependencies = [ "js-sys", "wasm-bindgen", @@ -13456,22 +13290,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.21.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" -dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", -] - -[[package]] -name = "webpki" -version = "0.22.1" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0e74f82d49d545ad128049b7e88f6576df2da6b02e9ce565c6f533be576957e" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring 0.16.20", - "untrusted 0.7.1", + "ring 0.17.7", + "untrusted 0.9.0", ] [[package]] @@ -13480,231 +13304,14 @@ version = "0.22.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87" dependencies = [ - "webpki 0.22.1", -] - -[[package]] -name = "webpki-roots" -version = "0.23.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" -dependencies = [ - "rustls-webpki 0.100.3", + "webpki", ] [[package]] name = "webpki-roots" -version = "0.25.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" - -[[package]] -name = "webrtc" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d3bc9049bdb2cea52f5fd4f6f728184225bdb867ed0dc2410eab6df5bdd67bb" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "hex", - "interceptor", - "lazy_static", - "log", - "rand 0.8.5", - "rcgen 0.9.3", - "regex", - "ring 0.16.20", - "rtcp", - "rtp", - "rustls 0.19.1", - "sdp", - "serde", - "serde_json", - "sha2 0.10.8", - "stun", - "thiserror", - "time", - "tokio", - "turn", - "url", - "waitgroup", - "webrtc-data", - "webrtc-dtls", - "webrtc-ice", - "webrtc-mdns", - "webrtc-media", - "webrtc-sctp", - "webrtc-srtp", - "webrtc-util", -] - -[[package]] -name = "webrtc-data" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef36a4d12baa6e842582fe9ec16a57184ba35e1a09308307b67d43ec8883100" -dependencies = [ - "bytes", - "derive_builder 0.11.2", - "log", - "thiserror", - "tokio", - "webrtc-sctp", - "webrtc-util", -] - -[[package]] -name = "webrtc-dtls" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a00f4242f2db33307347bd5be53263c52a0331c96c14292118c9a6bb48d267" -dependencies = [ - "aes 0.6.0", - "aes-gcm 0.10.2", - "async-trait", - "bincode", - "block-modes", - "byteorder", - "ccm", - "curve25519-dalek 3.2.0", - "der-parser 8.2.0", - "elliptic-curve 0.12.3", - "hkdf", - "hmac 0.12.1", - "log", - "p256", - "p384", - "rand 0.8.5", - "rand_core 0.6.4", - "rcgen 0.10.0", - "ring 0.16.20", - "rustls 0.19.1", - "sec1 0.3.0", - "serde", - "sha1", - "sha2 0.10.8", - "signature 1.6.4", - "subtle", - "thiserror", - "tokio", - "webpki 0.21.4", - "webrtc-util", - "x25519-dalek 2.0.0", - "x509-parser 0.13.2", -] - -[[package]] -name = "webrtc-ice" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465a03cc11e9a7d7b4f9f99870558fe37a102b65b93f8045392fef7c67b39e80" -dependencies = [ - "arc-swap", - "async-trait", - "crc", - "log", - "rand 0.8.5", - "serde", - "serde_json", - "stun", - "thiserror", - "tokio", - "turn", - "url", - "uuid", - "waitgroup", - "webrtc-mdns", - "webrtc-util", -] - -[[package]] -name = "webrtc-mdns" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f08dfd7a6e3987e255c4dbe710dde5d94d0f0574f8a21afa95d171376c143106" -dependencies = [ - "log", - "socket2 0.4.9", - "thiserror", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-media" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f72e1650a8ae006017d1a5280efb49e2610c19ccc3c0905b03b648aee9554991" -dependencies = [ - "byteorder", - "bytes", - "rand 0.8.5", - "rtp", - "thiserror", -] - -[[package]] -name = "webrtc-sctp" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d47adcd9427eb3ede33d5a7f3424038f63c965491beafcc20bc650a2f6679c0" -dependencies = [ - "arc-swap", - "async-trait", - "bytes", - "crc", - "log", - "rand 0.8.5", - "thiserror", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-srtp" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6183edc4c1c6c0175f8812eefdce84dfa0aea9c3ece71c2bf6ddd3c964de3da5" -dependencies = [ - "aead 0.4.3", - "aes 0.7.5", - "aes-gcm 0.9.4", - "async-trait", - "byteorder", - "bytes", - "ctr 0.8.0", - "hmac 0.11.0", - "log", - "rtcp", - "rtp", - "sha-1", - "subtle", - "thiserror", - "tokio", - "webrtc-util", -] - -[[package]] -name = "webrtc-util" -version = "0.7.0" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93f1db1727772c05cf7a2cfece52c3aca8045ca1e176cd517d323489aa3c6d87" -dependencies = [ - "async-trait", - "bitflags 1.3.2", - "bytes", - "cc", - "ipnet", - "lazy_static", - "libc", - "log", - "nix 0.24.3", - "rand 0.8.5", - "thiserror", - "tokio", - "winapi", -] +checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10" [[package]] name = "which" @@ -13715,7 +13322,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.13", + "rustix 0.38.30", ] [[package]] @@ -13730,9 +13337,9 @@ dependencies = [ [[package]] name = "wide" -version = "0.7.11" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa469ffa65ef7e0ba0f164183697b89b854253fd31aeb92358b7b6155177d62f" +checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c" dependencies = [ "bytemuck", "safe_arch", @@ -13768,9 +13375,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi", ] @@ -13783,30 +13390,30 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.48.0" +version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" dependencies = [ + "windows-core 0.51.1", "windows-targets 0.48.5", ] [[package]] -name = "windows" +name = "windows-core" version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-core", "windows-targets 0.48.5", ] [[package]] name = "windows-core" -version = "0.51.1" +version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.48.5", + "windows-targets 0.52.0", ] [[package]] @@ -14009,9 +13616,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.15" +version = "0.5.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc" +checksum = "1931d78a9c73861da0134f453bb1f790ce49b2e30eba8410b4b79bac72b46a2d" dependencies = [ "memchr", ] @@ -14058,38 +13665,19 @@ dependencies = [ "zeroize", ] -[[package]] -name = "x509-parser" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb9bace5b5589ffead1afb76e43e34cff39cd0f3ce7e170ae0c29e53b88eb1c" -dependencies = [ - "asn1-rs 0.3.1", - "base64 0.13.1", - "data-encoding", - "der-parser 7.0.0", - "lazy_static", - "nom", - "oid-registry 0.4.0", - "ring 0.16.20", - "rusticata-macros", - "thiserror", - "time", -] - [[package]] name = "x509-parser" version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0ecbeb7b67ce215e40e3cc7f2ff902f94a223acf44995934763467e7b1febc8" dependencies = [ - "asn1-rs 0.5.2", + "asn1-rs", "base64 0.13.1", "data-encoding", - "der-parser 8.2.0", + "der-parser", "lazy_static", "nom", - "oid-registry 0.6.1", + "oid-registry", "rusticata-macros", "thiserror", "time", @@ -14101,12 +13689,12 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da" dependencies = [ - "asn1-rs 0.5.2", + "asn1-rs", "data-encoding", - "der-parser 8.2.0", + "der-parser", "lazy_static", "nom", - "oid-registry 0.6.1", + "oid-registry", "rusticata-macros", "thiserror", "time", @@ -14114,11 +13702,13 @@ dependencies = [ [[package]] name = "xattr" -version = "1.1.1" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbc6ab6ec1907d1a901cdbcd2bd4cb9e7d64ce5c9739cbb97d3c391acd8c7fae" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", + "linux-raw-sys 0.4.13", + "rustix 0.38.30", ] [[package]] @@ -14152,9 +13742,9 @@ dependencies = [ [[package]] name = "yamux" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0329ef377816896f014435162bb3711ea7a07729c23d0960e6f8048b21b8fe91" +checksum = "9ed0164ae619f2dc144909a9f082187ebb5893693d8c0196e8085283ccd4b776" dependencies = [ "futures", "log", @@ -14174,11 +13764,31 @@ dependencies = [ "time", ] +[[package]] +name = "zerocopy" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + [[package]] name = "zeroize" -version = "1.6.0" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" +checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" dependencies = [ "zeroize_derive", ] @@ -14191,7 +13801,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.39", + "syn 2.0.48", ] [[package]] @@ -14212,6 +13822,15 @@ dependencies = [ "zstd-safe 6.0.6", ] +[[package]] +name = "zstd" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bffb3309596d527cfcba7dfc6ed6052f1d39dfbd7c867aa2e865e4a449c10110" +dependencies = [ + "zstd-safe 7.0.0", +] + [[package]] name = "zstd-safe" version = "5.0.2+zstd.1.5.2" @@ -14232,13 +13851,21 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "zstd-safe" +version = "7.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43747c7422e2924c11144d5229878b98180ef8b06cca4ab5af37afc8a8d8ea3e" +dependencies = [ + "zstd-sys", +] + [[package]] name = "zstd-sys" -version = "2.0.8+zstd.1.5.5" +version = "2.0.9+zstd.1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c" +checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656" dependencies = [ "cc", - "libc", "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 623b54a8..e3fb61ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -82,6 +82,10 @@ inherits = "release" codegen-units = 1 [patch.crates-io] +# TODO: Switch to release once v1.0.0-alpha.2 or newer is out +hwlocality = { git = "https://github.com/HadrienG2/hwlocality", rev = "0f248573bcad584960fe20293c826203a265b833" } +# TODO: Switch to stable release once https://github.com/paritytech/substrate-bip39/pull/20 is published +substrate-bip39 = { git = "https://github.com/paritytech/substrate-bip39", rev = "03f02a7225d9bc5add92b7657790ee1ac8ab90a4" } # TODO: remove once tracing-appender has a new release tracing = { git = "https://github.com/tokio-rs/tracing", branch = "v0.1.x" } tracing-appender = { git = "https://github.com/tokio-rs/tracing", branch = "v0.1.x" } @@ -92,42 +96,42 @@ tracing-subscriber = { git = "https://github.com/tokio-rs/tracing", branch = "v0 # Reason: We need to patch substrate dependency of snowfork and frontier libraries to our fork # TODO: Remove when we are using upstream substrate instead of fork [patch."https://github.com/paritytech/polkadot-sdk.git"] -frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -frame-support = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-client-db = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-network-common = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-rpc = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-application-crypto = { version = "23.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-database = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-externalities = { version = "0.19.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-keystore = { version = "0.27.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-runtime-interface = { version = "17.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-state-machine = { version = "0.28.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-std = { version = "8.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-storage = { version = "13.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-trie = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-inherents = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-io = { version = "23.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -substrate-prometheus-endpoint = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } +frame-benchmarking = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +frame-support = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-block-builder = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-client-db = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-network-common = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-rpc = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-transaction-pool = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-application-crypto = { version = "23.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-block-builder = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-consensus-aura = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-database = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-externalities = { version = "0.19.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-keystore = { version = "0.27.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-runtime-interface = { version = "17.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-state-machine = { version = "0.28.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-std = { version = "8.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-storage = { version = "13.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-timestamp = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-trie = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-inherents = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-io = { version = "23.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +substrate-prometheus-endpoint = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } diff --git a/pulsar/Cargo.toml b/pulsar/Cargo.toml index 57f8f70e..7889da3f 100644 --- a/pulsar/Cargo.toml +++ b/pulsar/Cargo.toml @@ -27,7 +27,7 @@ rand = "0.8.5" serde = "1" serde_derive = "1" single-instance = "0.3.3" -sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", features = ["full_crypto"] } +sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", features = ["full_crypto"] } strum = "0.24.1" strum_macros = "0.24.3" subspace-sdk = { path = "../sdk/subspace-sdk", default-features = false } diff --git a/pulsar/src/commands/init.rs b/pulsar/src/commands/init.rs index 3004a226..81b2e676 100644 --- a/pulsar/src/commands/init.rs +++ b/pulsar/src/commands/init.rs @@ -99,7 +99,7 @@ fn get_config_from_user_inputs() -> Result { )?; // get chain - let default_chain = ChainConfig::Gemini3g; + let default_chain = ChainConfig::Gemini3h; let chain = get_user_input( &format!( "Specify the chain to farm. Available options are: {:?}. \n Defaults to \ diff --git a/pulsar/src/config.rs b/pulsar/src/config.rs index 173399ef..14c1998e 100644 --- a/pulsar/src/config.rs +++ b/pulsar/src/config.rs @@ -49,19 +49,19 @@ impl NodeConfig { self; let (mut node, chain_spec) = match chain { - ChainConfig::Gemini3g => { - let mut node = Node::gemini_3g() - .network(NetworkBuilder::gemini_3g().name(name)) + ChainConfig::Gemini3h => { + let mut node = Node::gemini_3h() + .network(NetworkBuilder::gemini_3h().name(name)) .dsn( - DsnBuilder::gemini_3g() + DsnBuilder::gemini_3h() .provider_storage_path(provider_storage_dir_getter()), ) .sync_from_dsn(true) .enable_subspace_block_relay(true); if enable_domains { - node = node.domain(Some(DomainConfigBuilder::gemini_3g().configuration())); + node = node.domain(Some(DomainConfigBuilder::gemini_3h().configuration())); } - let chain_spec = chain_spec::gemini_3g(); + let chain_spec = chain_spec::gemini_3h(); (node, chain_spec) } ChainConfig::Dev => { @@ -153,7 +153,7 @@ impl FarmerConfig { #[derive(Deserialize, Serialize, Default, Clone, Debug, EnumIter)] pub(crate) enum ChainConfig { #[default] - Gemini3g, + Gemini3h, Dev, DevNet, } @@ -163,7 +163,7 @@ impl std::str::FromStr for ChainConfig { fn from_str(s: &str) -> Result { match s.to_lowercase().as_str() { - "gemini3g" => Ok(ChainConfig::Gemini3g), + "gemini3h" => Ok(ChainConfig::Gemini3h), "dev" => Ok(ChainConfig::Dev), "devnet" => Ok(ChainConfig::DevNet), _ => Err(eyre!("given chain: `{s}` is not recognized!")), diff --git a/pulsar/src/tests.rs b/pulsar/src/tests.rs index b18e34c2..b06e0fb1 100644 --- a/pulsar/src/tests.rs +++ b/pulsar/src/tests.rs @@ -130,7 +130,7 @@ fn size_checker() { #[test] fn chain_checker() { - assert!(ChainConfig::from_str("gemini3g").is_ok()); + assert!(ChainConfig::from_str("gemini3h").is_ok()); assert!(ChainConfig::from_str("devv").is_err()); } diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 6ce5e5e1..dfb6c7bb 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,5 +1,5 @@ [toolchain] -channel = "nightly-2023-10-16" +channel = "nightly-2024-01-19" components = ["rust-src"] targets = ["wasm32-unknown-unknown"] profile = "default" diff --git a/sdk/dsn/Cargo.toml b/sdk/dsn/Cargo.toml index d151c65d..ac467a3d 100644 --- a/sdk/dsn/Cargo.toml +++ b/sdk/dsn/Cargo.toml @@ -13,12 +13,12 @@ futures = "0.3" hex = "0.4.3" parking_lot = "0.12" prometheus-client = "0.22.0" -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } tracing = "0.1" diff --git a/sdk/dsn/src/builder.rs b/sdk/dsn/src/builder.rs index 8a19cb31..3286d82f 100644 --- a/sdk/dsn/src/builder.rs +++ b/sdk/dsn/src/builder.rs @@ -14,12 +14,11 @@ use serde::{Deserialize, Serialize}; use subspace_farmer::piece_cache::PieceCache as FarmerPieceCache; use subspace_farmer::utils::readers_and_pieces::ReadersAndPieces; use subspace_farmer::KNOWN_PEERS_CACHE_SIZE; -use subspace_networking::libp2p::metrics::Metrics; use subspace_networking::utils::strip_peer_id; use subspace_networking::{ - KademliaMode, KnownPeersManager, KnownPeersManagerConfig, PeerInfo, PeerInfoProvider, - PieceByIndexRequest, PieceByIndexRequestHandler, PieceByIndexResponse, - SegmentHeaderBySegmentIndexesRequestHandler, SegmentHeaderRequest, SegmentHeaderResponse, + KademliaMode, KnownPeersManager, KnownPeersManagerConfig, PieceByIndexRequest, + PieceByIndexRequestHandler, PieceByIndexResponse, SegmentHeaderBySegmentIndexesRequestHandler, + SegmentHeaderRequest, SegmentHeaderResponse, }; use super::local_provider_record_utils::MaybeLocalRecordProvider; @@ -142,7 +141,7 @@ impl DsnBuilder { } /// Gemini 3g configuration - pub fn gemini_3g() -> Self { + pub fn gemini_3h() -> Self { Self::new().listen_addresses(vec![ "/ip6/::/tcp/30433".parse().expect("hardcoded value is true"), "/ip4/0.0.0.0/tcp/30433".parse().expect("hardcoded value is true"), @@ -231,7 +230,6 @@ impl Dsn { let local_records_provider = MaybeLocalRecordProvider::new(farmer_piece_cache.clone()); let mut metrics_registry = Registry::default(); - let metrics = is_metrics_enabled.then(|| Metrics::new(&mut metrics_registry)); tracing::debug!(genesis_hash = protocol_version, "Setting DSN protocol version..."); @@ -242,11 +240,11 @@ impl Dsn { provider_storage_path: _, in_connections: InConnections(max_established_incoming_connections), out_connections: OutConnections(max_established_outgoing_connections), - target_connections: TargetConnections(target_connections), pending_in_connections: PendingInConnections(max_pending_incoming_connections), pending_out_connections: PendingOutConnections(max_pending_outgoing_connections), boot_nodes, external_addresses, + .. } = self; let bootstrap_nodes = boot_nodes.into_iter().map(Into::into).collect::>(); @@ -269,7 +267,7 @@ impl Dsn { protocol_version, keypair, local_records_provider.clone(), - Some(PeerInfoProvider::new_farmer()), + is_metrics_enabled.then_some(&mut metrics_registry), ); let config = subspace_networking::Config { @@ -305,23 +303,6 @@ impl Dsn { bootstrap_addresses: bootstrap_nodes, kademlia_mode: KademliaMode::Dynamic, external_addresses: external_addresses.into_iter().map(Into::into).collect(), - // Proactively maintain permanent connections with farmers (least restrictive value - // taken from farmer) - special_connected_peers_handler: Some(Arc::new(PeerInfo::is_farmer)), - // Maintain proactive connections with all peers (least restrictive value taken from - // node) - general_connected_peers_handler: Some(Arc::new(|_| true)), - // Maintain some number of persistent connections (taken from farmer) - general_connected_peers_target: 0, - // Special peers (taken from farmer) - special_connected_peers_target: target_connections, - // Allow up to quarter of incoming connections to be maintained (taken from node) - general_connected_peers_limit: max_established_incoming_connections / 4, - // Allow to maintain some extra farmer connections beyond direct interest too (taken - // from farmer) - special_connected_peers_limit: target_connections - + max_established_incoming_connections / 4, - metrics, ..default_networking_config }; diff --git a/sdk/farmer/Cargo.toml b/sdk/farmer/Cargo.toml index 225bbce7..07d0cfd0 100644 --- a/sdk/farmer/Cargo.toml +++ b/sdk/farmer/Cargo.toml @@ -12,7 +12,7 @@ derivative = "2.2.0" derive_builder = "0.12" derive_more = "0.99" futures = "0.3" -lru = "0.11.0" +lru = "0.12.2" libmimalloc-sys = { version = "0.1.35", features = ["extended"] } parking_lot = "0.12" pin-project = "1" @@ -20,13 +20,13 @@ rayon = "1.7.0" sdk-traits = { path = "../traits" } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", features = ["parallel"] } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", features = ["parallel"] } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } thiserror = "1" tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tokio-stream = { version = "0.1", features = ["sync", "time"] } diff --git a/sdk/farmer/src/lib.rs b/sdk/farmer/src/lib.rs index 1bf684e9..67f06dd4 100644 --- a/sdk/farmer/src/lib.rs +++ b/sdk/farmer/src/lib.rs @@ -29,8 +29,8 @@ use subspace_core_primitives::{PieceIndex, Record, SectorIndex}; use subspace_erasure_coding::ErasureCoding; use subspace_farmer::piece_cache::PieceCache as FarmerPieceCache; use subspace_farmer::single_disk_farm::{ - SingleDiskFarm, SingleDiskFarmError, SingleDiskFarmId, SingleDiskFarmInfo, - SingleDiskFarmOptions, SingleDiskFarmSummary, + SectorPlottingDetails, SectorUpdate, SingleDiskFarm, SingleDiskFarmError, SingleDiskFarmId, + SingleDiskFarmInfo, SingleDiskFarmOptions, SingleDiskFarmSummary, }; use subspace_farmer::thread_pool_manager::PlottingThreadPoolManager; use subspace_farmer::utils::farmer_piece_getter::FarmerPieceGetter; @@ -40,7 +40,6 @@ use subspace_farmer::utils::{ all_cpu_cores, create_plotting_thread_pool_manager, thread_pool_core_indices, }; use subspace_farmer::{Identity, KNOWN_PEERS_CACHE_SIZE}; -use subspace_farmer_components::plotting::PlottedSector; use subspace_farmer_components::sector::{sector_size, SectorMetadataChecksummed}; use subspace_networking::libp2p::kad::RecordKey; use subspace_networking::utils::multihash::ToMultihash; @@ -344,13 +343,20 @@ async fn create_readers_and_pieces( Ok(readers_and_pieces) } -#[allow(clippy::too_many_arguments)] -fn handler_on_sector_plotted( - plotted_sector: &PlottedSector, - maybe_old_plotted_sector: &Option, +fn handler_on_sector_update( + sector_update: &SectorUpdate, disk_farm_index: usize, readers_and_pieces: Arc>>, ) { + let (plotted_sector, maybe_old_plotted_sector) = match sector_update { + SectorUpdate::Plotting(SectorPlottingDetails::Finished { + plotted_sector, + old_plotted_sector, + .. + }) => (plotted_sector, old_plotted_sector), + _ => return, + }; + let disk_farm_index = disk_farm_index .try_into() .expect("More than 256 farms are not supported, this is checked above already; qed"); @@ -420,11 +426,12 @@ impl Config { node.rpc().clone(), kzg.clone(), // TODO: Consider introducing and using global in-memory segment commitments cache - parking_lot::Mutex::new(lru::LruCache::new(SEGMENT_COMMITMENTS_CACHE_SIZE)), + Arc::new(parking_lot::Mutex::new(lru::LruCache::new( + SEGMENT_COMMITMENTS_CACHE_SIZE, + ))), )), ); let farmer_piece_getter = Arc::new(FarmerPieceGetter::new( - node.dsn().node.clone(), piece_provider, farmer_piece_cache.clone(), node.rpc().clone(), @@ -622,12 +629,11 @@ impl Config { // Collect newly plotted pieces // TODO: Once we have replotting, this will have to be updated - sector_plotting_handler_ids.push(single_disk_farm.on_sector_plotted(Arc::new( - move |(plotted_sector, maybe_old_plotted_sector)| { + sector_plotting_handler_ids.push(single_disk_farm.on_sector_update(Arc::new( + move |(_plotted_sector, sector_update)| { let _span_guard = span.enter(); - handler_on_sector_plotted( - plotted_sector, - maybe_old_plotted_sector, + handler_on_sector_update( + sector_update, disk_farm_index, readers_and_pieces.clone(), ) @@ -792,7 +798,7 @@ pub struct InitialPlottingProgress { } /// Progress data received from sender, used to monitor plotting progress -pub type ProgressData = Option<(PlottedSector, Option)>; +pub type ProgressData = Option<(u16, SectorUpdate)>; /// Farm structure #[derive(Debug)] @@ -945,7 +951,7 @@ impl Farm { let progress = { let (sender, receiver) = watch::channel::>(None); - destructors.add_items_to_drop(single_disk_farm.on_sector_plotted(Arc::new( + destructors.add_items_to_drop(single_disk_farm.on_sector_update(Arc::new( move |sector| { let _ = sender.send(Some(sector.clone())); }, diff --git a/sdk/node/Cargo.toml b/sdk/node/Cargo.toml index 65e303e9..bf58a204 100644 --- a/sdk/node/Cargo.toml +++ b/sdk/node/Cargo.toml @@ -7,61 +7,59 @@ edition = "2021" [dependencies] anyhow = "1" backoff = "0.4" -cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } derivative = "2.2.0" derive_builder = "0.12" derive_more = "0.99" -domain-client-message-relayer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -domain-service = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "37ee45323120b21adc1d69ae7348bd0f7282eeae" } -frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } +domain-client-message-relayer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +domain-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "7627e61d80275a4cf24d06f27491f6c31eadb7b7" } +frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } futures = "0.3" hex-literal = "0.4" -pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } parity-scale-codec = "3.6.3" parking_lot = "0.12" pin-project = "1" -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -sc-executor = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } +sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } +sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sdk-dsn = { path = "../dsn" } sdk-substrate = { path = "../substrate" } sdk-traits = { path = "../traits" } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } serde_json = "1" -sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-domains = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -sp-domains-fraud-proof = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -sp-messenger = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-version = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-domains = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sp-messenger = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-version = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tokio-stream = { version = "0.1", features = ["sync", "time"] } tracing = "0.1" diff --git a/sdk/node/src/builder.rs b/sdk/node/src/builder.rs index cfbe3cbc..9c361ccc 100644 --- a/sdk/node/src/builder.rs +++ b/sdk/node/src/builder.rs @@ -100,8 +100,8 @@ impl Config { } /// Gemini 3g configuraiton - pub fn gemini_3g() -> Builder { - Builder::gemini_3g() + pub fn gemini_3h() -> Builder { + Builder::gemini_3h() } /// Devnet configuraiton @@ -123,12 +123,12 @@ impl Builder { } /// Gemini 3g configuration - pub fn gemini_3g() -> Self { + pub fn gemini_3h() -> Self { Self::new() - .network(NetworkBuilder::gemini_3g()) - .dsn(DsnBuilder::gemini_3g()) - .rpc(RpcBuilder::gemini_3g()) - .offchain_worker(OffchainWorkerBuilder::gemini_3g()) + .network(NetworkBuilder::gemini_3h()) + .dsn(DsnBuilder::gemini_3h()) + .rpc(RpcBuilder::gemini_3h()) + .offchain_worker(OffchainWorkerBuilder::gemini_3h()) .role(Role::Authority) .state_pruning(PruningMode::ArchiveAll) .blocks_pruning(BlocksPruning::Some(256)) diff --git a/sdk/node/src/chain_spec.rs b/sdk/node/src/chain_spec.rs index 9f6140b9..2439b682 100644 --- a/sdk/node/src/chain_spec.rs +++ b/sdk/node/src/chain_spec.rs @@ -6,8 +6,8 @@ use std::num::NonZeroU32; use hex_literal::hex; use parity_scale_codec::Encode; -use sc_service::{ChainType, NoExtension}; -use sc_subspace_chain_specs::{SerializableChainSpec, DEVNET_CHAIN_SPEC, GEMINI_3G_CHAIN_SPEC}; +use sc_service::{ChainType, GenericChainSpec, NoExtension}; +use sc_subspace_chain_specs::{DEVNET_CHAIN_SPEC, GEMINI_3H_CHAIN_SPEC}; use sc_telemetry::TelemetryEndpoints; use sdk_utils::chain_spec as utils; use sdk_utils::chain_spec::{chain_spec_properties, get_public_key_from_seed}; @@ -18,9 +18,9 @@ use sp_domains::{OperatorAllowList, OperatorPublicKey, RuntimeType}; use sp_runtime::{BuildStorage, Percent}; use subspace_core_primitives::PotKey; use subspace_runtime::{ - AllowAuthoringBy, BalancesConfig, DomainsConfig, MaxDomainBlockSize, MaxDomainBlockWeight, - RuntimeConfigsConfig, RuntimeGenesisConfig, SubspaceConfig, SudoConfig, SystemConfig, - VestingConfig, MILLISECS_PER_BLOCK, WASM_BINARY, + AllowAuthoringBy, BalancesConfig, DomainsConfig, EnableRewardsAt, MaxDomainBlockSize, + MaxDomainBlockWeight, RuntimeConfigsConfig, RuntimeGenesisConfig, SubspaceConfig, SudoConfig, + SystemConfig, VestingConfig, MILLISECS_PER_BLOCK, WASM_BINARY, }; use subspace_runtime_primitives::{AccountId, Balance, BlockNumber, SSC}; @@ -53,12 +53,13 @@ const TOKEN_GRANTS: &[(&str, u128)] = &[ /// Additional subspace specific genesis parameters. pub struct GenesisParams { - enable_rewards: bool, - enable_storage_access: bool, + enable_rewards_at: EnableRewardsAt, allow_authoring_by: AllowAuthoringBy, pot_slot_iterations: NonZeroU32, enable_domains: bool, + enable_dynamic_cost_of_storage: bool, enable_balance_transfers: bool, + enable_non_root_calls: bool, confirmation_depth_k: u32, } @@ -69,21 +70,23 @@ struct GenesisDomainParams { } /// Chain spec type for the subspace -pub type ChainSpec = SerializableChainSpec; +pub type ChainSpec = GenericChainSpec; /// Gemini 3g chain spec -pub fn gemini_3g() -> ChainSpec { - ChainSpec::from_json_bytes(GEMINI_3G_CHAIN_SPEC.as_bytes()).expect("Always valid") +pub fn gemini_3h() -> ChainSpec { + ChainSpec::from_json_bytes(GEMINI_3H_CHAIN_SPEC.as_bytes()).expect("Always valid") } /// Gemini 3g compiled chain spec -pub fn gemini_3g_compiled() -> ChainSpec { - ChainSpec::from_genesis( +pub fn gemini_3h_compiled() -> Result, String> { + // TODO: Migrate once https://github.com/paritytech/polkadot-sdk/issues/2963 is un-broken + #[allow(deprecated)] + Ok(GenericChainSpec::from_genesis( // Name - "Subspace Gemini 3g", + "Subspace Gemini 3h", // ID - "subspace_gemini_3g", - ChainType::Custom("Subspace Gemini 3g".to_string()), + "subspace_gemini_3h", + ChainType::Custom("Subspace Gemini 3h".to_string()), || { let sudo_account = AccountId::from_ss58check("5DNwQTHfARgKoa2NdiUM51ZUow7ve5xG9S2yYdSbVQcnYxBA") @@ -122,13 +125,11 @@ pub fn gemini_3g_compiled() -> ChainSpec { .collect::>(); subspace_genesis_config( SpecId::Gemini, - WASM_BINARY.expect("Wasm binary must be built for Gemini"), sudo_account.clone(), balances, vesting_schedules, GenesisParams { - enable_rewards: false, - enable_storage_access: false, + enable_rewards_at: EnableRewardsAt::Manually, allow_authoring_by: AllowAuthoringBy::RootFarmer( FarmerPublicKey::unchecked_from(hex_literal::hex!( "8aecbcf0b404590ddddc01ebacb205a562d12fdb5c2aa6a4035c1a20f23c9515" @@ -137,8 +138,10 @@ pub fn gemini_3g_compiled() -> ChainSpec { // TODO: Adjust once we bench PoT on faster hardware // About 1s on 6.0 GHz Raptor Lake CPU (14900K) pot_slot_iterations: NonZeroU32::new(200_032_000).expect("Not zero; qed"), - enable_domains: true, + enable_domains: false, + enable_dynamic_cost_of_storage: false, enable_balance_transfers: true, + enable_non_root_calls: false, confirmation_depth_k: 100, // TODO: Proper value here }, GenesisDomainParams { @@ -157,23 +160,25 @@ pub fn gemini_3g_compiled() -> ChainSpec { // Telemetry Some( TelemetryEndpoints::new(vec![(SUBSPACE_TELEMETRY_URL.into(), 1)]) - .expect("Telemetry value is valid"), + .map_err(|error| error.to_string())?, ), // Protocol ID - Some("subspace-gemini-3g"), + Some("subspace-gemini-3h"), None, // Properties Some({ let mut properties = chain_spec_properties(); properties.insert( "potExternalEntropy".to_string(), - serde_json::to_value(None::).expect("Serialization is not infallible; qed"), + serde_json::to_value(None::).expect("Serialization is infallible; qed"), ); properties }), // Extensions NoExtension::None, - ) + // Code + WASM_BINARY.expect("Wasm binary must be built for Gemini"), + )) } /// Dev net raw configuration @@ -183,6 +188,8 @@ pub fn devnet_config() -> ChainSpec { /// Dev net compiled configuration pub fn devnet_config_compiled() -> ChainSpec { + // TODO: Migrate once https://github.com/paritytech/polkadot-sdk/issues/2963 is un-broken + #[allow(deprecated)] ChainSpec::from_genesis( // Name "Subspace Dev network", @@ -227,17 +234,17 @@ pub fn devnet_config_compiled() -> ChainSpec { .collect::>(); subspace_genesis_config( evm_chain_spec::SpecId::DevNet, - WASM_BINARY.expect("Wasm binary must be built for Gemini"), sudo_account, balances, vesting_schedules, GenesisParams { - enable_rewards: false, - enable_storage_access: false, + enable_rewards_at: EnableRewardsAt::Manually, allow_authoring_by: AllowAuthoringBy::FirstFarmer, pot_slot_iterations: NonZeroU32::new(150_000_000).expect("Not zero; qed"), enable_domains: true, + enable_dynamic_cost_of_storage: false, enable_balance_transfers: true, + enable_non_root_calls: false, confirmation_depth_k: 100, // TODO: Proper value here }, GenesisDomainParams { @@ -270,13 +277,15 @@ pub fn devnet_config_compiled() -> ChainSpec { }), // Extensions None, + // Code + WASM_BINARY.expect("WASM binary was not build, please build it!"), ) } /// New dev chain spec pub fn dev_config() -> ChainSpec { - let wasm_binary = WASM_BINARY.expect("Development wasm not available"); - + // TODO: Migrate once https://github.com/paritytech/polkadot-sdk/issues/2963 is un-broken + #[allow(deprecated)] ChainSpec::from_genesis( // Name "Subspace development", @@ -286,7 +295,6 @@ pub fn dev_config() -> ChainSpec { || { subspace_genesis_config( evm_chain_spec::SpecId::Dev, - wasm_binary, // Sudo account utils::get_account_id_from_seed("Alice"), // Pre-funded accounts @@ -298,82 +306,14 @@ pub fn dev_config() -> ChainSpec { ], vec![], GenesisParams { - enable_rewards: false, - enable_balance_transfers: true, - enable_storage_access: false, + enable_rewards_at: EnableRewardsAt::Manually, allow_authoring_by: AllowAuthoringBy::Anyone, pot_slot_iterations: NonZeroU32::new(100_000_000).expect("Not zero; qed"), enable_domains: true, - confirmation_depth_k: 100, - }, - GenesisDomainParams { - domain_name: "evm-domain".to_owned(), - operator_allow_list: OperatorAllowList::Anyone, - operator_signing_key: get_public_key_from_seed::("Alice"), - }, - ) - }, - // Bootnodes - vec![], - // Telemetry - None, - // Protocol ID - None, - None, - // Properties - Some({ - let mut properties = chain_spec_properties(); - properties.insert( - "potExternalEntropy".to_string(), - serde_json::to_value(None::).expect("Serialization is not infallible; qed"), - ); - properties - }), - // Extensions - None, - ) -} - -/// New local chain spec -pub fn local_config() -> ChainSpec { - let wasm_binary = WASM_BINARY.expect("Development wasm not available"); - - ChainSpec::from_genesis( - // Name - "Subspace local", - // ID - "subspace_local", - ChainType::Local, - || { - subspace_genesis_config( - evm_chain_spec::SpecId::Local, - wasm_binary, - // Sudo account - utils::get_account_id_from_seed("Alice"), - // Pre-funded accounts - vec![ - (utils::get_account_id_from_seed("Alice"), 1_000 * SSC), - (utils::get_account_id_from_seed("Bob"), 1_000 * SSC), - (utils::get_account_id_from_seed("Charlie"), 1_000 * SSC), - (utils::get_account_id_from_seed("Dave"), 1_000 * SSC), - (utils::get_account_id_from_seed("Eve"), 1_000 * SSC), - (utils::get_account_id_from_seed("Ferdie"), 1_000 * SSC), - (utils::get_account_id_from_seed("Alice//stash"), 1_000 * SSC), - (utils::get_account_id_from_seed("Bob//stash"), 1_000 * SSC), - (utils::get_account_id_from_seed("Charlie//stash"), 1_000 * SSC), - (utils::get_account_id_from_seed("Dave//stash"), 1_000 * SSC), - (utils::get_account_id_from_seed("Eve//stash"), 1_000 * SSC), - (utils::get_account_id_from_seed("Ferdie//stash"), 1_000 * SSC), - ], - vec![], - GenesisParams { - enable_rewards: false, + enable_dynamic_cost_of_storage: false, enable_balance_transfers: true, - enable_storage_access: false, - allow_authoring_by: AllowAuthoringBy::Anyone, - pot_slot_iterations: NonZeroU32::new(100_000_000).expect("Not zero; qed"), - enable_domains: true, - confirmation_depth_k: 1, + enable_non_root_calls: true, + confirmation_depth_k: 5, }, GenesisDomainParams { domain_name: "evm-domain".to_owned(), @@ -400,13 +340,14 @@ pub fn local_config() -> ChainSpec { }), // Extensions None, + // Code + WASM_BINARY.expect("WASM binary was not build, please build it!"), ) } /// Configure initial storage state for FRAME modules. fn subspace_genesis_config( evm_domain_spec_id: evm_chain_spec::SpecId, - wasm_binary: &[u8], sudo_account: AccountId, balances: Vec<(AccountId, Balance)>, // who, start, period, period_count, per_period @@ -415,19 +356,29 @@ fn subspace_genesis_config( genesis_domain_params: GenesisDomainParams, ) -> RuntimeGenesisConfig { let GenesisParams { - enable_rewards, - enable_storage_access, + enable_rewards_at, allow_authoring_by, pot_slot_iterations, enable_domains, + enable_dynamic_cost_of_storage, enable_balance_transfers, + enable_non_root_calls, confirmation_depth_k, } = genesis_params; - let domain_genesis_config = evm_chain_spec::get_testnet_genesis_by_spec_id(evm_domain_spec_id); - let raw_genesis_storage = { - let storage = domain_genesis_config + let domain_chain_spec = match evm_domain_spec_id { + SpecId::Dev => evm_chain_spec::development_config(move || { + evm_chain_spec::get_testnet_genesis_by_spec_id(evm_domain_spec_id) + }), + SpecId::Gemini => evm_chain_spec::gemini_3h_config(move || { + evm_chain_spec::get_testnet_genesis_by_spec_id(evm_domain_spec_id) + }), + SpecId::DevNet => evm_chain_spec::devnet_config(move || { + evm_chain_spec::get_testnet_genesis_by_spec_id(evm_domain_spec_id) + }), + }; + let storage = domain_chain_spec .build_storage() .expect("Failed to build genesis storage from genesis runtime config"); let raw_genesis = RawGenesis::from_storage(storage); @@ -455,11 +406,7 @@ fn subspace_genesis_config( minimum_nominator_stake: 100 * SSC, }), }, - system: SystemConfig { - // Add Wasm runtime to storage. - code: wasm_binary.to_vec(), - ..Default::default() - }, + system: SystemConfig::default(), balances: BalancesConfig { balances }, transaction_payment: Default::default(), sudo: SudoConfig { @@ -467,8 +414,7 @@ fn subspace_genesis_config( key: Some(sudo_account), }, subspace: SubspaceConfig { - enable_rewards, - enable_storage_access, + enable_rewards_at, allow_authoring_by, pot_slot_iterations, phantom: PhantomData, @@ -476,7 +422,9 @@ fn subspace_genesis_config( vesting: VestingConfig { vesting }, runtime_configs: RuntimeConfigsConfig { enable_domains, + enable_dynamic_cost_of_storage, enable_balance_transfers, + enable_non_root_calls, confirmation_depth_k, }, } @@ -490,11 +438,10 @@ mod tests { #[test] fn test_chain_specs() { - gemini_3g_compiled(); - gemini_3g(); + gemini_3h_compiled().expect("Compiled chain spec is okay always"); + gemini_3h(); devnet_config_compiled(); devnet_config(); dev_config(); - local_config(); } } diff --git a/sdk/node/src/domains/builder.rs b/sdk/node/src/domains/builder.rs index be4d8ed4..1a14b6c9 100644 --- a/sdk/node/src/domains/builder.rs +++ b/sdk/node/src/domains/builder.rs @@ -5,7 +5,7 @@ use anyhow::{anyhow, Result}; use cross_domain_message_gossip::{ChainTxPoolMsg, Message}; use derivative::Derivative; use derive_builder::Builder; -use domain_client_operator::{BootstrapResult, Bootstrapper}; +use domain_client_operator::{fetch_domain_bootstrap_info, BootstrapResult}; use domain_runtime_primitives::opaque::Block as DomainBlock; use futures::future; use futures::future::Either::{Left, Right}; @@ -30,12 +30,11 @@ use tokio::sync::{oneshot, RwLock}; use crate::domains::domain::{Domain, DomainBuildingProgress}; use crate::domains::domain_instance_starter::DomainInstanceStarter; use crate::domains::evm_chain_spec; -use crate::ExecutorDispatch as CExecutorDispatch; /// Link to the consensus node pub struct ConsensusNodeLink { /// Consensus client - pub consensus_client: Arc>, + pub consensus_client: Arc>, /// Consensus network pub consensus_network: Arc>, /// Block import notification stream for consensus chain @@ -46,13 +45,8 @@ pub struct ConsensusNodeLink { /// Reference to the consensus node's network sync service pub consensus_sync_service: Arc>, /// Consensus tx pool - pub consensus_transaction_pool: Arc< - FullPool< - CFullClient, - CBlock, - ::Header, - >, - >, + pub consensus_transaction_pool: + Arc, CBlock, ::Header>>, /// Cross domain message gossip worker's message sink pub gossip_message_sink: TracingUnboundedSender, /// Cross domain message receiver for the domain @@ -116,8 +110,8 @@ impl DomainConfig { } /// Gemini 3g configuraiton - pub fn gemini_3g() -> DomainConfigBuilder { - DomainConfigBuilder::gemini_3g() + pub fn gemini_3h() -> DomainConfigBuilder { + DomainConfigBuilder::gemini_3h() } /// Devnet configuraiton @@ -138,7 +132,7 @@ impl DomainConfigBuilder { } /// Gemini 3g configuration - pub fn gemini_3g() -> Self { + pub fn gemini_3h() -> Self { Self::new().chain_id("gemini-3g").domain_id(DomainId::new(0)) } @@ -196,10 +190,11 @@ impl DomainConfig { let shared_progress_data = shared_progress_data.clone(); async move { *shared_progress_data.write().await = DomainBuildingProgress::BuildingStarted; - let bootstrapper = - Bootstrapper::::new(consensus_client.clone()); match future::select( - Box::pin(bootstrapper.fetch_domain_bootstrap_info(self.domain_id)), + Box::pin(fetch_domain_bootstrap_info::( + &*consensus_client, + self.domain_id, + )), bootstrapping_worker_drop_receiver, ) .await diff --git a/sdk/node/src/domains/domain_instance_starter.rs b/sdk/node/src/domains/domain_instance_starter.rs index 5546df01..e9895d2e 100644 --- a/sdk/node/src/domains/domain_instance_starter.rs +++ b/sdk/node/src/domains/domain_instance_starter.rs @@ -12,7 +12,7 @@ use sc_consensus_subspace::block_import::BlockImportingNotification; use sc_consensus_subspace::notification::SubspaceNotificationStream; use sc_consensus_subspace::slot_worker::NewSlotNotification; use sc_network::NetworkService; -use sc_service::{BasePath, Configuration, RpcHandlers}; +use sc_service::{Configuration, RpcHandlers}; use sc_transaction_pool_api::OffchainTransactionPoolFactory; use sc_utils::mpsc::{TracingUnboundedReceiver, TracingUnboundedSender}; use sp_core::H256; @@ -23,9 +23,7 @@ use subspace_runtime_primitives::opaque::Block as CBlock; use subspace_service::FullClient as CFullClient; use tokio::task::JoinHandle; -use crate::domains::evm_domain_executor_dispatch::EVMDomainExecutorDispatch; use crate::domains::utils::AccountId20; -use crate::ExecutorDispatch as CExecutorDispatch; /// `DomainInstanceStarter` used to start a domain instance node based on the /// given bootstrap result @@ -35,7 +33,7 @@ pub struct DomainInstanceStarter { pub domain_id: DomainId, pub runtime_type: RuntimeType, pub additional_arguments: Vec, - pub consensus_client: Arc>, + pub consensus_client: Arc>, pub consensus_network: Arc>, pub block_importing_notification_stream: SubspaceNotificationStream>, @@ -103,15 +101,11 @@ impl DomainInstanceStarter { let eth_provider = EthProvider::< evm_domain_runtime::TransactionConverter, DefaultEthConfig< - FullClient< - DomainBlock, - evm_domain_runtime::RuntimeApi, - EVMDomainExecutorDispatch, - >, + FullClient, FullBackend, >, >::new( - Some(BasePath::new(service_config.base_path.path())), + Some(service_config.base_path.path()), additional_arguments.drain(..), ); @@ -139,7 +133,6 @@ impl DomainInstanceStarter { _, _, evm_domain_runtime::RuntimeApi, - EVMDomainExecutorDispatch, AccountId20, _, _, diff --git a/sdk/node/src/domains/evm_chain_spec.rs b/sdk/node/src/domains/evm_chain_spec.rs index f445a89e..b62df6e4 100644 --- a/sdk/node/src/domains/evm_chain_spec.rs +++ b/sdk/node/src/domains/evm_chain_spec.rs @@ -7,20 +7,19 @@ use evm_domain_runtime::{ SudoConfig, SystemConfig, WASM_BINARY, }; use hex_literal::hex; -use sc_service::{ChainSpec as _, ChainType}; -use sc_subspace_chain_specs::ExecutionChainSpec; +use sc_service::{ChainSpec as _, ChainType, GenericChainSpec}; use sdk_utils::chain_spec::chain_spec_properties; use sp_domains::storage::RawGenesis; use subspace_runtime_primitives::SSC; /// Chain spec type for the system domain -pub type ChainSpec = ExecutionChainSpec; +pub type ChainSpec = GenericChainSpec; +#[derive(Copy, Clone)] pub enum SpecId { Dev, Gemini, DevNet, - Local, } pub fn create_domain_spec(chain_id: &str, raw_genesis: RawGenesis) -> Result { @@ -29,9 +28,8 @@ pub fn create_domain_spec(chain_id: &str, raw_genesis: RawGenesis) -> Result development_config(constructor), - "gemini-3g" => gemini_3g_config(constructor), + "gemini-3g" => gemini_3h_config(constructor), "devnet" => devnet_config(constructor), - "" | "local" => local_testnet_config(constructor), path => ChainSpec::from_json_file(std::path::PathBuf::from(path))?, }; @@ -86,14 +84,6 @@ pub fn get_testnet_genesis_by_spec_id(spec_id: SpecId) -> RuntimeGenesisConfig { Some(sudo_account), ) } - SpecId::Local => { - let accounts = get_dev_accounts(); - testnet_genesis( - accounts.clone(), - // Alith is sudo - Some(accounts[0]), - ) - } } } @@ -101,6 +91,8 @@ pub fn get_testnet_genesis_by_spec_id(spec_id: SpecId) -> RuntimeGenesisConfig { pub fn development_config RuntimeGenesisConfig + 'static + Send + Sync>( constructor: F, ) -> ChainSpec { + // TODO: Migrate once https://github.com/paritytech/polkadot-sdk/issues/2963 is un-broken + #[allow(deprecated)] ChainSpec::from_genesis( // Name "Development", @@ -114,43 +106,22 @@ pub fn development_config RuntimeGenesisConfig + 'static + Send + Syn None, Some(chain_spec_properties()), None, - ) -} - -/// Local config -pub fn local_testnet_config RuntimeGenesisConfig + 'static + Send + Sync>( - constructor: F, -) -> ChainSpec { - ChainSpec::from_genesis( - // Name - "Local Testnet", - // ID - "evm_domain_local_testnet", - ChainType::Local, - constructor, - // Bootnodes - vec![], - // Telemetry - None, - // Protocol ID - Some("evm-local"), - None, - // Properties - Some(chain_spec_properties()), - // Extensions - None, + // Code + WASM_BINARY.expect("WASM binary was not build, please build it!"), ) } /// Gemini 3g config -pub fn gemini_3g_config RuntimeGenesisConfig + 'static + Send + Sync>( +pub fn gemini_3h_config RuntimeGenesisConfig + 'static + Send + Sync>( constructor: F, ) -> ChainSpec { + // TODO: Migrate once https://github.com/paritytech/polkadot-sdk/issues/2963 is un-broken + #[allow(deprecated)] ChainSpec::from_genesis( // Name "Subspace Gemini 3g EVM Domain", // ID - "subspace_gemini_3g_evm_domain", + "subspace_gemini_3h_evm_domain", ChainType::Live, constructor, // Bootnodes @@ -164,12 +135,16 @@ pub fn gemini_3g_config RuntimeGenesisConfig + 'static + Send + Sync> Some(chain_spec_properties()), // Extensions None, + // Code + WASM_BINARY.expect("WASM binary was not build, please build it!"), ) } pub fn devnet_config RuntimeGenesisConfig + 'static + Send + Sync>( constructor: F, ) -> ChainSpec { + // TODO: Migrate once https://github.com/paritytech/polkadot-sdk/issues/2963 is un-broken + #[allow(deprecated)] ChainSpec::from_genesis( // Name "Subspace Devnet EVM Domain", @@ -188,6 +163,8 @@ pub fn devnet_config RuntimeGenesisConfig + 'static + Send + Sync>( Some(chain_spec_properties()), // Extensions None, + // Code + WASM_BINARY.expect("WASM binary was not build, please build it!"), ) } @@ -202,10 +179,7 @@ fn testnet_genesis( let revert_bytecode = vec![0x60, 0x00, 0x60, 0x00, 0xFD]; RuntimeGenesisConfig { - system: SystemConfig { - code: WASM_BINARY.expect("WASM binary was not build, please build it!").to_vec(), - ..Default::default() - }, + system: SystemConfig::default(), sudo: SudoConfig { key: maybe_sudo_account }, transaction_payment: Default::default(), balances: BalancesConfig { diff --git a/sdk/node/src/domains/evm_domain_executor_dispatch.rs b/sdk/node/src/domains/evm_domain_executor_dispatch.rs deleted file mode 100644 index 4255e213..00000000 --- a/sdk/node/src/domains/evm_domain_executor_dispatch.rs +++ /dev/null @@ -1,19 +0,0 @@ -use sc_executor::NativeExecutionDispatch; - -/// EVM domain executor instance. -pub struct EVMDomainExecutorDispatch; - -impl NativeExecutionDispatch for EVMDomainExecutorDispatch { - #[cfg(feature = "runtime-benchmarks")] - type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; - #[cfg(not(feature = "runtime-benchmarks"))] - type ExtendHostFunctions = (); - - fn dispatch(method: &str, data: &[u8]) -> Option> { - evm_domain_runtime::api::dispatch(method, data) - } - - fn native_version() -> sc_executor::NativeVersion { - evm_domain_runtime::native_version() - } -} diff --git a/sdk/node/src/domains/mod.rs b/sdk/node/src/domains/mod.rs index d8a19018..bbc3a8d3 100644 --- a/sdk/node/src/domains/mod.rs +++ b/sdk/node/src/domains/mod.rs @@ -3,5 +3,4 @@ pub mod domain; pub mod domain_instance_starter; pub mod domain_node; pub mod evm_chain_spec; -pub mod evm_domain_executor_dispatch; pub mod utils; diff --git a/sdk/node/src/lib.rs b/sdk/node/src/lib.rs index 7efc10aa..496f917b 100644 --- a/sdk/node/src/lib.rs +++ b/sdk/node/src/lib.rs @@ -22,7 +22,8 @@ use frame_system::pallet_prelude::BlockNumberFor; use futures::{FutureExt, Stream, StreamExt}; use sc_consensus_subspace::archiver::SegmentHeadersStore; use sc_network::network_state::NetworkState; -use sc_network::{NetworkService, NetworkStateInfo, SyncState}; +use sc_network::{NetworkService, NetworkStateInfo}; +use sc_network_sync::SyncState; use sc_rpc_api::state::StateApiClient; use sc_service::Configuration; use sc_utils::mpsc::tracing_unbounded; @@ -44,7 +45,7 @@ use subspace_networking::{ use subspace_rpc_primitives::MAX_SEGMENT_HEADERS_PER_REQUEST; use subspace_runtime::RuntimeApi; use subspace_runtime_primitives::opaque::{Block as OpaqueBlock, Header}; -use subspace_service::SubspaceConfiguration; +use subspace_service::config::SubspaceConfiguration; use tokio::sync::oneshot; mod builder; @@ -105,7 +106,6 @@ impl Config { mut dsn, sync_from_dsn, storage_monitor, - enable_subspace_block_relay, is_timekeeper, timekeeper_cpu_cores, pot_external_entropy: config_pot_external_entropy, @@ -114,15 +114,13 @@ impl Config { let base = base.configuration(directory.as_ref(), chain_spec.clone()).await; let name = base.network.node_name.clone(); - let database_source = base.database.clone(); - let partial_components = - subspace_service::new_partial::( - &base, - &pot_external_entropy(&base, config_pot_external_entropy) - .context("Failed to get proof of time external entropy")?, - ) - .context("Failed to build a partial subspace node")?; + let partial_components = subspace_service::new_partial::( + &base, + &pot_external_entropy(&base, config_pot_external_entropy) + .context("Failed to get proof of time external entropy")?, + ) + .context("Failed to build a partial subspace node")?; let (subspace_networking, dsn, mut runner) = { let keypair = { @@ -172,7 +170,7 @@ impl Config { tracing::debug!("Subspace networking initialized: Node ID is {}", dsn.node.id()); ( - subspace_service::SubspaceNetworking::Reuse { + subspace_service::config::SubspaceNetworking::Reuse { node: dsn.node.clone(), bootstrap_nodes, metrics_registry, @@ -199,6 +197,7 @@ impl Config { .unwrap_or_default(); let consensus_state_pruning_mode = base.state_pruning.clone().unwrap_or_default(); + let base_path_buf = base.base_path.path().to_path_buf(); // Default value are used for many of parameters let configuration = SubspaceConfiguration { @@ -206,7 +205,6 @@ impl Config { force_new_slot_notifications: false, subspace_networking, sync_from_dsn, - enable_subspace_block_relay, is_timekeeper, timekeeper_cpu_cores, }; @@ -221,7 +219,7 @@ impl Config { .context("Failed to run node runner future")?; let slot_proportion = sc_consensus_slots::SlotProportion::new(3f32 / 4f32); - let full_client = subspace_service::new_full::( + let full_client = subspace_service::new_full::( configuration, partial_components, true, @@ -245,12 +243,13 @@ impl Config { transaction_pool, block_importing_notification_stream, new_slot_notification_stream, + xdm_gossip_notification_service, } = full_client; if let Some(storage_monitor) = storage_monitor { sc_storage_monitor::StorageMonitorService::try_spawn( storage_monitor.into(), - database_source, + base_path_buf, &task_manager.spawn_essential_handle(), ) .context("Failed to start storage monitor")?; @@ -340,7 +339,11 @@ impl Config { .await?; let cross_domain_message_gossip_worker = xdm_gossip_worker_builder - .build::(network_service.clone(), sync_service.clone()); + .build::( + network_service.clone(), + xdm_gossip_notification_service, + sync_service.clone(), + ); task_manager.spawn_essential_handle().spawn_essential_blocking( "cross-domain-gossip-message-worker", @@ -412,34 +415,9 @@ impl Config { } } -/// Executor dispatch for subspace runtime -pub struct ExecutorDispatch; - -impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { - // /// Only enable the benchmarking host functions when we actually want to - // benchmark. #[cfg(feature = "runtime-benchmarks")] - // type ExtendHostFunctions = ( - // frame_benchmarking::benchmarking::HostFunctions, - // sp_consensus_subspace::consensus::HostFunctions, - // ) - // /// Otherwise we only use the default Substrate host functions. - // #[cfg(not(feature = "runtime-benchmarks"))] - type ExtendHostFunctions = - (sp_consensus_subspace::consensus::HostFunctions, sp_domains_fraud_proof::HostFunctions); - - fn dispatch(method: &str, data: &[u8]) -> Option> { - subspace_runtime::api::dispatch(method, data) - } - - fn native_version() -> sc_executor::NativeVersion { - subspace_runtime::native_version() - } -} - /// Chain spec for subspace node pub type ChainSpec = chain_spec::ChainSpec; -pub(crate) type FullClient = - subspace_service::FullClient; +pub(crate) type FullClient = subspace_service::FullClient; pub(crate) type NewFull = subspace_service::NewFull; /// Node structure @@ -450,7 +428,7 @@ pub struct Node { #[derivative(Debug = "ignore")] client: Arc, #[derivative(Debug = "ignore")] - sync_service: Arc>, + sync_service: Arc>, #[derivative(Debug = "ignore")] network_service: Arc>, rpc_handle: sdk_utils::Rpc, @@ -614,8 +592,8 @@ impl Node { } /// Gemini 3g configuration - pub fn gemini_3g() -> Builder { - Builder::gemini_3g() + pub fn gemini_3h() -> Builder { + Builder::gemini_3h() } /// Devnet configuration diff --git a/sdk/subspace-sdk/Cargo.toml b/sdk/subspace-sdk/Cargo.toml index e7eb6f8b..22220eb8 100644 --- a/sdk/subspace-sdk/Cargo.toml +++ b/sdk/subspace-sdk/Cargo.toml @@ -11,7 +11,7 @@ sdk-substrate = { path = "../substrate" } sdk-utils = { path = "../utils" } static_assertions = "1.1.0" -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } [dev-dependencies] anyhow = "1" @@ -22,7 +22,7 @@ fdlimit = "0.2" futures = "0.3" mimalloc = { version = "*", default-features = false } serde_json = "1" -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } tempfile = "3" tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros"] } tracing = "0.1" diff --git a/sdk/subspace-sdk/examples/mini-farmer.rs b/sdk/subspace-sdk/examples/mini-farmer.rs index c2418311..ae3f78e9 100644 --- a/sdk/subspace-sdk/examples/mini-farmer.rs +++ b/sdk/subspace-sdk/examples/mini-farmer.rs @@ -13,7 +13,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; #[derive(ValueEnum, Debug, Clone)] enum Chain { - Gemini3f, + Gemini3h, Devnet, Dev, } @@ -76,8 +76,8 @@ async fn main() -> anyhow::Result<()> { let node_dir = base_path.join("node"); let node = match chain { - Chain::Gemini3f => Node::gemini_3g().dsn( - subspace_sdk::node::DsnBuilder::gemini_3g() + Chain::Gemini3h => Node::gemini_3h().dsn( + subspace_sdk::node::DsnBuilder::gemini_3h() .provider_storage_path(node_dir.join("provider_storage")), ), Chain::Devnet => Node::devnet().dsn( @@ -106,7 +106,7 @@ async fn main() -> anyhow::Result<()> { .build( &node_dir, match chain { - Chain::Gemini3f => node::chain_spec::gemini_3g(), + Chain::Gemini3h => node::chain_spec::gemini_3h(), Chain::Devnet => node::chain_spec::devnet_config(), Chain::Dev => node::chain_spec::dev_config(), }, diff --git a/sdk/subspace-sdk/examples/sync.rs b/sdk/subspace-sdk/examples/sync.rs index 8ba08646..f57bf906 100644 --- a/sdk/subspace-sdk/examples/sync.rs +++ b/sdk/subspace-sdk/examples/sync.rs @@ -1,8 +1,10 @@ use std::num::NonZeroU8; use std::path::PathBuf; +use anyhow::anyhow; use clap::Parser; use futures::stream::StreamExt; +use sdk_node::ChainSpec; use subspace_sdk::node::NetworkBuilder; use subspace_sdk::{ chain_spec, ByteSize, FarmDescription, Farmer, MultiaddrWithPeerId, Node, PublicKey, @@ -49,9 +51,16 @@ async fn main() -> anyhow::Result<()> { let args = Args::parse(); match args { Args::GenerateSpec { path } => - tokio::fs::write(path, serde_json::to_string_pretty(&chain_spec::dev_config())?).await?, + tokio::fs::write( + path, + chain_spec::dev_config() + .as_json(false) + .map_err(|e| anyhow!("unable to write json spec, error: {}", e))?, + ) + .await?, Args::Farm { plot, plot_size, node, spec } => { - let chain_spec = serde_json::from_str(&tokio::fs::read_to_string(spec).await?)?; + let chain_spec = ChainSpec::from_json_file(spec) + .map_err(|e| anyhow!("unable to read json spec, error: {}", e))?; let (plot_size, _cache_size) = (ByteSize::b(plot_size.as_u64() * 9 / 10), ByteSize::b(plot_size.as_u64() / 10)); let plots = [FarmDescription::new(plot.join("plot"), plot_size)]; @@ -86,7 +95,8 @@ async fn main() -> anyhow::Result<()> { } Args::Sync { boot_nodes, spec } => { let node = TempDir::new()?; - let chain_spec = serde_json::from_str(&tokio::fs::read_to_string(spec).await?)?; + let chain_spec = ChainSpec::from_json_file(spec) + .map_err(|e| anyhow!("unable to read json spec, error: {}", e))?; let node = Node::builder() .force_authoring(true) .role(subspace_sdk::node::Role::Authority) diff --git a/sdk/substrate/Cargo.toml b/sdk/substrate/Cargo.toml index 63631f68..7e3dc21a 100644 --- a/sdk/substrate/Cargo.toml +++ b/sdk/substrate/Cargo.toml @@ -10,15 +10,14 @@ derivative = "2.2.0" derive_builder = "0.12" derive_more = "0.99" names = { version = "0.14.0", default-features = false } -sc-chain-spec = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-executor = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-informant = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sc-state-db = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } +sc-chain-spec = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-informant = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } +sc-state-db = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } serde_json = "1" -sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -tokio = { version = "1.34.0", features = ["fs", "rt", "tracing"] } +sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } diff --git a/sdk/substrate/src/lib.rs b/sdk/substrate/src/lib.rs index 38307eba..e786627d 100644 --- a/sdk/substrate/src/lib.rs +++ b/sdk/substrate/src/lib.rs @@ -15,12 +15,13 @@ use std::path::Path; use derivative::Derivative; use derive_builder::Builder; -use sc_executor::{WasmExecutionMethod, WasmtimeInstantiationStrategy}; -use sc_network::config::{NodeKeyConfig, Secret}; -use sc_service::config::{KeystoreConfig, NetworkConfiguration, TransportConfig}; -use sc_service::{BasePath, Configuration, DatabaseSource, TracingReceiver}; +use sc_network::config::{NodeKeyConfig, NonReservedPeerMode, Secret, SetConfig}; +use sc_service::{BasePath, Configuration}; use sdk_utils::{Multiaddr, MultiaddrWithPeerId}; use serde::{Deserialize, Serialize}; +use subspace_service::config::{ + SubstrateConfiguration, SubstrateNetworkConfiguration, SubstrateRpcConfiguration, +}; pub use types::*; mod types; @@ -144,18 +145,13 @@ impl Base { chain_spec: CS, ) -> Configuration where - CS: sc_chain_spec::ChainSpec - + serde::Serialize - + serde::de::DeserializeOwned - + sp_runtime::BuildStorage - + 'static, + CS: sc_chain_spec::ChainSpec + sp_runtime::BuildStorage + 'static, { const NODE_KEY_ED25519_FILE: &str = "secret_ed25519"; const DEFAULT_NETWORK_CONFIG_PATH: &str = "network"; let Self { force_authoring, - role, blocks_pruning, state_pruning, impl_name: ImplName(impl_name), @@ -167,30 +163,21 @@ impl Base { max_connections: rpc_max_connections, cors: rpc_cors, methods: rpc_methods, - max_request_size: rpc_max_request_size, - max_response_size: rpc_max_response_size, max_subs_per_conn: rpc_max_subs_per_conn, + .. }, network, - offchain_worker, informant_enable_color, telemetry, - dev_key_seed, + .. } = self; let base_path = BasePath::new(directory.as_ref()); let config_dir = base_path.config_dir(chain_spec.id()); - let mut network = { + let network = { let Network { - listen_addresses, - boot_nodes, - force_synced, - name, - client_id, - enable_mdns, - allow_private_ip, - allow_non_globals_in_dht, + listen_addresses, boot_nodes, force_synced, name, allow_private_ip, .. } = network; let name = name.unwrap_or_else(|| { names::Generator::with_naming(names::Name::Numbered) @@ -199,36 +186,33 @@ impl Base { .expect("RNG is available on all supported platforms; qed") }); - let client_id = client_id.unwrap_or_else(|| format!("{impl_name}/v{impl_version}")); let config_dir = config_dir.join(DEFAULT_NETWORK_CONFIG_PATH); let listen_addresses = listen_addresses.into_iter().map(Into::into).collect::>(); - NetworkConfiguration { - listen_addresses, - boot_nodes: chain_spec + SubstrateNetworkConfiguration { + listen_on: listen_addresses, + bootstrap_nodes: chain_spec .boot_nodes() .iter() .cloned() .chain(boot_nodes.into_iter().map(Into::into)) .collect(), + node_key: NodeKeyConfig::Ed25519(Secret::File( + config_dir.join(NODE_KEY_ED25519_FILE), + )), + default_peers_set: SetConfig { + in_peers: 125, + out_peers: 50, + reserved_nodes: vec![], + non_reserved_mode: NonReservedPeerMode::Accept, + }, + node_name: name, + allow_private_ips: allow_private_ip, force_synced, - transport: TransportConfig::Normal { enable_mdns, allow_private_ip }, - allow_non_globals_in_dht, - ..NetworkConfiguration::new( - name, - client_id, - NodeKeyConfig::Ed25519(Secret::File(config_dir.join(NODE_KEY_ED25519_FILE))), - Some(config_dir), - ) + public_addresses: vec![], } }; - // Increase default value of 25 to improve success rate of sync - network.default_peers_set.out_peers = 50; - // Full + Light clients - network.default_peers_set.in_peers = 25 + 100; - let keystore = KeystoreConfig::InMemory; - // HACK: Tricky way to add extra endpoints as we can't push into telemetry // endpoints let telemetry_endpoints = match chain_spec.telemetry_endpoints() { @@ -254,50 +238,34 @@ impl Base { .expect("Never returns an error"), }; - Configuration { + SubstrateConfiguration { impl_name, impl_version, - tokio_handle: tokio::runtime::Handle::current(), transaction_pool: Default::default(), network, - keystore, - database: DatabaseSource::ParityDb { path: config_dir.join("paritydb").join("full") }, - trie_cache_maximum_size: Some(67_108_864), state_pruning: Some(state_pruning.into()), blocks_pruning: blocks_pruning.into(), - wasm_method: WasmExecutionMethod::Compiled { - instantiation_strategy: WasmtimeInstantiationStrategy::PoolingCopyOnWrite, + rpc_options: SubstrateRpcConfiguration { + listen_on: rpc_addr.unwrap_or(SocketAddr::new( + IpAddr::V4(Ipv4Addr::LOCALHOST), + rpc_port.unwrap_or(9944), + )), + max_connections: rpc_max_connections.unwrap_or(100), + cors: rpc_cors, + methods: rpc_methods.into(), + max_subscriptions_per_connection: rpc_max_subs_per_conn.unwrap_or(100), }, - wasm_runtime_overrides: None, - rpc_addr, - rpc_port: rpc_port.unwrap_or_default(), - rpc_methods: rpc_methods.into(), - rpc_max_connections: rpc_max_connections.unwrap_or_default() as u32, - rpc_cors, - rpc_max_request_size: rpc_max_request_size.unwrap_or_default() as u32, - rpc_max_response_size: rpc_max_response_size.unwrap_or_default() as u32, - rpc_id_provider: None, - rpc_max_subs_per_conn: rpc_max_subs_per_conn.unwrap_or_default() as u32, - prometheus_config: None, + prometheus_listen_on: None, telemetry_endpoints: Some(telemetry_endpoints), - default_heap_pages: None, - offchain_worker: offchain_worker.into(), force_authoring, - disable_grandpa: false, - dev_key_seed, - tracing_targets: None, - tracing_receiver: TracingReceiver::Log, chain_spec: Box::new(chain_spec), - max_runtime_instances: 8, - announce_block: true, - role: role.into(), - base_path, - data_path: config_dir, + base_path: base_path.path().to_path_buf(), informant_output_format: sc_informant::OutputFormat { enable_color: informant_enable_color, }, - runtime_cache_size: 2, + farmer: self.role == Role::Authority, } + .into() } } @@ -318,7 +286,7 @@ pub struct Rpc { /// Maximum number of connections for RPC server. `None` if default. #[builder(setter(strip_option), default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub max_connections: Option, + pub max_connections: Option, /// CORS settings for HTTP & WS servers. `None` if all origins are /// allowed. #[builder(setter(strip_option), default)] @@ -340,7 +308,7 @@ pub struct Rpc { /// Maximum allowed subscriptions per rpc connection #[builder(default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub max_subs_per_conn: Option, + pub max_subs_per_conn: Option, } impl RpcBuilder { @@ -361,7 +329,7 @@ impl RpcBuilder { } /// Gemini 3g configuration - pub fn gemini_3g() -> Self { + pub fn gemini_3h() -> Self { Self::new().addr("127.0.0.1:9944".parse().expect("hardcoded value is true")).cors(vec![ "http://localhost:*".to_owned(), "http://127.0.0.1:*".to_owned(), @@ -429,7 +397,7 @@ impl NetworkBuilder { } /// Gemini 3g configuration - pub fn gemini_3g() -> Self { + pub fn gemini_3h() -> Self { Self::default() .listen_addresses(vec![ "/ip6/::/tcp/30333".parse().expect("hardcoded value is true"), diff --git a/sdk/substrate/src/types.rs b/sdk/substrate/src/types.rs index f60bddd1..7b68114d 100644 --- a/sdk/substrate/src/types.rs +++ b/sdk/substrate/src/types.rs @@ -161,7 +161,7 @@ impl OffchainWorkerBuilder { } /// Gemini 3g configuration - pub fn gemini_3g() -> Self { + pub fn gemini_3h() -> Self { Self::default().enabled(true) } diff --git a/sdk/traits/Cargo.toml b/sdk/traits/Cargo.toml index e39fa4a1..90b05646 100644 --- a/sdk/traits/Cargo.toml +++ b/sdk/traits/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] async-trait = "0.1" parking_lot = "0.12" -sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } +sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sdk-dsn = { path = "../dsn" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } diff --git a/sdk/utils/Cargo.toml b/sdk/utils/Cargo.toml index 5216cc7c..f4b1fb0d 100644 --- a/sdk/utils/Cargo.toml +++ b/sdk/utils/Cargo.toml @@ -13,30 +13,30 @@ bytesize = "1" bytesize-serde = "0.2" derivative = "2.2.0" derive_more = "0.99" -frame-support = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } +frame-support = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } futures = "0.3" jsonrpsee-core = "0.16" libp2p-core = { git = "https://github.com/subspace/rust-libp2p", rev = "d6339da35589d86bae6ecb25a5121c02f2e5b90e" } parity-scale-codec = "3.6.3" -sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sc-rpc = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } -sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c", default-features = false } +sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } +sc-rpc = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } +sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } +sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } serde = { version = "1", features = ["derive"] } serde_json = "1.0.106" -sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-core-hashing = { version = "9.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } -sp-storage = { version = "13.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "c63a8b28a9fd26d42116b0dcef1f2a5cefb9cd1c" } +sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-core-hashing = { version = "9.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } +sp-storage = { version = "13.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } ss58-registry = "1.33" # Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver` -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e", default-features = false } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "bd435100200b3dcce6d6f50534d52e3cd039ca8e" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } thiserror = "1" tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tracing = "0.1" diff --git a/sdk/utils/src/lib.rs b/sdk/utils/src/lib.rs index 34e58149..b4735725 100644 --- a/sdk/utils/src/lib.rs +++ b/sdk/utils/src/lib.rs @@ -34,8 +34,7 @@ use subspace_core_primitives::{Piece, PieceIndex, SegmentHeader, SegmentIndex, P use subspace_farmer::jsonrpsee::tracing; use subspace_farmer::node_client::{Error as NodeClientError, NodeClient}; use subspace_rpc_primitives::{ - FarmerAppInfo, NodeSyncStatus, RewardSignatureResponse, RewardSigningInfo, SlotInfo, - SolutionResponse, + FarmerAppInfo, RewardSignatureResponse, RewardSigningInfo, SlotInfo, SolutionResponse, }; /// Output that indicates whether the task was cancelled or successfully @@ -178,16 +177,6 @@ impl NodeClient for Rpc { )) } - async fn subscribe_node_sync_status_change( - &self, - ) -> Result + Send + 'static>>, NodeClientError> { - Ok(Box::pin( - SubspaceRpcApiClient::subscribe_node_sync_status_change(self) - .await? - .filter_map(|result| futures::future::ready(result.ok())), - )) - } - async fn segment_headers( &self, segment_indexes: Vec, From cd4cf5f00f7e4f7cb5b9be8d8fe948964cf9b946 Mon Sep 17 00:00:00 2001 From: Parth Desai Date: Wed, 7 Feb 2024 17:47:26 +0530 Subject: [PATCH 2/5] set test-threads=1 in CI to prevent intermittent test failures --- .github/workflows/ci-tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 2aa2ebeb..5527e191 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -178,11 +178,11 @@ jobs: run: cargo cache - name: Build and run tests (linux & windows) - run: cargo test --locked + run: cargo test --locked -- --test-threads 1 if: runner.os != 'macOS' - name: Build and run tests (macOS) - run: cargo test --locked --no-default-features + run: cargo test --locked --no-default-features -- --test-threads 1 if: runner.os == 'macOS' - name: Clean unused artifacts From e77129edeaebba5617e6d8b4a4ab0bd342a4adaf Mon Sep 17 00:00:00 2001 From: Parth Desai Date: Fri, 9 Feb 2024 17:55:26 +0530 Subject: [PATCH 3/5] addressing low hanging review comments + minor cleanups --- Cargo.lock | 1 - pulsar/src/config.rs | 9 +-- pulsar/src/utils.rs | 4 -- sdk/dsn/src/builder.rs | 11 ---- sdk/farmer/src/lib.rs | 30 +++++---- sdk/node/src/builder.rs | 12 ++-- sdk/node/src/domains/builder.rs | 2 +- sdk/node/src/lib.rs | 24 ++++--- sdk/subspace-sdk/examples/mini-farmer.rs | 15 +---- sdk/substrate/Cargo.toml | 1 - sdk/substrate/src/lib.rs | 83 ++++-------------------- 11 files changed, 55 insertions(+), 137 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0fdba8dd..e8bcd124 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10057,7 +10057,6 @@ dependencies = [ "sc-storage-monitor", "sdk-utils", "serde", - "serde_json", "sp-runtime", "subspace-service", ] diff --git a/pulsar/src/config.rs b/pulsar/src/config.rs index 14c1998e..c5b8ac74 100644 --- a/pulsar/src/config.rs +++ b/pulsar/src/config.rs @@ -11,7 +11,7 @@ use subspace_sdk::node::{DomainConfigBuilder, DsnBuilder, NetworkBuilder, Node, use subspace_sdk::{chain_spec, ByteSize, FarmDescription, PublicKey}; use tracing::instrument; -use crate::utils::{provider_storage_dir_getter, IntoEyre}; +use crate::utils::IntoEyre; /// defaults for the user config file pub(crate) const DEFAULT_FARM_SIZE: ByteSize = ByteSize::gb(2); @@ -52,10 +52,7 @@ impl NodeConfig { ChainConfig::Gemini3h => { let mut node = Node::gemini_3h() .network(NetworkBuilder::gemini_3h().name(name)) - .dsn( - DsnBuilder::gemini_3h() - .provider_storage_path(provider_storage_dir_getter()), - ) + .dsn(DsnBuilder::gemini_3h()) .sync_from_dsn(true) .enable_subspace_block_relay(true); if enable_domains { @@ -77,7 +74,7 @@ impl NodeConfig { ChainConfig::DevNet => { let mut node = Node::devnet() .network(NetworkBuilder::devnet().name(name)) - .dsn(DsnBuilder::devnet().provider_storage_path(provider_storage_dir_getter())) + .dsn(DsnBuilder::devnet()) .sync_from_dsn(true) .enable_subspace_block_relay(true); if enable_domains { diff --git a/pulsar/src/utils.rs b/pulsar/src/utils.rs index 6cef31bc..eea3ff7c 100644 --- a/pulsar/src/utils.rs +++ b/pulsar/src/utils.rs @@ -149,10 +149,6 @@ pub(crate) fn node_directory_getter() -> PathBuf { data_dir_getter().join("node") } -pub(crate) fn provider_storage_dir_getter() -> PathBuf { - node_directory_getter().join("provider-storage") -} - fn data_dir_getter() -> PathBuf { dirs::data_dir().expect("data folder must be present in every major OS").join("pulsar") } diff --git a/sdk/dsn/src/builder.rs b/sdk/dsn/src/builder.rs index 3286d82f..12393ad8 100644 --- a/sdk/dsn/src/builder.rs +++ b/sdk/dsn/src/builder.rs @@ -84,10 +84,6 @@ pub struct PendingOutConnections(#[derivative(Default(value = "150"))] pub u32); #[builder(pattern = "immutable", build_fn(private, name = "_build"), name = "DsnBuilder")] #[non_exhaustive] pub struct Dsn { - /// Listen on some address for other nodes - #[builder(default, setter(into, strip_option))] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub provider_storage_path: Option, /// Listen on some address for other nodes #[builder(default, setter(into))] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] @@ -125,11 +121,6 @@ pub struct Dsn { #[builder(setter(into), default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] pub pending_out_connections: PendingOutConnections, - /// Defines target total (in and out) connection number for DSN that - /// should be maintained. - #[builder(setter(into), default)] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub target_connections: TargetConnections, } sdk_utils::generate_builder!(Dsn); @@ -237,14 +228,12 @@ impl Dsn { listen_addresses, reserved_nodes, allow_non_global_addresses_in_dht, - provider_storage_path: _, in_connections: InConnections(max_established_incoming_connections), out_connections: OutConnections(max_established_outgoing_connections), pending_in_connections: PendingInConnections(max_pending_incoming_connections), pending_out_connections: PendingOutConnections(max_pending_outgoing_connections), boot_nodes, external_addresses, - .. } = self; let bootstrap_nodes = boot_nodes.into_iter().map(Into::into).collect::>(); diff --git a/sdk/farmer/src/lib.rs b/sdk/farmer/src/lib.rs index 67f06dd4..609a742b 100644 --- a/sdk/farmer/src/lib.rs +++ b/sdk/farmer/src/lib.rs @@ -40,6 +40,7 @@ use subspace_farmer::utils::{ all_cpu_cores, create_plotting_thread_pool_manager, thread_pool_core_indices, }; use subspace_farmer::{Identity, KNOWN_PEERS_CACHE_SIZE}; +use subspace_farmer_components::plotting::PlottedSector; use subspace_farmer_components::sector::{sector_size, SectorMetadataChecksummed}; use subspace_networking::libp2p::kad::RecordKey; use subspace_networking::utils::multihash::ToMultihash; @@ -343,20 +344,12 @@ async fn create_readers_and_pieces( Ok(readers_and_pieces) } -fn handler_on_sector_update( - sector_update: &SectorUpdate, +fn handler_on_sector_plotted( + plotted_sector: &PlottedSector, + maybe_old_plotted_sector: &Option, disk_farm_index: usize, readers_and_pieces: Arc>>, ) { - let (plotted_sector, maybe_old_plotted_sector) = match sector_update { - SectorUpdate::Plotting(SectorPlottingDetails::Finished { - plotted_sector, - old_plotted_sector, - .. - }) => (plotted_sector, old_plotted_sector), - _ => return, - }; - let disk_farm_index = disk_farm_index .try_into() .expect("More than 256 farms are not supported, this is checked above already; qed"); @@ -632,8 +625,19 @@ impl Config { sector_plotting_handler_ids.push(single_disk_farm.on_sector_update(Arc::new( move |(_plotted_sector, sector_update)| { let _span_guard = span.enter(); - handler_on_sector_update( - sector_update, + + let (plotted_sector, maybe_old_plotted_sector) = match sector_update { + SectorUpdate::Plotting(SectorPlottingDetails::Finished { + plotted_sector, + old_plotted_sector, + .. + }) => (plotted_sector, old_plotted_sector), + _ => return, + }; + + handler_on_sector_plotted( + plotted_sector, + maybe_old_plotted_sector, disk_farm_index, readers_and_pieces.clone(), ) diff --git a/sdk/node/src/builder.rs b/sdk/node/src/builder.rs index 9c361ccc..32ba0ebe 100644 --- a/sdk/node/src/builder.rs +++ b/sdk/node/src/builder.rs @@ -8,8 +8,7 @@ use derive_more::{Deref, DerefMut, Display, From}; use sc_service::BlocksPruning; use sdk_dsn::{Dsn, DsnBuilder}; use sdk_substrate::{ - Base, BaseBuilder, NetworkBuilder, OffchainWorkerBuilder, PruningMode, Role, RpcBuilder, - StorageMonitor, + Base, BaseBuilder, NetworkBuilder, PruningMode, Role, RpcBuilder, StorageMonitor, }; use sdk_utils::ByteSize; use serde::{Deserialize, Serialize}; @@ -90,7 +89,7 @@ pub struct Config { /// Proof of time entropy #[builder(setter(into), default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub pot_external_entropy: Option>, + pub pot_external_entropy: Option, } impl Config { @@ -119,7 +118,6 @@ impl Builder { .network(NetworkBuilder::dev()) .dsn(DsnBuilder::dev()) .rpc(RpcBuilder::dev()) - .offchain_worker(OffchainWorkerBuilder::dev()) } /// Gemini 3g configuration @@ -128,9 +126,8 @@ impl Builder { .network(NetworkBuilder::gemini_3h()) .dsn(DsnBuilder::gemini_3h()) .rpc(RpcBuilder::gemini_3h()) - .offchain_worker(OffchainWorkerBuilder::gemini_3h()) .role(Role::Authority) - .state_pruning(PruningMode::ArchiveAll) + .state_pruning(PruningMode::ArchiveCanonical) .blocks_pruning(BlocksPruning::Some(256)) } @@ -140,9 +137,8 @@ impl Builder { .network(NetworkBuilder::devnet()) .dsn(DsnBuilder::devnet()) .rpc(RpcBuilder::devnet()) - .offchain_worker(OffchainWorkerBuilder::devnet()) .role(Role::Authority) - .state_pruning(PruningMode::ArchiveAll) + .state_pruning(PruningMode::ArchiveCanonical) .blocks_pruning(BlocksPruning::Some(256)) } diff --git a/sdk/node/src/domains/builder.rs b/sdk/node/src/domains/builder.rs index 1a14b6c9..8600218d 100644 --- a/sdk/node/src/domains/builder.rs +++ b/sdk/node/src/domains/builder.rs @@ -128,7 +128,7 @@ impl DomainConfigBuilder { /// Dev chain configuration pub fn dev() -> Self { - Self::new().chain_id("dev").domain_id(DomainId::new(0)).dev_key_seed("//Alice") + Self::new().chain_id("dev").domain_id(DomainId::new(0)) } /// Gemini 3g configuration diff --git a/sdk/node/src/lib.rs b/sdk/node/src/lib.rs index 496f917b..032d3fd7 100644 --- a/sdk/node/src/lib.rs +++ b/sdk/node/src/lib.rs @@ -30,6 +30,7 @@ use sc_utils::mpsc::tracing_unbounded; use sdk_dsn::{DsnOptions, DsnShared}; use sdk_traits::Farmer; use sdk_utils::{DestructorSet, MultiaddrWithPeerId, PublicKey, TaskOutput}; +use serde_json::Value; use sp_consensus::SyncOracle; use sp_consensus_subspace::digests::PreDigest; use sp_core::traits::SpawnEssentialNamed; @@ -70,28 +71,31 @@ const SEGMENT_HEADERS_NUMBER_LIMIT: u64 = MAX_SEGMENT_HEADERS_PER_REQUEST as u64 fn pot_external_entropy( consensus_chain_config: &Configuration, - config_pot_external_entropy: Option>, + maybe_pot_external_entropy: Option, ) -> Result, sc_service::Error> { let maybe_chain_spec_pot_external_entropy = consensus_chain_config .chain_spec .properties() .get("potExternalEntropy") - .map(|d| serde_json::from_value(d.clone())) - .transpose() - .map_err(|error| { - sc_service::Error::Other(format!("Failed to decode PoT initial key: {error:?}")) - })? - .flatten(); + .map(|d| match d.clone() { + Value::String(s) => Ok(s), + Value::Null => Ok(String::new()), + _ => Err(sc_service::Error::Other("Failed to decode PoT initial key".to_string())), + }) + .transpose()?; if maybe_chain_spec_pot_external_entropy.is_some() - && config_pot_external_entropy.is_some() - && maybe_chain_spec_pot_external_entropy != config_pot_external_entropy + && maybe_pot_external_entropy.is_some() + && maybe_chain_spec_pot_external_entropy != maybe_pot_external_entropy { tracing::warn!( "--pot-external-entropy CLI argument was ignored due to chain spec having a different \ explicit value" ); } - Ok(maybe_chain_spec_pot_external_entropy.or(config_pot_external_entropy).unwrap_or_default()) + Ok(maybe_chain_spec_pot_external_entropy + .or(maybe_pot_external_entropy) + .unwrap_or_default() + .into_bytes()) } impl Config { diff --git a/sdk/subspace-sdk/examples/mini-farmer.rs b/sdk/subspace-sdk/examples/mini-farmer.rs index ae3f78e9..d94b74dd 100644 --- a/sdk/subspace-sdk/examples/mini-farmer.rs +++ b/sdk/subspace-sdk/examples/mini-farmer.rs @@ -76,18 +76,9 @@ async fn main() -> anyhow::Result<()> { let node_dir = base_path.join("node"); let node = match chain { - Chain::Gemini3h => Node::gemini_3h().dsn( - subspace_sdk::node::DsnBuilder::gemini_3h() - .provider_storage_path(node_dir.join("provider_storage")), - ), - Chain::Devnet => Node::devnet().dsn( - subspace_sdk::node::DsnBuilder::devnet() - .provider_storage_path(node_dir.join("provider_storage")), - ), - Chain::Dev => Node::dev().dsn( - subspace_sdk::node::DsnBuilder::dev() - .provider_storage_path(node_dir.join("provider_storage")), - ), + Chain::Gemini3h => Node::gemini_3h().dsn(subspace_sdk::node::DsnBuilder::gemini_3h()), + Chain::Devnet => Node::devnet().dsn(subspace_sdk::node::DsnBuilder::devnet()), + Chain::Dev => Node::dev().dsn(subspace_sdk::node::DsnBuilder::dev()), } .role(node::Role::Authority); diff --git a/sdk/substrate/Cargo.toml b/sdk/substrate/Cargo.toml index 7e3dc21a..7e7023eb 100644 --- a/sdk/substrate/Cargo.toml +++ b/sdk/substrate/Cargo.toml @@ -18,6 +18,5 @@ sc-state-db = { version = "0.10.0-dev", git = "https://github.com/subspace/polka sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } -serde_json = "1" sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } subspace-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } diff --git a/sdk/substrate/src/lib.rs b/sdk/substrate/src/lib.rs index e786627d..f4e87a1b 100644 --- a/sdk/substrate/src/lib.rs +++ b/sdk/substrate/src/lib.rs @@ -64,10 +64,6 @@ pub struct Base { #[builder(setter(into), default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] pub network: Network, - /// Offchain worker settings - #[builder(setter(into), default)] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub offchain_worker: OffchainWorker, /// Enable color for substrate informant #[builder(default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] @@ -76,10 +72,6 @@ pub struct Base { #[builder(default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] pub telemetry: Vec<(Multiaddr, u8)>, - /// Dev key seed - #[builder(setter(strip_option), default)] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub dev_key_seed: Option, } #[doc(hidden)] @@ -124,14 +116,10 @@ macro_rules! derive_base { rpc: $crate::Rpc, /// Network settings network: $crate::Network, - /// Offchain worker settings - offchain_worker: $crate::OffchainWorker, /// Enable color for substrate informant informant_enable_color: bool, /// Additional telemetry endpoints telemetry: Vec<(sdk_utils::Multiaddr, u8)>, - /// Dev key seed - dev_key_seed: String }); } } @@ -152,6 +140,7 @@ impl Base { let Self { force_authoring, + role, blocks_pruning, state_pruning, impl_name: ImplName(impl_name), @@ -164,21 +153,18 @@ impl Base { cors: rpc_cors, methods: rpc_methods, max_subs_per_conn: rpc_max_subs_per_conn, - .. }, network, informant_enable_color, telemetry, - .. } = self; let base_path = BasePath::new(directory.as_ref()); let config_dir = base_path.config_dir(chain_spec.id()); let network = { - let Network { - listen_addresses, boot_nodes, force_synced, name, allow_private_ip, .. - } = network; + let Network { listen_addresses, boot_nodes, force_synced, name, allow_private_ip } = + network; let name = name.unwrap_or_else(|| { names::Generator::with_naming(names::Name::Numbered) .next() @@ -213,25 +199,8 @@ impl Base { } }; - // HACK: Tricky way to add extra endpoints as we can't push into telemetry - // endpoints let telemetry_endpoints = match chain_spec.telemetry_endpoints() { - Some(endpoints) => { - let Ok(serde_json::Value::Array(extra_telemetry)) = - serde_json::to_value(&telemetry) - else { - unreachable!("Will always return an array") - }; - let Ok(serde_json::Value::Array(telemetry)) = serde_json::to_value(endpoints) - else { - unreachable!("Will always return an array") - }; - - serde_json::from_value(serde_json::Value::Array( - telemetry.into_iter().chain(extra_telemetry).collect::>(), - )) - .expect("Serialization is always valid") - } + Some(endpoints) => endpoints.clone(), None => sc_service::config::TelemetryEndpoints::new( telemetry.into_iter().map(|(endpoint, n)| (endpoint.to_string(), n)).collect(), ) @@ -263,7 +232,7 @@ impl Base { informant_output_format: sc_informant::OutputFormat { enable_color: informant_enable_color, }, - farmer: self.role == Role::Authority, + farmer: role == Role::Authority, } .into() } @@ -297,14 +266,6 @@ pub struct Rpc { #[builder(default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] pub methods: RpcMethods, - /// Maximum payload of a rpc request - #[builder(setter(strip_option), default)] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub max_request_size: Option, - /// Maximum payload of a rpc request - #[builder(setter(strip_option), default)] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub max_response_size: Option, /// Maximum allowed subscriptions per rpc connection #[builder(default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] @@ -323,8 +284,6 @@ impl RpcBuilder { .addr(SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), port)) .port(port) .max_connections(100) - .max_request_size(10 * 1024) - .max_response_size(10 * 1024) .max_subs_per_conn(Some(100)) } @@ -356,18 +315,10 @@ impl RpcBuilder { #[builder(pattern = "owned", build_fn(private, name = "_build"), name = "NetworkBuilder")] #[non_exhaustive] pub struct Network { - /// Listen on some address for other nodes - #[builder(default)] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub enable_mdns: bool, /// Listen on some address for other nodes #[builder(default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] pub allow_private_ip: bool, - /// Allow non globals in network DHT - #[builder(default)] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub allow_non_globals_in_dht: bool, /// Listen on some address for other nodes #[builder(default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] @@ -384,10 +335,6 @@ pub struct Network { #[builder(setter(into, strip_option), default)] #[serde(default, skip_serializing_if = "sdk_utils::is_default")] pub name: Option, - /// Client id for telemetry (default is `{IMPL_NAME}/v{IMPL_VERSION}`) - #[builder(setter(into, strip_option), default)] - #[serde(default, skip_serializing_if = "sdk_utils::is_default")] - pub client_id: Option, } impl NetworkBuilder { @@ -398,22 +345,18 @@ impl NetworkBuilder { /// Gemini 3g configuration pub fn gemini_3h() -> Self { - Self::default() - .listen_addresses(vec![ - "/ip6/::/tcp/30333".parse().expect("hardcoded value is true"), - "/ip4/0.0.0.0/tcp/30333".parse().expect("hardcoded value is true"), - ]) - .enable_mdns(true) + Self::default().listen_addresses(vec![ + "/ip6/::/tcp/30333".parse().expect("hardcoded value is true"), + "/ip4/0.0.0.0/tcp/30333".parse().expect("hardcoded value is true"), + ]) } /// Dev network configuration pub fn devnet() -> Self { - Self::default() - .listen_addresses(vec![ - "/ip6/::/tcp/30333".parse().expect("hardcoded value is true"), - "/ip4/0.0.0.0/tcp/30333".parse().expect("hardcoded value is true"), - ]) - .enable_mdns(true) + Self::default().listen_addresses(vec![ + "/ip6/::/tcp/30333".parse().expect("hardcoded value is true"), + "/ip4/0.0.0.0/tcp/30333".parse().expect("hardcoded value is true"), + ]) } } From f80f0ec952a2e9a7ad2c4d7595bae38a38a62ac4 Mon Sep 17 00:00:00 2001 From: Parth Desai Date: Fri, 9 Feb 2024 18:32:06 +0530 Subject: [PATCH 4/5] upgrade pulsar to gemini-3h-2023-feb-05 release --- Cargo.lock | 102 +++++++++++++------------- sdk/dsn/Cargo.toml | 6 +- sdk/farmer/Cargo.toml | 14 ++-- sdk/farmer/src/lib.rs | 2 +- sdk/node/Cargo.toml | 44 +++++------ sdk/node/src/builder.rs | 7 +- sdk/node/src/lib.rs | 1 + sdk/subspace-sdk/Cargo.toml | 4 +- sdk/subspace-sdk/examples/complete.rs | 4 +- sdk/substrate/Cargo.toml | 2 +- sdk/substrate/src/lib.rs | 2 +- sdk/substrate/src/types.rs | 39 ++++------ sdk/traits/Cargo.toml | 6 +- sdk/utils/Cargo.toml | 12 +-- 14 files changed, 116 insertions(+), 129 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8bcd124..59b2df5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1992,7 +1992,7 @@ checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216" [[package]] name = "cross-domain-message-gossip" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "futures", "parity-scale-codec", @@ -2551,7 +2551,7 @@ dependencies = [ [[package]] name = "domain-block-builder" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -2568,7 +2568,7 @@ dependencies = [ [[package]] name = "domain-block-preprocessor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -2596,7 +2596,7 @@ dependencies = [ [[package]] name = "domain-client-consensus-relay-chain" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "sc-consensus", @@ -2610,7 +2610,7 @@ dependencies = [ [[package]] name = "domain-client-message-relayer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-channel", "cross-domain-message-gossip", @@ -2632,7 +2632,7 @@ dependencies = [ [[package]] name = "domain-client-operator" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-block-builder", "domain-block-preprocessor", @@ -2673,7 +2673,7 @@ dependencies = [ [[package]] name = "domain-eth-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "clap", "domain-runtime-primitives", @@ -2708,7 +2708,7 @@ dependencies = [ [[package]] name = "domain-pallet-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-benchmarking", "frame-executive", @@ -2727,7 +2727,7 @@ dependencies = [ [[package]] name = "domain-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -2745,7 +2745,7 @@ dependencies = [ [[package]] name = "domain-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "cross-domain-message-gossip", @@ -3137,7 +3137,7 @@ dependencies = [ [[package]] name = "evm-domain-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-pallet-executive", "domain-runtime-primitives", @@ -7101,7 +7101,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7157,7 +7157,7 @@ dependencies = [ [[package]] name = "pallet-block-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-runtime-primitives", "frame-support", @@ -7173,7 +7173,7 @@ dependencies = [ [[package]] name = "pallet-domain-id" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7186,7 +7186,7 @@ dependencies = [ [[package]] name = "pallet-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -7298,7 +7298,7 @@ dependencies = [ [[package]] name = "pallet-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-benchmarking", "frame-support", @@ -7335,7 +7335,7 @@ dependencies = [ [[package]] name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7349,7 +7349,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7361,7 +7361,7 @@ dependencies = [ [[package]] name = "pallet-runtime-configs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7374,7 +7374,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-benchmarking", "frame-support", @@ -7397,7 +7397,7 @@ dependencies = [ [[package]] name = "pallet-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7449,7 +7449,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "frame-system", @@ -7505,7 +7505,7 @@ dependencies = [ [[package]] name = "pallet-transporter" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -9056,7 +9056,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "futures", @@ -9096,7 +9096,7 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-oneshot", "futures", @@ -9448,7 +9448,7 @@ dependencies = [ [[package]] name = "sc-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "atomic", "core_affinity", @@ -9669,7 +9669,7 @@ dependencies = [ [[package]] name = "sc-subspace-block-relay" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-channel", "async-trait", @@ -9694,7 +9694,7 @@ dependencies = [ [[package]] name = "sc-subspace-chain-specs" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" [[package]] name = "sc-sysinfo" @@ -10622,7 +10622,7 @@ dependencies = [ [[package]] name = "sp-block-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "domain-runtime-primitives", @@ -10733,7 +10733,7 @@ dependencies = [ [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "log", @@ -10869,7 +10869,7 @@ dependencies = [ [[package]] name = "sp-domain-digests" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10878,7 +10878,7 @@ dependencies = [ [[package]] name = "sp-domains" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "blake2 0.10.6", "domain-runtime-primitives", @@ -10910,7 +10910,7 @@ dependencies = [ [[package]] name = "sp-domains-fraud-proof" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-block-preprocessor", "domain-runtime-primitives", @@ -10942,7 +10942,7 @@ dependencies = [ [[package]] name = "sp-executive" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "parity-scale-codec", @@ -11034,7 +11034,7 @@ dependencies = [ [[package]] name = "sp-messenger" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "frame-support", "hash-db", @@ -11094,7 +11094,7 @@ dependencies = [ [[package]] name = "sp-objects" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "sp-api", "sp-std", @@ -11282,7 +11282,7 @@ dependencies = [ [[package]] name = "sp-subspace-mmr" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "scale-info", @@ -11557,7 +11557,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "rayon", @@ -11570,7 +11570,7 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "blake3", "derive_more", @@ -11593,7 +11593,7 @@ dependencies = [ [[package]] name = "subspace-erasure-coding" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "kzg", "rust-kzg-blst", @@ -11603,7 +11603,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "anyhow", "async-lock 3.3.0", @@ -11659,7 +11659,7 @@ dependencies = [ [[package]] name = "subspace-farmer-components" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-lock 3.3.0", "async-trait", @@ -11689,7 +11689,7 @@ dependencies = [ [[package]] name = "subspace-metrics" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "actix-web", "parking_lot 0.12.1", @@ -11701,7 +11701,7 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-mutex", "async-trait", @@ -11739,7 +11739,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-space" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "chacha20", "derive_more", @@ -11752,7 +11752,7 @@ dependencies = [ [[package]] name = "subspace-proof-of-time" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "aes", "subspace-core-primitives", @@ -11762,7 +11762,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "hex", "serde", @@ -11774,7 +11774,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "domain-runtime-primitives", "frame-benchmarking", @@ -11828,7 +11828,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "pallet-transaction-payment", "serde", @@ -11869,7 +11869,7 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "async-trait", "cross-domain-message-gossip", @@ -11944,7 +11944,7 @@ dependencies = [ [[package]] name = "subspace-verification" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=e8ed377ecee4e1992ffb731d67cd04bf444e6382#e8ed377ecee4e1992ffb731d67cd04bf444e6382" +source = "git+https://github.com/subspace/subspace?rev=a2e0318a75705ab31975ac8b172c999cab378e90#a2e0318a75705ab31975ac8b172c999cab378e90" dependencies = [ "parity-scale-codec", "schnorrkel", diff --git a/sdk/dsn/Cargo.toml b/sdk/dsn/Cargo.toml index ac467a3d..28b447a4 100644 --- a/sdk/dsn/Cargo.toml +++ b/sdk/dsn/Cargo.toml @@ -14,11 +14,11 @@ hex = "0.4.3" parking_lot = "0.12" prometheus-client = "0.22.0" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } tracing = "0.1" diff --git a/sdk/farmer/Cargo.toml b/sdk/farmer/Cargo.toml index 07d0cfd0..df6c4999 100644 --- a/sdk/farmer/Cargo.toml +++ b/sdk/farmer/Cargo.toml @@ -20,13 +20,13 @@ rayon = "1.7.0" sdk-traits = { path = "../traits" } sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", features = ["parallel"] } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-erasure-coding = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", features = ["parallel"] } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } thiserror = "1" tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tokio-stream = { version = "0.1", features = ["sync", "time"] } diff --git a/sdk/farmer/src/lib.rs b/sdk/farmer/src/lib.rs index 609a742b..bcc2ce24 100644 --- a/sdk/farmer/src/lib.rs +++ b/sdk/farmer/src/lib.rs @@ -907,7 +907,7 @@ impl Farm { plotting_thread_pool_manager, }: FarmOptions< '_, - impl subspace_farmer_components::plotting::PieceGetter + Clone + Send + Sync + 'static, + impl subspace_farmer_components::PieceGetter + Clone + Send + Sync + 'static, impl sdk_traits::Node, >, ) -> Result<(Self, SingleDiskFarm), BuildError> { diff --git a/sdk/node/Cargo.toml b/sdk/node/Cargo.toml index bf58a204..bd79dc6d 100644 --- a/sdk/node/Cargo.toml +++ b/sdk/node/Cargo.toml @@ -7,34 +7,34 @@ edition = "2021" [dependencies] anyhow = "1" backoff = "0.4" -cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +cross-domain-message-gossip = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } derivative = "2.2.0" derive_builder = "0.12" derive_more = "0.99" -domain-client-message-relayer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -domain-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +domain-client-message-relayer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +domain-client-operator = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +domain-eth-service = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +domain-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +domain-service = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +evm-domain-runtime = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } fp-evm = { version = "3.0.0-dev", git = "https://github.com/subspace/frontier", rev = "7627e61d80275a4cf24d06f27491f6c31eadb7b7" } frame-system = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } futures = "0.3" hex-literal = "0.4" -pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +pallet-rewards = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +pallet-subspace = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } parity-scale-codec = "3.6.3" parking_lot = "0.12" pin-project = "1" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-consensus-slots = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-network-sync = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-service = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } -sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-subspace-chain-specs = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sc-telemetry = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-transaction-pool-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sc-utils = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } @@ -46,20 +46,20 @@ serde = { version = "1", features = ["derive"] } serde_json = "1" sp-blockchain = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sp-consensus = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sp-consensus-subspace = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sp-core = { version = "21.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -sp-domains = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -sp-messenger = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sp-domains = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +sp-messenger = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sp-version = { version = "22.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-networking = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-networking = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tokio-stream = { version = "0.1", features = ["sync", "time"] } tracing = "0.1" diff --git a/sdk/node/src/builder.rs b/sdk/node/src/builder.rs index 32ba0ebe..6464b3df 100644 --- a/sdk/node/src/builder.rs +++ b/sdk/node/src/builder.rs @@ -5,10 +5,9 @@ use std::path::Path; use derivative::Derivative; use derive_builder::Builder; use derive_more::{Deref, DerefMut, Display, From}; -use sc_service::BlocksPruning; use sdk_dsn::{Dsn, DsnBuilder}; use sdk_substrate::{ - Base, BaseBuilder, NetworkBuilder, PruningMode, Role, RpcBuilder, StorageMonitor, + Base, BaseBuilder, BlocksPruning, NetworkBuilder, PruningMode, Role, RpcBuilder, StorageMonitor, }; use sdk_utils::ByteSize; use serde::{Deserialize, Serialize}; @@ -128,7 +127,7 @@ impl Builder { .rpc(RpcBuilder::gemini_3h()) .role(Role::Authority) .state_pruning(PruningMode::ArchiveCanonical) - .blocks_pruning(BlocksPruning::Some(256)) + .blocks_pruning(BlocksPruning::Number(256)) } /// Devnet chain configuration @@ -139,7 +138,7 @@ impl Builder { .rpc(RpcBuilder::devnet()) .role(Role::Authority) .state_pruning(PruningMode::ArchiveCanonical) - .blocks_pruning(BlocksPruning::Some(256)) + .blocks_pruning(BlocksPruning::Number(256)) } /// Get configuration for saving on disk diff --git a/sdk/node/src/lib.rs b/sdk/node/src/lib.rs index 032d3fd7..811f0b04 100644 --- a/sdk/node/src/lib.rs +++ b/sdk/node/src/lib.rs @@ -211,6 +211,7 @@ impl Config { sync_from_dsn, is_timekeeper, timekeeper_cpu_cores, + dsn_piece_getter: None, // TODO: Use custom piece getter for better performance }; let node_runner_future = subspace_farmer::utils::run_future_in_dedicated_thread( diff --git a/sdk/subspace-sdk/Cargo.toml b/sdk/subspace-sdk/Cargo.toml index 22220eb8..2d74251e 100644 --- a/sdk/subspace-sdk/Cargo.toml +++ b/sdk/subspace-sdk/Cargo.toml @@ -11,7 +11,7 @@ sdk-substrate = { path = "../substrate" } sdk-utils = { path = "../utils" } static_assertions = "1.1.0" -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } [dev-dependencies] anyhow = "1" @@ -22,7 +22,7 @@ fdlimit = "0.2" futures = "0.3" mimalloc = { version = "*", default-features = false } serde_json = "1" -subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-farmer-components = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } tempfile = "3" tokio = { version = "1.34.0", features = ["rt-multi-thread", "macros"] } tracing = "0.1" diff --git a/sdk/subspace-sdk/examples/complete.rs b/sdk/subspace-sdk/examples/complete.rs index 5c39b86d..4a3525e7 100644 --- a/sdk/subspace-sdk/examples/complete.rs +++ b/sdk/subspace-sdk/examples/complete.rs @@ -8,7 +8,7 @@ use subspace_sdk::{chain_spec, node, ByteSize, FarmDescription, Farmer, Node, Pu async fn main() { let plots = [FarmDescription::new("plot", ByteSize::gb(10))]; let node: Node = Node::builder() - .blocks_pruning(node::BlocksPruning::Some(1000)) + .blocks_pruning(node::BlocksPruning::Number(1000)) .state_pruning(node::PruningMode::ArchiveCanonical) .network(NetworkBuilder::new().name("i1i1")) .build("node", chain_spec::dev_config()) @@ -56,7 +56,7 @@ async fn main() { // Restarting let node = Node::builder() - .blocks_pruning(node::BlocksPruning::Some(1000)) + .blocks_pruning(node::BlocksPruning::Number(1000)) .state_pruning(node::PruningMode::ArchiveCanonical) .build("node", chain_spec::dev_config()) .await diff --git a/sdk/substrate/Cargo.toml b/sdk/substrate/Cargo.toml index 7e7023eb..edacb50f 100644 --- a/sdk/substrate/Cargo.toml +++ b/sdk/substrate/Cargo.toml @@ -19,4 +19,4 @@ sc-storage-monitor = { version = "0.1.0", git = "https://github.com/subspace/pol sdk-utils = { path = "../utils" } serde = { version = "1", features = ["derive"] } sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } diff --git a/sdk/substrate/src/lib.rs b/sdk/substrate/src/lib.rs index f4e87a1b..5046dffd 100644 --- a/sdk/substrate/src/lib.rs +++ b/sdk/substrate/src/lib.rs @@ -212,7 +212,7 @@ impl Base { impl_version, transaction_pool: Default::default(), network, - state_pruning: Some(state_pruning.into()), + state_pruning: state_pruning.into(), blocks_pruning: blocks_pruning.into(), rpc_options: SubstrateRpcConfiguration { listen_on: rpc_addr.unwrap_or(SocketAddr::new( diff --git a/sdk/substrate/src/types.rs b/sdk/substrate/src/types.rs index 7b68114d..782b7749 100644 --- a/sdk/substrate/src/types.rs +++ b/sdk/substrate/src/types.rs @@ -8,20 +8,20 @@ use serde::{Deserialize, Serialize}; #[derive(Debug, Clone, Copy, PartialEq, Default, Serialize, Deserialize, Eq, PartialOrd, Ord)] pub enum BlocksPruning { #[default] - /// Keep full block history, of every block that was ever imported. - KeepAll, /// Keep full finalized block history. - KeepFinalized, + ArchiveCanonical, + /// Keep full block history, of every block that was ever imported. + Archive, /// Keep N recent finalized blocks. - Some(u32), + Number(u32), } impl From for BlocksPruning { fn from(value: sc_service::BlocksPruning) -> Self { match value { - sc_service::BlocksPruning::KeepAll => Self::KeepAll, - sc_service::BlocksPruning::KeepFinalized => Self::KeepFinalized, - sc_service::BlocksPruning::Some(n) => Self::Some(n), + sc_service::BlocksPruning::KeepAll => Self::Archive, + sc_service::BlocksPruning::KeepFinalized => Self::ArchiveCanonical, + sc_service::BlocksPruning::Some(n) => Self::Number(n), } } } @@ -29,9 +29,9 @@ impl From for BlocksPruning { impl From for sc_service::BlocksPruning { fn from(value: BlocksPruning) -> Self { match value { - BlocksPruning::KeepAll => Self::KeepAll, - BlocksPruning::KeepFinalized => Self::KeepFinalized, - BlocksPruning::Some(n) => Self::Some(n), + BlocksPruning::Archive => Self::KeepAll, + BlocksPruning::ArchiveCanonical => Self::KeepFinalized, + BlocksPruning::Number(n) => Self::Some(n), } } } @@ -59,14 +59,12 @@ impl From for Constraints { /// Pruning mode. #[derive(Debug, Clone, Eq, PartialEq, Default, Serialize, Deserialize)] pub enum PruningMode { - /// No pruning. Canonicalization is a no-op. - #[default] - ArchiveAll, /// Canonicalization discards non-canonical nodes. All the canonical /// nodes are kept in the DB. + #[default] ArchiveCanonical, - /// Maintain a pruning window. - Constrained(Constraints), + /// No pruning. Canonicalization is a no-op. + ArchiveAll, } impl From for sc_service::PruningMode { @@ -74,17 +72,6 @@ impl From for sc_service::PruningMode { match value { PruningMode::ArchiveAll => Self::ArchiveAll, PruningMode::ArchiveCanonical => Self::ArchiveCanonical, - PruningMode::Constrained(c) => Self::Constrained(c.into()), - } - } -} - -impl From for PruningMode { - fn from(value: sc_service::PruningMode) -> Self { - match value { - sc_service::PruningMode::ArchiveAll => Self::ArchiveAll, - sc_service::PruningMode::ArchiveCanonical => Self::ArchiveCanonical, - sc_service::PruningMode::Constrained(c) => Self::Constrained(c.into()), } } } diff --git a/sdk/traits/Cargo.toml b/sdk/traits/Cargo.toml index 90b05646..4a95a485 100644 --- a/sdk/traits/Cargo.toml +++ b/sdk/traits/Cargo.toml @@ -9,7 +9,7 @@ async-trait = "0.1" parking_lot = "0.12" sc-client-api = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } sdk-dsn = { path = "../dsn" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-proof-of-space = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } diff --git a/sdk/utils/Cargo.toml b/sdk/utils/Cargo.toml index f4b1fb0d..84fffb08 100644 --- a/sdk/utils/Cargo.toml +++ b/sdk/utils/Cargo.toml @@ -19,7 +19,7 @@ futures = "0.3" jsonrpsee-core = "0.16" libp2p-core = { git = "https://github.com/subspace/rust-libp2p", rev = "d6339da35589d86bae6ecb25a5121c02f2e5b90e" } parity-scale-codec = "3.6.3" -sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +sc-consensus-subspace-rpc = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } sc-network = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sc-rpc = { version = "4.0.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } sc-rpc-api = { version = "0.10.0-dev", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8", default-features = false } @@ -32,11 +32,11 @@ sp-runtime = { version = "24.0.0", git = "https://github.com/subspace/polkadot-s sp-storage = { version = "13.0.0", git = "https://github.com/subspace/polkadot-sdk", rev = "d6b500960579d73c43fc4ef550b703acfa61c4c8" } ss58-registry = "1.33" # Unused for now. TODO: add `serde` feature to `subspace-core-primitives` in `subspace-archiver` -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382", default-features = false } -subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } -subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "e8ed377ecee4e1992ffb731d67cd04bf444e6382" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90", default-features = false } +subspace-rpc-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } +subspace-runtime-primitives = { git = "https://github.com/subspace/subspace", rev = "a2e0318a75705ab31975ac8b172c999cab378e90" } thiserror = "1" tokio = { version = "1.34.0", features = ["fs", "rt", "tracing", "macros", "parking_lot", "rt-multi-thread", "signal"] } tracing = "0.1" From 69fecd91bad25770dee733af92015539f3834f89 Mon Sep 17 00:00:00 2001 From: Parth Desai Date: Sat, 10 Feb 2024 17:02:41 +0530 Subject: [PATCH 5/5] Re-enable the filter to only run slow test on linux --- sdk/subspace-sdk/tests/integration/node.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/sdk/subspace-sdk/tests/integration/node.rs b/sdk/subspace-sdk/tests/integration/node.rs index 179ea016..35376dee 100644 --- a/sdk/subspace-sdk/tests/integration/node.rs +++ b/sdk/subspace-sdk/tests/integration/node.rs @@ -49,8 +49,7 @@ async fn sync_block_inner() { } #[tokio::test(flavor = "multi_thread")] -//#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are -//#[cfg_attr(any(tarpaulin, run only on linux")] +#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")] async fn sync_block() { tokio::time::timeout(std::time::Duration::from_secs(60 * 60), sync_block_inner()).await.unwrap() } @@ -116,8 +115,7 @@ async fn sync_farm_inner() { } #[tokio::test(flavor = "multi_thread")] -//#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are -//#[cfg_attr(any(tarpaulin, run only on linux")] +#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")] async fn sync_farm() { tokio::time::timeout(std::time::Duration::from_secs(60 * 60), sync_farm_inner()).await.unwrap() } @@ -135,8 +133,7 @@ async fn node_restart() { } #[tokio::test(flavor = "multi_thread")] -//#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are -//#[cfg_attr(any(tarpaulin, run only on linux")] +#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")] async fn node_events() { crate::common::setup(); @@ -175,8 +172,7 @@ async fn node_events() { } #[tokio::test(flavor = "multi_thread")] -//#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are -//#[cfg_attr(any(tarpaulin, run only on linux")] +#[cfg_attr(any(tarpaulin, not(target_os = "linux")), ignore = "Slow tests are run only on linux")] async fn fetch_block_author() { crate::common::setup();