From ec86d1d11906ae7439d921d83a4f0110e711cacb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com> Date: Tue, 24 Aug 2021 17:25:32 +0200 Subject: [PATCH] Substrate Companion #9575 (#3695) * Upgrade to tokio 1.10 * update Substrate * Fmt Co-authored-by: parity-processbot <> --- polkadot/Cargo.lock | 412 ++++++++---------- .../test/polkadot-simnet/common/src/lib.rs | 4 +- polkadot/node/test/service/Cargo.toml | 2 +- .../test-parachains/adder/collator/Cargo.toml | 2 +- .../kusama/src/weights/pallet_vesting.rs | 17 +- .../polkadot/src/weights/pallet_vesting.rs | 17 +- .../westend/src/weights/pallet_vesting.rs | 18 +- polkadot/utils/staking-miner/Cargo.toml | 4 +- 8 files changed, 210 insertions(+), 266 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 72097416b0a..5b84808ad44 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -1917,7 +1917,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", ] @@ -1935,7 +1935,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -1954,7 +1954,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "Inflector", "chrono", @@ -1980,7 +1980,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -1993,7 +1993,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -2008,7 +2008,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "serde", @@ -2019,7 +2019,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "bitflags", "frame-metadata", @@ -2045,7 +2045,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2057,7 +2057,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2069,7 +2069,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "proc-macro2", "quote", @@ -2079,7 +2079,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-metadata", "frame-support", @@ -2100,7 +2100,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -2110,7 +2110,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "log", @@ -2126,7 +2126,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -2140,7 +2140,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "sp-api", @@ -2149,7 +2149,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "sp-api", @@ -2660,7 +2660,7 @@ dependencies = [ "itoa", "pin-project-lite 0.2.4", "socket2 0.4.0", - "tokio 1.10.0", + "tokio", "tower-service", "tracing", "want", @@ -2678,8 +2678,8 @@ dependencies = [ "log", "rustls", "rustls-native-certs", - "tokio 1.10.0", - "tokio-rustls 0.22.0", + "tokio", + "tokio-rustls", "webpki", ] @@ -3043,9 +3043,9 @@ dependencies = [ "jsonrpc-core", "lazy_static", "log", - "tokio 1.10.0", + "tokio", "tokio-stream", - "tokio-util 0.6.7", + "tokio-util", "unicase", ] @@ -3114,9 +3114,9 @@ dependencies = [ "serde_json", "soketto 0.6.0", "thiserror", - "tokio 0.2.21", - "tokio-rustls 0.15.0", - "tokio-util 0.3.1", + "tokio", + "tokio-rustls", + "tokio-util", "url 2.2.0", ] @@ -4161,17 +4161,6 @@ dependencies = [ "slab", ] -[[package]] -name = "mio-uds" -version = "0.6.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" -dependencies = [ - "iovec", - "libc", - "mio 0.6.22", -] - [[package]] name = "miow" version = "0.2.1" @@ -4548,7 +4537,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -4563,7 +4552,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -4577,7 +4566,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4600,7 +4589,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4655,7 +4644,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4733,7 +4722,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4749,7 +4738,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4764,7 +4753,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4787,7 +4776,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4804,7 +4793,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4818,7 +4807,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4840,7 +4829,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4855,7 +4844,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4874,7 +4863,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4890,7 +4879,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4905,7 +4894,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -4922,7 +4911,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -4938,7 +4927,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4955,7 +4944,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -4969,7 +4958,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -4982,7 +4971,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -4998,7 +4987,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5020,7 +5009,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -5034,7 +5023,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -5047,7 +5036,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -5062,7 +5051,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -5082,7 +5071,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -5098,7 +5087,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -5111,7 +5100,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5133,7 +5122,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -5144,7 +5133,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "log", "sp-arithmetic", @@ -5153,7 +5142,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -5166,7 +5155,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -5183,7 +5172,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -5198,7 +5187,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-support", "frame-system", @@ -5214,7 +5203,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5231,7 +5220,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5242,7 +5231,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -5258,7 +5247,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -5273,7 +5262,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-benchmarking", "frame-support", @@ -5366,7 +5355,7 @@ dependencies = [ "libc", "log", "rand 0.7.3", - "tokio 1.10.0", + "tokio", "winapi 0.3.9", ] @@ -7127,7 +7116,7 @@ dependencies = [ "substrate-test-client", "substrate-test-utils", "tempfile", - "tokio 0.2.21", + "tokio", "tracing", ] @@ -7798,7 +7787,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "env_logger 0.9.0", "jsonrpsee-proc-macros", @@ -8069,7 +8058,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "log", "sp-core", @@ -8080,7 +8069,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "derive_more", @@ -8107,7 +8096,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -8130,7 +8119,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8146,7 +8135,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8162,7 +8151,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8173,7 +8162,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "chrono", "fdlimit", @@ -8205,13 +8194,13 @@ dependencies = [ "structopt", "thiserror", "tiny-bip39", - "tokio 0.2.21", + "tokio", ] [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "fnv", "futures 0.3.16", @@ -8239,7 +8228,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "hash-db", "kvdb", @@ -8264,7 +8253,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "futures 0.3.16", @@ -8288,7 +8277,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "derive_more", @@ -8331,7 +8320,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "derive_more", "futures 0.3.16", @@ -8355,7 +8344,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8368,7 +8357,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "assert_matches", "async-trait", @@ -8402,7 +8391,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "futures 0.3.16", @@ -8428,7 +8417,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "sc-client-api", "sp-authorship", @@ -8439,7 +8428,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -8465,7 +8454,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "derive_more", "parity-scale-codec", @@ -8482,7 +8471,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "log", "parity-scale-codec", @@ -8498,7 +8487,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8517,7 +8506,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "derive_more", @@ -8554,7 +8543,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "derive_more", "finality-grandpa", @@ -8578,7 +8567,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "ansi_term 0.12.1", "futures 0.3.16", @@ -8595,7 +8584,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "derive_more", @@ -8610,7 +8599,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "hash-db", "parity-scale-codec", @@ -8628,7 +8617,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-std", "async-trait", @@ -8679,7 +8668,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -8695,7 +8684,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "bytes 1.0.1", "fnv", @@ -8722,7 +8711,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "libp2p", @@ -8735,7 +8724,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8744,7 +8733,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "hash-db", @@ -8775,7 +8764,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "derive_more", "futures 0.3.16", @@ -8800,7 +8789,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "jsonrpc-core", @@ -8816,7 +8805,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "directories", @@ -8880,7 +8869,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "log", "parity-scale-codec", @@ -8894,7 +8883,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8916,7 +8905,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "chrono", "futures 0.3.16", @@ -8934,7 +8923,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8965,7 +8954,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8976,7 +8965,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "intervalier", @@ -9003,7 +8992,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "derive_more", "futures 0.3.16", @@ -9437,7 +9426,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "hash-db", "log", @@ -9454,7 +9443,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -9466,7 +9455,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "serde", @@ -9478,7 +9467,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "integer-sqrt", "num-traits", @@ -9492,7 +9481,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "sp-api", @@ -9504,7 +9493,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "parity-scale-codec", @@ -9516,7 +9505,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "sp-api", @@ -9528,7 +9517,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "log", @@ -9546,7 +9535,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "futures 0.3.16", @@ -9565,7 +9554,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "merlin", @@ -9587,7 +9576,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9597,7 +9586,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9609,7 +9598,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "base58", "blake2-rfc", @@ -9653,7 +9642,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9662,7 +9651,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "proc-macro2", "quote", @@ -9672,7 +9661,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "environmental", "parity-scale-codec", @@ -9683,7 +9672,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "finality-grandpa", "log", @@ -9700,7 +9689,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9714,7 +9703,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "hash-db", @@ -9739,7 +9728,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "lazy_static", "sp-core", @@ -9750,7 +9739,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "derive_more", @@ -9767,7 +9756,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "ruzstd", "zstd", @@ -9776,7 +9765,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "serde", @@ -9789,7 +9778,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9800,7 +9789,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "sp-api", "sp-core", @@ -9810,7 +9799,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "backtrace", ] @@ -9818,7 +9807,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "rustc-hash", "serde", @@ -9828,7 +9817,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "either", "hash256-std-hasher", @@ -9849,7 +9838,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9866,7 +9855,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9878,7 +9867,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "serde", "serde_json", @@ -9887,7 +9876,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "sp-api", @@ -9900,7 +9889,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9910,7 +9899,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "hash-db", "log", @@ -9933,12 +9922,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9951,7 +9940,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "log", "sp-core", @@ -9964,7 +9953,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -9980,7 +9969,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "erased-serde", "log", @@ -9998,7 +9987,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "sp-api", "sp-runtime", @@ -10007,7 +9996,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "log", @@ -10022,7 +10011,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "hash-db", "memory-db", @@ -10036,7 +10025,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -10047,7 +10036,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10062,7 +10051,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10073,7 +10062,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10127,7 +10116,7 @@ dependencies = [ "structopt", "sub-tokens", "thiserror", - "tokio 0.2.21", + "tokio", "westend-runtime", ] @@ -10271,7 +10260,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "platforms", ] @@ -10279,7 +10268,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.16", @@ -10301,7 +10290,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-std", "derive_more", @@ -10309,13 +10298,13 @@ dependencies = [ "hyper", "log", "prometheus", - "tokio 1.10.0", + "tokio", ] [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "async-trait", "futures 0.3.16", @@ -10342,19 +10331,20 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "futures 0.3.16", "substrate-test-utils-derive", - "tokio 0.2.21", + "tokio", ] [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "proc-macro-crate 1.0.0", + "proc-macro2", "quote", "syn", ] @@ -10362,7 +10352,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -10492,7 +10482,7 @@ dependencies = [ "structopt", "substrate-test-utils", "test-parachain-adder", - "tokio 0.2.21", + "tokio", ] [[package]] @@ -10517,7 +10507,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "frame-system", "futures 0.3.16", @@ -10556,7 +10546,7 @@ dependencies = [ "sp-state-machine", "sp-transaction-pool", "sp-wasm-interface", - "tokio 0.2.21", + "tokio", ] [[package]] @@ -10677,27 +10667,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" -[[package]] -name = "tokio" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58" -dependencies = [ - "bytes 0.5.6", - "fnv", - "iovec", - "lazy_static", - "libc", - "mio 0.6.22", - "mio-uds", - "num_cpus", - "pin-project-lite 0.1.7", - "signal-hook-registry", - "slab", - "tokio-macros", - "winapi 0.3.9", -] - [[package]] name = "tokio" version = "1.10.0" @@ -10710,33 +10679,24 @@ dependencies = [ "memchr", "mio 0.7.13", "num_cpus", + "once_cell", "pin-project-lite 0.2.4", + "signal-hook-registry", + "tokio-macros", "winapi 0.3.9", ] [[package]] name = "tokio-macros" -version = "0.2.5" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0c3acc6aa564495a0f2e1d59fab677cd7f81a19994cfc7f3ad0e64301560389" +checksum = "54473be61f4ebe4efd09cec9bd5d16fa51d70ea0192213d754d2d500457db110" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "tokio-rustls" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03d15e5669243a45f630a5167d101b942174ca94b615445b2057eace1c818736" -dependencies = [ - "futures-core", - "rustls", - "tokio 0.2.21", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.22.0" @@ -10744,7 +10704,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ "rustls", - "tokio 1.10.0", + "tokio", "webpki", ] @@ -10756,22 +10716,7 @@ checksum = "7b2f3f698253f03119ac0102beaa64f67a67e08074d03a22d18784104543727f" dependencies = [ "futures-core", "pin-project-lite 0.2.4", - "tokio 1.10.0", -] - -[[package]] -name = "tokio-util" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" -dependencies = [ - "bytes 0.5.6", - "futures-core", - "futures-io", - "futures-sink", - "log", - "pin-project-lite 0.1.7", - "tokio 0.2.21", + "tokio", ] [[package]] @@ -10782,10 +10727,11 @@ checksum = "1caa0b0c8d94a049db56b5acf8cba99dc0623aab1b26d5b5f5e2d945846b3592" dependencies = [ "bytes 1.0.1", "futures-core", + "futures-io", "futures-sink", "log", "pin-project-lite 0.2.4", - "tokio 1.10.0", + "tokio", ] [[package]] @@ -10968,7 +10914,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#60c6ec78ef14bb7fdab50141c0071629c33c8415" +source = "git+https://github.com/paritytech/substrate?branch=master#b7a1a2cda5c860f18a7802051e881c5062828042" dependencies = [ "log", "parity-scale-codec", diff --git a/polkadot/node/test/polkadot-simnet/common/src/lib.rs b/polkadot/node/test/polkadot-simnet/common/src/lib.rs index a161dc71ed1..60e1f925bbd 100644 --- a/polkadot/node/test/polkadot-simnet/common/src/lib.rs +++ b/polkadot/node/test/polkadot-simnet/common/src/lib.rs @@ -359,7 +359,7 @@ where use sc_cli::{CliConfiguration, SubstrateCli}; use structopt::StructOpt; - let mut tokio_runtime = build_runtime()?; + let tokio_runtime = build_runtime()?; let task_executor = task_executor(tokio_runtime.handle().clone()); // parse cli args let cmd = <polkadot_cli::Cli as StructOpt>::from_args(); @@ -391,7 +391,7 @@ mod tests { #[test] fn test_runner() { - let mut runtime = build_runtime().unwrap(); + let runtime = build_runtime().unwrap(); let task_executor = task_executor(runtime.handle().clone()); let (rpc, task_manager, client, pool, command_sink, backend) = client_parts::<PolkadotChainInfo>(ConfigOrChainSpec::ChainSpec( diff --git a/polkadot/node/test/service/Cargo.toml b/polkadot/node/test/service/Cargo.toml index b81079e5d43..ee4e32b976b 100644 --- a/polkadot/node/test/service/Cargo.toml +++ b/polkadot/node/test/service/Cargo.toml @@ -59,4 +59,4 @@ substrate-test-client = { git = "https://github.com/paritytech/substrate", branc pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } serde_json = "1.0.66" substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" } -tokio = { version = "0.2", features = ["macros"] } +tokio = { version = "1.10", features = ["macros"] } diff --git a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml index 1d1605df9f3..e4d44a756cb 100644 --- a/polkadot/parachain/test-parachains/adder/collator/Cargo.toml +++ b/polkadot/parachain/test-parachains/adder/collator/Cargo.toml @@ -45,4 +45,4 @@ substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" } sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" } -tokio = { version = "0.2", features = ["macros"] } +tokio = { version = "1.10", features = ["macros"] } diff --git a/polkadot/runtime/kusama/src/weights/pallet_vesting.rs b/polkadot/runtime/kusama/src/weights/pallet_vesting.rs index 8f5ee20edc3..b363e63287e 100644 --- a/polkadot/runtime/kusama/src/weights/pallet_vesting.rs +++ b/polkadot/runtime/kusama/src/weights/pallet_vesting.rs @@ -42,24 +42,23 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_vesting`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { - fn vest_locked(l: u32, s: u32, ) -> Weight { + fn vest_locked(l: u32, s: u32) -> Weight { (93_789_000 as Weight) // Standard Error: 70_000 .saturating_add((41_000 as Weight).saturating_mul(l as Weight)) // Standard Error: 182_000 .saturating_add((211_000 as Weight).saturating_mul(s as Weight)) - .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_unlocked(_l: u32, s: u32, ) -> Weight { + fn vest_unlocked(_l: u32, s: u32) -> Weight { (90_737_000 as Weight) // Standard Error: 0 .saturating_add((263_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_other_locked(l: u32, s: u32, ) -> Weight { + fn vest_other_locked(l: u32, s: u32) -> Weight { (85_211_000 as Weight) // Standard Error: 17_000 .saturating_add((153_000 as Weight).saturating_mul(l as Weight)) @@ -68,7 +67,7 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vest_other_unlocked(l: u32, s: u32, ) -> Weight { + fn vest_other_unlocked(l: u32, s: u32) -> Weight { (90_368_000 as Weight) // Standard Error: 17_000 .saturating_add((31_000 as Weight).saturating_mul(l as Weight)) @@ -77,21 +76,21 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vested_transfer(l: u32, _s: u32, ) -> Weight { + fn vested_transfer(l: u32, _s: u32) -> Weight { (167_500_000 as Weight) // Standard Error: 194_000 .saturating_add((255_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn force_vested_transfer(l: u32, _s: u32, ) -> Weight { + fn force_vested_transfer(l: u32, _s: u32) -> Weight { (174_000_000 as Weight) // Standard Error: 70_000 .saturating_add((143_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn not_unlocking_merge_schedules(l: u32, s: u32) -> Weight { (101_778_000 as Weight) // Standard Error: 17_000 .saturating_add((194_000 as Weight).saturating_mul(l as Weight)) @@ -100,7 +99,7 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn unlocking_merge_schedules(l: u32, s: u32) -> Weight { (104_111_000 as Weight) // Standard Error: 88_000 .saturating_add((276_000 as Weight).saturating_mul(l as Weight)) diff --git a/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs b/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs index 67e71acb239..11b867f9882 100644 --- a/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs +++ b/polkadot/runtime/polkadot/src/weights/pallet_vesting.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_vesting`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { - fn vest_locked(l: u32, s: u32, ) -> Weight { + fn vest_locked(l: u32, s: u32) -> Weight { (93_789_000 as Weight) // Standard Error: 70_000 .saturating_add((41_000 as Weight).saturating_mul(l as Weight)) @@ -51,14 +51,14 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_unlocked(_l: u32, s: u32, ) -> Weight { + fn vest_unlocked(_l: u32, s: u32) -> Weight { (90_737_000 as Weight) // Standard Error: 0 .saturating_add((263_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_other_locked(l: u32, s: u32, ) -> Weight { + fn vest_other_locked(l: u32, s: u32) -> Weight { (85_211_000 as Weight) // Standard Error: 17_000 .saturating_add((153_000 as Weight).saturating_mul(l as Weight)) @@ -67,7 +67,7 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vest_other_unlocked(l: u32, s: u32, ) -> Weight { + fn vest_other_unlocked(l: u32, s: u32) -> Weight { (90_368_000 as Weight) // Standard Error: 17_000 .saturating_add((31_000 as Weight).saturating_mul(l as Weight)) @@ -76,21 +76,21 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vested_transfer(l: u32, _s: u32, ) -> Weight { + fn vested_transfer(l: u32, _s: u32) -> Weight { (167_500_000 as Weight) // Standard Error: 194_000 .saturating_add((255_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn force_vested_transfer(l: u32, _s: u32, ) -> Weight { + fn force_vested_transfer(l: u32, _s: u32) -> Weight { (174_000_000 as Weight) // Standard Error: 70_000 .saturating_add((143_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn not_unlocking_merge_schedules(l: u32, s: u32) -> Weight { (101_778_000 as Weight) // Standard Error: 17_000 .saturating_add((194_000 as Weight).saturating_mul(l as Weight)) @@ -99,7 +99,7 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn unlocking_merge_schedules(l: u32, s: u32) -> Weight { (104_111_000 as Weight) // Standard Error: 88_000 .saturating_add((276_000 as Weight).saturating_mul(l as Weight)) @@ -109,4 +109,3 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().writes(3 as Weight)) } } - diff --git a/polkadot/runtime/westend/src/weights/pallet_vesting.rs b/polkadot/runtime/westend/src/weights/pallet_vesting.rs index c2a2df68398..2afee054518 100644 --- a/polkadot/runtime/westend/src/weights/pallet_vesting.rs +++ b/polkadot/runtime/westend/src/weights/pallet_vesting.rs @@ -42,7 +42,7 @@ use sp_std::marker::PhantomData; /// Weight functions for `pallet_vesting`. pub struct WeightInfo<T>(PhantomData<T>); impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { - fn vest_locked(l: u32, s: u32, ) -> Weight { + fn vest_locked(l: u32, s: u32) -> Weight { (93_789_000 as Weight) // Standard Error: 70_000 .saturating_add((41_000 as Weight).saturating_mul(l as Weight)) @@ -51,14 +51,14 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_unlocked(_l: u32, s: u32, ) -> Weight { + fn vest_unlocked(_l: u32, s: u32) -> Weight { (90_737_000 as Weight) // Standard Error: 0 .saturating_add((263_000 as Weight).saturating_mul(s as Weight)) .saturating_add(T::DbWeight::get().reads(2 as Weight)) .saturating_add(T::DbWeight::get().writes(2 as Weight)) } - fn vest_other_locked(l: u32, s: u32, ) -> Weight { + fn vest_other_locked(l: u32, s: u32) -> Weight { (85_211_000 as Weight) // Standard Error: 17_000 .saturating_add((153_000 as Weight).saturating_mul(l as Weight)) @@ -67,7 +67,7 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vest_other_unlocked(l: u32, s: u32, ) -> Weight { + fn vest_other_unlocked(l: u32, s: u32) -> Weight { (90_368_000 as Weight) // Standard Error: 17_000 .saturating_add((31_000 as Weight).saturating_mul(l as Weight)) @@ -76,21 +76,21 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn vested_transfer(l: u32, _s: u32, ) -> Weight { + fn vested_transfer(l: u32, _s: u32) -> Weight { (167_500_000 as Weight) // Standard Error: 194_000 .saturating_add((255_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn force_vested_transfer(l: u32, _s: u32, ) -> Weight { + fn force_vested_transfer(l: u32, _s: u32) -> Weight { (174_000_000 as Weight) // Standard Error: 70_000 .saturating_add((143_000 as Weight).saturating_mul(l as Weight)) .saturating_add(T::DbWeight::get().reads(4 as Weight)) .saturating_add(T::DbWeight::get().writes(4 as Weight)) } - fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn not_unlocking_merge_schedules(l: u32, s: u32) -> Weight { (101_778_000 as Weight) // Standard Error: 17_000 .saturating_add((194_000 as Weight).saturating_mul(l as Weight)) @@ -99,7 +99,7 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } - fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight { + fn unlocking_merge_schedules(l: u32, s: u32) -> Weight { (104_111_000 as Weight) // Standard Error: 88_000 .saturating_add((276_000 as Weight).saturating_mul(l as Weight)) @@ -108,4 +108,4 @@ impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> { .saturating_add(T::DbWeight::get().reads(3 as Weight)) .saturating_add(T::DbWeight::get().writes(3 as Weight)) } -} \ No newline at end of file +} diff --git a/polkadot/utils/staking-miner/Cargo.toml b/polkadot/utils/staking-miner/Cargo.toml index 01910e547aa..ab5139c0c6a 100644 --- a/polkadot/utils/staking-miner/Cargo.toml +++ b/polkadot/utils/staking-miner/Cargo.toml @@ -6,11 +6,11 @@ edition = "2018" [dependencies] codec = { package = "parity-scale-codec", version = "2.0.0" } -tokio = { version = "0.2", features = ["macros"] } +tokio = { version = "1.10", features = ["macros"] } log = "0.4.11" env_logger = "0.9.0" structopt = "0.3.0" -jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = ["tokio02"] } +jsonrpsee-ws-client = { version = "0.3.0", default-features = false, features = ["tokio1"] } serde_json = "1.0" serde = "1.0.0" hex = "0.4.3" -- GitLab