From 616667f14a165951d56d574c6ea77b22dd4ed5ec Mon Sep 17 00:00:00 2001 From: Ashley Date: Wed, 18 Aug 2021 15:26:30 +0200 Subject: [PATCH] Companion PR for 'Make choosing an executor an explicit part of service construction' (#9525) (#3615) * Companion PR * Update a few files * Run cargo fmt * Do better at renaming things * More renamings * More fixes * oops * Fix simnet problems * fix compilation * Update substrate Co-authored-by: thiolliere --- Cargo.lock | 306 ++++++++++---------- bridges/bin/millau/node/src/service.rs | 8 +- bridges/bin/rialto/node/src/service.rs | 8 +- cli/src/command.rs | 18 +- node/client/src/lib.rs | 28 +- node/service/src/lib.rs | 116 +++++--- node/test/client/src/lib.rs | 5 +- node/test/polkadot-simnet/common/src/lib.rs | 15 +- node/test/service/src/lib.rs | 10 +- 9 files changed, 277 insertions(+), 237 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b60be8e4bed..2d262c8e94e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1923,7 +1923,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", ] @@ -1941,7 +1941,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -1960,7 +1960,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "Inflector", "chrono", @@ -1986,7 +1986,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -1999,7 +1999,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -2014,7 +2014,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "14.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "serde", @@ -2025,7 +2025,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "bitflags", "frame-metadata", @@ -2051,7 +2051,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2063,7 +2063,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2075,7 +2075,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "proc-macro2", "quote", @@ -2085,7 +2085,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-metadata", "frame-support", @@ -2106,7 +2106,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -2116,7 +2116,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "log", @@ -2132,7 +2132,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -2146,7 +2146,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "sp-api", @@ -2155,7 +2155,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "sp-api", @@ -4554,7 +4554,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -4569,7 +4569,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -4583,7 +4583,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4606,7 +4606,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4661,7 +4661,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4739,7 +4739,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4755,7 +4755,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4770,7 +4770,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4791,7 +4791,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4808,7 +4808,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4822,7 +4822,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4844,7 +4844,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4859,7 +4859,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4878,7 +4878,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4894,7 +4894,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4909,7 +4909,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -4926,7 +4926,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -4942,7 +4942,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4959,7 +4959,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4973,7 +4973,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -4986,7 +4986,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -5002,7 +5002,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5024,7 +5024,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5038,7 +5038,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -5051,7 +5051,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5066,7 +5066,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -5086,7 +5086,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5102,7 +5102,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -5115,7 +5115,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5137,7 +5137,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -5148,7 +5148,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "log", "sp-arithmetic", @@ -5157,7 +5157,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -5170,7 +5170,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5187,7 +5187,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5202,7 +5202,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-support", "frame-system", @@ -5218,7 +5218,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5235,7 +5235,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5246,7 +5246,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5262,7 +5262,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -5277,7 +5277,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7810,7 +7810,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "env_logger 0.9.0", "jsonrpsee-proc-macros", @@ -8092,7 +8092,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "log", "sp-core", @@ -8103,7 +8103,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "derive_more", @@ -8130,7 +8130,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -8153,7 +8153,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8169,7 +8169,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8185,7 +8185,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8196,7 +8196,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "chrono", "fdlimit", @@ -8234,7 +8234,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "fnv", "futures 0.3.16", @@ -8262,7 +8262,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "hash-db", "kvdb", @@ -8287,7 +8287,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "futures 0.3.16", @@ -8311,7 +8311,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "derive_more", @@ -8354,7 +8354,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "derive_more", "futures 0.3.16", @@ -8378,7 +8378,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8391,7 +8391,7 @@ dependencies = [ [[package]] name = "sc-consensus-manual-seal" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "assert_matches", "async-trait", @@ -8425,7 +8425,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "futures 0.3.16", @@ -8451,7 +8451,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "sc-client-api", "sp-authorship", @@ -8462,7 +8462,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "lazy_static", "libsecp256k1 0.6.0", @@ -8488,7 +8488,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "derive_more", "parity-scale-codec", @@ -8505,7 +8505,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "log", "parity-scale-codec", @@ -8520,7 +8520,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8539,7 +8539,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "derive_more", @@ -8576,7 +8576,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "derive_more", "finality-grandpa", @@ -8600,7 +8600,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "ansi_term 0.12.1", "futures 0.3.16", @@ -8617,7 +8617,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "derive_more", @@ -8632,7 +8632,7 @@ dependencies = [ [[package]] name = "sc-light" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "hash-db", "parity-scale-codec", @@ -8650,7 +8650,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-std", "async-trait", @@ -8701,7 +8701,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -8717,7 +8717,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "bytes 1.0.1", "fnv", @@ -8744,7 +8744,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "libp2p", @@ -8757,7 +8757,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8766,7 +8766,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "hash-db", @@ -8797,7 +8797,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "derive_more", "futures 0.3.16", @@ -8822,7 +8822,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "jsonrpc-core", @@ -8838,7 +8838,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "directories", @@ -8902,7 +8902,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "log", "parity-scale-codec", @@ -8916,7 +8916,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8938,7 +8938,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "chrono", "futures 0.3.16", @@ -8956,7 +8956,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8987,7 +8987,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8998,7 +8998,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "intervalier", @@ -9025,7 +9025,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "derive_more", "futures 0.3.16", @@ -9459,7 +9459,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "hash-db", "log", @@ -9476,7 +9476,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -9488,7 +9488,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "serde", @@ -9500,7 +9500,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "integer-sqrt", "num-traits", @@ -9514,7 +9514,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "sp-api", @@ -9526,7 +9526,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "parity-scale-codec", @@ -9538,7 +9538,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "sp-api", @@ -9550,7 +9550,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "log", @@ -9568,7 +9568,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "futures 0.3.16", @@ -9587,7 +9587,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "merlin", @@ -9609,7 +9609,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9619,7 +9619,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9631,7 +9631,7 @@ dependencies = [ [[package]] name = "sp-core" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "base58", "blake2-rfc", @@ -9675,7 +9675,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9684,7 +9684,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "proc-macro2", "quote", @@ -9694,7 +9694,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "environmental", "parity-scale-codec", @@ -9705,7 +9705,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "finality-grandpa", "log", @@ -9722,7 +9722,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9736,7 +9736,7 @@ dependencies = [ [[package]] name = "sp-io" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "hash-db", @@ -9761,7 +9761,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "lazy_static", "sp-core", @@ -9772,7 +9772,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "derive_more", @@ -9789,7 +9789,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "ruzstd", "zstd", @@ -9798,7 +9798,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "serde", @@ -9811,7 +9811,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9822,7 +9822,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "sp-api", "sp-core", @@ -9832,7 +9832,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "backtrace", ] @@ -9840,7 +9840,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "rustc-hash", "serde", @@ -9850,7 +9850,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "either", "hash256-std-hasher", @@ -9871,7 +9871,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9888,7 +9888,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9900,7 +9900,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "serde", "serde_json", @@ -9909,7 +9909,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "sp-api", @@ -9922,7 +9922,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9932,7 +9932,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "hash-db", "log", @@ -9955,12 +9955,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" [[package]] name = "sp-storage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9973,7 +9973,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "log", "sp-core", @@ -9986,7 +9986,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10002,7 +10002,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "erased-serde", "log", @@ -10020,7 +10020,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "sp-api", "sp-runtime", @@ -10029,7 +10029,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "log", @@ -10044,7 +10044,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "hash-db", "memory-db", @@ -10058,7 +10058,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "futures-timer 3.0.2", @@ -10069,7 +10069,7 @@ dependencies = [ [[package]] name = "sp-version" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10084,7 +10084,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10095,7 +10095,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10272,7 +10272,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "platforms", ] @@ -10280,7 +10280,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.16", @@ -10302,7 +10302,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-std", "derive_more", @@ -10316,7 +10316,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "async-trait", "futures 0.3.16", @@ -10343,7 +10343,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "futures 0.3.16", "substrate-test-utils-derive", @@ -10353,7 +10353,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "proc-macro-crate 1.0.0", "quote", @@ -10363,7 +10363,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "ansi_term 0.12.1", "build-helper", @@ -10518,7 +10518,7 @@ dependencies = [ [[package]] name = "test-runner" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "frame-system", "futures 0.3.16", @@ -10969,7 +10969,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d2a43d47ab7339e70c3448b4553073584cfd61ab" +source = "git+https://github.com/paritytech/substrate?branch=master#3c2b2675c80f63b5371f4ea70890edb8d556a93c" dependencies = [ "log", "parity-scale-codec", diff --git a/bridges/bin/millau/node/src/service.rs b/bridges/bin/millau/node/src/service.rs index 06d8a456cc76..599fba1c374f 100644 --- a/bridges/bin/millau/node/src/service.rs +++ b/bridges/bin/millau/node/src/service.rs @@ -31,7 +31,7 @@ use millau_runtime::{self, opaque::Block, RuntimeApi}; use sc_client_api::{ExecutorProvider, RemoteBackend}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; -pub use sc_executor::NativeExecutor; +pub use sc_executor::NativeElseWasmExecutor; use sc_keystore::LocalKeystore; use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; @@ -41,9 +41,9 @@ use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use std::{sync::Arc, time::Duration}; // Our native executor instance. -pub struct Executor; +pub struct ExecutorDispatch; -impl sc_executor::NativeExecutionDispatch for Executor { +impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { @@ -55,7 +55,7 @@ impl sc_executor::NativeExecutionDispatch for Executor { } } -type FullClient = sc_service::TFullClient; +type FullClient = sc_service::TFullClient>; type FullBackend = sc_service::TFullBackend; type FullSelectChain = sc_consensus::LongestChain; diff --git a/bridges/bin/rialto/node/src/service.rs b/bridges/bin/rialto/node/src/service.rs index eb52b27ba1e4..e29ff2576509 100644 --- a/bridges/bin/rialto/node/src/service.rs +++ b/bridges/bin/rialto/node/src/service.rs @@ -33,7 +33,7 @@ use rialto_runtime::{self, opaque::Block, RuntimeApi}; use sc_client_api::{ExecutorProvider, RemoteBackend}; use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams}; -pub use sc_executor::NativeExecutor; +pub use sc_executor::NativeElseWasmExecutor; use sc_keystore::LocalKeystore; use sc_service::{error::Error as ServiceError, Configuration, TaskManager}; @@ -43,9 +43,9 @@ use sp_consensus_aura::sr25519::AuthorityPair as AuraPair; use std::{sync::Arc, time::Duration}; // Our native executor instance. -pub struct Executor; +pub struct ExecutorDispatch; -impl sc_executor::NativeExecutionDispatch for Executor { +impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { @@ -57,7 +57,7 @@ impl sc_executor::NativeExecutionDispatch for Executor { } } -type FullClient = sc_service::TFullClient; +type FullClient = sc_service::TFullClient>; type FullBackend = sc_service::TFullBackend; type FullSelectChain = sc_consensus::LongestChain; diff --git a/cli/src/command.rs b/cli/src/command.rs index cadfe2e01512..c641a29f8239 100644 --- a/cli/src/command.rs +++ b/cli/src/command.rs @@ -376,23 +376,29 @@ pub fn run() -> Result<()> { #[cfg(feature = "kusama-native")] if chain_spec.is_kusama() { return Ok(runner.sync_run(|config| { - cmd.run::(config) - .map_err(|e| Error::SubstrateCli(e)) + cmd.run::( + config, + ) + .map_err(|e| Error::SubstrateCli(e)) })?) } #[cfg(feature = "westend-native")] if chain_spec.is_westend() { return Ok(runner.sync_run(|config| { - cmd.run::(config) - .map_err(|e| Error::SubstrateCli(e)) + cmd.run::( + config, + ) + .map_err(|e| Error::SubstrateCli(e)) })?) } // else we assume it is polkadot. Ok(runner.sync_run(|config| { - cmd.run::(config) - .map_err(|e| Error::SubstrateCli(e)) + cmd.run::( + config, + ) + .map_err(|e| Error::SubstrateCli(e)) })?) }, Some(Subcommand::Key(cmd)) => Ok(cmd.run(&cli)?), diff --git a/node/client/src/lib.rs b/node/client/src/lib.rs index 86a837598442..4c4ff100820d 100644 --- a/node/client/src/lib.rs +++ b/node/client/src/lib.rs @@ -23,6 +23,7 @@ use polkadot_primitives::v1::{ AccountId, Balance, Block, BlockNumber, Hash, Header, Nonce, ParachainHost, }; use sc_client_api::{AuxStore, Backend as BackendT, BlockchainEvents, KeyIterator, UsageProvider}; +use sc_executor::NativeElseWasmExecutor; use sp_api::{CallApiAt, NumberFor, ProvideRuntimeApi}; use sp_blockchain::HeaderBackend; use sp_consensus::BlockStatus; @@ -36,12 +37,13 @@ use std::sync::Arc; pub type FullBackend = sc_service::TFullBackend; -pub type FullClient = sc_service::TFullClient; +pub type FullClient = + sc_service::TFullClient>; /// The native executor instance for Polkadot. -pub struct PolkadotExecutor; +pub struct PolkadotExecutorDispatch; -impl sc_executor::NativeExecutionDispatch for PolkadotExecutor { +impl sc_executor::NativeExecutionDispatch for PolkadotExecutorDispatch { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { @@ -55,10 +57,10 @@ impl sc_executor::NativeExecutionDispatch for PolkadotExecutor { #[cfg(feature = "kusama")] /// The native executor instance for Kusama. -pub struct KusamaExecutor; +pub struct KusamaExecutorDispatch; #[cfg(feature = "kusama")] -impl sc_executor::NativeExecutionDispatch for KusamaExecutor { +impl sc_executor::NativeExecutionDispatch for KusamaExecutorDispatch { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { @@ -72,10 +74,10 @@ impl sc_executor::NativeExecutionDispatch for KusamaExecutor { #[cfg(feature = "westend")] /// The native executor instance for Westend. -pub struct WestendExecutor; +pub struct WestendExecutorDispatch; #[cfg(feature = "westend")] -impl sc_executor::NativeExecutionDispatch for WestendExecutor { +impl sc_executor::NativeExecutionDispatch for WestendExecutorDispatch { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { @@ -89,10 +91,10 @@ impl sc_executor::NativeExecutionDispatch for WestendExecutor { #[cfg(feature = "rococo")] /// The native executor instance for Rococo. -pub struct RococoExecutor; +pub struct RococoExecutorDispatch; #[cfg(feature = "rococo")] -impl sc_executor::NativeExecutionDispatch for RococoExecutor { +impl sc_executor::NativeExecutionDispatch for RococoExecutorDispatch { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { @@ -247,13 +249,13 @@ macro_rules! with_client { /// See [`ExecuteWithClient`] for more information. #[derive(Clone)] pub enum Client { - Polkadot(Arc>), + Polkadot(Arc>), #[cfg(feature = "westend")] - Westend(Arc>), + Westend(Arc>), #[cfg(feature = "kusama")] - Kusama(Arc>), + Kusama(Arc>), #[cfg(feature = "rococo")] - Rococo(Arc>), + Rococo(Arc>), } impl ClientHandle for Client { diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs index 5011549cd70d..9db50cea3396 100644 --- a/node/service/src/lib.rs +++ b/node/service/src/lib.rs @@ -74,23 +74,24 @@ use telemetry::TelemetryWorker; use telemetry::{Telemetry, TelemetryWorkerHandle}; #[cfg(feature = "rococo-native")] -pub use polkadot_client::RococoExecutor; +pub use polkadot_client::RococoExecutorDispatch; #[cfg(feature = "westend-native")] -pub use polkadot_client::WestendExecutor; +pub use polkadot_client::WestendExecutorDispatch; #[cfg(feature = "kusama-native")] -pub use polkadot_client::KusamaExecutor; +pub use polkadot_client::KusamaExecutorDispatch; pub use chain_spec::{KusamaChainSpec, PolkadotChainSpec, RococoChainSpec, WestendChainSpec}; pub use consensus_common::{block_validation::Chain, Proposal, SelectChain}; pub use polkadot_client::{ AbstractClient, Client, ClientHandle, ExecuteWithClient, FullBackend, FullClient, - PolkadotExecutor, RuntimeApiCollection, + PolkadotExecutorDispatch, RuntimeApiCollection, }; pub use polkadot_primitives::v1::{Block, BlockId, CollatorPair, Hash, Id as ParaId}; pub use sc_client_api::{Backend, CallExecutor, ExecutionStrategy}; pub use sc_consensus::{BlockImport, LongestChain}; +use sc_executor::NativeElseWasmExecutor; pub use sc_executor::NativeExecutionDispatch; pub use service::{ config::{DatabaseSource, PrometheusConfig}, @@ -294,10 +295,10 @@ fn jaeger_launch_collector_with_agent( #[cfg(feature = "full-node")] type FullSelectChain = relay_chain_selection::SelectRelayChainWithFallback; #[cfg(feature = "full-node")] -type FullGrandpaBlockImport = grandpa::GrandpaBlockImport< +type FullGrandpaBlockImport = grandpa::GrandpaBlockImport< FullBackend, Block, - FullClient, + FullClient, FullSelectChain, >; @@ -305,30 +306,30 @@ type FullGrandpaBlockImport = grandpa::GrandpaBlockImport< type LightBackend = service::TLightBackendWithHash; #[cfg(feature = "light-node")] -type LightClient = - service::TLightClientWithBackend; +type LightClient = + service::TLightClientWithBackend; #[cfg(feature = "full-node")] -fn new_partial( +fn new_partial( config: &mut Configuration, jaeger_agent: Option, telemetry_worker_handle: Option, ) -> Result< service::PartialComponents< - FullClient, + FullClient, FullBackend, FullSelectChain, - sc_consensus::DefaultImportQueue>, - sc_transaction_pool::FullPool>, + sc_consensus::DefaultImportQueue>, + sc_transaction_pool::FullPool>, ( impl service::RpcExtensionBuilder, ( babe::BabeBlockImport< Block, - FullClient, - FullGrandpaBlockImport, + FullClient, + FullGrandpaBlockImport, >, - grandpa::LinkHalf, FullSelectChain>, + grandpa::LinkHalf, FullSelectChain>, babe::BabeLink, beefy_gadget::notification::BeefySignedCommitmentSender, ), @@ -340,11 +341,13 @@ fn new_partial( Error, > where - RuntimeApi: - ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + + Send + + Sync + + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, - Executor: NativeExecutionDispatch + 'static, + ExecutorDispatch: NativeExecutionDispatch + 'static, { set_prometheus_registry(config)?; @@ -365,10 +368,17 @@ where }) .transpose()?; + let executor = NativeElseWasmExecutor::::new( + config.wasm_method, + config.default_heap_pages, + config.max_runtime_instances, + ); + let (client, backend, keystore_container, task_manager) = - service::new_full_parts::( + service::new_full_parts::( &config, telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()), + executor, )?; let client = Arc::new(client); @@ -562,16 +572,18 @@ impl IsCollator { /// Returns the active leaves the overseer should start with. #[cfg(feature = "full-node")] -async fn active_leaves( +async fn active_leaves( select_chain: &impl SelectChain, - client: &FullClient, + client: &FullClient, ) -> Result, Error> where - RuntimeApi: - ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + + Send + + Sync + + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, - Executor: NativeExecutionDispatch + 'static, + ExecutorDispatch: NativeExecutionDispatch + 'static, { let best_block = select_chain.best_chain().await?; @@ -613,7 +625,7 @@ where /// This is an advanced feature and not recommended for general use. Generally, `build_full` is /// a better choice. #[cfg(feature = "full-node")] -pub fn new_full( +pub fn new_full( mut config: Configuration, is_collator: IsCollator, grandpa_pause: Option<(u32, u32)>, @@ -622,13 +634,15 @@ pub fn new_full( telemetry_worker_handle: Option, program_path: Option, overseer_gen: OverseerGenerator, -) -> Result>>, Error> +) -> Result>>, Error> where - RuntimeApi: - ConstructRuntimeApi> + Send + Sync + 'static, + RuntimeApi: ConstructRuntimeApi> + + Send + + Sync + + 'static, RuntimeApi::RuntimeApi: RuntimeApiCollection>, - Executor: NativeExecutionDispatch + 'static, + ExecutorDispatch: NativeExecutionDispatch + 'static, OverseerGenerator: OverseerGen, { use polkadot_node_network_protocol::request_response::IncomingRequest; @@ -660,7 +674,11 @@ where import_queue, transaction_pool, other: (rpc_extensions_builder, import_setup, rpc_setup, slot_duration, mut telemetry), - } = new_partial::(&mut config, jaeger_agent, telemetry_worker_handle)?; + } = new_partial::( + &mut config, + jaeger_agent, + telemetry_worker_handle, + )?; let prometheus_registry = config.prometheus_registry().cloned(); @@ -824,7 +842,7 @@ where let overseer_handle = if let Some((authority_discovery_service, keystore)) = maybe_params { let (overseer, overseer_handle) = overseer_gen - .generate::>( + .generate::>( OverseerGenArgs { leaves: active_leaves, keystore, @@ -1220,21 +1238,29 @@ pub fn new_chain_ops( #[cfg(feature = "rococo-native")] if config.chain_spec.is_rococo() || config.chain_spec.is_wococo() { let service::PartialComponents { client, backend, import_queue, task_manager, .. } = - new_partial::(config, jaeger_agent, None)?; + new_partial::( + config, + jaeger_agent, + None, + )?; return Ok((Arc::new(Client::Rococo(client)), backend, import_queue, task_manager)) } #[cfg(feature = "kusama-native")] if config.chain_spec.is_kusama() { let service::PartialComponents { client, backend, import_queue, task_manager, .. } = - new_partial::(config, jaeger_agent, None)?; + new_partial::( + config, + jaeger_agent, + None, + )?; return Ok((Arc::new(Client::Kusama(client)), backend, import_queue, task_manager)) } #[cfg(feature = "westend-native")] if config.chain_spec.is_westend() { let service::PartialComponents { client, backend, import_queue, task_manager, .. } = - new_partial::( + new_partial::( config, jaeger_agent, None, @@ -1243,7 +1269,11 @@ pub fn new_chain_ops( } let service::PartialComponents { client, backend, import_queue, task_manager, .. } = - new_partial::(config, jaeger_agent, None)?; + new_partial::( + config, + jaeger_agent, + None, + )?; Ok((Arc::new(Client::Polkadot(client)), backend, import_queue, task_manager)) } @@ -1252,20 +1282,20 @@ pub fn new_chain_ops( pub fn build_light(config: Configuration) -> Result<(TaskManager, RpcHandlers), Error> { #[cfg(feature = "rococo-native")] if config.chain_spec.is_rococo() || config.chain_spec.is_wococo() { - return new_light::(config) + return new_light::(config) } #[cfg(feature = "kusama-native")] if config.chain_spec.is_kusama() { - return new_light::(config) + return new_light::(config) } #[cfg(feature = "westend-native")] if config.chain_spec.is_westend() { - return new_light::(config) + return new_light::(config) } - new_light::(config) + new_light::(config) } #[cfg(feature = "full-node")] @@ -1280,7 +1310,7 @@ pub fn build_full( ) -> Result, Error> { #[cfg(feature = "rococo-native")] if config.chain_spec.is_rococo() || config.chain_spec.is_wococo() { - return new_full::( + return new_full::( config, is_collator, grandpa_pause, @@ -1295,7 +1325,7 @@ pub fn build_full( #[cfg(feature = "kusama-native")] if config.chain_spec.is_kusama() { - return new_full::( + return new_full::( config, is_collator, grandpa_pause, @@ -1310,7 +1340,7 @@ pub fn build_full( #[cfg(feature = "westend-native")] if config.chain_spec.is_westend() { - return new_full::( + return new_full::( config, is_collator, grandpa_pause, @@ -1323,7 +1353,7 @@ pub fn build_full( .map(|full| full.with_client(Client::Westend)) } - new_full::( + new_full::( config, is_collator, grandpa_pause, diff --git a/node/test/client/src/lib.rs b/node/test/client/src/lib.rs index 80e6a32c4c72..1485d61323f6 100644 --- a/node/test/client/src/lib.rs +++ b/node/test/client/src/lib.rs @@ -28,7 +28,8 @@ use sp_runtime::BuildStorage; pub use block_builder::*; pub use polkadot_test_runtime as runtime; pub use polkadot_test_service::{ - construct_extrinsic, construct_transfer_extrinsic, Client, FullBackend, PolkadotTestExecutor, + construct_extrinsic, construct_transfer_extrinsic, Client, FullBackend, + PolkadotTestExecutorDispatch, }; pub use substrate_test_client::*; @@ -36,7 +37,7 @@ pub use substrate_test_client::*; pub type Executor = client::LocalCallExecutor< Block, FullBackend, - sc_executor::NativeExecutor, + sc_executor::NativeElseWasmExecutor, >; /// Test client builder for Polkadot. diff --git a/node/test/polkadot-simnet/common/src/lib.rs b/node/test/polkadot-simnet/common/src/lib.rs index 93726bee27d4..a161dc71ed1c 100644 --- a/node/test/polkadot-simnet/common/src/lib.rs +++ b/node/test/polkadot-simnet/common/src/lib.rs @@ -27,6 +27,7 @@ use polkadot_runtime::{ use polkadot_runtime_common::claims; use sc_consensus_babe::BabeBlockImport; use sc_consensus_manual_seal::consensus::babe::SlotTimestampProvider; +use sc_executor::NativeElseWasmExecutor; use sc_service::{TFullBackend, TFullClient}; use sp_runtime::{app_crypto::sp_core::H256, generic::Era, AccountId32}; use std::{error::Error, future::Future, str::FromStr}; @@ -40,11 +41,11 @@ type BlockImport = BabeBlockImport, Block>; -/// Declare an instance of the native executor named `Executor`. Include the wasm binary as the +/// Declare an instance of the native executor named `ExecutorDispatch`. Include the wasm binary as the /// equivalent wasm code. -pub struct Executor; +pub struct ExecutorDispatch; -impl sc_executor::NativeExecutionDispatch for Executor { +impl sc_executor::NativeExecutionDispatch for ExecutorDispatch { type ExtendHostFunctions = (benchmarking::benchmarking::HostFunctions, SignatureVerificationOverride); @@ -62,14 +63,14 @@ pub struct PolkadotChainInfo; impl ChainInfo for PolkadotChainInfo { type Block = Block; - type Executor = Executor; + type ExecutorDispatch = ExecutorDispatch; type Runtime = Runtime; type RuntimeApi = RuntimeApi; type SelectChain = SelectChain; type BlockImport = BlockImport< Self::Block, TFullBackend, - TFullClient, + TFullClient>, Self::SelectChain, >; type SignedExtras = polkadot_runtime::SignedExtra; @@ -98,14 +99,14 @@ pub async fn dispatch_with_root( where T: ChainInfo< Block = Block, - Executor = Executor, + ExecutorDispatch = ExecutorDispatch, Runtime = Runtime, RuntimeApi = RuntimeApi, SelectChain = SelectChain, BlockImport = BlockImport< Block, TFullBackend, - TFullClient, + TFullClient>, SelectChain, >, SignedExtras = polkadot_runtime::SignedExtra, diff --git a/node/test/service/src/lib.rs b/node/test/service/src/lib.rs index 12b51e2a0c7b..bf5193469fa3 100644 --- a/node/test/service/src/lib.rs +++ b/node/test/service/src/lib.rs @@ -54,11 +54,11 @@ use substrate_test_client::{ BlockchainEventsExt, RpcHandlersExt, RpcTransactionError, RpcTransactionOutput, }; -/// Declare an instance of the native executor named `PolkadotTestExecutor`. Include the wasm binary as the +/// Declare an instance of the native executor named `PolkadotTestExecutorDispatch`. Include the wasm binary as the /// equivalent wasm code. -pub struct PolkadotTestExecutor; +pub struct PolkadotTestExecutorDispatch; -impl sc_executor::NativeExecutionDispatch for PolkadotTestExecutor { +impl sc_executor::NativeExecutionDispatch for PolkadotTestExecutorDispatch { type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions; fn dispatch(method: &str, data: &[u8]) -> Option> { @@ -71,7 +71,7 @@ impl sc_executor::NativeExecutionDispatch for PolkadotTestExecutor { } /// The client type being used by the test service. -pub type Client = FullClient; +pub type Client = FullClient; pub use polkadot_service::FullBackend; @@ -82,7 +82,7 @@ pub fn new_full( is_collator: IsCollator, worker_program_path: Option, ) -> Result>, Error> { - polkadot_service::new_full::( + polkadot_service::new_full::( config, is_collator, None,