From a13fb7a238d52c9209c92722b263d303d89d428b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=96zg=C3=BCn=20=C3=96zerk?= Date: Mon, 11 Apr 2022 21:51:35 +0300 Subject: [PATCH] Partial replica (#145) * partial replica implementation * round the plot size for bug fix --- package.json | 2 +- src-tauri/Cargo.lock | 1012 ++++++++++++++++---------------- src-tauri/Cargo.toml | 33 +- src-tauri/src/main.rs | 56 +- src-tauri/src/node.rs | 3 +- src/lib/client.ts | 7 +- src/lib/util.ts | 7 +- src/loc/en.json | 2 +- src/pages/Dashboard.vue | 10 +- src/pages/Index.vue | 4 +- src/pages/PlottingProgress.vue | 13 +- src/pages/SetupPlot.vue | 40 +- 12 files changed, 621 insertions(+), 568 deletions(-) diff --git a/package.json b/package.json index 3c84036c..ca07245a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "subspace-desktop", - "version": "0.3.3", + "version": "0.4.0", "private": true, "description": "Subspace desktop", "author": "Subspace Labs ", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 6c1b68ac..5d8fd49e 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -99,9 +99,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.53" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" [[package]] name = "approx" @@ -152,8 +152,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5eea0a7a98b3bd2832eb087e1078f6f58db5a54447574d3007cdac6309c1e9f1" dependencies = [ "enumflags2 0.7.3", - "futures 0.3.19", - "rand 0.8.4", + "futures 0.3.21", + "rand 0.8.5", "serde", "serde_repr", "zbus 2.1.1", @@ -263,23 +263,6 @@ dependencies = [ "futures-micro", ] -[[package]] -name = "async-process" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83137067e3a2a6a06d67168e49e68a0957d215410473a740cea95a2425c0b7c6" -dependencies = [ - "async-io", - "blocking", - "cfg-if 1.0.0", - "event-listener", - "futures-lite", - "libc", - "once_cell", - "signal-hook", - "winapi 0.3.9", -] - [[package]] name = "async-recursion" version = "0.3.2" @@ -301,7 +284,6 @@ dependencies = [ "async-global-executor", "async-io", "async-lock", - "async-process", "crossbeam-utils", "futures-channel", "futures-core", @@ -534,9 +516,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitvec" -version = "0.20.4" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848" +checksum = "1489fcb93a5bb47da0462ca93ad252ad6af2145cce58d10d46a83931ba9f016b" dependencies = [ "funty", "radium", @@ -762,6 +744,17 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +[[package]] +name = "bzip2-sys" +version = "0.1.11+1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" +dependencies = [ + "cc", + "libc", + "pkg-config", +] + [[package]] name = "cache-padded" version = "1.2.0" @@ -993,9 +986,9 @@ dependencies = [ [[package]] name = "cirrus-node-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "parity-scale-codec", "scale-info", "serde", @@ -1021,9 +1014,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.14" +version = "3.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63edc3f163b3c71ec8aa23f9bd6070f77edbf3d1d198b164afa90ff00e4ec62" +checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" dependencies = [ "atty", "bitflags", @@ -1038,9 +1031,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.0.14" +version = "3.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a1132dc3944b31c20dd8b906b3a9f0a5d0243e092d59171414969657ac6aa85" +checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" dependencies = [ "heck 0.4.0", "proc-macro-error", @@ -1941,7 +1934,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e43f2f1833d64e33f15592464d6fdd70f349dda7b1a53088eb83cd94014008c5" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", ] [[package]] @@ -2008,12 +2001,12 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.14.4" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8ac3ff5224ef91f3c97e03eb1de2db82743427e91aaa5ac635f454f0b164f5a" +checksum = "d9def033d8505edf199f6a5d07aa7e6d2d6185b164293b77f0efd108f4f3e11d" dependencies = [ "either", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "num-traits", @@ -2029,7 +2022,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c" dependencies = [ "byteorder 1.4.3", - "rand 0.8.4", + "rand 0.8.5", "rustc-hex", "static_assertions", ] @@ -2077,7 +2070,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", ] @@ -2095,7 +2088,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-support", "frame-system", @@ -2117,7 +2110,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-support", "frame-system", @@ -2132,9 +2125,9 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "14.2.0" +version = "15.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37ed5e5c346de62ca5c184b4325a6600d1eaca210666e4606fe4e449574978d0" +checksum = "df6bb8542ef006ef0de09a5c4420787d79823c0ed7924225822362fd2bf2ff2d" dependencies = [ "cfg-if 1.0.0", "parity-scale-codec", @@ -2145,7 +2138,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "bitflags", "frame-metadata", @@ -2174,7 +2167,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2186,10 +2179,10 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-support-procedural-tools-derive", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -2198,7 +2191,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "proc-macro2", "quote", @@ -2208,7 +2201,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-support", "log", @@ -2225,7 +2218,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "sp-api", @@ -2253,6 +2246,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "fs_extra" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" + [[package]] name = "fuchsia-cprng" version = "0.1.1" @@ -2277,9 +2276,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "funty" -version = "1.1.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futf" @@ -2299,9 +2298,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28560757fe2bb34e79f907794bb6b22ae8b0e5c669b638a1132f2592b19035b4" +checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e" dependencies = [ "futures-channel", "futures-core", @@ -2314,9 +2313,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3dda0b6588335f360afc675d0564c17a77a2bda81ca178a4b6081bd86c7f0b" +checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" dependencies = [ "futures-core", "futures-sink", @@ -2324,15 +2323,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0c8ff0461b82559810cdccfde3215c3f373807f5e5232b71479bff7bb2583d7" +checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" [[package]] name = "futures-executor" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d6d2ff5bb10fb95c85b8ce46538a2e5f5e7fdc755623a7d4529ab8a4ed9d2a" +checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6" dependencies = [ "futures-core", "futures-task", @@ -2342,9 +2341,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1f9d34af5a1aac6fb380f735fe510746c38067c5bf16c7fd250280503c971b2" +checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" [[package]] name = "futures-lite" @@ -2363,9 +2362,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbd947adfffb0efc70599b3ddcf7b5597bb5fa9e245eb99f62b3a5f7bb8bd3c" +checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" dependencies = [ "proc-macro2", "quote", @@ -2405,15 +2404,15 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3055baccb68d74ff6480350f8d6eb8fcfa3aa11bdc1a1ae3afdd0514617d508" +checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" [[package]] name = "futures-task" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ee7c6485c30167ce4dfb83ac568a849fe53274c831081476ee13e0dce1aad72" +checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" [[package]] name = "futures-timer" @@ -2423,9 +2422,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.19" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b5cf40b47a271f77a8b1bec03ca09044d99d2372c0de244e66430761127164" +checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2669,7 +2668,7 @@ checksum = "dac4d47c544af67747652ab1865ace0ffa1155709723ac4f32e97587dd4735b2" dependencies = [ "anyhow", "heck 0.4.0", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", @@ -2797,7 +2796,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24f518afe90c23fba585b2d7697856f9e6a7bbc62f65588035e66f6afb01a2e9" dependencies = [ "anyhow", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", @@ -2924,9 +2923,9 @@ dependencies = [ [[package]] name = "hmac" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddca131f3e7f2ce2df364b57949a9d47915cfbd35e46cfee355ccebbf794d6a2" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ "digest 0.10.3", ] @@ -3146,7 +3145,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae8ab7f67bad3240049cb24fb9cb0b4c2c6af4c245840917fbbdededeee91179" dependencies = [ "async-io", - "futures 0.3.19", + "futures 0.3.21", "futures-lite", "if-addrs 0.6.7", "ipnet", @@ -3175,9 +3174,9 @@ dependencies = [ [[package]] name = "impl-codec" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443" +checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f" dependencies = [ "parity-scale-codec", ] @@ -3242,9 +3241,9 @@ dependencies = [ [[package]] name = "integer-encoding" -version = "3.0.2" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90c11140ffea82edce8dcd74137ce9324ec24b3cf0175fc9d7e29164da9915b8" +checksum = "0e85a1509a128c855368e135cffcde7eac17d8e1083f41e2b98c58bc1a5074be" [[package]] name = "integer-sqrt" @@ -3383,7 +3382,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2b99d4207e2a04fb4581746903c2bb7eb376f88de9c699d0f3e10feeac0cd3a" dependencies = [ "derive_more", - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-core", "jsonrpc-pubsub", "log", @@ -3398,7 +3397,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14f7f76aef2d054868398427f6c54943cf3d1caa9a7ec7d0c38d69df97a965eb" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-executor", "futures-util", "log", @@ -3413,7 +3412,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b51da17abecbdab3e3d4f26b01c5ec075e88d3abe3ab3b05dc9aa69392764ec0" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-client-transports", ] @@ -3435,7 +3434,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1dea6e07251d9ce6a552abfb5d7ad6bc290a4596c8dcc3d795fae2bbdc1f3ff" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "hyper", "jsonrpc-core", "jsonrpc-server-utils", @@ -3451,7 +3450,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "382bb0206323ca7cda3dcd7e245cea86d37d02457a02a975e3378fb149a48845" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-core", "jsonrpc-server-utils", "log", @@ -3466,7 +3465,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240f87695e6c6f62fb37f05c02c04953cf68d6408b8c1c89de85c7a0125b1011" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-core", "lazy_static", "log", @@ -3482,7 +3481,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "globset", "jsonrpc-core", "lazy_static", @@ -3499,7 +3498,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f892c7d766369475ab7b0669f417906302d7c0fb521285c0a0c92e52e7c8e946" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-core", "jsonrpc-server-utils", "log", @@ -3529,7 +3528,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3303cdf246e6ab76e2866fb3d9acb6c76a068b1b28bd923a1b7a8122257ad7b5" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "http", "jsonrpsee-core", "jsonrpsee-types", @@ -3560,7 +3559,7 @@ dependencies = [ "hyper", "jsonrpsee-types", "parking_lot 0.11.2", - "rand 0.8.4", + "rand 0.8.5", "rustc-hash", "serde", "serde_json", @@ -3615,7 +3614,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4299ebf790ea9de1cb72e73ff2ae44c723ef264299e5e2d5ef46a371eb3ac3d8" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -3703,9 +3702,9 @@ dependencies = [ [[package]] name = "kvdb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a3f58dc069ec0e205a27f5b45920722a46faed802a0541538241af6228f512" +checksum = "a301d8ecb7989d4a6e2c57a49baca77d353bdbf879909debe3f375fe25d61f86" dependencies = [ "parity-util-mem", "smallvec", @@ -3713,20 +3712,20 @@ dependencies = [ [[package]] name = "kvdb-memorydb" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3b6b85fc643f5acd0bffb2cc8a6d150209379267af0d41db72170021841f9f5" +checksum = "ece7e668abd21387aeb6628130a6f4c802787f014fa46bc83221448322250357" dependencies = [ "kvdb", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "kvdb-rocksdb" -version = "0.14.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1b6ea8f2536f504b645ad78419c8246550e19d2c3419a167080ce08edee35a" +checksum = "ca7fbdfd71cd663dceb0faf3367a99f8cf724514933e9867cec4995b6027cbc1" dependencies = [ "fs-swap", "kvdb", @@ -3734,7 +3733,7 @@ dependencies = [ "num_cpus", "owning_ref", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rocksdb", "smallvec", @@ -3777,9 +3776,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.116" +version = "0.2.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74" +checksum = "efaa7b300f3b5fe8eb6bf21ce3895e1751d9665086af2d64b42f19701015ff4f" [[package]] name = "libloading" @@ -3815,7 +3814,7 @@ checksum = "3bec54343492ba5940a6c555e512c6721139835d28c59bc22febece72dfd0d9d" dependencies = [ "atomic", "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "lazy_static", "libp2p-core 0.30.2", "libp2p-deflate", @@ -3851,11 +3850,11 @@ dependencies = [ [[package]] name = "libp2p" version = "0.43.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "atomic", "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "getrandom 0.2.4", "instant", @@ -3874,7 +3873,7 @@ dependencies = [ "libp2p-websocket 0.34.0", "libp2p-yamux 0.36.0", "multiaddr 0.14.0", - "parking_lot 0.12.0", + "parking_lot 0.11.2", "pin-project 1.0.10", "rand 0.7.3", "smallvec", @@ -3891,7 +3890,7 @@ dependencies = [ "ed25519-dalek", "either", "fnv", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "instant", "lazy_static", @@ -3904,7 +3903,7 @@ dependencies = [ "pin-project 1.0.10", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "ring", "rw-stream-sink", "sha2 0.9.9", @@ -3918,14 +3917,14 @@ dependencies = [ [[package]] name = "libp2p-core" version = "0.32.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "asn1_der", "bs58", "ed25519-dalek", "either", "fnv", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "instant", "lazy_static", @@ -3933,11 +3932,11 @@ dependencies = [ "multiaddr 0.14.0", "multihash 0.16.1", "multistream-select 0.11.0", - "parking_lot 0.12.0", + "parking_lot 0.11.2", "pin-project 1.0.10", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "ring", "rw-stream-sink", "sha2 0.10.1", @@ -3955,7 +3954,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51a800adb195f33de63f4b17b63fe64cfc23bf2c6a0d3d0d5321328664e65197" dependencies = [ "flate2", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", ] @@ -3966,7 +3965,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bb8f89d15cb6e3c5bc22afff7513b11bab7856f2872d3cfba86f7f63a06bc498" dependencies = [ "async-std-resolver", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "log", "smallvec", @@ -3976,9 +3975,9 @@ dependencies = [ [[package]] name = "libp2p-dns" version = "0.32.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.32.0", "log", "smallvec", @@ -3993,7 +3992,7 @@ checksum = "aab3d7210901ea51b7bae2b581aa34521797af8c4ec738c980bda4a06434067f" dependencies = [ "cuckoofilter", "fnv", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", "log", @@ -4014,7 +4013,7 @@ dependencies = [ "byteorder 1.4.3", "bytes 1.1.0", "fnv", - "futures 0.3.19", + "futures 0.3.21", "hex_fmt", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", @@ -4032,19 +4031,21 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" version = "0.36.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "asynchronous-codec 0.6.0", "base64", "byteorder 1.4.3", "bytes 1.1.0", "fnv", - "futures 0.3.19", + "futures 0.3.21", + "futures-timer", "hex_fmt", "instant", "libp2p-core 0.32.0", "libp2p-swarm 0.34.0", "log", + "pin-project 1.0.10", "prometheus-client", "prost", "prost-build", @@ -4053,7 +4054,6 @@ dependencies = [ "sha2 0.10.1", "smallvec", "unsigned-varint 0.7.1", - "wasm-timer", ] [[package]] @@ -4062,7 +4062,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca1275574183f288ff8b72d535d5ffa5ea9292ef7829af8b47dcb197c7b0dcd" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", "log", @@ -4076,14 +4076,14 @@ dependencies = [ [[package]] name = "libp2p-identify" version = "0.34.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "libp2p-core 0.32.0", "libp2p-swarm 0.34.0", "log", - "lru 0.7.2", + "lru 0.7.5", "prost", "prost-build", "smallvec", @@ -4100,7 +4100,7 @@ dependencies = [ "bytes 1.1.0", "either", "fnv", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", "log", @@ -4118,14 +4118,14 @@ dependencies = [ [[package]] name = "libp2p-kad" version = "0.35.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "arrayvec 0.5.2", "asynchronous-codec 0.6.0", "bytes 1.1.0", "either", "fnv", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "instant", "libp2p-core 0.32.0", @@ -4151,13 +4151,13 @@ dependencies = [ "async-io", "data-encoding", "dns-parser", - "futures 0.3.19", + "futures 0.3.21", "if-watch", "lazy_static", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", "log", - "rand 0.8.4", + "rand 0.8.5", "smallvec", "socket2 0.4.4", "void", @@ -4180,7 +4180,7 @@ dependencies = [ [[package]] name = "libp2p-metrics" version = "0.4.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "libp2p-core 0.32.0", "libp2p-gossipsub 0.36.0", @@ -4199,7 +4199,7 @@ checksum = "7f2cd64ef597f40e14bfce0497f50ecb63dd6d201c61796daeb4227078834fbf" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "log", "nohash-hasher", @@ -4217,13 +4217,13 @@ checksum = "a8772c7a99088221bb7ca9c5c0574bf55046a7ab4c319f3619b275f28c8fb87a" dependencies = [ "bytes 1.1.0", "curve25519-dalek 3.2.0", - "futures 0.3.19", + "futures 0.3.21", "lazy_static", "libp2p-core 0.30.2", "log", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "sha2 0.9.9", "snow 0.8.0", "static_assertions", @@ -4234,17 +4234,17 @@ dependencies = [ [[package]] name = "libp2p-noise" version = "0.35.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "bytes 1.1.0", "curve25519-dalek 3.2.0", - "futures 0.3.19", + "futures 0.3.21", "lazy_static", "libp2p-core 0.32.0", "log", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "sha2 0.10.1", "snow 0.9.0", "static_assertions", @@ -4258,7 +4258,7 @@ version = "0.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "80ef7b0ec5cf06530d9eb6cf59ae49d46a2c45663bde31c25a12f682664adbcf" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", "log", @@ -4270,9 +4270,9 @@ dependencies = [ [[package]] name = "libp2p-ping" version = "0.34.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "instant", "libp2p-core 0.32.0", @@ -4290,7 +4290,7 @@ checksum = "5fba1a6ff33e4a274c89a3b1d78b9f34f32af13265cc5c46c16938262d4e945a" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "log", "prost", @@ -4305,7 +4305,7 @@ version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f1a458bbda880107b5b36fcb9b5a1ef0c329685da0e203ed692a8ebe64cc92c" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", "pin-project 1.0.10", "rand 0.7.3", @@ -4321,7 +4321,7 @@ checksum = "2852b61c90fa8ce3c8fcc2aba76e6cefc20d648f9df29157d6b3a916278ef3e3" dependencies = [ "asynchronous-codec 0.6.0", "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", @@ -4344,13 +4344,13 @@ checksum = "14a6d2b9e7677eff61dc3d2854876aaf3976d84a01ef6664b610c77a0c9407c5" dependencies = [ "asynchronous-codec 0.6.0", "bimap", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", "log", "prost", "prost-build", - "rand 0.8.4", + "rand 0.8.5", "sha2 0.9.9", "thiserror", "unsigned-varint 0.7.1", @@ -4366,11 +4366,11 @@ checksum = "a877a4ced6d46bf84677e1974e8cf61fb434af73b2e96fb48d6cb6223a4634d8" dependencies = [ "async-trait", "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "libp2p-swarm 0.31.0", "log", - "lru 0.7.2", + "lru 0.7.5", "rand 0.7.3", "smallvec", "unsigned-varint 0.7.1", @@ -4384,7 +4384,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f5184a508f223bc100a12665517773fb8730e9f36fc09eefb670bf01b107ae9" dependencies = [ "either", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "log", "rand 0.7.3", @@ -4396,19 +4396,16 @@ dependencies = [ [[package]] name = "libp2p-swarm" version = "0.34.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "either", - "fnv", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "instant", "libp2p-core 0.32.0", "log", - "pin-project 1.0.10", "rand 0.7.3", "smallvec", - "thiserror", "void", ] @@ -4425,7 +4422,7 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" version = "0.26.1" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "quote", "syn", @@ -4438,7 +4435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7399c5b6361ef525d41c11fcf51635724f832baf5819b30d3d873eabb4fbae4b" dependencies = [ "async-io", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "if-watch", "ipnet", @@ -4451,9 +4448,9 @@ dependencies = [ [[package]] name = "libp2p-tcp" version = "0.32.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "if-addrs 0.7.0", "ipnet", @@ -4471,7 +4468,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8b7563e46218165dfd60f64b96f7ce84590d75f53ecbdc74a7dd01450dc5973" dependencies = [ "async-std", - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "log", ] @@ -4482,7 +4479,7 @@ version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1008a302b73c5020251f9708c653f5ed08368e530e247cc9cd2f109ff30042cf" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "js-sys", "libp2p-core 0.30.2", "parity-send-wrapper", @@ -4497,7 +4494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "22e12df82d1ed64969371a9e65ea92b91064658604cc2576c2757f18ead9a1cf" dependencies = [ "either", - "futures 0.3.19", + "futures 0.3.21", "futures-rustls 0.21.1", "libp2p-core 0.30.2", "log", @@ -4511,10 +4508,10 @@ dependencies = [ [[package]] name = "libp2p-websocket" version = "0.34.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "either", - "futures 0.3.19", + "futures 0.3.21", "futures-rustls 0.22.0", "libp2p-core 0.32.0", "log", @@ -4531,7 +4528,7 @@ version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e7362abb8867d7187e7e93df17f460d554c997fc5c8ac57dc1259057f6889af" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.30.2", "parking_lot 0.11.2", "thiserror", @@ -4541,25 +4538,28 @@ dependencies = [ [[package]] name = "libp2p-yamux" version = "0.36.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libp2p-core 0.32.0", - "parking_lot 0.12.0", + "parking_lot 0.11.2", "thiserror", "yamux 0.10.0", ] [[package]] name = "librocksdb-sys" -version = "6.20.3" +version = "0.6.1+6.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c309a9d2470844aceb9a4a098cf5286154d20596868b75a6b36357d2bb9ca25d" +checksum = "81bc587013734dadb7cf23468e531aa120788b87243648be42e2d3a072186291" dependencies = [ "bindgen", + "bzip2-sys", "cc", "glob", "libc", + "libz-sys", + "tikv-jemalloc-sys", ] [[package]] @@ -4575,7 +4575,7 @@ dependencies = [ "libsecp256k1-core", "libsecp256k1-gen-ecmult", "libsecp256k1-gen-genmult", - "rand 0.8.4", + "rand 0.8.5", "serde", "sha2 0.9.9", "typenum", @@ -4697,9 +4697,9 @@ dependencies = [ [[package]] name = "lru" -version = "0.7.2" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "274353858935c992b13c0ca408752e2121da852d07dec7ce5f108c77dfa14d1f" +checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" dependencies = [ "hashbrown 0.11.2", ] @@ -4867,12 +4867,12 @@ dependencies = [ [[package]] name = "memory-db" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d505169b746dacf02f7d14d8c80b34edfd8212159c63d23c977739a0d960c626" +checksum = "6566c70c1016f525ced45d7b7f97730a2bafb037c788211d0c186ef5b2189f0a" dependencies = [ "hash-db", - "hashbrown 0.11.2", + "hashbrown 0.12.0", "parity-util-mem", ] @@ -4925,10 +4925,10 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "derive_more", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "thiserror", "tracing", @@ -4936,12 +4936,12 @@ dependencies = [ [[package]] name = "mick-jaeger" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd2c2cc134e57461f0898b0e921f0a7819b5e3f3a4335b9aa390ce81a5f36fb9" +checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532" dependencies = [ - "futures 0.3.19", - "rand 0.8.4", + "futures 0.3.21", + "rand 0.8.5", "thrift", ] @@ -4991,14 +4991,15 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", "miow 0.3.7", "ntapi", + "wasi 0.11.0+wasi-snapshot-preview1", "winapi 0.3.9", ] @@ -5137,7 +5138,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "424f6e86263cd5294cbd7f1e95746b95aca0e0d66bff31e5a40d6baa87b4aa99" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", @@ -5151,7 +5152,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro-error", "proc-macro2", "quote", @@ -5172,7 +5173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56a336acba8bc87c8876f6425407dbbe6c417bf478b22015f8fb0994ef3bc0ab" dependencies = [ "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "log", "pin-project 1.0.10", "smallvec", @@ -5182,10 +5183,10 @@ dependencies = [ [[package]] name = "multistream-select" version = "0.11.0" -source = "git+https://github.com/libp2p/rust-libp2p#fd2be38fafb203dc5466b533dd7610c695b646dd" +source = "git+https://github.com/libp2p/rust-libp2p?rev=b39770b8e9bfb113235c9ab8f7f2df2392482073#b39770b8e9bfb113235c9ab8f7f2df2392482073" dependencies = [ "bytes 1.1.0", - "futures 0.3.19", + "futures 0.3.21", "log", "pin-project 1.0.10", "smallvec", @@ -5204,7 +5205,7 @@ dependencies = [ "num-complex", "num-rational 0.4.0", "num-traits", - "rand 0.8.4", + "rand 0.8.5", "rand_distr", "simba", "typenum", @@ -5227,7 +5228,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" dependencies = [ - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -5413,6 +5414,16 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-format" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bafe4179722c2894288ee77a9f044f02811c86af699344c498b0840c698a2465" +dependencies = [ + "arrayvec 0.4.12", + "itoa 0.4.8", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -5492,7 +5503,7 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d992b768490d7fe0d8586d9b5745f6c49f557da6d81dc982b1d167ad4edbb21" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -5654,7 +5665,7 @@ dependencies = [ [[package]] name = "orml-vesting" version = "0.4.1-dev" -source = "git+https://github.com/subspace/open-runtime-module-library?rev=dc76f70657d17f7a7c3a6124772824bf6ddc8ade#dc76f70657d17f7a7c3a6124772824bf6ddc8ade" +source = "git+https://github.com/subspace/open-runtime-module-library?rev=0e9f38313775b94c87c289f346e50f900db2bab7#0e9f38313775b94c87c289f346e50f900db2bab7" dependencies = [ "frame-support", "frame-system", @@ -5708,7 +5719,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-benchmarking", "frame-support", @@ -5723,7 +5734,7 @@ dependencies = [ [[package]] name = "pallet-executor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "frame-support", "frame-system", @@ -5737,7 +5748,7 @@ dependencies = [ [[package]] name = "pallet-feeds" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "frame-support", "frame-system", @@ -5752,7 +5763,7 @@ dependencies = [ [[package]] name = "pallet-object-store" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "frame-support", "frame-system", @@ -5767,7 +5778,7 @@ dependencies = [ [[package]] name = "pallet-offences-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "frame-support", "frame-system", @@ -5782,7 +5793,7 @@ dependencies = [ [[package]] name = "pallet-rewards" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "frame-support", "frame-system", @@ -5794,7 +5805,7 @@ dependencies = [ [[package]] name = "pallet-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "frame-support", "frame-system", @@ -5815,7 +5826,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-support", "frame-system", @@ -5829,7 +5840,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-benchmarking", "frame-support", @@ -5846,7 +5857,7 @@ dependencies = [ [[package]] name = "pallet-transaction-fees" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "frame-support", "frame-system", @@ -5858,7 +5869,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-support", "frame-system", @@ -5875,7 +5886,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5892,7 +5903,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5903,7 +5914,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-support", "frame-system", @@ -5942,9 +5953,9 @@ dependencies = [ [[package]] name = "parity-db" -version = "0.3.7" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09aa6c5bb8070cf0456d9fc228b3022e900aae9092c48c9c45facf97422efc1d" +checksum = "ca053f90a4ba308969633c9b0185db612c688a5a9fb019ddc7912548bf73a60c" dependencies = [ "blake2-rfc", "crc32fast", @@ -5955,15 +5966,15 @@ dependencies = [ "lz4", "memmap2 0.2.3", "parking_lot 0.11.2", - "rand 0.8.4", + "rand 0.8.5", "snap", ] [[package]] name = "parity-scale-codec" -version = "2.3.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909" +checksum = "e8b44461635bbb1a0300f100a841e571e7d919c81c73075ef5d152ffdb521066" dependencies = [ "arrayvec 0.7.2", "bitvec", @@ -5975,11 +5986,11 @@ dependencies = [ [[package]] name = "parity-scale-codec-derive" -version = "2.3.1" +version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27" +checksum = "c45ed1f39709f5a89338fab50e59816b2e8815f5bb58276e7ddf9afd495f73f8" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -5997,7 +6008,7 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9981e32fb75e004cc148f5fb70342f393830e0a4aa62e3cc93b50976218d42b6" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libc", "log", "rand 0.7.3", @@ -6007,15 +6018,15 @@ dependencies = [ [[package]] name = "parity-util-mem" -version = "0.10.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f4cb4e169446179cbc6b8b6320cc9fca49bd2e94e8db25f25f200a8ea774770" +checksum = "c32561d248d352148124f036cac253a644685a21dc9fea383eb4907d7bd35a8f" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.11.2", + "hashbrown 0.12.0", "impl-trait-for-tuples", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "smallvec", "winapi 0.3.9", @@ -6235,7 +6246,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6" dependencies = [ "phf_shared 0.10.0", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -6381,10 +6392,10 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "cirrus-node-primitives", - "futures 0.3.19", + "futures 0.3.21", "parity-scale-codec", "polkadot-node-subsystem", "polkadot-node-subsystem-util", @@ -6399,9 +6410,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "polkadot-node-subsystem", "polkadot-node-subsystem-util", "sc-client-api", @@ -6413,9 +6424,9 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "memory-lru", "parity-util-mem", "polkadot-node-subsystem", @@ -6430,7 +6441,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "async-std", "lazy_static", @@ -6448,9 +6459,9 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "metered-channel", "substrate-prometheus-endpoint", @@ -6459,7 +6470,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -6469,10 +6480,10 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "cirrus-node-primitives", - "futures 0.3.19", + "futures 0.3.21", "polkadot-node-jaeger", "polkadot-overseer-gen", "sc-network", @@ -6488,10 +6499,10 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "metered-channel", "pin-project 1.0.10", "polkadot-node-jaeger", @@ -6510,12 +6521,12 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "cirrus-node-primitives", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", - "lru 0.7.2", + "lru 0.7.5", "parity-util-mem", "parking_lot 0.12.0", "polkadot-node-metrics", @@ -6530,10 +6541,10 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "metered-channel", "pin-project 1.0.10", @@ -6546,9 +6557,9 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.13" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -6622,9 +6633,9 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" [[package]] name = "primitive-types" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373" +checksum = "e28720988bff275df1f51b171e1b2a18c30d194c4d2b61defdacecd625a5d94a" dependencies = [ "fixed-hash", "impl-codec", @@ -6644,9 +6655,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "1.1.0" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebace6889caf889b4d3f76becee12e90353f2b8c7d875534a71e5742f8f6f83" +checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" dependencies = [ "thiserror", "toml", @@ -6818,9 +6829,9 @@ dependencies = [ [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -6845,20 +6856,19 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "rand_core 0.5.1", - "rand_hc 0.2.0", + "rand_hc", "rand_pcg", ] [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", "rand_core 0.6.3", - "rand_hc 0.3.1", ] [[package]] @@ -6921,7 +6931,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" dependencies = [ "num-traits", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -6933,15 +6943,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_pcg" version = "0.2.1" @@ -7187,9 +7188,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a62eca5cacf2c8261128631bed9f045598d40bfbe4b29f5163f0f802f8f44a7" +checksum = "620f4129485ff1a7128d184bc687470c21c7951b64779ebc9cfdad3dcd920290" dependencies = [ "libc", "librocksdb-sys", @@ -7327,7 +7328,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4da5fcb054c46f5a5dff833b129285a93d3f0179531735e6c866e8cc307d2020" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "pin-project 0.4.29", "static_assertions", ] @@ -7359,7 +7360,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "log", "sp-core", @@ -7370,9 +7371,9 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "parity-scale-codec", @@ -7393,7 +7394,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7409,7 +7410,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.3", @@ -7426,9 +7427,9 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -7437,14 +7438,14 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "fnv", - "futures 0.3.19", + "futures 0.3.21", "hash-db", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-executor", "sc-transaction-pool-api", "sc-utils", @@ -7465,7 +7466,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "hash-db", "kvdb", @@ -7475,7 +7476,7 @@ dependencies = [ "log", "parity-db", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-state-db", "sp-arithmetic", @@ -7490,14 +7491,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "libp2p 0.40.0", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sc-utils", "serde", @@ -7514,10 +7515,10 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "parity-scale-codec", @@ -7539,16 +7540,16 @@ dependencies = [ [[package]] name = "sc-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "async-trait", "fork-tree", - "futures 0.3.19", + "futures 0.3.21", "log", - "lru 0.7.2", + "lru 0.7.5", "parity-scale-codec", "parking_lot 0.12.0", - "rand 0.8.4", + "rand 0.8.5", "sc-client-api", "sc-consensus", "sc-consensus-slots", @@ -7577,10 +7578,10 @@ dependencies = [ [[package]] name = "sc-consensus-subspace-rpc" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "async-oneshot", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "jsonrpc-core", "jsonrpc-core-client", @@ -7605,7 +7606,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "sc-client-api", "sp-authorship", @@ -7616,14 +7617,12 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "lazy_static", - "libsecp256k1", - "log", "lru 0.6.6", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-executor-common", "sc-executor-wasmi", "sc-executor-wasmtime", @@ -7638,13 +7637,14 @@ dependencies = [ "sp-trie", "sp-version", "sp-wasm-interface", + "tracing", "wasmi", ] [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "environmental", "parity-scale-codec", @@ -7661,7 +7661,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "log", "parity-scale-codec", @@ -7677,7 +7677,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "cfg-if 1.0.0", "libc", @@ -7695,10 +7695,10 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "ansi_term", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "parity-util-mem", @@ -7712,11 +7712,11 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", "hex", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "serde_json", "sp-application-crypto", "sp-core", @@ -7727,9 +7727,8 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "async-std", "async-trait", "asynchronous-codec 0.5.0", "bitflags", @@ -7738,7 +7737,7 @@ dependencies = [ "either", "fnv", "fork-tree", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "hex", "ip_network", @@ -7746,9 +7745,9 @@ dependencies = [ "linked-hash-map", "linked_hash_set", "log", - "lru 0.7.2", + "lru 0.7.5", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "prost", "prost-build", @@ -7777,11 +7776,11 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "bytes 1.1.0", "fnv", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "hex", "hyper", @@ -7789,7 +7788,7 @@ dependencies = [ "num_cpus", "once_cell", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "sc-client-api", "sc-network", @@ -7805,9 +7804,9 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "libp2p 0.40.0", "log", "sc-utils", @@ -7818,7 +7817,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -7827,15 +7826,15 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "hash-db", "jsonrpc-core", "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-block-builder", "sc-chain-spec", "sc-client-api", @@ -7858,16 +7857,16 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", "jsonrpc-pubsub", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-chain-spec", "sc-transaction-pool-api", "serde", @@ -7883,9 +7882,9 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-core", "jsonrpc-http-server", "jsonrpc-ipc-server", @@ -7900,12 +7899,12 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", "directories", "exit-future", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "hash-db", "jsonrpc-core", @@ -7913,7 +7912,7 @@ dependencies = [ "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "sc-block-builder", @@ -7964,13 +7963,13 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "log", "parity-scale-codec", "parity-util-mem", "parity-util-mem-derive", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sc-client-api", "sp-core", ] @@ -7978,13 +7977,13 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "chrono", - "futures 0.3.19", + "futures 0.3.21", "libp2p 0.40.0", "log", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project 1.0.10", "rand 0.7.3", "serde", @@ -7996,7 +7995,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "ansi_term", "atty", @@ -8005,7 +8004,7 @@ dependencies = [ "libc", "log", "once_cell", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "regex", "rustc-hash", "sc-client-api", @@ -8027,9 +8026,9 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -8038,15 +8037,15 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "linked-hash-map", "log", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "retain_mut", "sc-client-api", "sc-transaction-pool-api", @@ -8065,9 +8064,9 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", "serde", "sp-blockchain", @@ -8078,20 +8077,21 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "lazy_static", - "parking_lot 0.11.2", + "log", + "parking_lot 0.12.0", "prometheus", ] [[package]] name = "scale-info" -version = "1.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c55b744399c25532d63a0d2789b109df8d46fc93752d46b0782991a931a782f" +checksum = "0563970d79bcbf3c537ce3ad36d859b30d36fc5b190efd227f1f7a84d7cf0d42" dependencies = [ "bitvec", "cfg-if 1.0.0", @@ -8103,11 +8103,11 @@ dependencies = [ [[package]] name = "scale-info-derive" -version = "1.0.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baeb2780690380592f86205aa4ee49815feb2acad8c2f59e6dd207148c3f1fcd" +checksum = "b7805950c36512db9e3251c970bb7ac425f326716941862205d612ab3b5e46e2" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -8173,6 +8173,24 @@ dependencies = [ "untrusted", ] +[[package]] +name = "secp256k1" +version = "0.21.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c42e6f1735c5f00f51e43e28d6634141f2bcad10931b2609ddd74a86d751260" +dependencies = [ + "secp256k1-sys", +] + +[[package]] +name = "secp256k1-sys" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "957da2573cde917463ece3570eab4a0b3f19de6f1646cde62e6fd3868f566036" +dependencies = [ + "cc", +] + [[package]] name = "secrecy" version = "0.8.0" @@ -8298,9 +8316,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.78" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d23c1ba4cf0efd44be32017709280b32d1cea5c3f1275c3b6d9e8bc54f758085" +checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95" dependencies = [ "itoa 1.0.1", "ryu", @@ -8518,25 +8536,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3" -[[package]] -name = "signal-hook" -version = "0.3.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "647c97df271007dcea485bb74ffdb57f2e683f1306c854f468a0c244badabf2d" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" -dependencies = [ - "libc", -] - [[package]] name = "signature" version = "1.5.0" @@ -8600,7 +8599,7 @@ dependencies = [ "aes-gcm", "blake2 0.9.2", "chacha20poly1305 0.8.0", - "rand 0.8.4", + "rand 0.8.5", "rand_core 0.6.3", "ring", "rustc_version 0.3.3", @@ -8656,10 +8655,10 @@ dependencies = [ "base64", "bytes 1.1.0", "flate2", - "futures 0.3.19", + "futures 0.3.21", "httparse", "log", - "rand 0.8.4", + "rand 0.8.5", "sha-1 0.9.8", ] @@ -8680,7 +8679,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "hash-db", "log", @@ -8697,10 +8696,10 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "blake2 0.10.2", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -8708,8 +8707,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "scale-info", @@ -8721,8 +8720,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "integer-sqrt", "num-traits", @@ -8737,7 +8736,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", "parity-scale-codec", @@ -8749,7 +8748,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "sp-api", @@ -8761,13 +8760,13 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", - "lru 0.7.2", + "lru 0.7.5", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "sp-api", "sp-consensus", "sp-database", @@ -8779,10 +8778,10 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "futures-timer", "log", "parity-scale-codec", @@ -8798,19 +8797,21 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "scale-info", "serde", "sp-arithmetic", "sp-runtime", + "sp-std", + "sp-timestamp", ] [[package]] name = "sp-consensus-subspace" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "async-trait", "parity-scale-codec", @@ -8830,8 +8831,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "base58", "bitflags", @@ -8839,7 +8840,7 @@ dependencies = [ "byteorder 1.4.3", "dyn-clonable", "ed25519-dalek", - "futures 0.3.19", + "futures 0.3.21", "hash-db", "hash256-std-hasher", "hex", @@ -8851,12 +8852,13 @@ dependencies = [ "num-traits", "parity-scale-codec", "parity-util-mem", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "primitive-types", "rand 0.7.3", "regex", "scale-info", "schnorrkel", + "secp256k1", "secrecy", "serde", "sp-core-hashing", @@ -8876,7 +8878,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "blake2 0.10.2", "byteorder 1.4.3", @@ -8889,8 +8891,8 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "proc-macro2", "quote", @@ -8901,16 +8903,16 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "kvdb", - "parking_lot 0.11.2", + "parking_lot 0.12.0", ] [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "proc-macro2", "quote", @@ -8920,7 +8922,7 @@ dependencies = [ [[package]] name = "sp-executor" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "parity-scale-codec", "scale-info", @@ -8936,8 +8938,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "environmental", "parity-scale-codec", @@ -8948,7 +8950,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "finality-grandpa", "log", @@ -8966,7 +8968,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -8979,15 +8981,16 @@ dependencies = [ [[package]] name = "sp-io" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "hash-db", "libsecp256k1", "log", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", + "secp256k1", "sp-core", "sp-externalities", "sp-keystore", @@ -9003,14 +9006,14 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", - "futures 0.3.19", + "futures 0.3.21", "merlin", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "schnorrkel", "serde", "sp-core", @@ -9021,7 +9024,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "thiserror", "zstd", @@ -9030,7 +9033,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "sp-api", "sp-core", @@ -9040,7 +9043,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "backtrace", "lazy_static", @@ -9049,8 +9052,8 @@ dependencies = [ [[package]] name = "sp-rpc" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "rustc-hash", "serde", @@ -9059,8 +9062,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "either", "hash256-std-hasher", @@ -9081,8 +9084,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9098,11 +9101,11 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "Inflector", - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -9111,7 +9114,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "serde", "serde_json", @@ -9120,7 +9123,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "scale-info", @@ -9134,7 +9137,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "scale-info", @@ -9144,14 +9147,14 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.11.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "0.12.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "hash-db", "log", "num-traits", "parity-scale-codec", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "rand 0.7.3", "smallvec", "sp-core", @@ -9161,19 +9164,18 @@ dependencies = [ "sp-trie", "thiserror", "tracing", - "trie-db", "trie-root", ] [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" [[package]] name = "sp-storage" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9186,7 +9188,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "log", "sp-core", @@ -9199,7 +9201,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", "futures-timer", @@ -9214,8 +9216,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "sp-std", @@ -9227,7 +9229,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "sp-api", "sp-runtime", @@ -9236,7 +9238,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "async-trait", "log", @@ -9251,8 +9253,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "hash-db", "memory-db", @@ -9260,14 +9262,15 @@ dependencies = [ "scale-info", "sp-core", "sp-std", + "thiserror", "trie-db", "trie-root", ] [[package]] name = "sp-version" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "5.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9284,7 +9287,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -9294,8 +9297,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +version = "6.0.0" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "impl-trait-for-tuples", "log", @@ -9319,11 +9322,12 @@ checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" [[package]] name = "ss58-registry" -version = "1.12.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8319f44e20b42e5c11b88b1ad4130c35fe2974665a007b08b02322070177136a" +checksum = "7b84a70894df7a73666e0694f44b41a9571625e9546fb58a0818a565d2c7e084" dependencies = [ "Inflector", + "num-format", "proc-macro2", "quote", "serde", @@ -9362,7 +9366,7 @@ dependencies = [ "lazy_static", "nalgebra", "num-traits", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -9467,7 +9471,7 @@ dependencies = [ [[package]] name = "subspace-archiving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "merkletree", "parity-scale-codec", @@ -9482,9 +9486,9 @@ dependencies = [ [[package]] name = "subspace-core-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ - "hmac 0.12.0", + "hmac 0.12.1", "parity-scale-codec", "scale-info", "serde", @@ -9494,7 +9498,7 @@ dependencies = [ [[package]] name = "subspace-desktop" -version = "0.3.3" +version = "0.4.0" dependencies = [ "anyhow", "dotenv", @@ -9502,6 +9506,7 @@ dependencies = [ "fdlimit", "fs2", "hex", + "jsonrpsee", "log", "names", "sc-chain-spec", @@ -9529,7 +9534,7 @@ dependencies = [ [[package]] name = "subspace-farmer" version = "0.3.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "anyhow", "arc-swap", @@ -9539,12 +9544,12 @@ dependencies = [ "dirs 4.0.0", "env_logger", "event-listener-primitives", - "futures 0.3.19", + "futures 0.3.21", "hex", "hex-buffer-serde", "jsonrpsee", "log", - "lru 0.7.2", + "lru 0.7.5", "parity-scale-codec", "parking_lot 0.12.0", "rayon", @@ -9568,11 +9573,11 @@ dependencies = [ [[package]] name = "subspace-networking" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "bytes 1.1.0", "event-listener-primitives", - "futures 0.3.19", + "futures 0.3.21", "hex", "libp2p 0.43.0", "log", @@ -9586,7 +9591,7 @@ dependencies = [ [[package]] name = "subspace-rpc-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "hex-buffer-serde", "serde", @@ -9596,7 +9601,7 @@ dependencies = [ [[package]] name = "subspace-runtime" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "frame-executive", "frame-support", @@ -9639,7 +9644,7 @@ dependencies = [ [[package]] name = "subspace-runtime-primitives" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -9653,14 +9658,14 @@ dependencies = [ [[package]] name = "subspace-service" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "cirrus-node-primitives", "frame-support", "frame-system-rpc-runtime-api", - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-core", - "lru 0.7.2", + "lru 0.7.5", "pallet-transaction-payment-rpc", "pallet-transaction-payment-rpc-runtime-api", "polkadot-node-collation-generation", @@ -9706,7 +9711,7 @@ dependencies = [ [[package]] name = "subspace-solving" version = "0.1.0" -source = "git+https://github.com/subspace/subspace?rev=042302ed2c86abd765be56c93b6f3ee535a1573a#042302ed2c86abd765be56c93b6f3ee535a1573a" +source = "git+https://github.com/subspace/subspace?rev=46420f74bc87f38795a7a4a0196d7214f90ed929#46420f74bc87f38795a7a4a0196d7214f90ed929" dependencies = [ "log", "num_cpus", @@ -9734,7 +9739,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "platforms", ] @@ -9742,10 +9747,10 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "frame-system-rpc-runtime-api", - "futures 0.3.19", + "futures 0.3.21", "jsonrpc-core", "jsonrpc-core-client", "jsonrpc-derive", @@ -9764,9 +9769,8 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ - "async-std", "futures-util", "hyper", "log", @@ -9778,7 +9782,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?rev=e6def65920d30029e42d498cb07cec5dd433b927#e6def65920d30029e42d498cb07cec5dd433b927" +source = "git+https://github.com/paritytech/substrate?rev=c364008a6c7da8456e17967f55edf51e45146998#c364008a6c7da8456e17967f55edf51e45146998" dependencies = [ "ansi_term", "build-helper", @@ -9955,7 +9959,7 @@ dependencies = [ "either", "embed_plist", "flate2", - "futures 0.3.19", + "futures 0.3.21", "futures-lite", "glib", "glob", @@ -9969,7 +9973,7 @@ dependencies = [ "os_info", "os_pipe", "percent-encoding 2.1.0", - "rand 0.8.4", + "rand 0.8.5", "raw-window-handle", "regex", "rfd", @@ -10146,9 +10150,9 @@ dependencies = [ [[package]] name = "textwrap" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" +checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" [[package]] name = "thin-slice" @@ -10207,6 +10211,17 @@ dependencies = [ "threadpool", ] +[[package]] +name = "tikv-jemalloc-sys" +version = "0.4.3+5.2.1-patched.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a1792ccb507d955b46af42c123ea8863668fae24d03721e40cad6a41773dbb49" +dependencies = [ + "cc", + "fs_extra", + "libc", +] + [[package]] name = "time" version = "0.1.43" @@ -10253,17 +10268,18 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.16.1" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c27a64b625de6d309e8c57716ba93021dccf1b3b5c97edd6d3dd2d2135afc0a" +checksum = "2af73ac49756f3f7c01172e34a23e5d0216f6c32333757c2c61feb2bbff5a5ee" dependencies = [ "bytes 1.1.0", "libc", "memchr", - "mio 0.7.14", + "mio 0.8.2", "num_cpus", - "parking_lot 0.11.2", + "parking_lot 0.12.0", "pin-project-lite 0.2.8", + "socket2 0.4.4", "tokio-macros", "winapi 0.3.9", ] @@ -10344,9 +10360,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" dependencies = [ "cfg-if 1.0.0", "pin-project-lite 0.2.8", @@ -10356,9 +10372,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.18" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f480b8f81512e825f337ad51e94c1eb5d3bbdf2b363dcd01e2b19a9ffe3f8e" +checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" dependencies = [ "proc-macro2", "quote", @@ -10367,11 +10383,12 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" dependencies = [ "lazy_static", + "valuable", ] [[package]] @@ -10494,7 +10511,7 @@ dependencies = [ "ipnet", "lazy_static", "log", - "rand 0.8.4", + "rand 0.8.5", "smallvec", "thiserror", "tinyvec", @@ -10542,7 +10559,7 @@ checksum = "4ee73e6e4924fe940354b8d4d98cad5231175d615cd855b758adc658c0aac6a0" dependencies = [ "cfg-if 1.0.0", "digest 0.10.3", - "rand 0.8.4", + "rand 0.8.5", "static_assertions", ] @@ -10691,6 +10708,12 @@ dependencies = [ "getrandom 0.2.4", ] +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "value-bag" version = "1.0.0-alpha.8" @@ -10770,6 +10793,12 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.79" @@ -10862,7 +10891,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "js-sys", "parking_lot 0.11.2", "pin-utils", @@ -11034,7 +11063,7 @@ dependencies = [ "mach", "memoffset", "more-asserts", - "rand 0.8.4", + "rand 0.8.5", "region", "rustix", "thiserror", @@ -11506,9 +11535,12 @@ dependencies = [ [[package]] name = "wyz" -version = "0.2.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" +checksum = "30b31594f29d27036c383b53b59ed3476874d518f0efb151b27a4c275141390e" +dependencies = [ + "tap", +] [[package]] name = "x11" @@ -11563,11 +11595,11 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7d9028f208dd5e63c614be69f115c1b53cacc1111437d4c765185856666c107" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", "nohash-hasher", "parking_lot 0.11.2", - "rand 0.8.4", + "rand 0.8.5", "static_assertions", ] @@ -11577,11 +11609,11 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "29d4c1dd079043fe673e79fe3c3a260ae2d2fb413f1062cae9e062748df0df03" dependencies = [ - "futures 0.3.19", + "futures 0.3.21", "log", "nohash-hasher", "parking_lot 0.11.2", - "rand 0.8.4", + "rand 0.8.5", "static_assertions", ] @@ -11596,7 +11628,7 @@ dependencies = [ "derivative", "enumflags2 0.6.4", "fastrand", - "futures 0.3.19", + "futures 0.3.21", "nb-connect", "nix 0.17.0", "once_cell", @@ -11634,7 +11666,7 @@ dependencies = [ "nix 0.23.1", "once_cell", "ordered-stream", - "rand 0.8.4", + "rand 0.8.5", "serde", "serde_repr", "sha1", @@ -11663,7 +11695,7 @@ version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36823cc10fddc3c6b19f048903262dacaf8274170e9a255784bdd8b4570a8040" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "regex", @@ -11765,7 +11797,7 @@ version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", @@ -11777,7 +11809,7 @@ version = "3.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c2cecc5a61c2a053f7f653a24cd15b3b0195d7f7ddb5042c837fb32e161fb7a" dependencies = [ - "proc-macro-crate 1.1.0", + "proc-macro-crate 1.1.3", "proc-macro2", "quote", "syn", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 5b698bd0..3dea70f4 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "subspace-desktop" -version = "0.3.3" +version = "0.4.0" description = "Subspace desktop" authors = ["Subspace Labs "] license = "Apache-2.0" @@ -8,7 +8,7 @@ repository = "https://github.com/subspace/subspace-desktop" edition = "2021" [build-dependencies] -substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" } +substrate-build-script-utils = { version = "3.0.0", git = "https://github.com/paritytech/substrate", rev = "c364008a6c7da8456e17967f55edf51e45146998" } tauri-build = { version = "1.0.0-rc.4", features = [] } [dependencies] @@ -18,22 +18,23 @@ event-listener-primitives = "2.0.1" fdlimit = "0.2.1" fs2 = "0.4.3" hex = "0.4.3" +jsonrpsee = { version = "0.8.0", features = ["client", "macros", "server"] } log = "0.4.14" names = { version = "0.12.0", default-features = false } -sc-chain-spec = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" } -sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927", features = ["wasmtime"] } -sc-network = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" } -sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" } -sc-tracing = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" } -serde_json = "1.0" -serde = { version = "1.0", features = [ "derive" ] } -sp-core = { version = "5.0.0", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" } -sp-panic-handler = { version = "4.0.0", git = "https://github.com/paritytech/substrate", rev = "e6def65920d30029e42d498cb07cec5dd433b927" } -subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "042302ed2c86abd765be56c93b6f3ee535a1573a" } -subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "042302ed2c86abd765be56c93b6f3ee535a1573a" } -subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "042302ed2c86abd765be56c93b6f3ee535a1573a" } -subspace-service = { git = "https://github.com/subspace/subspace", rev = "042302ed2c86abd765be56c93b6f3ee535a1573a" } -subspace-solving = { git = "https://github.com/subspace/subspace", rev = "042302ed2c86abd765be56c93b6f3ee535a1573a" } +sc-chain-spec = { git = "https://github.com/paritytech/substrate", rev = "c364008a6c7da8456e17967f55edf51e45146998" } +sc-executor = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "c364008a6c7da8456e17967f55edf51e45146998", features = ["wasmtime"] } +sc-network = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "c364008a6c7da8456e17967f55edf51e45146998" } +sc-service = { version = "0.10.0-dev", git = "https://github.com/paritytech/substrate", rev = "c364008a6c7da8456e17967f55edf51e45146998", features = ["wasmtime"] } +sc-tracing = { version = "4.0.0-dev", git = "https://github.com/paritytech/substrate", rev = "c364008a6c7da8456e17967f55edf51e45146998" } +serde_json = "1.0.79" +serde = { version = "1.0.136", features = [ "derive" ] } +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", rev = "c364008a6c7da8456e17967f55edf51e45146998" } +sp-panic-handler = { version = "4.0.0", git = "https://github.com/paritytech/substrate", rev = "c364008a6c7da8456e17967f55edf51e45146998" } +subspace-core-primitives = { git = "https://github.com/subspace/subspace", rev = "46420f74bc87f38795a7a4a0196d7214f90ed929" } +subspace-farmer = { git = "https://github.com/subspace/subspace", rev = "46420f74bc87f38795a7a4a0196d7214f90ed929" } +subspace-runtime = { git = "https://github.com/subspace/subspace", rev = "46420f74bc87f38795a7a4a0196d7214f90ed929" } +subspace-service = { git = "https://github.com/subspace/subspace", rev = "46420f74bc87f38795a7a4a0196d7214f90ed929" } +subspace-solving = { git = "https://github.com/subspace/subspace", rev = "46420f74bc87f38795a7a4a0196d7214f90ed929" } tiny-bip39 = "0.8.2" tokio = { version = "1.11.0", features = ["macros", "rt-multi-thread"] } diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index 58d946fe..a218526e 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -16,6 +16,7 @@ use serde::Serialize; use std::path::PathBuf; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::Arc; +use std::time::Duration; use subspace_core_primitives::{PublicKey, PIECE_SIZE}; use subspace_farmer::{ Commitments, FarmerData, Farming, Identity, ObjectMappings, Plot, Plotting, RpcClient, WsRpc, @@ -29,6 +30,7 @@ use tauri::{ use tokio::runtime::Handle; static PLOTTED_PIECES: AtomicUsize = AtomicUsize::new(0); +const BEST_BLOCK_NUMBER_CHECK_INTERVAL: Duration = Duration::from_secs(5); #[derive(Serialize)] #[serde(rename_all = "camelCase")] @@ -49,16 +51,16 @@ fn plot_progress_tracker() -> usize { } #[tauri::command] -async fn farming(path: String, reward_address: String) { +async fn farming(path: String, reward_address: String, plot_size: u64) { match reward_address.len() { 0 => { - farm(path.into(), "ws://127.0.0.1:9944", None) + farm(path.into(), "ws://127.0.0.1:9944", None, plot_size) .await .unwrap(); } _ => { if let Ok(address) = parse_reward_address(&reward_address) { - farm(path.into(), "ws://127.0.0.1:9944", Some(address)) + farm(path.into(), "ws://127.0.0.1:9944", Some(address), plot_size) .await .unwrap(); } else { @@ -129,7 +131,7 @@ async fn main() -> Result<()> { get_this_binary, farming, plot_progress_tracker, - start_node, + start_node ], #[cfg(target_os = "windows")] tauri::generate_handler![ @@ -140,7 +142,7 @@ async fn main() -> Result<()> { get_disk_stats, farming, plot_progress_tracker, - start_node, + start_node ], ) .build(tauri::generate_context!()) @@ -208,18 +210,34 @@ async fn farm( base_directory: PathBuf, node_rpc_url: &str, reward_address: Option, + plot_size: u64, ) -> Result<()> { let identity = Identity::open_or_create(&base_directory)?; + let address = identity.public_key().to_bytes().into(); + let reward_address = reward_address.unwrap_or_else(|| identity.public_key().to_bytes().into()); + + info!("Connecting to node at {}", node_rpc_url); + let client = WsRpc::new(node_rpc_url).await?; + + let farmer_metadata = client + .farmer_metadata() + .await + .map_err(|error| anyhow::Error::msg(error.to_string()))?; + + // TODO: This doesn't account for the fact that node can + // have a completely different history to what farmer expects info!("Opening plot"); let plot_fut = tokio::task::spawn_blocking({ let base_directory = base_directory.clone(); + let plot_size = plot_size / PIECE_SIZE as u64; - move || Plot::open_or_create(&base_directory) + // TODO: Piece count should account for database overhead of various additional databases + move || Plot::open_or_create(&base_directory, address, Some(plot_size)) }); - let plot = plot_fut.await.unwrap()?; + // Keep track of the plotting for Desktop App plot.on_progress_change(Arc::new(|plotted_pieces| { PLOTTED_PIECES.fetch_add( plotted_pieces.plotted_piece_count / PIECE_SIZE, @@ -248,41 +266,25 @@ async fn farm( }) .await??; - info!("Connecting to node at {}", node_rpc_url); - let client = WsRpc::new(node_rpc_url).await?; - - let farmer_metadata = client - .farmer_metadata() - .await - .map_err(|error| anyhow::Error::msg(error.to_string()))?; - let subspace_codec = SubspaceCodec::new(identity.public_key()); - let reward_address = reward_address.unwrap_or_else(|| { - identity - .public_key() - .as_ref() - .to_vec() - .try_into() - .map(From::<[u8; 32]>::from) - .expect("Length of public key is always correct") - }); // start the farming task let farming_instance = Farming::start( plot.clone(), commitments.clone(), client.clone(), - identity.clone(), + identity, reward_address, ); - let farmer_data = FarmerData::new(plot.clone(), commitments, object_mappings, farmer_metadata); + + let farmer_data = FarmerData::new(plot, commitments, object_mappings, farmer_metadata); // start the background plotting let plotting_instance = Plotting::start( farmer_data, client, subspace_codec, - std::time::Duration::from_secs(5), + BEST_BLOCK_NUMBER_CHECK_INTERVAL, ); // wait for the farming and plotting in the background diff --git a/src-tauri/src/node.rs b/src-tauri/src/node.rs index 0a2d0c6d..4165ad03 100644 --- a/src-tauri/src/node.rs +++ b/src-tauri/src/node.rs @@ -11,7 +11,7 @@ use sc_service::config::{ }; use sc_service::{ BasePath, Configuration, DatabaseSource, KeepBlocks, PruningMode, Role, RpcMethods, - TracingReceiver, TransactionStorageMode, + TracingReceiver, }; use sc_tracing::logging::LoggerBuilder; use sp_core::crypto::Ss58AddressFormat; @@ -159,7 +159,6 @@ fn create_configuration( // TODO: Change to constrained eventually (need DSN for this) state_pruning: PruningMode::ArchiveAll, keep_blocks: KeepBlocks::All, - transaction_storage: TransactionStorageMode::BlockBody, wasm_method: WasmExecutionMethod::Compiled, wasm_runtime_overrides: None, execution_strategies: ExecutionStrategies { diff --git a/src/lib/client.ts b/src/lib/client.ts index 84f9de25..f6791bc9 100644 --- a/src/lib/client.ts +++ b/src/lib/client.ts @@ -207,7 +207,7 @@ export class Client { await this.connectLocalApi() return clientIdentity } - + // TODO: Disable mnemonic return from tauri commmand instead of this validation. private async startNode(path: string): Promise { const { publicKey, mnemonic } = await tauri.invoke("start_node", { path }) @@ -229,9 +229,10 @@ export class Client { } /* FARMER INTEGRATION */ - public async startFarming(path: string): Promise { + public async startFarming(path: string, plotSizeGB: number): Promise { + const plotSize = Math.round(plotSizeGB * 1048576) const rewardAddress = LocalStorage.getItem("rewardAddress")?.toString() || "" - return await tauri.invoke("farming", { path, rewardAddress }) + return await tauri.invoke("farming", { path, rewardAddress, plotSize }) } /* MNEMONIC displayed only FIRST LOAD on SaveKeys Modal. */ diff --git a/src/lib/util.ts b/src/lib/util.ts index 6ed73e46..9514ce67 100644 --- a/src/lib/util.ts +++ b/src/lib/util.ts @@ -49,19 +49,20 @@ export interface AppConfig { export interface SegmentCache { networkSegmentCount: number - allocatedGB: number + blockchainSizeGB: number } export interface Account { farmerPublicKey: string } export interface Plot { location: string + sizeGB: number } export const emptyAppConfig: AppConfig = { - plot: { location: "" }, + plot: { location: "", sizeGB: 0 }, account: { farmerPublicKey: "" }, - segmentCache: { networkSegmentCount: 0, allocatedGB: 0 }, + segmentCache: { networkSegmentCount: 0, blockchainSizeGB: 0 }, launchOnBoot: true, importedRewAddr: false } diff --git a/src/loc/en.json b/src/loc/en.json index c4657f88..8fece63a 100644 --- a/src/loc/en.json +++ b/src/loc/en.json @@ -29,7 +29,7 @@ "availableSpace": "How much free space there are in the disk.", "utilizedSpace": "How much space is currently being used.", "allocatedSpace": "Space to be shared with Subspace Protocol.", - "estimatingSpace": "Requesting the plot size from the network.", + "estimatingSpace": "Requesting the blockchain size from the network.", "plotsDirectory": "Plots Directory" }, "plottingProgress": { diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue index 0d86e89a..a1934b01 100644 --- a/src/pages/Dashboard.vue +++ b/src/pages/Dashboard.vue @@ -76,12 +76,12 @@ export default defineComponent({ async mounted() { const config = appConfig.getAppConfig() if (config) { - this.plot.plotSizeGB = config.segmentCache.allocatedGB + this.plot.plotSizeGB = config.plot.sizeGB if (this.client.isFirstLoad() === false) { await this.client.connectPublicApi() await this.client.waitNodeStartApiConnect(config.plot.location) - await this.client.startFarming(config.plot.location) + await this.client.startFarming(config.plot.location, config.plot.sizeGB) await this.client.startBlockSubscription() } @@ -120,10 +120,8 @@ export default defineComponent({ this.plot.state = "verifying" this.plot.message = lang.verifyingPlot - const networkSegmentCount = await this.client.getNetworkSegmentCount() - const totalSize = networkSegmentCount * 256 * util.PIECE_SIZE - const allocatedGB = Math.round((totalSize * 100) / util.GB) / 100 - this.plot.plotSizeGB = allocatedGB + const config = appConfig.getAppConfig() + if (config) this.plot.plotSizeGB = config.plot.sizeGB this.plot.message = lang.syncedMsg this.plot.state = "finished" diff --git a/src/pages/Index.vue b/src/pages/Index.vue index cb82ed0e..318673a7 100644 --- a/src/pages/Index.vue +++ b/src/pages/Index.vue @@ -78,10 +78,10 @@ export default defineComponent({ await this.client.connectPublicApi() const networkSegmentCount = await this.client.getNetworkSegmentCount() const totalSize = networkSegmentCount * 256 * util.PIECE_SIZE - const allocatedGB = Math.round((totalSize * 100) / util.GB) / 100 + const blockchainSizeGB = Math.round((totalSize * 100) / util.GB) / 100 appConfig.updateAppConfig(null, null, { networkSegmentCount, - allocatedGB: allocatedGB === 0 ? 0.1 : allocatedGB + blockchainSizeGB: blockchainSizeGB === 0 ? 0.1 : blockchainSizeGB }, null, null) } } diff --git a/src/pages/PlottingProgress.vue b/src/pages/PlottingProgress.vue index fa33e93a..fbd47956 100644 --- a/src/pages/PlottingProgress.vue +++ b/src/pages/PlottingProgress.vue @@ -201,8 +201,8 @@ export default defineComponent({ this.client.setFirstLoad() const config = appConfig.getAppConfig() if (config) { - this.plottingData.remainingGB = config.segmentCache.allocatedGB - this.plottingData.allocatedGB = config.segmentCache.allocatedGB + this.plottingData.remainingGB = config.plot.sizeGB + this.plottingData.allocatedGB = config.plot.sizeGB this.plotDirectory = config.plot.location } else { console.error("PLOT PROGRESS | ERROR | NO CONFIG LOADED") @@ -232,14 +232,15 @@ export default defineComponent({ clearInterval(farmerTimer) }, async farmingWrapper(): Promise { - await this.client.startBlockSubscription() - await this.client.startFarming(this.plotDirectory) + const config = appConfig.getAppConfig() if (config) { - const { networkSegmentCount, allocatedGB } = config.segmentCache + await this.client.startBlockSubscription() + await this.client.startFarming(this.plotDirectory, config.plot.sizeGB) + const networkSegmentCount = config.segmentCache.networkSegmentCount this.networkSegmentCount = networkSegmentCount - this.plottingData.allocatedGB = allocatedGB + this.plottingData.allocatedGB = config.plot.sizeGB this.localSegmentCount = await this.client.getLocalSegmentCount() do { await new Promise((resolve) => setTimeout(resolve, 2000)) diff --git a/src/pages/SetupPlot.vue b/src/pages/SetupPlot.vue index ac4fde22..bc2ead1d 100644 --- a/src/pages/SetupPlot.vue +++ b/src/pages/SetupPlot.vue @@ -59,17 +59,16 @@ q-page.q-pa-lg.q-mr-lg.q-ml-lg style="margin-left: 6px" color="black" size="12px" - v-if="allocatedGB === 0" + v-if="blockchainSizeGB === 0" ) q-input( color="blue" dense input-class="setupPlotInput" outlined - readonly suffix="GB" v-model="allocatedGB" - v-if="allocatedGB > 0" + v-if="blockchainSizeGB > 0" ) q-tooltip.q-pa-sm p {{ lang.allocatedSpace }} @@ -79,8 +78,8 @@ q-page.q-pa-lg.q-mr-lg.q-ml-lg input-class="setupPlotInput" outlined readonly - prefix="Estimating plot size ..." - v-if="allocatedGB === 0" + prefix="Estimating blockchain size ..." + v-if="blockchainSizeGB === 0" ) q-tooltip.q-pa-sm p {{ lang.estimatingSpace }} @@ -88,7 +87,7 @@ q-page.q-pa-lg.q-mr-lg.q-ml-lg .col.q-pr-md .row.justify-center( style="transform: scale(-1, 1)" - v-if="allocatedGB > 0" + v-if="blockchainSizeGB > 0" ) apexchart( :options="chartOptions" @@ -98,6 +97,21 @@ q-page.q-pa-lg.q-mr-lg.q-ml-lg ) .row.justify-center(v-else) q-spinner-pie(color="grey" size="120px" thickness="1") + .row.q-mt-md + .col-1 + .col + q-slider( + :max="getMaxPlotSize()" + :min="1" + :step="1" + color="blue" + markers + snap + style="height: 25px" + v-model="allocatedGB" + v-if="blockchainSizeGB > 0" + ) + .col-1 .row.justify-end.q-mt-sm.absolute-bottom.q-pb-md .col-auto.q-pr-md div {{ lang.hint }} @@ -139,7 +153,8 @@ export default defineComponent({ revealKey: false, userConfirm: false, plotDirectory: "/", - allocatedGB: 0, + allocatedGB: 1, + blockchainSizeGB: 0, validPath: true, defaultPath: "/", driveStats: { freeBytes: 0, totalBytes: 0 }, @@ -174,7 +189,7 @@ export default defineComponent({ } }, canContinue(): boolean { - return this.allocatedGB > 0 && this.validPath + return this.blockchainSizeGB > 0 && this.validPath }, unsafeFree(): boolean { return this.stats.freeGB < 20 @@ -207,9 +222,9 @@ export default defineComponent({ this.defaultPath = (await tauri.path.dataDir()) + util.dirName this.plotDirectory = this.defaultPath do { - this.allocatedGB = appConfig.getAppConfig()?.segmentCache.allocatedGB || 0 + this.blockchainSizeGB = appConfig.getAppConfig()?.segmentCache.blockchainSizeGB || 0 await new Promise((resolve) => setTimeout(resolve, 1000)) - } while (this.allocatedGB <= 0) + } while (this.blockchainSizeGB <= 0) }, async created() { this.$watch( @@ -230,6 +245,9 @@ export default defineComponent({ ) }, methods: { + getMaxPlotSize() { + return Math.min(this.stats.safeAvailableGB, this.blockchainSizeGB, 100) + }, async confirmCreateDir() { const dirExists = await native.dirExists(this.plotDirectory) @@ -260,7 +278,7 @@ export default defineComponent({ this.plotDirectory.slice(-1) await appData.createCustomDataDir(this.plotDirectory) - appConfig.updateAppConfig({ location: this.plotDirectory }, null, null, null, null) + appConfig.updateAppConfig({ location: this.plotDirectory, sizeGB: this.allocatedGB }, null, null, null, null) this.$router.replace({ name: "plottingProgress" }) }, async updateDriveStats() {