From 5af2990cfd3711f86c7cb8606b22364208a5c32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Thu, 16 Sep 2021 06:57:29 +0200 Subject: [PATCH] Upgrade Substrate & Polkadot (#612) --- Cargo.lock | 538 ++++++++++------------ client/cli/src/lib.rs | 4 - client/network/tests/sync.rs | 14 +- client/pov-recovery/tests/pov_recovery.rs | 12 +- polkadot-parachains/src/command.rs | 59 ++- test/service/Cargo.toml | 2 +- test/service/src/lib.rs | 21 +- test/service/tests/integration.rs | 13 +- test/service/tests/runtime_upgrade.rs | 12 +- 9 files changed, 309 insertions(+), 366 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fdb14c32edd..bdfa7479d73 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -470,7 +470,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f83d5ef819c66d1efe7b4a34ba1a532ee91a57de" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#c152c45ac331eb8ab40d956ab1d008d181810ef4" dependencies = [ "beefy-primitives", "fnv", @@ -500,7 +500,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f83d5ef819c66d1efe7b4a34ba1a532ee91a57de" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#c152c45ac331eb8ab40d956ab1d008d181810ef4" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -521,12 +521,12 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f83d5ef819c66d1efe7b4a34ba1a532ee91a57de" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#c152c45ac331eb8ab40d956ab1d008d181810ef4" [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f83d5ef819c66d1efe7b4a34ba1a532ee91a57de" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#c152c45ac331eb8ab40d956ab1d008d181810ef4" dependencies = [ "parity-scale-codec", "sp-api", @@ -716,7 +716,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "finality-grandpa", "frame-support", @@ -731,7 +731,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-runtime", "frame-support", @@ -742,7 +742,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "bp-runtime", @@ -757,7 +757,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-messages", "bp-runtime", @@ -774,7 +774,7 @@ dependencies = [ [[package]] name = "bp-rialto" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-messages", "bp-runtime", @@ -789,7 +789,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -806,7 +806,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "frame-support", "hash-db", @@ -823,7 +823,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -838,7 +838,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -853,7 +853,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -2442,7 +2442,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", ] @@ -2460,7 +2460,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -2479,7 +2479,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "Inflector", "chrono", @@ -2505,7 +2505,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -2518,7 +2518,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -2533,7 +2533,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "serde", @@ -2544,7 +2544,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "bitflags", "frame-metadata", @@ -2570,7 +2570,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2582,7 +2582,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2594,7 +2594,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "proc-macro2", "quote", @@ -2604,7 +2604,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "log", @@ -2620,7 +2620,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -2634,7 +2634,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "sp-api", @@ -2643,7 +2643,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "sp-api", @@ -2685,12 +2685,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "fuchsia-zircon" version = "0.3.3" @@ -3633,7 +3627,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -4544,7 +4538,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "derive_more", "futures 0.3.17", @@ -4788,11 +4782,11 @@ dependencies = [ [[package]] name = "names" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef320dab323286b50fb5cdda23f61c796a72a89998ab565ca32525c5c556f2da" +checksum = "10a8690bf09abf659851e58cd666c3d37ac6af07c2bd7a9e332cfba471715775" dependencies = [ - "rand 0.3.23", + "rand 0.8.4", ] [[package]] @@ -4832,7 +4826,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-system", "parity-scale-codec", @@ -5011,7 +5005,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5024,7 +5018,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5039,7 +5033,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5054,7 +5048,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5068,7 +5062,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5091,7 +5085,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5105,7 +5099,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f83d5ef819c66d1efe7b4a34ba1a532ee91a57de" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#c152c45ac331eb8ab40d956ab1d008d181810ef4" dependencies = [ "beefy-primitives", "frame-support", @@ -5121,7 +5115,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#f83d5ef819c66d1efe7b4a34ba1a532ee91a57de" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#c152c45ac331eb8ab40d956ab1d008d181810ef4" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -5146,7 +5140,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5160,7 +5154,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5176,7 +5170,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5197,7 +5191,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "bp-message-dispatch", @@ -5242,7 +5236,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5258,7 +5252,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5273,7 +5267,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5296,7 +5290,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5313,7 +5307,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5327,7 +5321,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5349,7 +5343,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5364,7 +5358,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5383,7 +5377,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5399,7 +5393,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5415,7 +5409,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5432,7 +5426,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5448,7 +5442,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5465,7 +5459,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5479,7 +5473,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5492,7 +5486,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5508,7 +5502,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5530,7 +5524,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5544,7 +5538,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5557,7 +5551,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5570,7 +5564,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5585,7 +5579,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5605,7 +5599,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5621,7 +5615,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5634,7 +5628,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5656,7 +5650,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -5667,7 +5661,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "log", "sp-arithmetic", @@ -5676,7 +5670,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5689,7 +5683,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5706,14 +5700,17 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", "frame-system", + "log", "pallet-treasury", "parity-scale-codec", "serde", + "sp-core", + "sp-io", "sp-runtime", "sp-std", ] @@ -5721,7 +5718,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-support", "frame-system", @@ -5737,7 +5734,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5754,7 +5751,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5765,7 +5762,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5781,7 +5778,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5794,7 +5791,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5809,7 +5806,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-benchmarking", "frame-support", @@ -5823,7 +5820,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "frame-support", "frame-system", @@ -6240,7 +6237,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "polkadot-node-network-protocol", @@ -6254,7 +6251,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "polkadot-node-network-protocol", @@ -6267,7 +6264,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "derive_more", "futures 0.3.17", @@ -6289,7 +6286,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "lru", @@ -6309,7 +6306,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "frame-benchmarking-cli", "futures 0.3.17", @@ -6329,7 +6326,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6427,7 +6424,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "always-assert", "derive_more", @@ -6448,7 +6445,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6460,7 +6457,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "derive_more", "futures 0.3.17", @@ -6482,7 +6479,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6496,7 +6493,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "polkadot-node-network-protocol", @@ -6514,7 +6511,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-trait", "futures 0.3.17", @@ -6533,7 +6530,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "parity-scale-codec", @@ -6551,7 +6548,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "derive_more", @@ -6579,7 +6576,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "futures 0.3.17", @@ -6599,7 +6596,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "futures 0.3.17", @@ -6617,7 +6614,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "polkadot-node-subsystem", @@ -6632,7 +6629,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-trait", "futures 0.3.17", @@ -6650,7 +6647,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "polkadot-node-subsystem", @@ -6665,7 +6662,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -6682,7 +6679,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "derive_more", @@ -6701,7 +6698,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-participation" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "polkadot-node-primitives", @@ -6714,7 +6711,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-trait", "futures 0.3.17", @@ -6731,7 +6728,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "futures 0.3.17", @@ -6746,7 +6743,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "always-assert", "assert_matches", @@ -6777,7 +6774,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "memory-lru", @@ -6795,7 +6792,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-std", "lazy_static", @@ -6813,7 +6810,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -6825,7 +6822,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-trait", "derive_more", @@ -6843,7 +6840,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bounded-vec", "futures 0.3.17", @@ -6865,7 +6862,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -6875,7 +6872,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-trait", "futures 0.3.17", @@ -6893,7 +6890,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "derive_more", "futures 0.3.17", @@ -6912,7 +6909,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-trait", "derive_more", @@ -6939,7 +6936,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -6960,7 +6957,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-all-subsystems-gen" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "proc-macro2", "quote", @@ -6970,7 +6967,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-trait", "futures 0.3.17", @@ -6987,7 +6984,7 @@ dependencies = [ [[package]] name = "polkadot-overseer-gen-proc-macro" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -6998,7 +6995,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "derive_more", "frame-support", @@ -7014,7 +7011,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "frame-system", @@ -7043,7 +7040,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7074,7 +7071,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -7149,10 +7146,11 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitvec 0.20.1", "frame-benchmarking", + "frame-election-provider-support", "frame-support", "frame-system", "impl-trait-for-tuples", @@ -7192,7 +7190,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "bitflags", "bitvec 0.20.1", @@ -7230,7 +7228,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "async-trait", "beefy-gadget", @@ -7327,7 +7325,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "arrayvec 0.5.2", "derive_more", @@ -7348,7 +7346,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7358,7 +7356,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -7383,7 +7381,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -7443,7 +7441,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "frame-benchmarking", "frame-system", @@ -7489,6 +7487,7 @@ dependencies = [ "sp-state-machine", "substrate-test-client", "tempfile", + "tokio", "tracing", ] @@ -7792,29 +7791,6 @@ version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" -[[package]] -name = "rand" -version = "0.3.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" -dependencies = [ - "libc", - "rand 0.4.6", -] - -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi 0.3.9", -] - [[package]] name = "rand" version = "0.7.3" @@ -7861,21 +7837,6 @@ dependencies = [ "rand_core 0.6.1", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -7962,15 +7923,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.1.57" @@ -8084,7 +8036,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "env_logger 0.9.0", "jsonrpsee-proc-macros", @@ -8211,7 +8163,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "beefy-primitives", "bp-messages", @@ -8396,7 +8348,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "log", "sp-core", @@ -8407,7 +8359,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "derive_more", @@ -8434,7 +8386,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -8457,7 +8409,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8473,7 +8425,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8489,7 +8441,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8500,7 +8452,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "chrono", "fdlimit", @@ -8538,7 +8490,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "fnv", "futures 0.3.17", @@ -8566,7 +8518,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "hash-db", "kvdb", @@ -8591,7 +8543,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "futures 0.3.17", @@ -8615,7 +8567,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "derive_more", @@ -8644,7 +8596,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "derive_more", @@ -8687,7 +8639,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "derive_more", "futures 0.3.17", @@ -8711,7 +8663,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8724,7 +8676,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "futures 0.3.17", @@ -8750,7 +8702,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "sc-client-api", "sp-authorship", @@ -8761,7 +8713,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -8787,7 +8739,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "derive_more", "environmental", @@ -8805,7 +8757,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "log", "parity-scale-codec", @@ -8821,7 +8773,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8840,7 +8792,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "derive_more", @@ -8877,7 +8829,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "derive_more", "finality-grandpa", @@ -8901,7 +8853,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "ansi_term 0.12.1", "futures 0.3.17", @@ -8918,7 +8870,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "derive_more", @@ -8933,7 +8885,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "hash-db", "parity-scale-codec", @@ -8951,7 +8903,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-std", "async-trait", @@ -9002,7 +8954,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9018,7 +8970,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "bytes 1.0.1", "fnv", @@ -9045,7 +8997,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "libp2p", @@ -9058,7 +9010,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9067,7 +9019,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "hash-db", @@ -9098,7 +9050,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -9123,7 +9075,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "jsonrpc-core", @@ -9134,12 +9086,13 @@ dependencies = [ "log", "serde_json", "substrate-prometheus-endpoint", + "tokio", ] [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "directories", @@ -9196,6 +9149,7 @@ dependencies = [ "substrate-prometheus-endpoint", "tempfile", "thiserror", + "tokio", "tracing", "tracing-futures", ] @@ -9203,7 +9157,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "log", "parity-scale-codec", @@ -9217,7 +9171,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9239,7 +9193,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "chrono", "futures 0.3.17", @@ -9257,7 +9211,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9286,7 +9240,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9297,7 +9251,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "intervalier", @@ -9324,7 +9278,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "derive_more", "futures 0.3.17", @@ -9338,7 +9292,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "futures-timer 3.0.2", @@ -9693,7 +9647,7 @@ dependencies = [ [[package]] name = "slot-range-helper" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "enumn", "parity-scale-codec", @@ -9796,7 +9750,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "hash-db", "log", @@ -9813,7 +9767,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -9825,7 +9779,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "serde", @@ -9837,7 +9791,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "integer-sqrt", "num-traits", @@ -9851,7 +9805,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "sp-api", @@ -9863,7 +9817,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "parity-scale-codec", @@ -9875,7 +9829,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "sp-api", @@ -9887,7 +9841,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "log", @@ -9905,7 +9859,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "futures 0.3.17", @@ -9924,7 +9878,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "parity-scale-codec", @@ -9941,7 +9895,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "merlin", @@ -9963,7 +9917,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9973,7 +9927,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9985,7 +9939,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "base58", "blake2-rfc", @@ -10029,7 +9983,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -10038,7 +9992,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "proc-macro2", "quote", @@ -10048,7 +10002,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "environmental", "parity-scale-codec", @@ -10059,7 +10013,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "finality-grandpa", "log", @@ -10076,7 +10030,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10090,7 +10044,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "hash-db", @@ -10115,7 +10069,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "lazy_static", "sp-core", @@ -10126,7 +10080,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "derive_more", @@ -10143,7 +10097,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "zstd", ] @@ -10151,7 +10105,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "serde", @@ -10165,7 +10119,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -10176,7 +10130,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "sp-api", "sp-core", @@ -10186,7 +10140,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "backtrace", ] @@ -10194,7 +10148,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "rustc-hash", "serde", @@ -10204,7 +10158,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "either", "hash256-std-hasher", @@ -10225,7 +10179,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10242,7 +10196,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -10254,7 +10208,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "serde", "serde_json", @@ -10263,7 +10217,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "sp-api", @@ -10276,7 +10230,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10286,7 +10240,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "hash-db", "log", @@ -10309,12 +10263,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10327,7 +10281,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "log", "sp-core", @@ -10340,7 +10294,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10356,7 +10310,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "erased-serde", "log", @@ -10374,7 +10328,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "sp-api", "sp-runtime", @@ -10383,7 +10337,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "log", @@ -10398,7 +10352,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "hash-db", "memory-db", @@ -10412,7 +10366,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10427,7 +10381,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10438,7 +10392,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10718,7 +10672,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "platforms", ] @@ -10726,7 +10680,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.17", @@ -10748,7 +10702,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-std", "derive_more", @@ -10762,7 +10716,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "async-trait", "futures 0.3.17", @@ -10789,7 +10743,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "futures 0.3.17", "substrate-test-utils-derive", @@ -10799,7 +10753,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -10810,7 +10764,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -11263,7 +11217,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#63b32fbaa2764c0a8ee76b70cdfa0fcb59b7181f" +source = "git+https://github.com/paritytech/substrate?branch=master#630422d6108cbaaca893ab213dde69f3bdaa1f6b" dependencies = [ "log", "parity-scale-codec", @@ -11287,7 +11241,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" dependencies = [ "cfg-if 0.1.10", - "rand 0.3.23", + "rand 0.7.3", "static_assertions", ] @@ -11868,7 +11822,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "beefy-primitives", "bitvec 0.20.1", @@ -12108,7 +12062,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -12120,7 +12074,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "frame-support", "frame-system", @@ -12139,7 +12093,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.9" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -12156,7 +12110,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#7229ab87acf5bc5d4d10655ad1a9819a1e317442" +source = "git+https://github.com/paritytech/polkadot?branch=master#77e92caaa276b956d3f1e4c658e745f2fce55ad0" dependencies = [ "proc-macro2", "quote", diff --git a/client/cli/src/lib.rs b/client/cli/src/lib.rs index e06183625dd..1af93c36aa7 100644 --- a/client/cli/src/lib.rs +++ b/client/cli/src/lib.rs @@ -217,10 +217,6 @@ impl sc_cli::CliConfiguration for NormalizedRunCmd { self.base.rpc_ws_max_connections() } - fn rpc_http_threads(&self) -> sc_cli::Result> { - self.base.rpc_http_threads() - } - fn rpc_cors(&self, is_dev: bool) -> sc_cli::Result>> { self.base.rpc_cors(is_dev) } diff --git a/client/network/tests/sync.rs b/client/network/tests/sync.rs index 6d9bef3a2b0..56f5bc3a72e 100644 --- a/client/network/tests/sync.rs +++ b/client/network/tests/sync.rs @@ -17,23 +17,23 @@ use cumulus_primitives_core::ParaId; use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*}; use futures::join; -use sc_service::TaskExecutor; #[substrate_test_utils::test] #[ignore] -async fn sync_blocks_from_tip_without_being_connected_to_a_collator(task_executor: TaskExecutor) { +async fn sync_blocks_from_tip_without_being_connected_to_a_collator() { let mut builder = sc_cli::LoggerBuilder::new(""); builder.with_colors(false); let _ = builder.init(); let para_id = ParaId::from(100); + let tokio_handle = tokio::runtime::Handle::current(); // start alice - let alice = run_relay_chain_validator_node(task_executor.clone(), Alice, || {}, vec![]); + let alice = run_relay_chain_validator_node(tokio_handle.clone(), Alice, || {}, vec![]); // start bob let bob = - run_relay_chain_validator_node(task_executor.clone(), Bob, || {}, vec![alice.addr.clone()]); + run_relay_chain_validator_node(tokio_handle.clone(), Bob, || {}, vec![alice.addr.clone()]); // register parachain alice @@ -49,21 +49,21 @@ async fn sync_blocks_from_tip_without_being_connected_to_a_collator(task_executo // run charlie as parachain collator let charlie = - cumulus_test_service::TestNodeBuilder::new(para_id, task_executor.clone(), Charlie) + cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Charlie) .enable_collator() .connect_to_relay_chain_nodes(vec![&alice, &bob]) .build() .await; // run dave as parachain full node - let dave = cumulus_test_service::TestNodeBuilder::new(para_id, task_executor.clone(), Dave) + let dave = cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Dave) .connect_to_parachain_node(&charlie) .connect_to_relay_chain_nodes(vec![&alice, &bob]) .build() .await; // run eve as parachain full node that is only connected to dave - let eve = cumulus_test_service::TestNodeBuilder::new(para_id, task_executor.clone(), Eve) + let eve = cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle, Eve) .connect_to_parachain_node(&dave) .exclusively_connect_to_registered_parachain_nodes() .connect_to_relay_chain_nodes(vec![&alice, &bob]) diff --git a/client/pov-recovery/tests/pov_recovery.rs b/client/pov-recovery/tests/pov_recovery.rs index e1896285b28..bbad4b2416f 100644 --- a/client/pov-recovery/tests/pov_recovery.rs +++ b/client/pov-recovery/tests/pov_recovery.rs @@ -17,7 +17,6 @@ use cumulus_primitives_core::ParaId; use cumulus_test_service::{initial_head_data, Keyring::*}; use futures::join; -use sc_service::TaskExecutor; use std::sync::Arc; /// Tests the PoV recovery. @@ -27,16 +26,17 @@ use std::sync::Arc; /// recover the block, import it and share it with the other nodes of the parachain network. #[substrate_test_utils::test] #[ignore] -async fn pov_recovery(task_executor: TaskExecutor) { +async fn pov_recovery() { let mut builder = sc_cli::LoggerBuilder::new(""); builder.with_colors(false); let _ = builder.init(); let para_id = ParaId::from(100); + let tokio_handle = tokio::runtime::Handle::current(); // Start alice let alice = cumulus_test_service::run_relay_chain_validator_node( - task_executor.clone(), + tokio_handle.clone(), Alice, || {}, vec![], @@ -44,7 +44,7 @@ async fn pov_recovery(task_executor: TaskExecutor) { // Start bob let bob = cumulus_test_service::run_relay_chain_validator_node( - task_executor.clone(), + tokio_handle.clone(), Bob, || {}, vec![alice.addr.clone()], @@ -64,7 +64,7 @@ async fn pov_recovery(task_executor: TaskExecutor) { // Run charlie as parachain collator let charlie = - cumulus_test_service::TestNodeBuilder::new(para_id, task_executor.clone(), Charlie) + cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Charlie) .enable_collator() .connect_to_relay_chain_nodes(vec![&alice, &bob]) .wrap_announce_block(|_| { @@ -77,7 +77,7 @@ async fn pov_recovery(task_executor: TaskExecutor) { // Run dave as parachain full node // // It will need to recover the pov blocks through availability recovery. - let dave = cumulus_test_service::TestNodeBuilder::new(para_id, task_executor, Dave) + let dave = cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle, Dave) .enable_collator() .use_null_consensus() .connect_to_parachain_node(&charlie) diff --git a/polkadot-parachains/src/command.rs b/polkadot-parachains/src/command.rs index d0aec70a083..7ac61fafbf6 100644 --- a/polkadot-parachains/src/command.rs +++ b/polkadot-parachains/src/command.rs @@ -18,8 +18,8 @@ use crate::{ chain_spec, cli::{Cli, RelayChainCli, Subcommand}, service::{ - StatemineRuntimeExecutor, StatemintRuntimeExecutor, WestmintRuntimeExecutor, new_partial, - RococoParachainRuntimeExecutor, ShellRuntimeExecutor, Block, + new_partial, Block, RococoParachainRuntimeExecutor, ShellRuntimeExecutor, + StatemineRuntimeExecutor, StatemintRuntimeExecutor, WestmintRuntimeExecutor, }, }; use codec::Encode; @@ -327,7 +327,7 @@ pub fn run() -> Result<()> { let polkadot_config = SubstrateCli::create_configuration( &polkadot_cli, &polkadot_cli, - config.task_executor.clone(), + config.tokio_handle.clone(), ) .map_err(|err| format!("Relay chain argument error: {}", err))?; @@ -423,9 +423,9 @@ pub fn run() -> Result<()> { generate_genesis_block(&config.chain_spec).map_err(|e| format!("{:?}", e))?; let genesis_state = format!("0x{:?}", HexDisplay::from(&block.header().encode())); - let task_executor = config.task_executor.clone(); + let tokio_handle = config.tokio_handle.clone(); let polkadot_config = - SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, task_executor) + SubstrateCli::create_configuration(&polkadot_cli, &polkadot_cli, tokio_handle) .map_err(|err| format!("Relay chain argument error: {}", err))?; info!("Parachain id: {:?}", id); @@ -441,32 +441,29 @@ pub fn run() -> Result<()> { ); if config.chain_spec.is_statemint() { - crate::service::start_statemint_node::( - config, - polkadot_config, - id, - ) - .await - .map(|r| r.0) - .map_err(Into::into) + crate::service::start_statemint_node::< + statemint_runtime::RuntimeApi, + StatemintRuntimeExecutor, + >(config, polkadot_config, id) + .await + .map(|r| r.0) + .map_err(Into::into) } else if config.chain_spec.is_statemine() { - crate::service::start_statemint_node::( - config, - polkadot_config, - id, - ) - .await - .map(|r| r.0) - .map_err(Into::into) + crate::service::start_statemint_node::< + statemine_runtime::RuntimeApi, + StatemineRuntimeExecutor, + >(config, polkadot_config, id) + .await + .map(|r| r.0) + .map_err(Into::into) } else if config.chain_spec.is_westmint() { - crate::service::start_statemint_node::( - config, - polkadot_config, - id, - ) - .await - .map(|r| r.0) - .map_err(Into::into) + crate::service::start_statemint_node::< + westmint_runtime::RuntimeApi, + WestmintRuntimeExecutor, + >(config, polkadot_config, id) + .await + .map(|r| r.0) + .map_err(Into::into) } else if config.chain_spec.is_shell() { crate::service::start_shell_node(config, polkadot_config, id) .await @@ -575,10 +572,6 @@ impl CliConfiguration for RelayChainCli { self.base.base.rpc_ws_max_connections() } - fn rpc_http_threads(&self) -> Result> { - self.base.base.rpc_http_threads() - } - fn rpc_cors(&self, is_dev: bool) -> Result>> { self.base.base.rpc_cors(is_dev) } diff --git a/test/service/Cargo.toml b/test/service/Cargo.toml index 5e3205a72ad..613ea506d09 100644 --- a/test/service/Cargo.toml +++ b/test/service/Cargo.toml @@ -9,6 +9,7 @@ codec = { package = "parity-scale-codec", version = "2.0.0" } rand = "0.7.3" serde = { version = "1.0.101", features = ["derive"] } async-trait = "0.1.42" +tokio = { version = "1.10", features = ["macros"] } # Substrate frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -53,7 +54,6 @@ jsonrpc-core = "18.0.0" [dev-dependencies] futures = "0.3.5" -tokio = { version = "1.10", features = ["macros"] } # Polkadot dependencies polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs index 570f29ee27c..db93bf1f7c4 100644 --- a/test/service/src/lib.rs +++ b/test/service/src/lib.rs @@ -38,7 +38,7 @@ use sc_service::{ OffchainWorkerConfig, PruningMode, TransactionStorageMode, WasmExecutionMethod, }, BasePath, ChainSpec, Configuration, Error as ServiceError, PartialComponents, Role, - RpcHandlers, TFullBackend, TFullClient, TaskExecutor, TaskManager, + RpcHandlers, TFullBackend, TFullClient, TaskManager, }; use sp_arithmetic::traits::SaturatedConversion; use sp_blockchain::HeaderBackend; @@ -375,7 +375,7 @@ enum Consensus { /// A builder to create a [`TestNode`]. pub struct TestNodeBuilder { para_id: ParaId, - task_executor: TaskExecutor, + tokio_handle: tokio::runtime::Handle, key: Sr25519Keyring, collator_key: Option, parachain_nodes: Vec, @@ -393,11 +393,11 @@ impl TestNodeBuilder { /// `para_id` - The parachain id this node is running for. /// `task_executor` - The task executor to use. /// `key` - The key that will be used to generate the name and that will be passed as `dev_seed`. - pub fn new(para_id: ParaId, task_executor: TaskExecutor, key: Sr25519Keyring) -> Self { + pub fn new(para_id: ParaId, tokio_handle: tokio::runtime::Handle, key: Sr25519Keyring) -> Self { TestNodeBuilder { key, para_id, - task_executor, + tokio_handle, collator_key: None, parachain_nodes: Vec::new(), parachain_nodes_exclusive: false, @@ -503,7 +503,7 @@ impl TestNodeBuilder { let parachain_config = node_config( self.storage_update_func_parachain .unwrap_or_else(|| Box::new(|| ())), - self.task_executor.clone(), + self.tokio_handle.clone(), self.key.clone(), self.parachain_nodes, self.parachain_nodes_exclusive, @@ -514,7 +514,7 @@ impl TestNodeBuilder { let mut relay_chain_config = polkadot_test_service::node_config( self.storage_update_func_relay_chain .unwrap_or_else(|| Box::new(|| ())), - self.task_executor, + self.tokio_handle, self.key, self.relay_chain_nodes, false, @@ -557,7 +557,7 @@ impl TestNodeBuilder { /// adjustments to the runtime genesis. pub fn node_config( storage_update_func: impl Fn(), - task_executor: TaskExecutor, + tokio_handle: tokio::runtime::Handle, key: Sr25519Keyring, nodes: Vec, nodes_exlusive: bool, @@ -609,7 +609,7 @@ pub fn node_config( impl_name: "cumulus-test-node".to_string(), impl_version: "0.1".to_string(), role, - task_executor, + tokio_handle, transaction_pool: Default::default(), network: network_config, keystore: KeystoreConfig::InMemory, @@ -637,7 +637,6 @@ pub fn node_config( rpc_ws: None, rpc_ipc: None, rpc_ws_max_connections: None, - rpc_http_threads: None, rpc_cors: None, rpc_methods: Default::default(), rpc_max_payload: None, @@ -747,13 +746,13 @@ pub fn construct_extrinsic( /// This is essentially a wrapper around /// [`run_validator_node`](polkadot_test_service::run_validator_node). pub fn run_relay_chain_validator_node( - task_executor: TaskExecutor, + tokio_handle: tokio::runtime::Handle, key: Sr25519Keyring, storage_update_func: impl Fn(), boot_nodes: Vec, ) -> polkadot_test_service::PolkadotTestNode { polkadot_test_service::run_validator_node( - task_executor, + tokio_handle, key, storage_update_func, boot_nodes, diff --git a/test/service/tests/integration.rs b/test/service/tests/integration.rs index f826346d932..e78405473d4 100644 --- a/test/service/tests/integration.rs +++ b/test/service/tests/integration.rs @@ -17,23 +17,24 @@ use cumulus_primitives_core::ParaId; use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*}; use futures::join; -use sc_service::TaskExecutor; #[substrate_test_utils::test] #[ignore] -async fn test_collating_and_non_collator_mode_catching_up(task_executor: TaskExecutor) { +async fn test_collating_and_non_collator_mode_catching_up() { let mut builder = sc_cli::LoggerBuilder::new(""); builder.with_colors(false); let _ = builder.init(); let para_id = ParaId::from(100); + let tokio_handle = tokio::runtime::Handle::current(); + // start alice - let alice = run_relay_chain_validator_node(task_executor.clone(), Alice, || {}, vec![]); + let alice = run_relay_chain_validator_node(tokio_handle.clone(), Alice, || {}, vec![]); // start bob let bob = - run_relay_chain_validator_node(task_executor.clone(), Bob, || {}, vec![alice.addr.clone()]); + run_relay_chain_validator_node(tokio_handle.clone(), Bob, || {}, vec![alice.addr.clone()]); // register parachain alice @@ -49,7 +50,7 @@ async fn test_collating_and_non_collator_mode_catching_up(task_executor: TaskExe // run cumulus charlie (a parachain collator) let charlie = - cumulus_test_service::TestNodeBuilder::new(para_id, task_executor.clone(), Charlie) + cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Charlie) .enable_collator() .connect_to_relay_chain_nodes(vec![&alice, &bob]) .build() @@ -57,7 +58,7 @@ async fn test_collating_and_non_collator_mode_catching_up(task_executor: TaskExe charlie.wait_for_blocks(5).await; // run cumulus dave (a parachain full node) and wait for it to sync some blocks - let dave = cumulus_test_service::TestNodeBuilder::new(para_id, task_executor.clone(), Dave) + let dave = cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle, Dave) .connect_to_parachain_node(&charlie) .connect_to_relay_chain_nodes(vec![&alice, &bob]) .build() diff --git a/test/service/tests/runtime_upgrade.rs b/test/service/tests/runtime_upgrade.rs index 230872038e5..79341175a2a 100644 --- a/test/service/tests/runtime_upgrade.rs +++ b/test/service/tests/runtime_upgrade.rs @@ -17,25 +17,25 @@ use cumulus_primitives_core::ParaId; use cumulus_test_service::{initial_head_data, run_relay_chain_validator_node, Keyring::*}; use futures::{join, StreamExt}; -use sc_service::TaskExecutor; use sp_runtime::generic::BlockId; use sc_client_api::BlockchainEvents; #[substrate_test_utils::test] #[ignore] -async fn test_runtime_upgrade(task_executor: TaskExecutor) { +async fn test_runtime_upgrade() { let mut builder = sc_cli::LoggerBuilder::new("runtime=debug"); builder.with_colors(false); let _ = builder.init(); let para_id = ParaId::from(100); + let tokio_handle = tokio::runtime::Handle::current(); // start alice - let alice = run_relay_chain_validator_node(task_executor.clone(), Alice, || {}, vec![]); + let alice = run_relay_chain_validator_node(tokio_handle.clone(), Alice, || {}, vec![]); // start bob let bob = - run_relay_chain_validator_node(task_executor.clone(), Bob, || {}, vec![alice.addr.clone()]); + run_relay_chain_validator_node(tokio_handle.clone(), Bob, || {}, vec![alice.addr.clone()]); // register parachain alice @@ -51,14 +51,14 @@ async fn test_runtime_upgrade(task_executor: TaskExecutor) { // run cumulus charlie (a parachain collator) let charlie = - cumulus_test_service::TestNodeBuilder::new(para_id, task_executor.clone(), Charlie) + cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle.clone(), Charlie) .enable_collator() .connect_to_relay_chain_nodes(vec![&alice, &bob]) .build() .await; // run cumulus dave (a parachain full node) - let dave = cumulus_test_service::TestNodeBuilder::new(para_id, task_executor.clone(), Dave) + let dave = cumulus_test_service::TestNodeBuilder::new(para_id, tokio_handle, Dave) .connect_to_parachain_node(&charlie) .connect_to_relay_chain_nodes(vec![&alice, &bob]) .build()