diff --git a/Cargo.lock b/Cargo.lock index 44ea7ec05b6..a3771dc15c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -450,7 +450,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -487,7 +487,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "beefy-gadget", "futures", @@ -507,7 +507,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "sp-api", "sp-beefy", @@ -2938,7 +2938,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", ] @@ -2961,7 +2961,7 @@ checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -2984,7 +2984,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "Inflector", "array-bytes 4.2.0", @@ -3036,7 +3036,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3047,7 +3047,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3063,7 +3063,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -3092,7 +3092,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "env_logger 0.9.0", "log", @@ -3109,7 +3109,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "bitflags", "frame-metadata", @@ -3141,7 +3141,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "Inflector", "cfg-expr", @@ -3155,7 +3155,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3167,7 +3167,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro2", "quote", @@ -3177,7 +3177,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "log", @@ -3195,7 +3195,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -3210,7 +3210,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "sp-api", @@ -3219,7 +3219,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "parity-scale-codec", @@ -4958,7 +4958,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "log", @@ -4978,7 +4978,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "anyhow", "jsonrpsee", @@ -5429,7 +5429,7 @@ checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" [[package]] name = "pallet-alliance" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "frame-benchmarking", @@ -5450,7 +5450,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5468,7 +5468,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5482,7 +5482,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -5498,7 +5498,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -5514,7 +5514,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -5529,7 +5529,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5553,7 +5553,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5573,7 +5573,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5588,7 +5588,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -5604,7 +5604,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "beefy-merkle-tree", @@ -5627,7 +5627,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5645,7 +5645,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5689,7 +5689,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5706,7 +5706,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "bitflags", "frame-benchmarking", @@ -5735,7 +5735,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "bitflags", "parity-scale-codec", @@ -5747,7 +5747,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro2", "quote", @@ -5757,7 +5757,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5774,7 +5774,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5792,7 +5792,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5816,7 +5816,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5829,7 +5829,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5847,7 +5847,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5866,7 +5866,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5889,7 +5889,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5905,7 +5905,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5925,7 +5925,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5942,7 +5942,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5959,7 +5959,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5976,7 +5976,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -5992,7 +5992,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6008,7 +6008,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -6025,7 +6025,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6045,7 +6045,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "sp-api", @@ -6055,7 +6055,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -6072,7 +6072,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6095,7 +6095,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6112,7 +6112,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6127,7 +6127,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -6141,7 +6141,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6159,7 +6159,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6174,7 +6174,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "assert_matches", "frame-benchmarking", @@ -6193,7 +6193,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6204,12 +6204,13 @@ dependencies = [ "sp-io", "sp-runtime", "sp-std", + "sp-weights", ] [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -6230,7 +6231,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6246,7 +6247,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -6260,7 +6261,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6284,7 +6285,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -6295,7 +6296,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "log", "sp-arithmetic", @@ -6304,7 +6305,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6321,7 +6322,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -6350,7 +6351,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6368,7 +6369,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6387,7 +6388,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-support", "frame-system", @@ -6403,7 +6404,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6419,7 +6420,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6431,7 +6432,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6448,7 +6449,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6463,7 +6464,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6479,7 +6480,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -6494,7 +6495,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-benchmarking", "frame-support", @@ -9308,7 +9309,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "log", "sp-core", @@ -9319,7 +9320,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures", @@ -9346,7 +9347,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "futures-timer", @@ -9369,7 +9370,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9385,7 +9386,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "impl-trait-for-tuples", "memmap2", @@ -9402,7 +9403,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9413,7 +9414,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "chrono", @@ -9453,7 +9454,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "fnv", "futures", @@ -9481,7 +9482,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "hash-db", "kvdb", @@ -9506,13 +9507,14 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures", "futures-timer", "libp2p", "log", + "mockall", "parking_lot 0.12.1", "sc-client-api", "sc-utils", @@ -9530,7 +9532,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures", @@ -9559,7 +9561,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "fork-tree", @@ -9600,7 +9602,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "jsonrpsee", @@ -9622,7 +9624,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9635,7 +9637,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures", @@ -9659,7 +9661,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "lru", "parity-scale-codec", @@ -9683,7 +9685,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -9696,7 +9698,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "log", "sc-allocator", @@ -9709,7 +9711,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "cfg-if", "libc", @@ -9726,7 +9728,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "ahash", "array-bytes 4.2.0", @@ -9767,7 +9769,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "finality-grandpa", "futures", @@ -9788,7 +9790,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "ansi_term", "futures", @@ -9804,7 +9806,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -9819,7 +9821,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -9866,7 +9868,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "cid", "futures", @@ -9886,7 +9888,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "bitflags", @@ -9912,7 +9914,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "ahash", "futures", @@ -9930,7 +9932,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "futures", @@ -9951,7 +9953,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -9976,13 +9978,14 @@ dependencies = [ "sp-core", "sp-finality-grandpa", "sp-runtime", + "substrate-prometheus-endpoint", "thiserror", ] [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "futures", @@ -10001,7 +10004,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "bytes", @@ -10031,7 +10034,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "libp2p", @@ -10044,7 +10047,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -10053,7 +10056,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "hash-db", @@ -10083,7 +10086,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "jsonrpsee", @@ -10106,7 +10109,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "jsonrpsee", @@ -10119,7 +10122,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "hex", @@ -10138,7 +10141,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "directories", @@ -10208,7 +10211,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "log", "parity-scale-codec", @@ -10220,7 +10223,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -10239,7 +10242,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "libc", @@ -10258,7 +10261,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "chrono", "futures", @@ -10276,7 +10279,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "ansi_term", "atty", @@ -10307,7 +10310,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10318,7 +10321,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures", @@ -10344,7 +10347,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures", @@ -10358,7 +10361,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "futures-timer", @@ -10859,7 +10862,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "hash-db", "log", @@ -10877,7 +10880,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "blake2", "proc-macro-crate", @@ -10889,7 +10892,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "scale-info", @@ -10902,7 +10905,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "integer-sqrt", "num-traits", @@ -10917,7 +10920,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "scale-info", @@ -10930,7 +10933,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "parity-scale-codec", @@ -10942,7 +10945,7 @@ dependencies = [ [[package]] name = "sp-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "scale-info", @@ -10959,7 +10962,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "sp-api", @@ -10971,7 +10974,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "log", @@ -10989,7 +10992,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures", @@ -11008,7 +11011,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "parity-scale-codec", @@ -11026,7 +11029,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "merlin", @@ -11049,7 +11052,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "scale-info", @@ -11063,7 +11066,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "scale-info", @@ -11076,7 +11079,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "base58", @@ -11121,7 +11124,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "blake2", "byteorder", @@ -11135,7 +11138,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro2", "quote", @@ -11146,7 +11149,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -11155,7 +11158,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro2", "quote", @@ -11165,7 +11168,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "environmental", "parity-scale-codec", @@ -11176,7 +11179,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "finality-grandpa", "log", @@ -11194,7 +11197,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -11208,7 +11211,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "bytes", "ed25519-dalek", @@ -11235,7 +11238,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "lazy_static", "sp-core", @@ -11246,7 +11249,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures", @@ -11263,7 +11266,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "thiserror", "zstd", @@ -11272,7 +11275,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -11290,7 +11293,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "scale-info", @@ -11304,7 +11307,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "sp-api", "sp-core", @@ -11314,7 +11317,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "backtrace", "lazy_static", @@ -11324,7 +11327,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "rustc-hash", "serde", @@ -11334,7 +11337,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "either", "hash256-std-hasher", @@ -11356,7 +11359,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11374,7 +11377,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "Inflector", "proc-macro-crate", @@ -11386,7 +11389,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "serde", "serde_json", @@ -11395,7 +11398,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "scale-info", @@ -11409,7 +11412,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "scale-info", @@ -11420,7 +11423,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "hash-db", "log", @@ -11442,12 +11445,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11460,7 +11463,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "futures-timer", @@ -11476,7 +11479,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "sp-std", @@ -11488,7 +11491,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "sp-api", "sp-runtime", @@ -11497,7 +11500,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "log", @@ -11513,7 +11516,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "ahash", "hash-db", @@ -11536,7 +11539,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11553,7 +11556,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11564,7 +11567,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "impl-trait-for-tuples", "log", @@ -11577,7 +11580,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11880,7 +11883,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "platforms", ] @@ -11888,7 +11891,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11909,7 +11912,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures-util", "hyper", @@ -11922,7 +11925,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "async-trait", "jsonrpsee", @@ -11935,7 +11938,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "jsonrpsee", "log", @@ -11956,7 +11959,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -11982,7 +11985,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11992,7 +11995,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12003,7 +12006,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "ansi_term", "build-helper", @@ -12544,7 +12547,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#d0540a79967cb06cd7598a4965c7c06afc788b0c" +source = "git+https://github.com/paritytech/substrate?branch=master#9931220910f9fb65227fe4571842f800d61c7b95" dependencies = [ "clap 4.0.29", "frame-remote-externalities", diff --git a/client/pov-recovery/src/lib.rs b/client/pov-recovery/src/lib.rs index 3327d4bb86b..e1f59677423 100644 --- a/client/pov-recovery/src/lib.rs +++ b/client/pov-recovery/src/lib.rs @@ -42,7 +42,7 @@ //! make sure that the blocks are imported in the correct order. use sc_client_api::{BlockBackend, BlockchainEvents, UsageProvider}; -use sc_consensus::import_queue::{ImportQueue, IncomingBlock}; +use sc_consensus::import_queue::{ImportQueueService, IncomingBlock}; use sp_consensus::{BlockOrigin, BlockStatus}; use sp_runtime::{ generic::BlockId, @@ -103,7 +103,7 @@ impl RecoveryDelay { } /// Encapsulates the logic of the pov recovery. -pub struct PoVRecovery { +pub struct PoVRecovery { /// All the pending candidates that we are waiting for to be imported or that need to be /// recovered when `next_candidate_to_recover` tells us to do so. pending_candidates: HashMap>, @@ -119,23 +119,22 @@ pub struct PoVRecovery { waiting_for_parent: HashMap>, recovery_delay: RecoveryDelay, parachain_client: Arc, - parachain_import_queue: IQ, + parachain_import_queue: Box>, relay_chain_interface: RC, para_id: ParaId, } -impl PoVRecovery +impl PoVRecovery where PC: BlockBackend + BlockchainEvents + UsageProvider, RCInterface: RelayChainInterface + Clone, - IQ: ImportQueue, { /// Create a new instance. pub fn new( overseer_handle: OverseerHandle, recovery_delay: RecoveryDelay, parachain_client: Arc, - parachain_import_queue: IQ, + parachain_import_queue: Box>, relay_chain_interface: RCInterface, para_id: ParaId, ) -> Self { diff --git a/client/relay-chain-minimal-node/src/network.rs b/client/relay-chain-minimal-node/src/network.rs index 7769312f67b..9bd31ad7600 100644 --- a/client/relay-chain-minimal-node/src/network.rs +++ b/client/relay-chain-minimal-node/src/network.rs @@ -21,6 +21,7 @@ use polkadot_node_network_protocol::PeerId; use sc_network::{NetworkService, SyncState}; use sc_client_api::HeaderBackend; +use sc_consensus::{BlockImportError, BlockImportStatus, JustificationSyncLink, Link}; use sc_network_common::{ config::{ NonDefaultSetConfig, NonReservedPeerMode, NotificationHandshake, ProtocolId, SetConfig, @@ -29,12 +30,10 @@ use sc_network_common::{ service::NetworkSyncForkRequest, sync::{ message::{BlockAnnouncesHandshake, BlockRequest}, - Metrics, SyncStatus, + BadPeer, Metrics, OnBlockData, PollBlockAnnounceValidation, SyncStatus, }, }; use sc_service::{error::Error, Configuration, NetworkStarter, SpawnTaskHandle}; -use sp_consensus::BlockOrigin; -use sp_runtime::Justifications; use std::{iter, sync::Arc}; @@ -80,7 +79,6 @@ pub(crate) fn build_collator_network( chain_sync: Box::new(chain_sync), network_config: config.network.clone(), chain: client.clone(), - import_queue: Box::new(DummyImportQueue), protocol_id, metrics_registry: config.prometheus_config.as_ref().map(|config| config.registry.clone()), block_announce_config, @@ -253,28 +251,6 @@ impl sc_network_common::sync::ChainSync for DummyChainSync { unimplemented!("Not supported on the RPC collator") } - fn on_blocks_processed( - &mut self, - _imported: usize, - _count: usize, - _results: Vec<( - Result< - sc_consensus::BlockImportStatus>, - sc_consensus::BlockImportError, - >, - ::Hash, - )>, - ) -> Box< - dyn Iterator< - Item = Result< - (PeerId, sc_network_common::sync::message::BlockRequest), - sc_network_common::sync::BadPeer, - >, - >, - > { - Box::new(std::iter::empty()) - } - fn on_justification_import( &mut self, _hash: ::Hash, @@ -307,12 +283,7 @@ impl sc_network_common::sync::ChainSync for DummyChainSync { std::task::Poll::Pending } - fn peer_disconnected( - &mut self, - _who: &PeerId, - ) -> Option> { - None - } + fn peer_disconnected(&mut self, _who: &PeerId) {} fn metrics(&self) -> sc_network_common::sync::Metrics { Metrics { @@ -338,7 +309,7 @@ impl sc_network_common::sync::ChainSync for DummyChainSync { fn poll( &mut self, _cx: &mut std::task::Context, - ) -> std::task::Poll> { + ) -> std::task::Poll> { std::task::Poll::Pending } @@ -349,37 +320,39 @@ impl sc_network_common::sync::ChainSync for DummyChainSync { fn num_active_peers(&self) -> usize { 0 } + + fn process_block_response_data(&mut self, _blocks_to_import: Result, BadPeer>) {} } -struct DummyImportQueue; +struct DummyChainSyncService(std::marker::PhantomData); -impl sc_service::ImportQueue for DummyImportQueue { - fn import_blocks( - &mut self, - _origin: BlockOrigin, - _blocks: Vec>, - ) { - } +impl NetworkSyncForkRequest> for DummyChainSyncService { + fn set_sync_fork_request(&self, _peers: Vec, _hash: B::Hash, _number: NumberFor) {} +} + +impl JustificationSyncLink for DummyChainSyncService { + fn request_justification(&self, _hash: &B::Hash, _number: NumberFor) {} + + fn clear_justification_requests(&self) {} +} - fn import_justifications( +impl Link for DummyChainSyncService { + fn blocks_processed( &mut self, - _who: PeerId, - _hash: Hash, - _number: NumberFor, - _justifications: Justifications, + _imported: usize, + _count: usize, + _results: Vec<(Result>, BlockImportError>, B::Hash)>, ) { } - fn poll_actions( + fn justification_imported( &mut self, - _cx: &mut futures::task::Context, - _link: &mut dyn sc_consensus::import_queue::Link, + _who: PeerId, + _hash: &B::Hash, + _number: NumberFor, + _success: bool, ) { } -} -struct DummyChainSyncService(std::marker::PhantomData); - -impl NetworkSyncForkRequest> for DummyChainSyncService { - fn set_sync_fork_request(&self, _peers: Vec, _hash: B::Hash, _number: NumberFor) {} + fn request_justification(&mut self, _hash: &B::Hash, _number: NumberFor) {} } diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs index 067ca1c83f3..53277ca5817 100644 --- a/client/service/src/lib.rs +++ b/client/service/src/lib.rs @@ -25,23 +25,16 @@ use polkadot_primitives::v2::CollatorPair; use sc_client_api::{ Backend as BackendT, BlockBackend, BlockchainEvents, Finalizer, UsageProvider, }; -use sc_consensus::{ - import_queue::{ImportQueue, IncomingBlock, Link, RuntimeOrigin}, - BlockImport, -}; +use sc_consensus::{import_queue::ImportQueueService, BlockImport}; use sc_service::{Configuration, TaskManager}; use sp_api::ProvideRuntimeApi; use sp_blockchain::HeaderBackend; -use sp_consensus::BlockOrigin; use sp_core::traits::SpawnNamed; -use sp_runtime::{ - traits::{Block as BlockT, NumberFor}, - Justifications, -}; +use sp_runtime::traits::Block as BlockT; use std::{sync::Arc, time::Duration}; /// Parameters given to [`start_collator`]. -pub struct StartCollatorParams<'a, Block: BlockT, BS, Client, RCInterface, Spawner, IQ> { +pub struct StartCollatorParams<'a, Block: BlockT, BS, Client, RCInterface, Spawner> { pub block_status: Arc, pub client: Arc, pub announce_block: Arc>) + Send + Sync>, @@ -50,7 +43,7 @@ pub struct StartCollatorParams<'a, Block: BlockT, BS, Client, RCInterface, Spawn pub relay_chain_interface: RCInterface, pub task_manager: &'a mut TaskManager, pub parachain_consensus: Box>, - pub import_queue: IQ, + pub import_queue: Box>, pub collator_key: CollatorPair, pub relay_chain_slot_duration: Duration, } @@ -60,7 +53,7 @@ pub struct StartCollatorParams<'a, Block: BlockT, BS, Client, RCInterface, Spawn /// A collator is similar to a validator in a normal blockchain. /// It is responsible for producing blocks and sending the blocks to a /// parachain validator for validation and inclusion into the relay chain. -pub async fn start_collator<'a, Block, BS, Client, Backend, RCInterface, Spawner, IQ>( +pub async fn start_collator<'a, Block, BS, Client, Backend, RCInterface, Spawner>( StartCollatorParams { block_status, client, @@ -73,7 +66,7 @@ pub async fn start_collator<'a, Block, BS, Client, Backend, RCInterface, Spawner import_queue, collator_key, relay_chain_slot_duration, - }: StartCollatorParams<'a, Block, BS, Client, RCInterface, Spawner, IQ>, + }: StartCollatorParams<'a, Block, BS, Client, RCInterface, Spawner>, ) -> sc_service::error::Result<()> where Block: BlockT, @@ -92,7 +85,6 @@ where Spawner: SpawnNamed + Clone + Send + Sync + 'static, RCInterface: RelayChainInterface + Clone + 'static, Backend: BackendT + 'static, - IQ: ImportQueue + 'static, { let consensus = cumulus_client_consensus_common::run_parachain_consensus( para_id, @@ -139,21 +131,21 @@ where } /// Parameters given to [`start_full_node`]. -pub struct StartFullNodeParams<'a, Block: BlockT, Client, RCInterface, IQ> { +pub struct StartFullNodeParams<'a, Block: BlockT, Client, RCInterface> { pub para_id: ParaId, pub client: Arc, pub relay_chain_interface: RCInterface, pub task_manager: &'a mut TaskManager, pub announce_block: Arc>) + Send + Sync>, pub relay_chain_slot_duration: Duration, - pub import_queue: IQ, + pub import_queue: Box>, } /// Start a full node for a parachain. /// /// A full node will only sync the given parachain and will follow the /// tip of the chain. -pub fn start_full_node( +pub fn start_full_node( StartFullNodeParams { client, announce_block, @@ -162,7 +154,7 @@ pub fn start_full_node( para_id, relay_chain_slot_duration, import_queue, - }: StartFullNodeParams, + }: StartFullNodeParams, ) -> sc_service::error::Result<()> where Block: BlockT, @@ -176,7 +168,6 @@ where for<'a> &'a Client: BlockImport, Backend: BackendT + 'static, RCInterface: RelayChainInterface + Clone + 'static, - IQ: ImportQueue + 'static, { let consensus = cumulus_client_consensus_common::run_parachain_consensus( para_id, @@ -226,36 +217,3 @@ pub fn prepare_node_config(mut parachain_config: Configuration) -> Configuration parachain_config } - -/// A shared import queue -/// -/// This is basically a hack until the Substrate side is implemented properly. -#[derive(Clone)] -pub struct SharedImportQueue(Arc>>); - -impl SharedImportQueue { - /// Create a new instance of the shared import queue. - pub fn new + 'static>(import_queue: IQ) -> Self { - Self(Arc::new(parking_lot::Mutex::new(import_queue))) - } -} - -impl ImportQueue for SharedImportQueue { - fn import_blocks(&mut self, origin: BlockOrigin, blocks: Vec>) { - self.0.lock().import_blocks(origin, blocks) - } - - fn import_justifications( - &mut self, - who: RuntimeOrigin, - hash: Block::Hash, - number: NumberFor, - justifications: Justifications, - ) { - self.0.lock().import_justifications(who, hash, number, justifications) - } - - fn poll_actions(&mut self, cx: &mut std::task::Context, link: &mut dyn Link) { - self.0.lock().poll_actions(cx, link) - } -} diff --git a/parachain-template/node/src/service.rs b/parachain-template/node/src/service.rs index 0a0d1327e0e..36ccfe2f75c 100644 --- a/parachain-template/node/src/service.rs +++ b/parachain-template/node/src/service.rs @@ -22,6 +22,7 @@ use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayC use cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node; // Substrate Imports +use sc_consensus::ImportQueue; use sc_executor::NativeElseWasmExecutor; use sc_network::NetworkService; use sc_network_common::service::NetworkBlock; @@ -196,14 +197,15 @@ async fn start_node_impl( let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let import_queue_service = params.import_queue.service(); + let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), + import_queue: params.import_queue, block_announce_validator_builder: Some(Box::new(|_| { Box::new(block_announce_validator) })), @@ -293,7 +295,7 @@ async fn start_node_impl( relay_chain_interface, spawner, parachain_consensus, - import_queue, + import_queue: import_queue_service, collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -307,7 +309,7 @@ async fn start_node_impl( para_id: id, relay_chain_interface, relay_chain_slot_duration, - import_queue, + import_queue: import_queue_service, }; start_full_node(params)?; diff --git a/polkadot-parachain/src/service.rs b/polkadot-parachain/src/service.rs index b4ce7a31643..a40b290524d 100644 --- a/polkadot-parachain/src/service.rs +++ b/polkadot-parachain/src/service.rs @@ -43,7 +43,7 @@ use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier; use futures::lock::Mutex; use sc_consensus::{ import_queue::{BasicQueue, Verifier as VerifierT}, - BlockImportParams, + BlockImportParams, ImportQueue, }; use sc_executor::WasmExecutor; use sc_network::NetworkService; @@ -404,14 +404,15 @@ where let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let import_queue_service = params.import_queue.service(); + let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), + import_queue: params.import_queue, block_announce_validator_builder: Some(Box::new(|_| { Box::new(block_announce_validator) })), @@ -480,7 +481,7 @@ where relay_chain_interface, spawner, parachain_consensus, - import_queue, + import_queue: import_queue_service, collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -494,7 +495,7 @@ where para_id, relay_chain_interface, relay_chain_slot_duration, - import_queue, + import_queue: import_queue_service, }; start_full_node(params)?; @@ -587,14 +588,15 @@ where let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let import_queue_service = params.import_queue.service(); + let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), + import_queue: params.import_queue, block_announce_validator_builder: Some(Box::new(|_| { Box::new(block_announce_validator) })), @@ -676,7 +678,7 @@ where relay_chain_interface: relay_chain_interface.clone(), spawner, parachain_consensus, - import_queue, + import_queue: import_queue_service, collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -690,7 +692,7 @@ where para_id, relay_chain_interface, relay_chain_slot_duration, - import_queue, + import_queue: import_queue_service, }; start_full_node(params)?; @@ -1356,14 +1358,15 @@ where let validator = parachain_config.role.is_authority(); let prometheus_registry = parachain_config.prometheus_registry().cloned(); let transaction_pool = params.transaction_pool.clone(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let import_queue_service = params.import_queue.service(); + let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), + import_queue: params.import_queue, block_announce_validator_builder: Some(Box::new(|_| { Box::new(block_announce_validator) })), @@ -1444,7 +1447,7 @@ where relay_chain_interface, spawner, parachain_consensus, - import_queue, + import_queue: import_queue_service, collator_key: collator_key.expect("Command line arguments do not allow this. qed"), relay_chain_slot_duration, }; @@ -1458,7 +1461,7 @@ where para_id, relay_chain_interface, relay_chain_slot_duration, - import_queue, + import_queue: import_queue_service, }; start_full_node(params)?; diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs index 29f37806ccf..486184ff6b7 100644 --- a/test/service/src/lib.rs +++ b/test/service/src/lib.rs @@ -48,6 +48,7 @@ use frame_system_rpc_runtime_api::AccountNonceApi; use polkadot_primitives::v2::{CollatorPair, Hash as PHash, PersistedValidationData}; use polkadot_service::ProvideRuntimeApi; use sc_client_api::execution_extensions::ExecutionStrategies; +use sc_consensus::ImportQueue; use sc_network::{multiaddr, NetworkBlock, NetworkService}; use sc_network_common::{config::TransportConfig, service::NetworkStateInfo}; use sc_service::{ @@ -269,14 +270,15 @@ where let block_announce_validator_builder = move |_| Box::new(block_announce_validator) as Box<_>; let prometheus_registry = parachain_config.prometheus_registry().cloned(); - let import_queue = cumulus_client_service::SharedImportQueue::new(params.import_queue); + let import_queue_service = params.import_queue.service(); + let (network, system_rpc_tx, tx_handler_controller, start_network) = sc_service::build_network(sc_service::BuildNetworkParams { config: ¶chain_config, client: client.clone(), transaction_pool: transaction_pool.clone(), spawn_handle: task_manager.spawn_handle(), - import_queue: import_queue.clone(), + import_queue: params.import_queue, block_announce_validator_builder: Some(Box::new(block_announce_validator_builder)), warp_sync: None, })?; @@ -362,7 +364,7 @@ where parachain_consensus, relay_chain_interface, collator_key, - import_queue, + import_queue: import_queue_service, relay_chain_slot_duration: Duration::from_secs(6), }; @@ -374,7 +376,7 @@ where task_manager: &mut task_manager, para_id, relay_chain_interface, - import_queue, + import_queue: import_queue_service, // The slot duration is currently used internally only to configure // the recovery delay of pov-recovery. We don't want to wait for too // long on the full node to recover, so we reduce this time here.