From 594f2f4347a4a47315ee009f83a318eb61bd0f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bastian=20K=C3=B6cher?= Date: Tue, 20 Jul 2021 16:11:56 +0200 Subject: [PATCH] Update Substrate & Polkadot (#540) --- Cargo.lock | 1063 ++++++++++------- client/collator/src/lib.rs | 12 +- .../src/active_candidate_recovery.rs | 10 +- client/pov-recovery/src/lib.rs | 7 +- client/service/src/lib.rs | 10 +- pallets/collator-selection/Cargo.toml | 32 +- pallets/collator-selection/src/mock.rs | 2 +- pallets/dmp-queue/src/lib.rs | 2 +- pallets/parachain-system/src/tests.rs | 2 +- pallets/session-benchmarking/Cargo.toml | 20 +- pallets/xcmp-queue/Cargo.toml | 6 +- pallets/xcmp-queue/src/mock.rs | 2 +- polkadot-parachains/rococo/src/lib.rs | 2 +- polkadot-parachains/shell/src/lib.rs | 2 +- .../statemint-common/src/impls.rs | 2 +- polkadot-parachains/statemint/src/lib.rs | 2 +- polkadot-parachains/westmint/src/lib.rs | 2 +- test/runtime/src/lib.rs | 2 +- 18 files changed, 664 insertions(+), 516 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index dc54c7442c5..81303d2f42e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -451,6 +451,19 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bae" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf" +dependencies = [ + "heck", + "proc-macro-error 0.4.12", + "proc-macro2 1.0.27", + "quote 1.0.9", + "syn 1.0.73", +] + [[package]] name = "base-x" version = "0.2.8" @@ -487,7 +500,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#d2c063430652a244e4cfe1eac25544172892a44d" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6c99d14caac1f9d9bad459b725b6ce6619cd34ee" dependencies = [ "beefy-primitives", "fnv", @@ -516,7 +529,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#d2c063430652a244e4cfe1eac25544172892a44d" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6c99d14caac1f9d9bad459b725b6ce6619cd34ee" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -534,10 +547,15 @@ dependencies = [ "sp-runtime", ] +[[package]] +name = "beefy-merkle-tree" +version = "0.1.0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6c99d14caac1f9d9bad459b725b6ce6619cd34ee" + [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#d2c063430652a244e4cfe1eac25544172892a44d" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6c99d14caac1f9d9bad459b725b6ce6619cd34ee" dependencies = [ "parity-scale-codec", "sp-api", @@ -715,7 +733,7 @@ dependencies = [ [[package]] name = "bp-header-chain" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "finality-grandpa", "frame-support", @@ -730,7 +748,7 @@ dependencies = [ [[package]] name = "bp-message-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-runtime", "frame-support", @@ -741,7 +759,7 @@ dependencies = [ [[package]] name = "bp-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bitvec", "bp-runtime", @@ -756,7 +774,7 @@ dependencies = [ [[package]] name = "bp-polkadot-core" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-messages", "bp-runtime", @@ -773,7 +791,7 @@ dependencies = [ [[package]] name = "bp-rialto" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-messages", "bp-runtime", @@ -788,7 +806,7 @@ dependencies = [ [[package]] name = "bp-rococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -805,7 +823,7 @@ dependencies = [ [[package]] name = "bp-runtime" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "frame-support", "hash-db", @@ -822,7 +840,7 @@ dependencies = [ [[package]] name = "bp-test-utils" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-header-chain", "ed25519-dalek", @@ -837,7 +855,7 @@ dependencies = [ [[package]] name = "bp-wococo" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-messages", "bp-polkadot-core", @@ -852,7 +870,7 @@ dependencies = [ [[package]] name = "bridge-runtime-common" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-message-dispatch", "bp-messages", @@ -2580,7 +2598,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", ] @@ -2597,8 +2615,8 @@ dependencies = [ [[package]] name = "frame-benchmarking" -version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -2616,12 +2634,13 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "Inflector", "chrono", "frame-benchmarking", + "frame-support", "handlebars", "parity-scale-codec", "sc-cli", @@ -2639,8 +2658,8 @@ dependencies = [ [[package]] name = "frame-election-provider-support" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -2652,8 +2671,8 @@ dependencies = [ [[package]] name = "frame-executive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -2667,8 +2686,8 @@ dependencies = [ [[package]] name = "frame-metadata" -version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "14.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "serde", @@ -2678,8 +2697,8 @@ dependencies = [ [[package]] name = "frame-support" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "bitflags", "frame-metadata", @@ -2704,8 +2723,8 @@ dependencies = [ [[package]] name = "frame-support-procedural" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2716,8 +2735,8 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2729,7 +2748,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", @@ -2738,8 +2757,8 @@ dependencies = [ [[package]] name = "frame-system" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2755,8 +2774,8 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -2769,8 +2788,8 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "sp-api", @@ -2778,8 +2797,8 @@ dependencies = [ [[package]] name = "frame-try-runtime" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "parity-scale-codec", @@ -3812,11 +3831,12 @@ dependencies = [ [[package]] name = "jsonrpsee-proc-macros" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b4c85cfa6767333f3e5f3b2f2f765dad2727b0033ee270ae07c599bf43ed5ae" +checksum = "f37924e16300e249a52a22cabb5632f846dc9760b39355f5e8bc70cd23dc6300" dependencies = [ "Inflector", + "bae", "proc-macro-crate 1.0.0", "proc-macro2 1.0.27", "quote 1.0.9", @@ -3825,9 +3845,9 @@ dependencies = [ [[package]] name = "jsonrpsee-types" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0cf7bd4e93b3b56e59131de7f24afbea871faf914e97bcdd942c86927ab0172" +checksum = "d67724d368c59e08b557a516cf8fcc51100e7a708850f502e1044b151fe89788" dependencies = [ "async-trait", "beef", @@ -3837,15 +3857,15 @@ dependencies = [ "log", "serde", "serde_json", - "soketto 0.5.0", + "soketto 0.6.0", "thiserror", ] [[package]] name = "jsonrpsee-ws-client" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ec51150965544e1a4468f372bdab8545243a1b045d4ab272023aac74c60de32" +checksum = "8e2834b6e7f57ce9a4412ed4d6dc95125d2c8612e68f86b9d9a07369164e4198" dependencies = [ "async-trait", "fnv", @@ -3857,7 +3877,7 @@ dependencies = [ "rustls-native-certs 0.5.0", "serde", "serde_json", - "soketto 0.5.0", + "soketto 0.6.0", "thiserror", "tokio 0.2.24", "tokio-rustls 0.15.0", @@ -3884,7 +3904,7 @@ dependencies = [ [[package]] name = "kusama-runtime" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "beefy-primitives", "bitvec", @@ -4749,7 +4769,7 @@ dependencies = [ [[package]] name = "metered-channel" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "derive_more 0.99.14", "futures 0.3.15", @@ -4914,7 +4934,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f" dependencies = [ "proc-macro-crate 0.1.5", - "proc-macro-error", + "proc-macro-error 1.0.4", "proc-macro2 1.0.27", "quote 1.0.9", "syn 1.0.73", @@ -5016,7 +5036,7 @@ dependencies = [ [[package]] name = "node-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-system", "parity-scale-codec", @@ -5183,8 +5203,8 @@ dependencies = [ [[package]] name = "pallet-assets" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5196,8 +5216,8 @@ dependencies = [ [[package]] name = "pallet-aura" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5212,8 +5232,8 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5227,8 +5247,8 @@ dependencies = [ [[package]] name = "pallet-authorship" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5241,8 +5261,8 @@ dependencies = [ [[package]] name = "pallet-babe" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5264,8 +5284,8 @@ dependencies = [ [[package]] name = "pallet-balances" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5279,7 +5299,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#d2c063430652a244e4cfe1eac25544172892a44d" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6c99d14caac1f9d9bad459b725b6ce6619cd34ee" dependencies = [ "beefy-primitives", "frame-support", @@ -5291,10 +5311,34 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-beefy-mmr" +version = "0.1.0" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#6c99d14caac1f9d9bad459b725b6ce6619cd34ee" +dependencies = [ + "beefy-merkle-tree", + "beefy-primitives", + "frame-support", + "frame-system", + "hex", + "libsecp256k1", + "log", + "pallet-beefy", + "pallet-mmr", + "pallet-mmr-primitives", + "pallet-session", + "parity-scale-codec", + "serde", + "sp-core", + "sp-io", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-bounties" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5308,7 +5352,7 @@ dependencies = [ [[package]] name = "pallet-bridge-dispatch" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-message-dispatch", "bp-runtime", @@ -5324,7 +5368,7 @@ dependencies = [ [[package]] name = "pallet-bridge-grandpa" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bp-header-chain", "bp-runtime", @@ -5345,7 +5389,7 @@ dependencies = [ [[package]] name = "pallet-bridge-messages" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bitvec", "bp-message-dispatch", @@ -5389,8 +5433,8 @@ dependencies = [ [[package]] name = "pallet-collective" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5405,8 +5449,8 @@ dependencies = [ [[package]] name = "pallet-democracy" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5420,8 +5464,8 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5441,8 +5485,8 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "5.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5458,8 +5502,8 @@ dependencies = [ [[package]] name = "pallet-gilt" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5472,8 +5516,8 @@ dependencies = [ [[package]] name = "pallet-grandpa" -version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5494,8 +5538,8 @@ dependencies = [ [[package]] name = "pallet-identity" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5509,8 +5553,8 @@ dependencies = [ [[package]] name = "pallet-im-online" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5528,8 +5572,8 @@ dependencies = [ [[package]] name = "pallet-indices" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5544,8 +5588,8 @@ dependencies = [ [[package]] name = "pallet-membership" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5559,8 +5603,8 @@ dependencies = [ [[package]] name = "pallet-mmr" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5576,8 +5620,8 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5593,7 +5637,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5610,8 +5654,8 @@ dependencies = [ [[package]] name = "pallet-multisig" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5625,8 +5669,8 @@ dependencies = [ [[package]] name = "pallet-nicks" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5638,8 +5682,8 @@ dependencies = [ [[package]] name = "pallet-offences" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5654,8 +5698,8 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5676,8 +5720,8 @@ dependencies = [ [[package]] name = "pallet-proxy" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5691,8 +5735,8 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5704,8 +5748,8 @@ dependencies = [ [[package]] name = "pallet-recovery" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "enumflags2", "frame-support", @@ -5718,8 +5762,8 @@ dependencies = [ [[package]] name = "pallet-scheduler" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5733,8 +5777,8 @@ dependencies = [ [[package]] name = "pallet-session" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5753,8 +5797,8 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5769,8 +5813,8 @@ dependencies = [ [[package]] name = "pallet-society" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5782,8 +5826,8 @@ dependencies = [ [[package]] name = "pallet-staking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5806,8 +5850,8 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.27", @@ -5817,8 +5861,8 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "log", "sp-arithmetic", @@ -5826,8 +5870,8 @@ dependencies = [ [[package]] name = "pallet-sudo" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5839,8 +5883,8 @@ dependencies = [ [[package]] name = "pallet-timestamp" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5857,8 +5901,8 @@ dependencies = [ [[package]] name = "pallet-tips" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5872,8 +5916,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-support", "frame-system", @@ -5888,8 +5932,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5905,8 +5949,8 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5916,8 +5960,8 @@ dependencies = [ [[package]] name = "pallet-treasury" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5932,8 +5976,8 @@ dependencies = [ [[package]] name = "pallet-uniques" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5946,8 +5990,8 @@ dependencies = [ [[package]] name = "pallet-utility" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-benchmarking", "frame-support", @@ -5961,8 +6005,8 @@ dependencies = [ [[package]] name = "pallet-vesting" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5976,7 +6020,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "frame-support", "frame-system", @@ -6427,7 +6471,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325" [[package]] name = "polkadot-approval-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "polkadot-node-network-protocol", @@ -6441,7 +6485,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "polkadot-node-network-protocol", @@ -6454,7 +6498,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "lru", @@ -6477,7 +6521,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "lru", @@ -6496,7 +6540,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "frame-benchmarking-cli", "futures 0.3.15", @@ -6516,7 +6560,7 @@ dependencies = [ [[package]] name = "polkadot-client" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "beefy-primitives", "frame-benchmarking", @@ -6618,7 +6662,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "always-assert", "futures 0.3.15", @@ -6638,7 +6682,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -6647,10 +6691,34 @@ dependencies = [ "sp-std", ] +[[package]] +name = "polkadot-dispute-distribution" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" +dependencies = [ + "futures 0.3.15", + "lru", + "parity-scale-codec", + "polkadot-erasure-coding", + "polkadot-node-core-runtime-api", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", + "polkadot-primitives", + "rand 0.8.3", + "sc-network", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "thiserror", + "tracing", +] + [[package]] name = "polkadot-erasure-coding" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -6664,7 +6732,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "polkadot-node-network-protocol", @@ -6682,7 +6750,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "async-trait", "futures 0.3.15", @@ -6691,8 +6759,8 @@ dependencies = [ "polkadot-node-network-protocol", "polkadot-node-subsystem", "polkadot-node-subsystem-util", + "polkadot-overseer", "polkadot-primitives", - "sc-authority-discovery", "sc-network", "sp-consensus", "strum", @@ -6702,7 +6770,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "parity-scale-codec", @@ -6720,7 +6788,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bitvec", "derive_more 0.99.14", @@ -6750,7 +6818,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bitvec", "futures 0.3.15", @@ -6770,7 +6838,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bitvec", "futures 0.3.15", @@ -6788,7 +6856,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "polkadot-node-subsystem", @@ -6803,7 +6871,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "async-trait", "futures 0.3.15", @@ -6821,7 +6889,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "polkadot-node-subsystem", @@ -6836,13 +6904,12 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "async-trait", "futures 0.3.15", "futures-timer 3.0.2", "polkadot-node-subsystem", - "polkadot-overseer", "polkadot-primitives", "sp-blockchain", "sp-inherents", @@ -6854,7 +6921,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bitvec", "futures 0.3.15", @@ -6869,7 +6936,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "always-assert", "assert_matches", @@ -6899,7 +6966,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "memory-lru", @@ -6917,7 +6984,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "async-std", "lazy_static", @@ -6932,16 +6999,34 @@ dependencies = [ "thiserror", ] +[[package]] +name = "polkadot-node-metrics" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" +dependencies = [ + "async-trait", + "futures 0.3.15", + "futures-timer 3.0.2", + "metered-channel", + "sc-network", + "sp-application-crypto", + "sp-core", + "sp-keystore", + "substrate-prometheus-endpoint", +] + [[package]] name = "polkadot-node-network-protocol" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ + "async-trait", "futures 0.3.15", "parity-scale-codec", "polkadot-node-jaeger", "polkadot-node-primitives", "polkadot-primitives", + "sc-authority-discovery", "sc-network", "strum", "thiserror", @@ -6950,7 +7035,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "futures 0.3.15", "parity-scale-codec", @@ -6967,65 +7052,80 @@ dependencies = [ "sp-maybe-compressed-blob", "sp-runtime", "thiserror", + "tracing", "zstd", ] [[package]] name = "polkadot-node-subsystem" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" +dependencies = [ + "polkadot-node-jaeger", + "polkadot-node-subsystem-types", + "polkadot-overseer", +] + +[[package]] +name = "polkadot-node-subsystem-test-helpers" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ - "async-std", "async-trait", - "derive_more 0.99.14", "futures 0.3.15", "futures-timer 3.0.2", - "lazy_static", - "log", - "mick-jaeger", "parity-scale-codec", "parking_lot 0.11.1", "pin-project 1.0.7", - "polkadot-node-jaeger", - "polkadot-node-network-protocol", "polkadot-node-primitives", + "polkadot-node-subsystem", + "polkadot-node-subsystem-util", "polkadot-primitives", - "polkadot-procmacro-subsystem-dispatch-gen", "polkadot-statement-table", + "sc-keystore", "sc-network", "smallvec 1.6.1", + "sp-application-crypto", "sp-core", - "substrate-prometheus-endpoint", - "thiserror", + "sp-keyring", + "sp-keystore", "tracing", ] [[package]] -name = "polkadot-node-subsystem-test-helpers" +name = "polkadot-node-subsystem-types" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ + "async-std", "async-trait", + "derive_more 0.99.14", "futures 0.3.15", "futures-timer 3.0.2", + "lazy_static", + "log", + "mick-jaeger", "parity-scale-codec", "parking_lot 0.11.1", "pin-project 1.0.7", + "polkadot-node-jaeger", + "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", + "polkadot-overseer-gen", "polkadot-primitives", "polkadot-statement-table", "sc-network", "smallvec 1.6.1", "sp-core", + "substrate-prometheus-endpoint", + "thiserror", "tracing", ] [[package]] name = "polkadot-node-subsystem-util" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "async-trait", "futures 0.3.15", @@ -7036,9 +7136,11 @@ dependencies = [ "parity-scale-codec", "pin-project 1.0.7", "polkadot-node-jaeger", + "polkadot-node-metrics", "polkadot-node-network-protocol", "polkadot-node-primitives", "polkadot-node-subsystem", + "polkadot-overseer", "polkadot-primitives", "rand 0.8.3", "sc-network", @@ -7053,26 +7155,67 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "async-trait", "futures 0.3.15", "futures-timer 3.0.2", "lru", + "polkadot-node-metrics", + "polkadot-node-network-protocol", "polkadot-node-primitives", - "polkadot-node-subsystem", - "polkadot-node-subsystem-util", + "polkadot-node-subsystem-types", + "polkadot-overseer-all-subsystems-gen", + "polkadot-overseer-gen", "polkadot-primitives", - "polkadot-procmacro-overseer-subsystems-gen", "sc-client-api", "sp-api", "tracing", ] +[[package]] +name = "polkadot-overseer-all-subsystems-gen" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" +dependencies = [ + "assert_matches", + "proc-macro2 1.0.27", + "quote 1.0.9", + "syn 1.0.73", +] + +[[package]] +name = "polkadot-overseer-gen" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" +dependencies = [ + "async-trait", + "futures 0.3.15", + "futures-timer 3.0.2", + "metered-channel", + "pin-project 1.0.7", + "polkadot-node-network-protocol", + "polkadot-node-primitives", + "polkadot-overseer-gen-proc-macro", + "thiserror", + "tracing", +] + +[[package]] +name = "polkadot-overseer-gen-proc-macro" +version = "0.1.0" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" +dependencies = [ + "proc-macro-crate 1.0.0", + "proc-macro2 1.0.27", + "quote 1.0.9", + "syn 1.0.73", +] + [[package]] name = "polkadot-parachain" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "derive_more 0.99.14", "parity-scale-codec", @@ -7087,7 +7230,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bitvec", "frame-system", @@ -7114,32 +7257,10 @@ dependencies = [ "thiserror", ] -[[package]] -name = "polkadot-procmacro-overseer-subsystems-gen" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" -dependencies = [ - "assert_matches", - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", -] - -[[package]] -name = "polkadot-procmacro-subsystem-dispatch-gen" -version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" -dependencies = [ - "assert_matches", - "proc-macro2 1.0.27", - "quote 1.0.9", - "syn 1.0.73", -] - [[package]] name = "polkadot-rpc" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "beefy-gadget", "beefy-gadget-rpc", @@ -7158,6 +7279,7 @@ dependencies = [ "sc-keystore", "sc-rpc", "sc-sync-state-rpc", + "sc-transaction-pool-api", "sp-api", "sp-block-builder", "sp-blockchain", @@ -7165,14 +7287,13 @@ dependencies = [ "sp-consensus-babe", "sp-keystore", "sp-runtime", - "sp-transaction-pool", "substrate-frame-rpc-system", ] [[package]] name = "polkadot-runtime" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "beefy-primitives", "bitvec", @@ -7247,9 +7368,8 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ - "beefy-primitives", "bitvec", "frame-benchmarking", "frame-support", @@ -7260,9 +7380,8 @@ dependencies = [ "pallet-authorship", "pallet-babe", "pallet-balances", - "pallet-beefy", + "pallet-beefy-mmr", "pallet-election-provider-multi-phase", - "pallet-mmr", "pallet-offences", "pallet-session", "pallet-staking", @@ -7292,7 +7411,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "bitvec", "derive_more 0.99.14", @@ -7331,7 +7450,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "async-trait", "beefy-gadget", @@ -7353,6 +7472,7 @@ dependencies = [ "polkadot-availability-recovery", "polkadot-client", "polkadot-collator-protocol", + "polkadot-dispute-distribution", "polkadot-gossip-support", "polkadot-network-bridge", "polkadot-node-collation-generation", @@ -7423,7 +7543,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.1.0" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "arrayvec 0.5.2", "futures 0.3.15", @@ -7444,7 +7564,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -7454,7 +7574,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "parity-scale-codec", "polkadot-node-subsystem", @@ -7479,7 +7599,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "beefy-primitives", "bitvec", @@ -7535,7 +7655,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "frame-benchmarking", "frame-system", @@ -7682,19 +7802,45 @@ dependencies = [ "toml", ] +[[package]] +name = "proc-macro-error" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18f33027081eba0a6d8aba6d1b1c3a3be58cbb12106341c2d5759fcd9b5277e7" +dependencies = [ + "proc-macro-error-attr 0.4.12", + "proc-macro2 1.0.27", + "quote 1.0.9", + "syn 1.0.73", + "version_check", +] + [[package]] name = "proc-macro-error" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" dependencies = [ - "proc-macro-error-attr", + "proc-macro-error-attr 1.0.4", "proc-macro2 1.0.27", "quote 1.0.9", "syn 1.0.73", "version_check", ] +[[package]] +name = "proc-macro-error-attr" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de" +dependencies = [ + "proc-macro2 1.0.27", + "quote 1.0.9", + "syn 1.0.73", + "syn-mid", + "version_check", +] + [[package]] name = "proc-macro-error-attr" version = "1.0.4" @@ -8261,8 +8407,8 @@ dependencies = [ [[package]] name = "remote-externalities" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "env_logger 0.8.3", "hex", @@ -8389,7 +8535,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "beefy-primitives", "bp-messages", @@ -8408,6 +8554,7 @@ dependencies = [ "pallet-babe", "pallet-balances", "pallet-beefy", + "pallet-beefy-mmr", "pallet-bridge-dispatch", "pallet-bridge-grandpa", "pallet-bridge-messages", @@ -8612,20 +8759,19 @@ dependencies = [ [[package]] name = "sc-allocator" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "log", "sp-core", - "sp-std", "sp-wasm-interface", "thiserror", ] [[package]] name = "sc-authority-discovery" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -8653,8 +8799,8 @@ dependencies = [ [[package]] name = "sc-basic-authorship" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.3.15", "futures-timer 3.0.2", @@ -8664,20 +8810,20 @@ dependencies = [ "sc-client-api", "sc-proposer-metrics", "sc-telemetry", + "sc-transaction-pool-api", "sp-api", "sp-blockchain", "sp-consensus", "sp-core", "sp-inherents", "sp-runtime", - "sp-transaction-pool", "substrate-prometheus-endpoint", ] [[package]] name = "sc-block-builder" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8692,8 +8838,8 @@ dependencies = [ [[package]] name = "sc-chain-spec" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -8712,8 +8858,8 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.27", @@ -8723,8 +8869,8 @@ dependencies = [ [[package]] name = "sc-cli" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "chrono", "fdlimit", @@ -8761,8 +8907,8 @@ dependencies = [ [[package]] name = "sc-client-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "derive_more 0.99.14", "fnv", @@ -8774,6 +8920,7 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "sc-executor", + "sc-transaction-pool-api", "sp-api", "sp-blockchain", "sp-consensus", @@ -8786,7 +8933,6 @@ dependencies = [ "sp-state-machine", "sp-std", "sp-storage", - "sp-transaction-pool", "sp-trie", "sp-utils", "sp-version", @@ -8795,8 +8941,8 @@ dependencies = [ [[package]] name = "sc-client-db" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "blake2-rfc", "hash-db", @@ -8825,8 +8971,8 @@ dependencies = [ [[package]] name = "sc-consensus" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "parking_lot 0.11.1", @@ -8838,8 +8984,8 @@ dependencies = [ [[package]] name = "sc-consensus-aura" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -8869,8 +9015,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -8915,8 +9061,8 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "derive_more 0.99.14", "futures 0.3.15", @@ -8939,8 +9085,8 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8952,8 +9098,8 @@ dependencies = [ [[package]] name = "sc-consensus-slots" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "futures 0.3.15", @@ -8980,8 +9126,8 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "sc-client-api", "sp-authorship", @@ -8991,8 +9137,8 @@ dependencies = [ [[package]] name = "sc-executor" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "derive_more 0.99.14", "lazy_static", @@ -9020,8 +9166,8 @@ dependencies = [ [[package]] name = "sc-executor-common" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "derive_more 0.99.14", "parity-scale-codec", @@ -9037,8 +9183,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "log", "parity-scale-codec", @@ -9052,8 +9198,8 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "cfg-if 1.0.0", "libc", @@ -9072,8 +9218,8 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9113,8 +9259,8 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "derive_more 0.99.14", "finality-grandpa", @@ -9137,8 +9283,8 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "derive_more 0.99.14", "futures 0.3.15", @@ -9158,8 +9304,8 @@ dependencies = [ [[package]] name = "sc-informant" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "ansi_term 0.12.1", "futures 0.3.15", @@ -9168,16 +9314,16 @@ dependencies = [ "parity-util-mem", "sc-client-api", "sc-network", + "sc-transaction-pool-api", "sp-blockchain", "sp-runtime", - "sp-transaction-pool", "wasm-timer", ] [[package]] name = "sc-keystore" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -9196,8 +9342,8 @@ dependencies = [ [[package]] name = "sc-light" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "hash-db", "lazy_static", @@ -9215,8 +9361,8 @@ dependencies = [ [[package]] name = "sc-network" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-std", "async-trait", @@ -9268,8 +9414,8 @@ dependencies = [ [[package]] name = "sc-network-gossip" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.3.15", "futures-timer 3.0.2", @@ -9285,8 +9431,8 @@ dependencies = [ [[package]] name = "sc-offchain" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "bytes 0.5.6", "fnv", @@ -9313,8 +9459,8 @@ dependencies = [ [[package]] name = "sc-peerset" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.3.15", "libp2p", @@ -9327,7 +9473,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9335,8 +9481,8 @@ dependencies = [ [[package]] name = "sc-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.3.15", "hash-db", @@ -9352,6 +9498,7 @@ dependencies = [ "sc-keystore", "sc-rpc-api", "sc-tracing", + "sc-transaction-pool-api", "serde_json", "sp-api", "sp-blockchain", @@ -9363,15 +9510,14 @@ dependencies = [ "sp-session", "sp-state-machine", "sp-tracing", - "sp-transaction-pool", "sp-utils", "sp-version", ] [[package]] name = "sc-rpc-api" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "derive_more 0.99.14", "futures 0.3.15", @@ -9383,20 +9529,20 @@ dependencies = [ "parity-scale-codec", "parking_lot 0.11.1", "sc-chain-spec", + "sc-transaction-pool-api", "serde", "serde_json", "sp-core", "sp-rpc", "sp-runtime", "sp-tracing", - "sp-transaction-pool", "sp-version", ] [[package]] name = "sc-rpc-server" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.1.30", "jsonrpc-core", @@ -9413,8 +9559,8 @@ dependencies = [ [[package]] name = "sc-service" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "directories", @@ -9447,6 +9593,7 @@ dependencies = [ "sc-telemetry", "sc-tracing", "sc-transaction-pool", + "sc-transaction-pool-api", "serde", "serde_json", "sp-api", @@ -9479,8 +9626,8 @@ dependencies = [ [[package]] name = "sc-state-db" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "log", "parity-scale-codec", @@ -9494,8 +9641,8 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -9514,8 +9661,8 @@ dependencies = [ [[package]] name = "sc-telemetry" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "chrono", "futures 0.3.15", @@ -9534,8 +9681,8 @@ dependencies = [ [[package]] name = "sc-tracing" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "ansi_term 0.12.1", "atty", @@ -9571,8 +9718,8 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.27", @@ -9581,50 +9728,47 @@ dependencies = [ ] [[package]] -name = "sc-transaction-graph" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +name = "sc-transaction-pool" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "derive_more 0.99.14", "futures 0.3.15", + "intervalier", "linked-hash-map", "log", + "parity-scale-codec", "parity-util-mem", "parking_lot 0.11.1", "retain_mut", + "sc-client-api", + "sc-transaction-pool-api", "serde", + "sp-api", "sp-blockchain", "sp-core", "sp-runtime", + "sp-tracing", "sp-transaction-pool", "sp-utils", + "substrate-prometheus-endpoint", "thiserror", "wasm-timer", ] [[package]] -name = "sc-transaction-pool" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +name = "sc-transaction-pool-api" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ + "derive_more 0.99.14", "futures 0.3.15", - "intervalier", "log", "parity-scale-codec", - "parity-util-mem", - "parking_lot 0.11.1", - "sc-client-api", - "sc-transaction-graph", - "sp-api", + "serde", "sp-blockchain", - "sp-core", "sp-runtime", - "sp-tracing", - "sp-transaction-pool", - "sp-utils", - "substrate-prometheus-endpoint", "thiserror", - "wasm-timer", ] [[package]] @@ -9981,7 +10125,7 @@ dependencies = [ [[package]] name = "slot-range-helper" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "enumn", "parity-scale-codec", @@ -10071,9 +10215,9 @@ dependencies = [ [[package]] name = "soketto" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4919971d141dbadaa0e82b5d369e2d7666c98e4625046140615ca363e50d4daa" +checksum = "a74e48087dbeed4833785c2f3352b59140095dc192dce966a3bfc155020a439f" dependencies = [ "base64 0.13.0", "bytes 1.0.1", @@ -10086,8 +10230,8 @@ dependencies = [ [[package]] name = "sp-api" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "hash-db", "log", @@ -10103,8 +10247,8 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -10115,8 +10259,8 @@ dependencies = [ [[package]] name = "sp-application-crypto" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "serde", @@ -10127,8 +10271,8 @@ dependencies = [ [[package]] name = "sp-arithmetic" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "integer-sqrt", "num-traits", @@ -10141,8 +10285,8 @@ dependencies = [ [[package]] name = "sp-authority-discovery" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "sp-api", @@ -10153,8 +10297,8 @@ dependencies = [ [[package]] name = "sp-authorship" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "parity-scale-codec", @@ -10165,8 +10309,8 @@ dependencies = [ [[package]] name = "sp-block-builder" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "sp-api", @@ -10177,8 +10321,8 @@ dependencies = [ [[package]] name = "sp-blockchain" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.3.15", "log", @@ -10195,8 +10339,8 @@ dependencies = [ [[package]] name = "sp-consensus" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "futures 0.3.15", @@ -10222,8 +10366,8 @@ dependencies = [ [[package]] name = "sp-consensus-aura" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "parity-scale-codec", @@ -10239,8 +10383,8 @@ dependencies = [ [[package]] name = "sp-consensus-babe" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "merlin", @@ -10261,8 +10405,8 @@ dependencies = [ [[package]] name = "sp-consensus-slots" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -10271,8 +10415,8 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -10283,8 +10427,8 @@ dependencies = [ [[package]] name = "sp-core" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "base58", "blake2-rfc", @@ -10327,8 +10471,8 @@ dependencies = [ [[package]] name = "sp-database" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -10337,7 +10481,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", @@ -10346,8 +10490,8 @@ dependencies = [ [[package]] name = "sp-externalities" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "environmental", "parity-scale-codec", @@ -10357,8 +10501,8 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "finality-grandpa", "log", @@ -10374,8 +10518,8 @@ dependencies = [ [[package]] name = "sp-inherents" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10388,8 +10532,8 @@ dependencies = [ [[package]] name = "sp-io" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.3.15", "hash-db", @@ -10413,8 +10557,8 @@ dependencies = [ [[package]] name = "sp-keyring" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "lazy_static", "sp-core", @@ -10424,8 +10568,8 @@ dependencies = [ [[package]] name = "sp-keystore" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "derive_more 0.99.14", @@ -10441,8 +10585,8 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "ruzstd", "zstd", @@ -10450,8 +10594,8 @@ dependencies = [ [[package]] name = "sp-npos-elections" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "serde", @@ -10463,8 +10607,8 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2 1.0.27", @@ -10474,8 +10618,8 @@ dependencies = [ [[package]] name = "sp-offchain" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "sp-api", "sp-core", @@ -10485,15 +10629,15 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "backtrace", ] [[package]] name = "sp-rpc" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "rustc-hash", "serde", @@ -10503,8 +10647,8 @@ dependencies = [ [[package]] name = "sp-runtime" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "either", "hash256-std-hasher", @@ -10524,8 +10668,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10541,8 +10685,8 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -10554,7 +10698,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "serde", "serde_json", @@ -10562,8 +10706,8 @@ dependencies = [ [[package]] name = "sp-session" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "sp-api", @@ -10575,8 +10719,8 @@ dependencies = [ [[package]] name = "sp-staking" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -10585,8 +10729,8 @@ dependencies = [ [[package]] name = "sp-state-machine" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "hash-db", "log", @@ -10608,13 +10752,13 @@ dependencies = [ [[package]] name = "sp-std" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" [[package]] name = "sp-storage" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10626,8 +10770,8 @@ dependencies = [ [[package]] name = "sp-tasks" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "log", "sp-core", @@ -10640,7 +10784,7 @@ dependencies = [ [[package]] name = "sp-test-primitives" version = "2.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "parity-util-mem", @@ -10652,8 +10796,8 @@ dependencies = [ [[package]] name = "sp-timestamp" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -10669,8 +10813,8 @@ dependencies = [ [[package]] name = "sp-tracing" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "erased-serde", "log", @@ -10687,24 +10831,17 @@ dependencies = [ [[package]] name = "sp-transaction-pool" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ - "derive_more 0.99.14", - "futures 0.3.15", - "log", - "parity-scale-codec", - "serde", "sp-api", - "sp-blockchain", "sp-runtime", - "thiserror", ] [[package]] name = "sp-transaction-storage-proof" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "log", @@ -10718,8 +10855,8 @@ dependencies = [ [[package]] name = "sp-trie" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "hash-db", "memory-db", @@ -10732,8 +10869,8 @@ dependencies = [ [[package]] name = "sp-utils" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.3.15", "futures-core", @@ -10744,8 +10881,8 @@ dependencies = [ [[package]] name = "sp-version" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10759,8 +10896,8 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "parity-scale-codec", "proc-macro-crate 1.0.0", @@ -10771,8 +10908,8 @@ dependencies = [ [[package]] name = "sp-wasm-interface" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -11032,7 +11169,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90" dependencies = [ "heck", - "proc-macro-error", + "proc-macro-error 1.0.4", "proc-macro2 1.0.27", "quote 1.0.9", "syn 1.0.73", @@ -11075,15 +11212,15 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "platforms", ] [[package]] name = "substrate-frame-rpc-system" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.15", @@ -11094,19 +11231,19 @@ dependencies = [ "parity-scale-codec", "sc-client-api", "sc-rpc-api", + "sc-transaction-pool-api", "serde", "sp-api", "sp-block-builder", "sp-blockchain", "sp-core", "sp-runtime", - "sp-transaction-pool", ] [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-std", "derive_more 0.99.14", @@ -11120,7 +11257,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "async-trait", "futures 0.1.30", @@ -11148,8 +11285,8 @@ dependencies = [ [[package]] name = "substrate-test-utils" -version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "futures 0.3.15", "substrate-test-utils-derive", @@ -11158,8 +11295,8 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "proc-macro-crate 1.0.0", "quote 1.0.9", @@ -11168,8 +11305,8 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" -version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "5.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "ansi_term 0.12.1", "atty", @@ -11216,6 +11353,17 @@ dependencies = [ "unicode-xid 0.2.1", ] +[[package]] +name = "syn-mid" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9" +dependencies = [ + "proc-macro2 1.0.27", + "quote 1.0.9", + "syn 1.0.73", +] + [[package]] name = "synstructure" version = "0.12.4" @@ -11869,8 +12017,8 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" -version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#3cd75117765c4a63d40c00aa41e1bf12135c237b" +version = "0.10.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#88f147a9849688b22ea9f2689e636c30e030242a" dependencies = [ "frame-try-runtime", "log", @@ -11886,7 +12034,6 @@ dependencies = [ "sp-blockchain", "sp-core", "sp-externalities", - "sp-io", "sp-keystore", "sp-runtime", "sp-state-machine", @@ -11900,7 +12047,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04f8ab788026715fa63b31960869617cba39117e520eb415b0139543e325ab59" dependencies = [ "cfg-if 0.1.10", - "rand 0.7.3", + "rand 0.6.5", "static_assertions", ] @@ -12498,7 +12645,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "beefy-primitives", "bitvec", @@ -12740,7 +12887,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "derivative", "impl-trait-for-tuples", @@ -12751,7 +12898,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "frame-support", "frame-system", @@ -12770,7 +12917,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.8" -source = "git+https://github.com/paritytech/polkadot?branch=master#2bad8079a73dc92d83bc3c0e5d81de388d36cf24" +source = "git+https://github.com/paritytech/polkadot?branch=master#5480ecf69c323c84f3c16989e9d715ef99b2d1ad" dependencies = [ "frame-support", "impl-trait-for-tuples", diff --git a/client/collator/src/lib.rs b/client/collator/src/lib.rs index 17af9efa2a5..59eb56df359 100644 --- a/client/collator/src/lib.rs +++ b/client/collator/src/lib.rs @@ -33,7 +33,7 @@ use polkadot_node_primitives::{ BlockData, Collation, CollationGenerationConfig, CollationResult, PoV, }; use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage}; -use polkadot_overseer::OverseerHandler; +use polkadot_overseer::Handle as OverseerHandle; use polkadot_primitives::v1::{CollatorPair, Hash as PHash, HeadData, Id as ParaId}; use codec::{Decode, Encode}; @@ -275,7 +275,7 @@ pub struct StartCollatorParams { pub runtime_api: Arc, pub block_status: Arc, pub announce_block: Arc>) + Send + Sync>, - pub overseer_handler: OverseerHandler, + pub overseer_handle: OverseerHandle, pub spawner: Spawner, pub key: CollatorPair, pub parachain_consensus: Box>, @@ -287,7 +287,7 @@ pub async fn start_collator( para_id, block_status, announce_block, - mut overseer_handler, + mut overseer_handle, spawner, key, parachain_consensus, @@ -321,14 +321,14 @@ pub async fn start_collator( }), }; - overseer_handler + overseer_handle .send_msg( CollationGenerationMessage::Initialize(config), "StartCollator", ) .await; - overseer_handler + overseer_handle .send_msg(CollatorProtocolMessage::CollateOn(para_id), "StartCollator") .await; } @@ -420,7 +420,7 @@ mod tests { runtime_api: client.clone(), block_status: client.clone(), announce_block: Arc::new(announce_block), - overseer_handler: handler, + overseer_handle: handler, spawner, para_id, key: CollatorPair::generate().0, diff --git a/client/pov-recovery/src/active_candidate_recovery.rs b/client/pov-recovery/src/active_candidate_recovery.rs index 1a2f5d81584..42384e0d289 100644 --- a/client/pov-recovery/src/active_candidate_recovery.rs +++ b/client/pov-recovery/src/active_candidate_recovery.rs @@ -18,7 +18,7 @@ use sp_runtime::traits::Block as BlockT; use polkadot_node_primitives::AvailableData; use polkadot_node_subsystem::messages::AvailabilityRecoveryMessage; -use polkadot_overseer::OverseerHandler; +use polkadot_overseer::Handle as OverseerHandle; use futures::{channel::oneshot, stream::FuturesUnordered, Future, FutureExt, StreamExt}; @@ -34,15 +34,15 @@ pub(crate) struct ActiveCandidateRecovery { >, /// The block hashes of the candidates currently being recovered. candidates: HashSet, - overseer_handler: OverseerHandler, + overseer_handle: OverseerHandle, } impl ActiveCandidateRecovery { - pub fn new(overseer_handler: OverseerHandler) -> Self { + pub fn new(overseer_handle: OverseerHandle) -> Self { Self { recoveries: Default::default(), candidates: Default::default(), - overseer_handler, + overseer_handle, } } @@ -54,7 +54,7 @@ impl ActiveCandidateRecovery { ) { let (tx, rx) = oneshot::channel(); - self.overseer_handler + self.overseer_handle .send_msg( AvailabilityRecoveryMessage::RecoverAvailableData( pending_candidate.receipt, diff --git a/client/pov-recovery/src/lib.rs b/client/pov-recovery/src/lib.rs index 4e979a255f6..d1126bfffe3 100644 --- a/client/pov-recovery/src/lib.rs +++ b/client/pov-recovery/src/lib.rs @@ -54,7 +54,7 @@ use sp_runtime::{ }; use polkadot_node_primitives::{AvailableData, POV_BOMB_LIMIT}; -use polkadot_overseer::OverseerHandler; +use polkadot_overseer::Handle as OverseerHandle; use polkadot_primitives::v1::{ Block as PBlock, CandidateReceipt, CommittedCandidateReceipt, Id as ParaId, ParachainHost, SessionIndex, @@ -117,7 +117,7 @@ where { /// Create a new instance. pub fn new( - overseer_handler: OverseerHandler, + overseer_handle: OverseerHandle, relay_chain_slot_duration: Duration, parachain_client: Arc, parachain_import_queue: IQ, @@ -127,7 +127,7 @@ where Self { pending_candidates: HashMap::new(), next_candidate_to_recover: Default::default(), - active_candidate_recovery: ActiveCandidateRecovery::new(overseer_handler), + active_candidate_recovery: ActiveCandidateRecovery::new(overseer_handle), relay_chain_slot_duration, waiting_for_parent: HashMap::new(), parachain_client, @@ -354,6 +354,7 @@ where origin: None, skip_execution: false, state: None, + indexed_body: None, }); if let Some(waiting) = self.waiting_for_parent.remove(&block_hash) { diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs index 6db45b5e1fa..211142a6ea7 100644 --- a/client/service/src/lib.rs +++ b/client/service/src/lib.rs @@ -20,7 +20,7 @@ use cumulus_client_consensus_common::ParachainConsensus; use cumulus_primitives_core::{CollectCollationInfo, ParaId}; -use polkadot_overseer::OverseerHandler; +use polkadot_overseer::Handle as OverseerHandle; use polkadot_primitives::v1::{Block as PBlock, CollatorPair}; use polkadot_service::{AbstractClient, Client as PClient, ClientHandle, RuntimeApiCollection}; use sc_client_api::{ @@ -124,7 +124,7 @@ where client: client.clone(), import_queue, task_manager, - overseer_handler: relay_chain_full_node + overseer_handle: relay_chain_full_node .overseer_handler .clone() .ok_or_else(|| "Polkadot full node did not provided an `OverseerHandler`!")?, @@ -135,7 +135,7 @@ where runtime_api: client.clone(), block_status, announce_block, - overseer_handler: relay_chain_full_node + overseer_handle: relay_chain_full_node .overseer_handler .clone() .ok_or_else(|| "Polkadot full node did not provided an `OverseerHandler`!")?, @@ -248,7 +248,7 @@ struct StartPoVRecovery<'a, Block: BlockT, Client, IQ> { para_id: ParaId, client: Arc, task_manager: &'a mut TaskManager, - overseer_handler: OverseerHandler, + overseer_handle: OverseerHandle, import_queue: IQ, _phantom: PhantomData, } @@ -276,7 +276,7 @@ where PClient: AbstractClient + 'static, { let pov_recovery = cumulus_client_pov_recovery::PoVRecovery::new( - self.overseer_handler, + self.overseer_handle, sc_consensus_babe::Config::get_or_compute(&*client)?.slot_duration(), self.client, self.import_queue, diff --git a/pallets/collator-selection/Cargo.toml b/pallets/collator-selection/Cargo.toml index 0d8c0179556..8849881345d 100644 --- a/pallets/collator-selection/Cargo.toml +++ b/pallets/collator-selection/Cargo.toml @@ -16,25 +16,25 @@ targets = ['x86_64-unknown-linux-gnu'] log = { version = "0.4.0", default-features = false } codec = { default-features = false, features = ['derive'], package = 'parity-scale-codec', version = '2.0.0' } serde = { version = "1.0.119", default-features = false } -sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-staking = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -pallet-authorship = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -pallet-session = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } +sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-staking = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +pallet-authorship = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +pallet-session = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } -frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } +frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = "master" } [dev-dependencies] -sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '0.9.0' } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -pallet-aura = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-tracing = { git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-runtime = { git = 'https://github.com/paritytech/substrate', branch = "master" } +pallet-timestamp = { git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-consensus-aura = { git = 'https://github.com/paritytech/substrate', branch = "master" } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "master" } +pallet-aura = { git = 'https://github.com/paritytech/substrate', branch = "master" } [features] default = ['std'] diff --git a/pallets/collator-selection/src/mock.rs b/pallets/collator-selection/src/mock.rs index bbc63295814..00fd6432cea 100644 --- a/pallets/collator-selection/src/mock.rs +++ b/pallets/collator-selection/src/mock.rs @@ -55,7 +55,7 @@ parameter_types! { } impl system::Config for Test { - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type BlockWeights = (); type BlockLength = (); type DbWeight = (); diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs index a0eb91a8788..349d1cfa7c6 100644 --- a/pallets/dmp-queue/src/lib.rs +++ b/pallets/dmp-queue/src/lib.rs @@ -396,7 +396,7 @@ mod tests { type OnNewAccount = (); type OnKilledAccount = (); type DbWeight = (); - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); diff --git a/pallets/parachain-system/src/tests.rs b/pallets/parachain-system/src/tests.rs index 7b4e13570de..6e8a711464c 100755 --- a/pallets/parachain-system/src/tests.rs +++ b/pallets/parachain-system/src/tests.rs @@ -88,7 +88,7 @@ impl frame_system::Config for Test { type OnNewAccount = (); type OnKilledAccount = (); type DbWeight = (); - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = ParachainSetCode; diff --git a/pallets/session-benchmarking/Cargo.toml b/pallets/session-benchmarking/Cargo.toml index 6136bb26740..660cac2fe51 100644 --- a/pallets/session-benchmarking/Cargo.toml +++ b/pallets/session-benchmarking/Cargo.toml @@ -13,19 +13,19 @@ readme = "README.md" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-staking = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -pallet-session = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } +sp-std = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-runtime = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-staking = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +frame-support = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +frame-system = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +frame-benchmarking = { default-features = false, optional = true, git = 'https://github.com/paritytech/substrate', branch = "master" } +pallet-session = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-io = { default-features = false, git = 'https://github.com/paritytech/substrate', branch = "master" } [dev-dependencies] serde = { version = "1.0.119" } -codec = { package = "parity-scale-codec", version = "2.0.0", features = ["derive"] } -sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } +codec = { package = "parity-scale-codec", version = "2.0.0", features = [ "derive" ] } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master" } [features] default = ["std"] diff --git a/pallets/xcmp-queue/Cargo.toml b/pallets/xcmp-queue/Cargo.toml index e1bf3894830..6325ceb271e 100644 --- a/pallets/xcmp-queue/Cargo.toml +++ b/pallets/xcmp-queue/Cargo.toml @@ -25,11 +25,11 @@ xcm-executor = { git = "https://github.com/paritytech/polkadot", default-feature cumulus-primitives-core = { path = "../../primitives/core", default-features = false } [dev-dependencies] -sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } -sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } +sp-core = { git = 'https://github.com/paritytech/substrate', branch = "master" } +sp-io = { git = 'https://github.com/paritytech/substrate', branch = "master" } cumulus-pallet-parachain-system = { path = "../parachain-system" } xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "master" } -pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "master", version = '3.0.0' } +pallet-balances = { git = 'https://github.com/paritytech/substrate', branch = "master" } [features] default = [ "std" ] diff --git a/pallets/xcmp-queue/src/mock.rs b/pallets/xcmp-queue/src/mock.rs index 783e3a69f39..f2fb0349364 100644 --- a/pallets/xcmp-queue/src/mock.rs +++ b/pallets/xcmp-queue/src/mock.rs @@ -53,7 +53,7 @@ parameter_types! { type AccountId = u64; impl frame_system::Config for Test { - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type BlockWeights = (); type BlockLength = (); type DbWeight = (); diff --git a/polkadot-parachains/rococo/src/lib.rs b/polkadot-parachains/rococo/src/lib.rs index 94e638031b1..6206d89aca6 100644 --- a/polkadot-parachains/rococo/src/lib.rs +++ b/polkadot-parachains/rococo/src/lib.rs @@ -179,7 +179,7 @@ impl frame_system::Config for Runtime { type OnNewAccount = (); type OnKilledAccount = (); type DbWeight = (); - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type SystemWeightInfo = (); type BlockWeights = RuntimeBlockWeights; type BlockLength = RuntimeBlockLength; diff --git a/polkadot-parachains/shell/src/lib.rs b/polkadot-parachains/shell/src/lib.rs index cb282c1344e..2134ce56ee3 100644 --- a/polkadot-parachains/shell/src/lib.rs +++ b/polkadot-parachains/shell/src/lib.rs @@ -145,7 +145,7 @@ impl frame_system::Config for Runtime { type OnNewAccount = (); type OnKilledAccount = (); type DbWeight = (); - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type SystemWeightInfo = (); type BlockWeights = RuntimeBlockWeights; type BlockLength = RuntimeBlockLength; diff --git a/polkadot-parachains/statemint-common/src/impls.rs b/polkadot-parachains/statemint-common/src/impls.rs index 84eccd24666..b73f54c74e0 100644 --- a/polkadot-parachains/statemint-common/src/impls.rs +++ b/polkadot-parachains/statemint-common/src/impls.rs @@ -99,7 +99,7 @@ mod tests { } impl frame_system::Config for Test { - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type Origin = Origin; type Index = u64; type BlockNumber = u64; diff --git a/polkadot-parachains/statemint/src/lib.rs b/polkadot-parachains/statemint/src/lib.rs index ff14c66ee01..c6696034e8c 100644 --- a/polkadot-parachains/statemint/src/lib.rs +++ b/polkadot-parachains/statemint/src/lib.rs @@ -145,7 +145,7 @@ parameter_types! { // Configure FRAME pallets to include in runtime. impl frame_system::Config for Runtime { - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type BlockWeights = RuntimeBlockWeights; type BlockLength = RuntimeBlockLength; type AccountId = AccountId; diff --git a/polkadot-parachains/westmint/src/lib.rs b/polkadot-parachains/westmint/src/lib.rs index 4a9415cbe3b..d67fa30d451 100644 --- a/polkadot-parachains/westmint/src/lib.rs +++ b/polkadot-parachains/westmint/src/lib.rs @@ -145,7 +145,7 @@ parameter_types! { // Configure FRAME pallets to include in runtime. impl frame_system::Config for Runtime { - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type BlockWeights = RuntimeBlockWeights; type BlockLength = RuntimeBlockLength; type AccountId = AccountId; diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs index f51aba16954..7e115cd5113 100644 --- a/test/runtime/src/lib.rs +++ b/test/runtime/src/lib.rs @@ -184,7 +184,7 @@ impl frame_system::Config for Runtime { type OnNewAccount = (); type OnKilledAccount = (); type DbWeight = (); - type BaseCallFilter = (); + type BaseCallFilter = frame_support::traits::AllowAll; type SystemWeightInfo = (); type BlockWeights = RuntimeBlockWeights; type BlockLength = RuntimeBlockLength;