From 6c0abc6f7d05459c0d63f18b10d284a1d63c31ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Tue, 3 Aug 2021 11:59:37 +0200
Subject: [PATCH] Update Substrate & Polkadot (#557)
* Update Substrate & Polkadot
* Format
* Update again
---
cumulus/Cargo.lock | 732 +++++++++---------
cumulus/client/consensus/aura/Cargo.toml | 1 +
.../client/consensus/aura/src/import_queue.rs | 5 +-
cumulus/client/consensus/aura/src/lib.rs | 13 +-
cumulus/client/consensus/common/Cargo.toml | 1 +
cumulus/client/consensus/common/src/lib.rs | 14 +-
.../common/src/parachain_consensus.rs | 3 +-
cumulus/client/consensus/common/src/tests.rs | 3 +-
.../client/consensus/relay-chain/Cargo.toml | 1 +
.../consensus/relay-chain/src/import_queue.rs | 35 +-
.../client/consensus/relay-chain/src/lib.rs | 8 +-
cumulus/client/pov-recovery/Cargo.toml | 2 +-
cumulus/client/pov-recovery/src/lib.rs | 6 +-
cumulus/client/service/Cargo.toml | 1 +
cumulus/client/service/src/lib.rs | 29 +-
cumulus/polkadot-parachains/src/service.rs | 235 +++---
.../relay-validation-worker-provider/build.rs | 9 +-
cumulus/test/service/Cargo.toml | 2 +-
cumulus/test/service/src/lib.rs | 3 +-
19 files changed, 562 insertions(+), 541 deletions(-)
diff --git a/cumulus/Cargo.lock b/cumulus/Cargo.lock
index dfde6e976f2..bfb37834c2e 100644
--- a/cumulus/Cargo.lock
+++ b/cumulus/Cargo.lock
@@ -369,7 +369,7 @@ version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -460,7 +460,7 @@ checksum = "ec107f431ee3d8a8e45e6dd117adab769556ef463959e77bf6a4888d5fd500cf"
dependencies = [
"heck",
"proc-macro-error 0.4.12",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -501,7 +501,7 @@ dependencies = [
[[package]]
name = "beefy-gadget"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#b09a58011332b18cfdf8344da58ad7217eab20d1"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#653e925439215d866514ba2e98c6650325ef347b"
dependencies = [
"beefy-primitives",
"fnv",
@@ -531,7 +531,7 @@ dependencies = [
[[package]]
name = "beefy-gadget-rpc"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#b09a58011332b18cfdf8344da58ad7217eab20d1"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#653e925439215d866514ba2e98c6650325ef347b"
dependencies = [
"beefy-gadget",
"beefy-primitives",
@@ -552,12 +552,12 @@ dependencies = [
[[package]]
name = "beefy-merkle-tree"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#b09a58011332b18cfdf8344da58ad7217eab20d1"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#653e925439215d866514ba2e98c6650325ef347b"
[[package]]
name = "beefy-primitives"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#b09a58011332b18cfdf8344da58ad7217eab20d1"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#653e925439215d866514ba2e98c6650325ef347b"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -589,7 +589,7 @@ dependencies = [
"lazy_static",
"lazycell",
"peeking_take_while",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"regex",
"rustc-hash",
@@ -735,7 +735,7 @@ dependencies = [
[[package]]
name = "bp-header-chain"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"finality-grandpa",
"frame-support",
@@ -750,7 +750,7 @@ dependencies = [
[[package]]
name = "bp-message-dispatch"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-runtime",
"frame-support",
@@ -761,7 +761,7 @@ dependencies = [
[[package]]
name = "bp-messages"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"bp-runtime",
@@ -776,7 +776,7 @@ dependencies = [
[[package]]
name = "bp-polkadot-core"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-messages",
"bp-runtime",
@@ -793,7 +793,7 @@ dependencies = [
[[package]]
name = "bp-rialto"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-messages",
"bp-runtime",
@@ -808,7 +808,7 @@ dependencies = [
[[package]]
name = "bp-rococo"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-messages",
"bp-polkadot-core",
@@ -825,7 +825,7 @@ dependencies = [
[[package]]
name = "bp-runtime"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"frame-support",
"hash-db",
@@ -842,7 +842,7 @@ dependencies = [
[[package]]
name = "bp-test-utils"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-header-chain",
"ed25519-dalek",
@@ -857,7 +857,7 @@ dependencies = [
[[package]]
name = "bp-wococo"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-messages",
"bp-polkadot-core",
@@ -872,7 +872,7 @@ dependencies = [
[[package]]
name = "bridge-runtime-common"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-message-dispatch",
"bp-messages",
@@ -1523,6 +1523,7 @@ dependencies = [
"parking_lot 0.10.2",
"polkadot-client",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-aura",
"sc-consensus-slots",
"sc-telemetry",
@@ -1558,6 +1559,7 @@ dependencies = [
"polkadot-test-client",
"sc-cli",
"sc-client-api",
+ "sc-consensus",
"sc-service",
"sp-api",
"sp-block-builder",
@@ -1586,6 +1588,7 @@ dependencies = [
"parking_lot 0.10.2",
"polkadot-client",
"sc-client-api",
+ "sc-consensus",
"sp-api",
"sp-block-builder",
"sp-blockchain",
@@ -1643,9 +1646,10 @@ dependencies = [
"polkadot-overseer",
"polkadot-primitives",
"polkadot-test-client",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-cli",
"sc-client-api",
+ "sc-consensus",
"sc-service",
"sp-api",
"sp-consensus",
@@ -1674,6 +1678,7 @@ dependencies = [
"polkadot-service",
"sc-chain-spec",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-babe",
"sc-service",
"sc-telemetry",
@@ -1712,7 +1717,7 @@ dependencies = [
"frame-system",
"log",
"parity-scale-codec",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_chacha 0.3.1",
"sp-core",
"sp-io",
@@ -1762,7 +1767,7 @@ name = "cumulus-pallet-parachain-system-proc-macro"
version = "0.1.0"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -1810,7 +1815,7 @@ dependencies = [
"log",
"pallet-balances",
"parity-scale-codec",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_chacha 0.3.1",
"sp-core",
"sp-io",
@@ -2053,6 +2058,7 @@ dependencies = [
"sc-chain-spec",
"sc-cli",
"sc-client-api",
+ "sc-consensus",
"sc-executor",
"sc-network",
"sc-rpc",
@@ -2065,7 +2071,6 @@ dependencies = [
"sp-arithmetic",
"sp-block-builder",
"sp-blockchain",
- "sp-consensus",
"sp-core",
"sp-keyring",
"sp-maybe-compressed-blob",
@@ -2140,7 +2145,7 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2166,7 +2171,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5cc7b9cef1e351660e5443924e4f43ab25fbbed3e9a5f052df3677deb4d6b320"
dependencies = [
"convert_case",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2274,7 +2279,7 @@ version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "558e40ea573c374cf53507fd240b7ee2f5477df7cfebdb97323ec61c719399c5"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2321,7 +2326,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c5f0096a91d210159eceb2ff5e1c4da18388a170e1e3ce948aac9c8fdbbf595"
dependencies = [
"heck",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2341,7 +2346,7 @@ version = "0.6.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "946ee94e3dbf58fdd324f9ce245c7b238d46a66f00e86a020b71996349e46cce"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2352,7 +2357,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e58b112d5099aa0857c5d05f0eacab86406dd8c0f85fe5d320a13256d29ecf4"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2499,7 +2504,7 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"synstructure",
@@ -2567,7 +2572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
dependencies = [
"byteorder",
- "rand 0.8.3",
+ "rand 0.8.4",
"rustc-hex",
"static_assertions",
]
@@ -2600,7 +2605,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "fork-tree"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
]
@@ -2618,7 +2623,7 @@ dependencies = [
[[package]]
name = "frame-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -2637,13 +2642,15 @@ dependencies = [
[[package]]
name = "frame-benchmarking-cli"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"Inflector",
"chrono",
"frame-benchmarking",
"frame-support",
"handlebars",
+ "linked-hash-map",
+ "log",
"parity-scale-codec",
"sc-cli",
"sc-client-db",
@@ -2661,7 +2668,7 @@ dependencies = [
[[package]]
name = "frame-election-provider-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -2674,7 +2681,7 @@ dependencies = [
[[package]]
name = "frame-executive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -2689,7 +2696,7 @@ dependencies = [
[[package]]
name = "frame-metadata"
version = "14.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"serde",
@@ -2700,7 +2707,7 @@ dependencies = [
[[package]]
name = "frame-support"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"bitflags",
"frame-metadata",
@@ -2726,11 +2733,11 @@ dependencies = [
[[package]]
name = "frame-support-procedural"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"Inflector",
"frame-support-procedural-tools",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2738,11 +2745,11 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support-procedural-tools-derive",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2750,9 +2757,9 @@ dependencies = [
[[package]]
name = "frame-support-procedural-tools-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -2760,7 +2767,7 @@ dependencies = [
[[package]]
name = "frame-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"impl-trait-for-tuples",
@@ -2777,7 +2784,7 @@ dependencies = [
[[package]]
name = "frame-system-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -2791,7 +2798,7 @@ dependencies = [
[[package]]
name = "frame-system-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -2800,7 +2807,7 @@ dependencies = [
[[package]]
name = "frame-try-runtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"parity-scale-codec",
@@ -2953,7 +2960,7 @@ checksum = "c54913bae956fb8df7f4dc6fc90362aa72e69148e3f39041fbe8742d21e0ac57"
dependencies = [
"autocfg 1.0.1",
"proc-macro-hack",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -3595,7 +3602,7 @@ version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d5dacb10c5b3bb92d46ba347505a9041e676bb20ad220101326bffb0c93031ee"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -3765,7 +3772,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "99a847f9ec7bb52149b2786a17c9cb260d6effc6b8eeb8c16b343a487a7563a3"
dependencies = [
"proc-macro-crate 0.1.5",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -3851,7 +3858,7 @@ dependencies = [
"Inflector",
"bae",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -3917,7 +3924,7 @@ dependencies = [
[[package]]
name = "kusama-runtime"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -4289,7 +4296,7 @@ dependencies = [
"libp2p-core",
"libp2p-swarm",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"smallvec 1.6.1",
"socket2 0.4.0",
"void",
@@ -4613,9 +4620,9 @@ dependencies = [
[[package]]
name = "linked-hash-map"
-version = "0.5.3"
+version = "0.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8dd5a6d5999d9907cda8ed67bbd137d3af8085216c2ac62de5be860bd41f304a"
+checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
[[package]]
name = "linked_hash_set"
@@ -4830,7 +4837,7 @@ dependencies = [
[[package]]
name = "metered-channel"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"derive_more 0.99.14",
"futures 0.3.16",
@@ -4863,7 +4870,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "19ce18b5423c573a13e80cb3046ea0af6379ef725dc3af4886bdb8f4e5093068"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -4996,7 +5003,7 @@ checksum = "85ee3c48cb9d9b275ad967a0e96715badc13c6029adb92f34fa17b9ff28fd81f"
dependencies = [
"proc-macro-crate 0.1.5",
"proc-macro-error 1.0.4",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"synstructure",
@@ -5034,7 +5041,7 @@ dependencies = [
"num-complex",
"num-rational 0.4.0",
"num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_distr",
"simba",
"typenum",
@@ -5046,7 +5053,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01fcc0b8149b4632adc89ac3b7b31a12fb6099a0317a4eb2ebff574ef7de7218"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -5097,7 +5104,7 @@ dependencies = [
[[package]]
name = "node-primitives"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-system",
"parity-scale-codec",
@@ -5265,7 +5272,7 @@ dependencies = [
[[package]]
name = "pallet-assets"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5278,7 +5285,7 @@ dependencies = [
[[package]]
name = "pallet-aura"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5294,7 +5301,7 @@ dependencies = [
[[package]]
name = "pallet-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5309,7 +5316,7 @@ dependencies = [
[[package]]
name = "pallet-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5323,7 +5330,7 @@ dependencies = [
[[package]]
name = "pallet-babe"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5346,7 +5353,7 @@ dependencies = [
[[package]]
name = "pallet-balances"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5360,13 +5367,14 @@ dependencies = [
[[package]]
name = "pallet-beefy"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#b09a58011332b18cfdf8344da58ad7217eab20d1"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#653e925439215d866514ba2e98c6650325ef347b"
dependencies = [
"beefy-primitives",
"frame-support",
"frame-system",
"pallet-session",
"parity-scale-codec",
+ "scale-info",
"serde",
"sp-runtime",
"sp-std",
@@ -5375,7 +5383,7 @@ dependencies = [
[[package]]
name = "pallet-beefy-mmr"
version = "0.1.0"
-source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#b09a58011332b18cfdf8344da58ad7217eab20d1"
+source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#653e925439215d866514ba2e98c6650325ef347b"
dependencies = [
"beefy-merkle-tree",
"beefy-primitives",
@@ -5389,6 +5397,7 @@ dependencies = [
"pallet-mmr-primitives",
"pallet-session",
"parity-scale-codec",
+ "scale-info",
"serde",
"sp-core",
"sp-io",
@@ -5399,7 +5408,7 @@ dependencies = [
[[package]]
name = "pallet-bounties"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5413,7 +5422,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-dispatch"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-message-dispatch",
"bp-runtime",
@@ -5429,7 +5438,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-grandpa"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bp-header-chain",
"bp-runtime",
@@ -5450,7 +5459,7 @@ dependencies = [
[[package]]
name = "pallet-bridge-messages"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"bp-message-dispatch",
@@ -5495,7 +5504,7 @@ dependencies = [
[[package]]
name = "pallet-collective"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5511,7 +5520,7 @@ dependencies = [
[[package]]
name = "pallet-democracy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5526,7 +5535,7 @@ dependencies = [
[[package]]
name = "pallet-election-provider-multi-phase"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5547,7 +5556,7 @@ dependencies = [
[[package]]
name = "pallet-elections-phragmen"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5564,7 +5573,7 @@ dependencies = [
[[package]]
name = "pallet-gilt"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5578,7 +5587,7 @@ dependencies = [
[[package]]
name = "pallet-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5600,7 +5609,7 @@ dependencies = [
[[package]]
name = "pallet-identity"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -5615,7 +5624,7 @@ dependencies = [
[[package]]
name = "pallet-im-online"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5634,7 +5643,7 @@ dependencies = [
[[package]]
name = "pallet-indices"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5650,7 +5659,7 @@ dependencies = [
[[package]]
name = "pallet-membership"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5665,7 +5674,7 @@ dependencies = [
[[package]]
name = "pallet-mmr"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"ckb-merkle-mountain-range",
"frame-benchmarking",
@@ -5682,7 +5691,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-primitives"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5698,7 +5707,7 @@ dependencies = [
[[package]]
name = "pallet-mmr-rpc"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -5716,7 +5725,7 @@ dependencies = [
[[package]]
name = "pallet-multisig"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5731,7 +5740,7 @@ dependencies = [
[[package]]
name = "pallet-nicks"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5744,7 +5753,7 @@ dependencies = [
[[package]]
name = "pallet-offences"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5760,7 +5769,7 @@ dependencies = [
[[package]]
name = "pallet-offences-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5782,7 +5791,7 @@ dependencies = [
[[package]]
name = "pallet-proxy"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5797,7 +5806,7 @@ dependencies = [
[[package]]
name = "pallet-randomness-collective-flip"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5810,7 +5819,7 @@ dependencies = [
[[package]]
name = "pallet-recovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"enumflags2",
"frame-support",
@@ -5824,7 +5833,7 @@ dependencies = [
[[package]]
name = "pallet-scheduler"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5839,7 +5848,7 @@ dependencies = [
[[package]]
name = "pallet-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5859,7 +5868,7 @@ dependencies = [
[[package]]
name = "pallet-session-benchmarking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5875,7 +5884,7 @@ dependencies = [
[[package]]
name = "pallet-society"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5888,7 +5897,7 @@ dependencies = [
[[package]]
name = "pallet-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-election-provider-support",
@@ -5912,10 +5921,10 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-curve"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -5923,7 +5932,7 @@ dependencies = [
[[package]]
name = "pallet-staking-reward-fn"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"log",
"sp-arithmetic",
@@ -5932,7 +5941,7 @@ dependencies = [
[[package]]
name = "pallet-sudo"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5945,7 +5954,7 @@ dependencies = [
[[package]]
name = "pallet-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5963,7 +5972,7 @@ dependencies = [
[[package]]
name = "pallet-tips"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -5978,7 +5987,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-support",
"frame-system",
@@ -5994,7 +6003,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -6011,7 +6020,7 @@ dependencies = [
[[package]]
name = "pallet-transaction-payment-rpc-runtime-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"pallet-transaction-payment",
"parity-scale-codec",
@@ -6022,7 +6031,7 @@ dependencies = [
[[package]]
name = "pallet-treasury"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6038,7 +6047,7 @@ dependencies = [
[[package]]
name = "pallet-uniques"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6052,7 +6061,7 @@ dependencies = [
[[package]]
name = "pallet-utility"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -6067,7 +6076,7 @@ dependencies = [
[[package]]
name = "pallet-vesting"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"enumflags2",
"frame-benchmarking",
@@ -6081,7 +6090,7 @@ dependencies = [
[[package]]
name = "pallet-xcm"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"frame-support",
"frame-system",
@@ -6119,7 +6128,7 @@ dependencies = [
"log",
"memmap2",
"parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -6161,7 +6170,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40dbbfef7f0a1143c5b06e0d76a6278e25dac0bc1af4be51a0fbb73f07e7ad09"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -6215,7 +6224,7 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"syn 1.0.73",
"synstructure",
]
@@ -6433,7 +6442,7 @@ checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55"
dependencies = [
"pest",
"pest_meta",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -6483,7 +6492,7 @@ version = "0.4.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "65ad2ae56b6abe3a1ee25f15ee605bacadb9a764edaba9c2bf4103800d4a1895"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -6494,7 +6503,7 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -6532,7 +6541,7 @@ checksum = "989d43012e2ca1c4a02507c67282691a0a3207f9dc67cec596b43fe925b3d325"
[[package]]
name = "polkadot-approval-distribution"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"polkadot-node-network-protocol",
@@ -6546,7 +6555,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-bitfield-distribution"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"polkadot-node-network-protocol",
@@ -6559,7 +6568,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-distribution"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"lru",
@@ -6571,7 +6580,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"sp-application-crypto",
"sp-core",
"sp-keystore",
@@ -6582,7 +6591,7 @@ dependencies = [
[[package]]
name = "polkadot-availability-recovery"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"lru",
@@ -6593,7 +6602,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"thiserror",
"tracing",
]
@@ -6601,7 +6610,7 @@ dependencies = [
[[package]]
name = "polkadot-cli"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"frame-benchmarking-cli",
"futures 0.3.16",
@@ -6621,7 +6630,7 @@ dependencies = [
[[package]]
name = "polkadot-client"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"beefy-primitives",
"frame-benchmarking",
@@ -6631,6 +6640,7 @@ dependencies = [
"polkadot-primitives",
"polkadot-runtime",
"sc-client-api",
+ "sc-consensus",
"sc-executor",
"sc-service",
"sp-api",
@@ -6723,7 +6733,7 @@ dependencies = [
[[package]]
name = "polkadot-collator-protocol"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"always-assert",
"futures 0.3.16",
@@ -6743,7 +6753,7 @@ dependencies = [
[[package]]
name = "polkadot-core-primitives"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -6755,7 +6765,7 @@ dependencies = [
[[package]]
name = "polkadot-dispute-distribution"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"lru",
@@ -6767,7 +6777,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-network",
"sp-application-crypto",
"sp-core",
@@ -6779,7 +6789,7 @@ dependencies = [
[[package]]
name = "polkadot-erasure-coding"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"parity-scale-codec",
"polkadot-node-primitives",
@@ -6793,14 +6803,14 @@ dependencies = [
[[package]]
name = "polkadot-gossip-support"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"polkadot-node-network-protocol",
"polkadot-node-subsystem",
"polkadot-node-subsystem-util",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_chacha 0.3.1",
"sp-application-crypto",
"sp-core",
@@ -6811,7 +6821,7 @@ dependencies = [
[[package]]
name = "polkadot-network-bridge"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -6831,7 +6841,7 @@ dependencies = [
[[package]]
name = "polkadot-node-collation-generation"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"parity-scale-codec",
@@ -6849,7 +6859,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-approval-voting"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"derive_more 0.99.14",
@@ -6879,7 +6889,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-av-store"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"futures 0.3.16",
@@ -6899,7 +6909,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-backing"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"futures 0.3.16",
@@ -6917,7 +6927,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-bitfield-signing"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"polkadot-node-subsystem",
@@ -6932,7 +6942,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-candidate-validation"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -6950,7 +6960,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-api"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"polkadot-node-subsystem",
@@ -6965,7 +6975,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-chain-selection"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"futures-timer 3.0.2",
@@ -6982,7 +6992,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-coordinator"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"derive_more 0.99.14",
@@ -7001,7 +7011,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-dispute-participation"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"polkadot-node-primitives",
@@ -7014,7 +7024,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-parachains-inherent"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -7031,7 +7041,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-provisioner"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"futures 0.3.16",
@@ -7046,7 +7056,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-pvf"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"always-assert",
"assert_matches",
@@ -7059,7 +7069,7 @@ dependencies = [
"pin-project 1.0.7",
"polkadot-core-primitives",
"polkadot-parachain",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-executor",
"sc-executor-common",
"sc-executor-wasmtime",
@@ -7076,7 +7086,7 @@ dependencies = [
[[package]]
name = "polkadot-node-core-runtime-api"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"memory-lru",
@@ -7094,7 +7104,7 @@ dependencies = [
[[package]]
name = "polkadot-node-jaeger"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-std",
"lazy_static",
@@ -7112,7 +7122,7 @@ dependencies = [
[[package]]
name = "polkadot-node-metrics"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -7128,7 +7138,7 @@ dependencies = [
[[package]]
name = "polkadot-node-network-protocol"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -7145,7 +7155,7 @@ dependencies = [
[[package]]
name = "polkadot-node-primitives"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"futures 0.3.16",
"parity-scale-codec",
@@ -7169,7 +7179,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"polkadot-node-jaeger",
"polkadot-node-subsystem-types",
@@ -7179,7 +7189,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-test-helpers"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -7205,7 +7215,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-types"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-std",
"async-trait",
@@ -7235,7 +7245,7 @@ dependencies = [
[[package]]
name = "polkadot-node-subsystem-util"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -7252,7 +7262,7 @@ dependencies = [
"polkadot-node-subsystem",
"polkadot-overseer",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-network",
"sp-application-crypto",
"sp-core",
@@ -7265,7 +7275,7 @@ dependencies = [
[[package]]
name = "polkadot-overseer"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -7287,10 +7297,10 @@ dependencies = [
[[package]]
name = "polkadot-overseer-all-subsystems-gen"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"assert_matches",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -7298,7 +7308,7 @@ dependencies = [
[[package]]
name = "polkadot-overseer-gen"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -7315,10 +7325,10 @@ dependencies = [
[[package]]
name = "polkadot-overseer-gen-proc-macro"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -7326,9 +7336,10 @@ dependencies = [
[[package]]
name = "polkadot-parachain"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"derive_more 0.99.14",
+ "frame-support",
"parity-scale-codec",
"parity-util-mem",
"polkadot-core-primitives",
@@ -7341,7 +7352,7 @@ dependencies = [
[[package]]
name = "polkadot-primitives"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"frame-system",
@@ -7371,7 +7382,7 @@ dependencies = [
[[package]]
name = "polkadot-rpc"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"beefy-gadget",
"beefy-gadget-rpc",
@@ -7404,7 +7415,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7479,7 +7490,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-common"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitvec",
"frame-benchmarking",
@@ -7522,7 +7533,7 @@ dependencies = [
[[package]]
name = "polkadot-runtime-parachains"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"bitflags",
"bitvec",
@@ -7541,7 +7552,7 @@ dependencies = [
"pallet-vesting",
"parity-scale-codec",
"polkadot-primitives",
- "rand 0.8.3",
+ "rand 0.8.4",
"rand_chacha 0.3.1",
"rustc-hex",
"serde",
@@ -7561,7 +7572,7 @@ dependencies = [
[[package]]
name = "polkadot-service"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"async-trait",
"beefy-gadget",
@@ -7622,7 +7633,6 @@ dependencies = [
"sc-consensus-uncles",
"sc-executor",
"sc-finality-grandpa",
- "sc-finality-grandpa-warp-sync",
"sc-keystore",
"sc-network",
"sc-service",
@@ -7657,7 +7667,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-distribution"
version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"arrayvec 0.5.2",
"futures 0.3.16",
@@ -7678,7 +7688,7 @@ dependencies = [
[[package]]
name = "polkadot-statement-table"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"parity-scale-codec",
"polkadot-primitives",
@@ -7688,7 +7698,7 @@ dependencies = [
[[package]]
name = "polkadot-test-client"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"parity-scale-codec",
"polkadot-node-subsystem",
@@ -7713,7 +7723,7 @@ dependencies = [
[[package]]
name = "polkadot-test-runtime"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -7769,7 +7779,7 @@ dependencies = [
[[package]]
name = "polkadot-test-service"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"frame-benchmarking",
"frame-system",
@@ -7789,7 +7799,7 @@ dependencies = [
"polkadot-runtime-parachains",
"polkadot-service",
"polkadot-test-runtime",
- "rand 0.8.3",
+ "rand 0.8.4",
"sc-authority-discovery",
"sc-chain-spec",
"sc-cli",
@@ -7923,7 +7933,7 @@ 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",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"version_check",
@@ -7936,7 +7946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr 1.0.4",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"version_check",
@@ -7948,7 +7958,7 @@ version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a5b4b77fdb63c1eca72173d68d24501c54ab1269409f6b672c85deb18af69de"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"syn-mid",
@@ -7961,7 +7971,7 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"version_check",
]
@@ -7989,9 +7999,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.27"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0d8caf72986c1a598726adc988bb5984792ef84f5ee5aa50209145ee8077038"
+checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612"
dependencies = [
"unicode-xid 0.2.1",
]
@@ -8046,7 +8056,7 @@ checksum = "169a15f3008ecb5160cba7d37bcd690a7601b6d30cfb87a117d45e59d52af5d4"
dependencies = [
"anyhow",
"itertools 0.9.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -8119,7 +8129,7 @@ version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
]
[[package]]
@@ -8186,9 +8196,9 @@ dependencies = [
[[package]]
name = "rand"
-version = "0.8.3"
+version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e"
+checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8"
dependencies = [
"libc",
"rand_chacha 0.3.1",
@@ -8266,7 +8276,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "051b398806e42b9cd04ad9ec8f81e355d0a382c543ac6672c62f5a5b452ef142"
dependencies = [
"num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -8462,7 +8472,7 @@ version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -8522,7 +8532,7 @@ dependencies = [
[[package]]
name = "remote-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"env_logger 0.8.3",
"hex",
@@ -8649,7 +8659,7 @@ dependencies = [
[[package]]
name = "rococo-runtime"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"beefy-primitives",
"bp-messages",
@@ -8874,7 +8884,7 @@ dependencies = [
[[package]]
name = "sc-allocator"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"log",
"sp-core",
@@ -8885,7 +8895,7 @@ dependencies = [
[[package]]
name = "sc-authority-discovery"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"derive_more 0.99.14",
@@ -8914,7 +8924,7 @@ dependencies = [
[[package]]
name = "sc-basic-authorship"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.3.16",
"futures-timer 3.0.2",
@@ -8937,7 +8947,7 @@ dependencies = [
[[package]]
name = "sc-block-builder"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"sc-client-api",
@@ -8953,7 +8963,7 @@ dependencies = [
[[package]]
name = "sc-chain-spec"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -8973,10 +8983,10 @@ dependencies = [
[[package]]
name = "sc-chain-spec-derive"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -8984,7 +8994,7 @@ dependencies = [
[[package]]
name = "sc-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"chrono",
"fdlimit",
@@ -9022,7 +9032,7 @@ dependencies = [
[[package]]
name = "sc-client-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"derive_more 0.99.14",
"fnv",
@@ -9056,7 +9066,7 @@ dependencies = [
[[package]]
name = "sc-client-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"blake2-rfc",
"hash-db",
@@ -9074,7 +9084,6 @@ dependencies = [
"sc-state-db",
"sp-arithmetic",
"sp-blockchain",
- "sp-consensus",
"sp-core",
"sp-database",
"sp-runtime",
@@ -9086,20 +9095,32 @@ dependencies = [
[[package]]
name = "sc-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
+ "futures 0.3.16",
+ "futures-timer 3.0.2",
+ "libp2p",
+ "log",
"parking_lot 0.11.1",
"sc-client-api",
+ "serde",
+ "sp-api",
"sp-blockchain",
"sp-consensus",
+ "sp-core",
"sp-runtime",
+ "sp-state-machine",
+ "sp-utils",
+ "substrate-prometheus-endpoint",
+ "thiserror",
+ "wasm-timer",
]
[[package]]
name = "sc-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"derive_more 0.99.14",
@@ -9109,6 +9130,7 @@ dependencies = [
"parity-scale-codec",
"sc-block-builder",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-slots",
"sc-telemetry",
"sp-api",
@@ -9130,7 +9152,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"derive_more 0.99.14",
@@ -9148,6 +9170,7 @@ dependencies = [
"rand 0.7.3",
"retain_mut",
"sc-client-api",
+ "sc-consensus",
"sc-consensus-epochs",
"sc-consensus-slots",
"sc-consensus-uncles",
@@ -9176,7 +9199,7 @@ dependencies = [
[[package]]
name = "sc-consensus-babe-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"derive_more 0.99.14",
"futures 0.3.16",
@@ -9200,7 +9223,7 @@ dependencies = [
[[package]]
name = "sc-consensus-epochs"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"fork-tree",
"parity-scale-codec",
@@ -9213,7 +9236,7 @@ dependencies = [
[[package]]
name = "sc-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"futures 0.3.16",
@@ -9222,6 +9245,7 @@ dependencies = [
"log",
"parity-scale-codec",
"sc-client-api",
+ "sc-consensus",
"sc-telemetry",
"sp-api",
"sp-application-crypto",
@@ -9241,7 +9265,7 @@ dependencies = [
[[package]]
name = "sc-consensus-uncles"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"sc-client-api",
"sp-authorship",
@@ -9252,7 +9276,7 @@ dependencies = [
[[package]]
name = "sc-executor"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"derive_more 0.99.14",
"lazy_static",
@@ -9281,7 +9305,7 @@ dependencies = [
[[package]]
name = "sc-executor-common"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"derive_more 0.99.14",
"parity-scale-codec",
@@ -9298,7 +9322,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmi"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"log",
"parity-scale-codec",
@@ -9313,7 +9337,7 @@ dependencies = [
[[package]]
name = "sc-executor-wasmtime"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"cfg-if 1.0.0",
"libc",
@@ -9333,7 +9357,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"derive_more 0.99.14",
@@ -9347,7 +9371,7 @@ dependencies = [
"parity-scale-codec",
"parking_lot 0.11.1",
"pin-project 1.0.7",
- "rand 0.7.3",
+ "rand 0.8.4",
"sc-block-builder",
"sc-client-api",
"sc-consensus",
@@ -9374,7 +9398,7 @@ dependencies = [
[[package]]
name = "sc-finality-grandpa-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"derive_more 0.99.14",
"finality-grandpa",
@@ -9395,31 +9419,10 @@ dependencies = [
"sp-runtime",
]
-[[package]]
-name = "sc-finality-grandpa-warp-sync"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
-dependencies = [
- "derive_more 0.99.14",
- "futures 0.3.16",
- "log",
- "num-traits",
- "parity-scale-codec",
- "parking_lot 0.11.1",
- "prost",
- "sc-client-api",
- "sc-finality-grandpa",
- "sc-network",
- "sc-service",
- "sp-blockchain",
- "sp-finality-grandpa",
- "sp-runtime",
-]
-
[[package]]
name = "sc-informant"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"ansi_term 0.12.1",
"futures 0.3.16",
@@ -9437,7 +9440,7 @@ dependencies = [
[[package]]
name = "sc-keystore"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"derive_more 0.99.14",
@@ -9457,7 +9460,7 @@ dependencies = [
[[package]]
name = "sc-light"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"hash-db",
"lazy_static",
@@ -9476,7 +9479,7 @@ dependencies = [
[[package]]
name = "sc-network"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-std",
"async-trait",
@@ -9508,6 +9511,7 @@ dependencies = [
"rand 0.7.3",
"sc-block-builder",
"sc-client-api",
+ "sc-consensus",
"sc-peerset",
"serde",
"serde_json",
@@ -9516,6 +9520,7 @@ dependencies = [
"sp-blockchain",
"sp-consensus",
"sp-core",
+ "sp-finality-grandpa",
"sp-runtime",
"sp-utils",
"substrate-prometheus-endpoint",
@@ -9529,7 +9534,7 @@ dependencies = [
[[package]]
name = "sc-network-gossip"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.3.16",
"futures-timer 3.0.2",
@@ -9546,7 +9551,7 @@ dependencies = [
[[package]]
name = "sc-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"bytes 0.5.6",
"fnv",
@@ -9574,7 +9579,7 @@ dependencies = [
[[package]]
name = "sc-peerset"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.3.16",
"libp2p",
@@ -9587,7 +9592,7 @@ dependencies = [
[[package]]
name = "sc-proposer-metrics"
version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"log",
"substrate-prometheus-endpoint",
@@ -9596,7 +9601,7 @@ dependencies = [
[[package]]
name = "sc-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.3.16",
"hash-db",
@@ -9631,7 +9636,7 @@ dependencies = [
[[package]]
name = "sc-rpc-api"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"derive_more 0.99.14",
"futures 0.3.16",
@@ -9656,7 +9661,7 @@ dependencies = [
[[package]]
name = "sc-rpc-server"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.1.30",
"jsonrpc-core",
@@ -9674,7 +9679,7 @@ dependencies = [
[[package]]
name = "sc-service"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"directories",
@@ -9696,6 +9701,7 @@ dependencies = [
"sc-chain-spec",
"sc-client-api",
"sc-client-db",
+ "sc-consensus",
"sc-executor",
"sc-informant",
"sc-keystore",
@@ -9741,7 +9747,7 @@ dependencies = [
[[package]]
name = "sc-state-db"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"log",
"parity-scale-codec",
@@ -9756,7 +9762,7 @@ dependencies = [
[[package]]
name = "sc-sync-state-rpc"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"jsonrpc-core",
"jsonrpc-core-client",
@@ -9776,7 +9782,7 @@ dependencies = [
[[package]]
name = "sc-telemetry"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"chrono",
"futures 0.3.16",
@@ -9796,7 +9802,7 @@ dependencies = [
[[package]]
name = "sc-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"ansi_term 0.12.1",
"atty",
@@ -9833,10 +9839,10 @@ dependencies = [
[[package]]
name = "sc-tracing-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -9844,7 +9850,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"derive_more 0.99.14",
"futures 0.3.16",
@@ -9873,7 +9879,7 @@ dependencies = [
[[package]]
name = "sc-transaction-pool-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"derive_more 0.99.14",
"futures 0.3.16",
@@ -9885,6 +9891,31 @@ dependencies = [
"thiserror",
]
+[[package]]
+name = "scale-info"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2e62ff266e136db561a007c84569985805f84a1d5a08278e52c36aacb6e061b"
+dependencies = [
+ "bitvec",
+ "cfg-if 1.0.0",
+ "derive_more 0.99.14",
+ "parity-scale-codec",
+ "scale-info-derive",
+]
+
+[[package]]
+name = "scale-info-derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b648fa291891a4c80187a25532f6a7d96b82c70353e30b868b14632b8fe043d6"
+dependencies = [
+ "proc-macro-crate 1.0.0",
+ "proc-macro2 1.0.28",
+ "quote 1.0.9",
+ "syn 1.0.73",
+]
+
[[package]]
name = "schannel"
version = "0.1.19"
@@ -10041,20 +10072,20 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.126"
+version = "1.0.127"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03"
+checksum = "f03b9878abf6d14e6779d3f24f07b2cfa90352cfec4acc5aab8f1ac7f146fae8"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.126"
+version = "1.0.127"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43"
+checksum = "a024926d3432516606328597e0f224a51355a493b49fdd67e9209187cbe55ecc"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -10239,7 +10270,7 @@ dependencies = [
[[package]]
name = "slot-range-helper"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"enumn",
"parity-scale-codec",
@@ -10338,14 +10369,14 @@ dependencies = [
"futures 0.3.16",
"httparse",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"sha-1 0.9.2",
]
[[package]]
name = "sp-api"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"hash-db",
"log",
@@ -10362,11 +10393,11 @@ dependencies = [
[[package]]
name = "sp-api-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"blake2-rfc",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -10374,7 +10405,7 @@ dependencies = [
[[package]]
name = "sp-application-crypto"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"serde",
@@ -10386,7 +10417,7 @@ dependencies = [
[[package]]
name = "sp-arithmetic"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"integer-sqrt",
"num-traits",
@@ -10400,7 +10431,7 @@ dependencies = [
[[package]]
name = "sp-authority-discovery"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10412,7 +10443,7 @@ dependencies = [
[[package]]
name = "sp-authorship"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10424,7 +10455,7 @@ dependencies = [
[[package]]
name = "sp-block-builder"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10436,7 +10467,7 @@ dependencies = [
[[package]]
name = "sp-blockchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.3.16",
"log",
@@ -10454,12 +10485,11 @@ dependencies = [
[[package]]
name = "sp-consensus"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"futures 0.3.16",
"futures-timer 3.0.2",
- "libp2p",
"log",
"parity-scale-codec",
"parking_lot 0.11.1",
@@ -10481,7 +10511,7 @@ dependencies = [
[[package]]
name = "sp-consensus-aura"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"parity-scale-codec",
@@ -10498,7 +10528,7 @@ dependencies = [
[[package]]
name = "sp-consensus-babe"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"merlin",
@@ -10520,7 +10550,7 @@ dependencies = [
[[package]]
name = "sp-consensus-slots"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"sp-arithmetic",
@@ -10530,7 +10560,7 @@ dependencies = [
[[package]]
name = "sp-consensus-vrf"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"schnorrkel",
@@ -10542,7 +10572,7 @@ dependencies = [
[[package]]
name = "sp-core"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"base58",
"blake2-rfc",
@@ -10586,7 +10616,7 @@ dependencies = [
[[package]]
name = "sp-database"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"kvdb",
"parking_lot 0.11.1",
@@ -10595,9 +10625,9 @@ dependencies = [
[[package]]
name = "sp-debug-derive"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -10605,7 +10635,7 @@ dependencies = [
[[package]]
name = "sp-externalities"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"environmental",
"parity-scale-codec",
@@ -10616,7 +10646,7 @@ dependencies = [
[[package]]
name = "sp-finality-grandpa"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"finality-grandpa",
"log",
@@ -10633,7 +10663,7 @@ dependencies = [
[[package]]
name = "sp-inherents"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"impl-trait-for-tuples",
@@ -10647,7 +10677,7 @@ dependencies = [
[[package]]
name = "sp-io"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.3.16",
"hash-db",
@@ -10672,7 +10702,7 @@ dependencies = [
[[package]]
name = "sp-keyring"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"lazy_static",
"sp-core",
@@ -10683,7 +10713,7 @@ dependencies = [
[[package]]
name = "sp-keystore"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"derive_more 0.99.14",
@@ -10700,7 +10730,7 @@ dependencies = [
[[package]]
name = "sp-maybe-compressed-blob"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"ruzstd",
"zstd",
@@ -10709,7 +10739,7 @@ dependencies = [
[[package]]
name = "sp-npos-elections"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"serde",
@@ -10722,10 +10752,10 @@ dependencies = [
[[package]]
name = "sp-npos-elections-compact"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -10733,7 +10763,7 @@ dependencies = [
[[package]]
name = "sp-offchain"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"sp-api",
"sp-core",
@@ -10743,7 +10773,7 @@ dependencies = [
[[package]]
name = "sp-panic-handler"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"backtrace",
]
@@ -10751,7 +10781,7 @@ dependencies = [
[[package]]
name = "sp-rpc"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"rustc-hash",
"serde",
@@ -10762,7 +10792,7 @@ dependencies = [
[[package]]
name = "sp-runtime"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"either",
"hash256-std-hasher",
@@ -10783,7 +10813,7 @@ dependencies = [
[[package]]
name = "sp-runtime-interface"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -10800,11 +10830,11 @@ dependencies = [
[[package]]
name = "sp-runtime-interface-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"Inflector",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -10812,7 +10842,7 @@ dependencies = [
[[package]]
name = "sp-serializer"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"serde",
"serde_json",
@@ -10821,7 +10851,7 @@ dependencies = [
[[package]]
name = "sp-session"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"sp-api",
@@ -10834,7 +10864,7 @@ dependencies = [
[[package]]
name = "sp-staking"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"sp-runtime",
@@ -10844,7 +10874,7 @@ dependencies = [
[[package]]
name = "sp-state-machine"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"hash-db",
"log",
@@ -10867,12 +10897,12 @@ dependencies = [
[[package]]
name = "sp-std"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
[[package]]
name = "sp-storage"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -10885,7 +10915,7 @@ dependencies = [
[[package]]
name = "sp-tasks"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"log",
"sp-core",
@@ -10898,7 +10928,7 @@ dependencies = [
[[package]]
name = "sp-test-primitives"
version = "2.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"parity-util-mem",
@@ -10911,7 +10941,7 @@ dependencies = [
[[package]]
name = "sp-timestamp"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"futures-timer 3.0.2",
@@ -10928,7 +10958,7 @@ dependencies = [
[[package]]
name = "sp-tracing"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"erased-serde",
"log",
@@ -10946,7 +10976,7 @@ dependencies = [
[[package]]
name = "sp-transaction-pool"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"sp-api",
"sp-runtime",
@@ -10955,7 +10985,7 @@ dependencies = [
[[package]]
name = "sp-transaction-storage-proof"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"log",
@@ -10970,7 +11000,7 @@ dependencies = [
[[package]]
name = "sp-trie"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"hash-db",
"memory-db",
@@ -10984,7 +11014,7 @@ dependencies = [
[[package]]
name = "sp-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.3.16",
"futures-core",
@@ -10996,7 +11026,7 @@ dependencies = [
[[package]]
name = "sp-version"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"impl-serde",
"parity-scale-codec",
@@ -11011,11 +11041,11 @@ dependencies = [
[[package]]
name = "sp-version-proc-macro"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"parity-scale-codec",
"proc-macro-crate 1.0.0",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11023,7 +11053,7 @@ dependencies = [
[[package]]
name = "sp-wasm-interface"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"impl-trait-for-tuples",
"parity-scale-codec",
@@ -11222,7 +11252,7 @@ checksum = "f2261c91034a1edc3fc4d1b80e89d82714faede0515c14a75da10cb941546bbf"
dependencies = [
"cfg_aliases",
"memchr",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11237,7 +11267,7 @@ dependencies = [
"lazy_static",
"nalgebra",
"num-traits",
- "rand 0.8.3",
+ "rand 0.8.4",
]
[[package]]
@@ -11284,7 +11314,7 @@ checksum = "5ba9cdfda491b814720b6b06e0cac513d922fc407582032e8706e9f137976f90"
dependencies = [
"heck",
"proc-macro-error 1.0.4",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11305,7 +11335,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149"
dependencies = [
"heck",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11326,7 +11356,7 @@ dependencies = [
[[package]]
name = "substrate-build-script-utils"
version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"platforms",
]
@@ -11334,7 +11364,7 @@ dependencies = [
[[package]]
name = "substrate-frame-rpc-system"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-system-rpc-runtime-api",
"futures 0.3.16",
@@ -11357,7 +11387,7 @@ dependencies = [
[[package]]
name = "substrate-prometheus-endpoint"
version = "0.9.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-std",
"derive_more 0.99.14",
@@ -11371,7 +11401,7 @@ dependencies = [
[[package]]
name = "substrate-test-client"
version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"async-trait",
"futures 0.1.30",
@@ -11400,7 +11430,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils"
version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"futures 0.3.16",
"substrate-test-utils-derive",
@@ -11410,7 +11440,7 @@ dependencies = [
[[package]]
name = "substrate-test-utils-derive"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"proc-macro-crate 1.0.0",
"quote 1.0.9",
@@ -11420,7 +11450,7 @@ dependencies = [
[[package]]
name = "substrate-wasm-builder"
version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"ansi_term 0.12.1",
"atty",
@@ -11462,7 +11492,7 @@ version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"unicode-xid 0.2.1",
]
@@ -11473,7 +11503,7 @@ version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baa8e7560a164edb1621a55d18a0c59abf49d360f47aa7b821061dd7eea7fac9"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11484,7 +11514,7 @@ version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"unicode-xid 0.2.1",
@@ -11516,7 +11546,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "rand 0.8.3",
+ "rand 0.8.4",
"redox_syscall 0.2.4",
"remove_dir_all",
"winapi 0.3.9",
@@ -11555,7 +11585,7 @@ version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11771,7 +11801,7 @@ version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -11976,7 +12006,7 @@ version = "0.1.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c42e6fa53307c8a17e4ccd4dc81cf5ec38db9209f59b222210375b54ee40d1e2"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
]
@@ -12097,7 +12127,7 @@ dependencies = [
"ipnet",
"lazy_static",
"log",
- "rand 0.8.3",
+ "rand 0.8.4",
"smallvec 1.6.1",
"thiserror",
"tinyvec",
@@ -12132,7 +12162,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
[[package]]
name = "try-runtime-cli"
version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#e76e4c6fca3f37de9a9980f03d224c255e674615"
+source = "git+https://github.com/paritytech/substrate?branch=master#be72e5df46de2fa5805049e3037d0db2c4c25635"
dependencies = [
"frame-try-runtime",
"log",
@@ -12365,9 +12395,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]]
name = "walkdir"
-version = "2.3.1"
+version = "2.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d"
+checksum = "808cf2735cd4b6866113f648b791c6adc5714537bc222d9347bb203386ffda56"
dependencies = [
"same-file",
"winapi 0.3.9",
@@ -12426,7 +12456,7 @@ dependencies = [
"bumpalo",
"lazy_static",
"log",
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"wasm-bindgen-shared",
@@ -12460,7 +12490,7 @@ version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"wasm-bindgen-backend",
@@ -12711,7 +12741,7 @@ dependencies = [
"mach",
"memoffset 0.6.1",
"more-asserts",
- "rand 0.8.3",
+ "rand 0.8.4",
"region",
"thiserror",
"wasmtime-environ",
@@ -12759,7 +12789,7 @@ dependencies = [
[[package]]
name = "westend-runtime"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"beefy-primitives",
"bitvec",
@@ -13001,7 +13031,7 @@ dependencies = [
[[package]]
name = "xcm"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"derivative",
"impl-trait-for-tuples",
@@ -13012,7 +13042,7 @@ dependencies = [
[[package]]
name = "xcm-builder"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"frame-support",
"frame-system",
@@ -13031,7 +13061,7 @@ dependencies = [
[[package]]
name = "xcm-executor"
version = "0.9.8"
-source = "git+https://github.com/paritytech/polkadot?branch=master#7aed7a2ee5338ceee5194818775f62b003670087"
+source = "git+https://github.com/paritytech/polkadot?branch=master#e1eb02d01c88329b2bababa8d204f676374d89ab"
dependencies = [
"frame-support",
"impl-trait-for-tuples",
@@ -13055,7 +13085,7 @@ dependencies = [
"log",
"nohash-hasher",
"parking_lot 0.11.1",
- "rand 0.8.3",
+ "rand 0.8.4",
"static_assertions",
]
@@ -13074,7 +13104,7 @@ version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16"
dependencies = [
- "proc-macro2 1.0.27",
+ "proc-macro2 1.0.28",
"quote 1.0.9",
"syn 1.0.73",
"synstructure",
diff --git a/cumulus/client/consensus/aura/Cargo.toml b/cumulus/client/consensus/aura/Cargo.toml
index ed62a384654..c9a85165e86 100644
--- a/cumulus/client/consensus/aura/Cargo.toml
+++ b/cumulus/client/consensus/aura/Cargo.toml
@@ -21,6 +21,7 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "mas
sc-consensus-aura = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-slots = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
# Polkadot dependencies
diff --git a/cumulus/client/consensus/aura/src/import_queue.rs b/cumulus/client/consensus/aura/src/import_queue.rs
index d0f0dd62adb..eaf7eac4461 100644
--- a/cumulus/client/consensus/aura/src/import_queue.rs
+++ b/cumulus/client/consensus/aura/src/import_queue.rs
@@ -18,15 +18,14 @@
use codec::Codec;
use sc_client_api::{backend::AuxStore, BlockOf, UsageProvider};
+use sc_consensus::{import_queue::DefaultImportQueue, BlockImport};
use sc_consensus_aura::AuraVerifier;
use sc_consensus_slots::InherentDataProviderExt;
use sc_telemetry::TelemetryHandle;
use sp_api::{ApiExt, ProvideRuntimeApi};
use sp_block_builder::BlockBuilder as BlockBuilderApi;
use sp_blockchain::{HeaderBackend, ProvideCache};
-use sp_consensus::{
- import_queue::DefaultImportQueue, BlockImport, CanAuthorWith, Error as ConsensusError,
-};
+use sp_consensus::{CanAuthorWith, Error as ConsensusError};
use sp_consensus_aura::{digests::CompatibleDigestItem, AuraApi};
use sp_core::crypto::Pair;
use sp_inherents::CreateInherentDataProviders;
diff --git a/cumulus/client/consensus/aura/src/lib.rs b/cumulus/client/consensus/aura/src/lib.rs
index c3d5c0c3f37..c2edb97d763 100644
--- a/cumulus/client/consensus/aura/src/lib.rs
+++ b/cumulus/client/consensus/aura/src/lib.rs
@@ -33,13 +33,14 @@ use cumulus_primitives_core::{
use futures::lock::Mutex;
use polkadot_client::ClientHandle;
use sc_client_api::{backend::AuxStore, Backend, BlockOf};
+use sc_consensus::BlockImport;
use sc_consensus_slots::{BackoffAuthoringBlocksStrategy, SlotInfo};
use sc_telemetry::TelemetryHandle;
use sp_api::ProvideRuntimeApi;
use sp_application_crypto::AppPublic;
use sp_blockchain::{HeaderBackend, ProvideCache};
use sp_consensus::{
- BlockImport, EnableProofRecording, Environment, ProofRecording, Proposer, SlotData, SyncOracle,
+ EnableProofRecording, Environment, ProofRecording, Proposer, SlotData, SyncOracle,
};
use sp_consensus_aura::AuraApi;
use sp_core::crypto::Pair;
@@ -52,8 +53,7 @@ mod import_queue;
pub use import_queue::{build_verifier, import_queue, BuildVerifierParams, ImportQueueParams};
pub use sc_consensus_aura::{
- slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotDuration,
- SlotProportion,
+ slot_duration, AuraVerifier, BuildAuraWorkerParams, SlotDuration, SlotProportion,
};
pub use sc_consensus_slots::InherentDataProviderExt;
@@ -138,8 +138,8 @@ where
P::Public: AppPublic + Hash + Member + Encode + Decode,
P::Signature: TryFrom<Vec<u8>> + Hash + Member + Encode + Decode,
{
- let worker =
- sc_consensus_aura::build_aura_worker::<P, _, _, _, _, _, _, _, _>(BuildAuraWorkerParams {
+ let worker = sc_consensus_aura::build_aura_worker::<P, _, _, _, _, _, _, _, _>(
+ BuildAuraWorkerParams {
client: para_client,
block_import: ParachainBlockImport::new(block_import),
justification_sync_link: (),
@@ -151,7 +151,8 @@ where
telemetry,
block_proposal_slot_portion,
max_block_proposal_slot_portion,
- });
+ },
+ );
Self {
create_inherent_data_providers: Arc::new(create_inherent_data_providers),
diff --git a/cumulus/client/consensus/common/Cargo.toml b/cumulus/client/consensus/common/Cargo.toml
index cfbf5282909..9253dd60ae5 100644
--- a/cumulus/client/consensus/common/Cargo.toml
+++ b/cumulus/client/consensus/common/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2018"
[dependencies]
# Substrate deps
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/cumulus/client/consensus/common/src/lib.rs b/cumulus/client/consensus/common/src/lib.rs
index bba1a4d9347..843020a36b0 100644
--- a/cumulus/client/consensus/common/src/lib.rs
+++ b/cumulus/client/consensus/common/src/lib.rs
@@ -15,7 +15,7 @@
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
use polkadot_primitives::v1::{Hash as PHash, PersistedValidationData};
-use sp_consensus::BlockImport;
+use sc_consensus::BlockImport;
use sp_runtime::traits::Block as BlockT;
mod parachain_consensus;
@@ -96,19 +96,19 @@ where
async fn check_block(
&mut self,
- block: sp_consensus::BlockCheckParams<Block>,
- ) -> Result<sp_consensus::ImportResult, Self::Error> {
+ block: sc_consensus::BlockCheckParams<Block>,
+ ) -> Result<sc_consensus::ImportResult, Self::Error> {
self.0.check_block(block).await
}
async fn import_block(
&mut self,
- mut block_import_params: sp_consensus::BlockImportParams<Block, Self::Transaction>,
- cache: std::collections::HashMap<sp_consensus::import_queue::CacheKeyId, Vec<u8>>,
- ) -> Result<sp_consensus::ImportResult, Self::Error> {
+ mut block_import_params: sc_consensus::BlockImportParams<Block, Self::Transaction>,
+ cache: std::collections::HashMap<sp_consensus::CacheKeyId, Vec<u8>>,
+ ) -> Result<sc_consensus::ImportResult, Self::Error> {
// Best block is determined by the relay chain, or if we are doing the intial sync
// we import all blocks as new best.
- block_import_params.fork_choice = Some(sp_consensus::ForkChoiceStrategy::Custom(
+ block_import_params.fork_choice = Some(sc_consensus::ForkChoiceStrategy::Custom(
block_import_params.origin == sp_consensus::BlockOrigin::NetworkInitialSync,
));
self.0.import_block(block_import_params, cache).await
diff --git a/cumulus/client/consensus/common/src/parachain_consensus.rs b/cumulus/client/consensus/common/src/parachain_consensus.rs
index b872b4366c1..7b23bc7cbb5 100644
--- a/cumulus/client/consensus/common/src/parachain_consensus.rs
+++ b/cumulus/client/consensus/common/src/parachain_consensus.rs
@@ -17,9 +17,10 @@
use sc_client_api::{
Backend, BlockBackend, BlockImportNotification, BlockchainEvents, Finalizer, UsageProvider,
};
+use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
use sp_api::ProvideRuntimeApi;
use sp_blockchain::{Error as ClientError, Result as ClientResult};
-use sp_consensus::{BlockImport, BlockImportParams, BlockOrigin, BlockStatus, ForkChoiceStrategy};
+use sp_consensus::{BlockOrigin, BlockStatus};
use sp_runtime::{
generic::BlockId,
traits::{Block as BlockT, Header as HeaderT},
diff --git a/cumulus/client/consensus/common/src/tests.rs b/cumulus/client/consensus/common/src/tests.rs
index 4365e496d7f..4093c2ec648 100644
--- a/cumulus/client/consensus/common/src/tests.rs
+++ b/cumulus/client/consensus/common/src/tests.rs
@@ -25,8 +25,9 @@ use futures::{channel::mpsc, executor::block_on, select, FutureExt, Stream, Stre
use futures_timer::Delay;
use polkadot_primitives::v1::{Block as PBlock, Id as ParaId};
use sc_client_api::UsageProvider;
+use sc_consensus::{BlockImport, BlockImportParams, ForkChoiceStrategy};
use sp_blockchain::{Error as ClientError, Result as ClientResult};
-use sp_consensus::{BlockImport, BlockImportParams, BlockOrigin, ForkChoiceStrategy};
+use sp_consensus::BlockOrigin;
use sp_runtime::generic::BlockId;
use std::{
sync::{Arc, Mutex},
diff --git a/cumulus/client/consensus/relay-chain/Cargo.toml b/cumulus/client/consensus/relay-chain/Cargo.toml
index cb782025b71..5486a3f0915 100644
--- a/cumulus/client/consensus/relay-chain/Cargo.toml
+++ b/cumulus/client/consensus/relay-chain/Cargo.toml
@@ -15,6 +15,7 @@ sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "mas
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-prometheus-endpoint = { git = "https://github.com/paritytech/substrate", branch = "master" }
# Polkadot dependencies
diff --git a/cumulus/client/consensus/relay-chain/src/import_queue.rs b/cumulus/client/consensus/relay-chain/src/import_queue.rs
index f7a25f3da52..ea9fc5bef50 100644
--- a/cumulus/client/consensus/relay-chain/src/import_queue.rs
+++ b/cumulus/client/consensus/relay-chain/src/import_queue.rs
@@ -16,19 +16,18 @@
use std::{marker::PhantomData, sync::Arc};
+use sc_consensus::{
+ import_queue::{BasicQueue, Verifier as VerifierT},
+ BlockImport, BlockImportParams,
+};
use sp_api::ProvideRuntimeApi;
use sp_block_builder::BlockBuilder as BlockBuilderApi;
use sp_blockchain::Result as ClientResult;
-use sp_consensus::{
- error::Error as ConsensusError,
- import_queue::{BasicQueue, CacheKeyId, Verifier as VerifierT},
- BlockImport, BlockImportParams, BlockOrigin,
-};
+use sp_consensus::{error::Error as ConsensusError, CacheKeyId};
use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
use sp_runtime::{
generic::BlockId,
traits::{Block as BlockT, Header as HeaderT},
- Justifications,
};
/// A verifier that just checks the inherents.
@@ -59,10 +58,7 @@ where
{
async fn verify(
&mut self,
- origin: BlockOrigin,
- header: Block::Header,
- justifications: Option<Justifications>,
- mut body: Option<Vec<Block::Extrinsic>>,
+ mut block_params: BlockImportParams<Block, ()>,
) -> Result<
(
BlockImportParams<Block, ()>,
@@ -70,10 +66,10 @@ where
),
String,
> {
- if let Some(inner_body) = body.take() {
+ if let Some(inner_body) = block_params.body.take() {
let inherent_data_providers = self
.create_inherent_data_providers
- .create_inherent_data_providers(*header.parent_hash(), ())
+ .create_inherent_data_providers(*block_params.header.parent_hash(), ())
.await
.map_err(|e| e.to_string())?;
@@ -81,13 +77,13 @@ where
.create_inherent_data()
.map_err(|e| format!("{:?}", e))?;
- let block = Block::new(header.clone(), inner_body);
+ let block = Block::new(block_params.header.clone(), inner_body);
let inherent_res = self
.client
.runtime_api()
.check_inherents(
- &BlockId::Hash(*header.parent_hash()),
+ &BlockId::Hash(*block.header().parent_hash()),
block.clone(),
inherent_data,
)
@@ -106,17 +102,12 @@ where
}
let (_, inner_body) = block.deconstruct();
- body = Some(inner_body);
+ block_params.body = Some(inner_body);
}
- let post_hash = Some(header.hash());
- let mut block_import_params = BlockImportParams::new(origin, header);
- block_import_params.body = body;
- block_import_params.justifications = justifications;
-
- block_import_params.post_hash = post_hash;
+ block_params.post_hash = Some(block_params.header.hash());
- Ok((block_import_params, None))
+ Ok((block_params, None))
}
}
diff --git a/cumulus/client/consensus/relay-chain/src/lib.rs b/cumulus/client/consensus/relay-chain/src/lib.rs
index 782080bf7a7..7e1f7d85509 100644
--- a/cumulus/client/consensus/relay-chain/src/lib.rs
+++ b/cumulus/client/consensus/relay-chain/src/lib.rs
@@ -43,10 +43,10 @@ use cumulus_primitives_core::{
use parking_lot::Mutex;
use polkadot_client::ClientHandle;
use sc_client_api::Backend;
+use sc_consensus::{BlockImport, BlockImportParams};
use sp_api::ProvideRuntimeApi;
use sp_consensus::{
- BlockImport, BlockImportParams, BlockOrigin, EnableProofRecording, Environment, ProofRecording,
- Proposal, Proposer,
+ BlockOrigin, EnableProofRecording, Environment, ProofRecording, Proposal, Proposer,
};
use sp_inherents::{CreateInherentDataProviders, InherentData, InherentDataProvider};
use sp_runtime::traits::{Block as BlockT, HashFor, Header as HeaderT};
@@ -208,8 +208,8 @@ where
let mut block_import_params = BlockImportParams::new(BlockOrigin::Own, header);
block_import_params.body = Some(extrinsics);
- block_import_params.state_action = sp_consensus::StateAction::ApplyChanges(
- sp_consensus::StorageChanges::Changes(storage_changes)
+ block_import_params.state_action = sc_consensus::StateAction::ApplyChanges(
+ sc_consensus::StorageChanges::Changes(storage_changes),
);
if let Err(err) = self
diff --git a/cumulus/client/pov-recovery/Cargo.toml b/cumulus/client/pov-recovery/Cargo.toml
index 0af05ea452f..d400af7907e 100644
--- a/cumulus/client/pov-recovery/Cargo.toml
+++ b/cumulus/client/pov-recovery/Cargo.toml
@@ -13,6 +13,7 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-maybe-compressed-blob = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
# Polkadot deps
polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
@@ -44,7 +45,6 @@ sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "mas
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keystore = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }
substrate-test-utils = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-service = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/cumulus/client/pov-recovery/src/lib.rs b/cumulus/client/pov-recovery/src/lib.rs
index d1126bfffe3..24c2e3b580f 100644
--- a/cumulus/client/pov-recovery/src/lib.rs
+++ b/cumulus/client/pov-recovery/src/lib.rs
@@ -43,11 +43,9 @@
//! make sure that the blocks are imported in the correct order.
use sc_client_api::{BlockBackend, BlockchainEvents, UsageProvider};
+use sc_consensus::import_queue::{ImportQueue, IncomingBlock};
use sp_api::ProvideRuntimeApi;
-use sp_consensus::{
- import_queue::{ImportQueue, IncomingBlock},
- BlockOrigin, BlockStatus,
-};
+use sp_consensus::{BlockOrigin, BlockStatus};
use sp_runtime::{
generic::BlockId,
traits::{Block as BlockT, Header as HeaderT, NumberFor},
diff --git a/cumulus/client/service/Cargo.toml b/cumulus/client/service/Cargo.toml
index b4e1924c7f0..187e19c301d 100644
--- a/cumulus/client/service/Cargo.toml
+++ b/cumulus/client/service/Cargo.toml
@@ -18,6 +18,7 @@ sc-service = { git = "https://github.com/paritytech/substrate", branch = "master
sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/cumulus/client/service/src/lib.rs b/cumulus/client/service/src/lib.rs
index 547b4dc464a..0262bca4881 100644
--- a/cumulus/client/service/src/lib.rs
+++ b/cumulus/client/service/src/lib.rs
@@ -26,14 +26,15 @@ use polkadot_service::{AbstractClient, Client as PClient, ClientHandle, RuntimeA
use sc_client_api::{
Backend as BackendT, BlockBackend, BlockchainEvents, Finalizer, UsageProvider,
};
+use sc_consensus::{
+ import_queue::{ImportQueue, IncomingBlock, Link, Origin},
+ BlockImport,
+};
use sc_service::{Configuration, Role, TaskManager};
use sc_telemetry::TelemetryWorkerHandle;
use sp_api::ProvideRuntimeApi;
use sp_blockchain::HeaderBackend;
-use sp_consensus::{
- import_queue::{ImportQueue, IncomingBlock, Link, Origin},
- BlockImport, BlockOrigin,
-};
+use sp_consensus::BlockOrigin;
use sp_core::{traits::SpawnNamed, Pair};
use sp_runtime::{
traits::{BlakeTwo256, Block as BlockT, NumberFor},
@@ -118,18 +119,18 @@ where
});
relay_chain_full_node
- .client
- .execute_with(StartPoVRecovery {
- para_id,
- client: client.clone(),
- import_queue,
- task_manager,
- overseer_handle: relay_chain_full_node
- .overseer_handle
+ .client
+ .execute_with(StartPoVRecovery {
+ para_id,
+ client: client.clone(),
+ import_queue,
+ task_manager,
+ overseer_handle: relay_chain_full_node
+ .overseer_handle
.clone()
.ok_or_else(|| "Polkadot full node did not provide an `OverseerHandle`!")?,
- _phantom: PhantomData,
- })?;
+ _phantom: PhantomData,
+ })?;
cumulus_client_collator::start_collator(cumulus_client_collator::StartCollatorParams {
runtime_api: client.clone(),
diff --git a/cumulus/polkadot-parachains/src/service.rs b/cumulus/polkadot-parachains/src/service.rs
index 26c43f2f24b..517a925caf9 100644
--- a/cumulus/polkadot-parachains/src/service.rs
+++ b/cumulus/polkadot-parachains/src/service.rs
@@ -18,33 +18,38 @@ use cumulus_client_consensus_aura::{
build_aura_consensus, BuildAuraConsensusParams, SlotProportion,
};
use cumulus_client_consensus_common::{
- ParachainConsensus, ParachainCandidate, ParachainBlockImport,
+ ParachainBlockImport, ParachainCandidate, ParachainConsensus,
};
use cumulus_client_network::build_block_announce_validator;
use cumulus_client_service::{
prepare_node_config, start_collator, start_full_node, StartCollatorParams, StartFullNodeParams,
};
use cumulus_primitives_core::{
- ParaId, relay_chain::v1::{Hash as PHash, PersistedValidationData},
+ relay_chain::v1::{Hash as PHash, PersistedValidationData},
+ ParaId,
};
+use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier;
+use futures::lock::Mutex;
use sc_client_api::ExecutorProvider;
+use sc_consensus::{
+ import_queue::{BasicQueue, Verifier as VerifierT},
+ BlockImportParams,
+};
use sc_executor::native_executor_instance;
use sc_network::NetworkService;
use sc_service::{Configuration, PartialComponents, Role, TFullBackend, TFullClient, TaskManager};
use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerHandle};
-use sp_api::{ConstructRuntimeApi, ApiExt};
-use sp_consensus::{
- BlockImportParams, BlockOrigin, SlotData,
- import_queue::{BasicQueue, CacheKeyId, Verifier as VerifierT},
-};
+use sp_api::{ApiExt, ConstructRuntimeApi};
+use sp_consensus::{CacheKeyId, SlotData};
use sp_consensus_aura::{sr25519::AuthorityId as AuraId, AuraApi};
use sp_keystore::SyncCryptoStorePtr;
-use sp_runtime::{traits::{BlakeTwo256, Header as HeaderT}, generic::BlockId};
+use sp_runtime::{
+ generic::BlockId,
+ traits::{BlakeTwo256, Header as HeaderT},
+};
use std::sync::Arc;
use substrate_prometheus_endpoint::Registry;
-use futures::lock::Mutex;
-use cumulus_client_consensus_relay_chain::Verifier as RelayChainVerifier;
pub use sc_executor::NativeExecutor;
@@ -103,7 +108,7 @@ pub fn new_partial<RuntimeApi, Executor, BIQ>(
TFullClient<Block, RuntimeApi, Executor>,
TFullBackend<Block>,
(),
- sp_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
+ sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
sc_transaction_pool::FullPool<Block, TFullClient<Block, RuntimeApi, Executor>>,
(Option<Telemetry>, Option<TelemetryWorkerHandle>),
>,
@@ -130,7 +135,7 @@ where
Option<TelemetryHandle>,
&TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
+ sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
sc_service::Error,
>,
{
@@ -227,7 +232,7 @@ where
Option<TelemetryHandle>,
&TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
+ sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
sc_service::Error,
>,
BIC: FnOnce(
@@ -251,14 +256,12 @@ where
let params = new_partial::<RuntimeApi, Executor, BIQ>(¶chain_config, build_import_queue)?;
let (mut telemetry, telemetry_worker_handle) = params.other;
- let relay_chain_full_node = cumulus_client_service::build_polkadot_full_node(
- polkadot_config,
- telemetry_worker_handle,
- )
- .map_err(|e| match e {
- polkadot_service::Error::Sub(x) => x,
- s => format!("{}", s).into(),
- })?;
+ let relay_chain_full_node =
+ cumulus_client_service::build_polkadot_full_node(polkadot_config, telemetry_worker_handle)
+ .map_err(|e| match e {
+ polkadot_service::Error::Sub(x) => x,
+ s => format!("{}", s).into(),
+ })?;
let client = params.client.clone();
let backend = params.backend.clone();
@@ -284,6 +287,7 @@ where
import_queue: import_queue.clone(),
on_demand: None,
block_announce_validator_builder: Some(Box::new(|_| block_announce_validator)),
+ warp_sync: None,
})?;
let rpc_client = client.clone();
@@ -363,7 +367,7 @@ pub fn rococo_parachain_build_import_queue(
telemetry: Option<TelemetryHandle>,
task_manager: &TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue<
+ sc_consensus::DefaultImportQueue<
Block,
TFullClient<Block, rococo_parachain_runtime::RuntimeApi, RococoParachainRuntimeExecutor>,
>,
@@ -371,29 +375,33 @@ pub fn rococo_parachain_build_import_queue(
> {
let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
- cumulus_client_consensus_aura::import_queue::<sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _>(
- cumulus_client_consensus_aura::ImportQueueParams {
- block_import: client.clone(),
- client: client.clone(),
- create_inherent_data_providers: move |_, _| async move {
- let time = sp_timestamp::InherentDataProvider::from_system_time();
+ cumulus_client_consensus_aura::import_queue::<
+ sp_consensus_aura::sr25519::AuthorityPair,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ >(cumulus_client_consensus_aura::ImportQueueParams {
+ block_import: client.clone(),
+ client: client.clone(),
+ create_inherent_data_providers: move |_, _| async move {
+ let time = sp_timestamp::InherentDataProvider::from_system_time();
- let slot =
- sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
- *time,
- slot_duration.slot_duration(),
- );
+ let slot =
+ sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
+ *time,
+ slot_duration.slot_duration(),
+ );
- Ok((time, slot))
- },
- registry: config.prometheus_registry().clone(),
- can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(
- client.executor().clone(),
- ),
- spawner: &task_manager.spawn_essential_handle(),
- telemetry,
+ Ok((time, slot))
},
- )
+ registry: config.prometheus_registry().clone(),
+ can_author_with: sp_consensus::CanAuthorWithNativeVersion::new(client.executor().clone()),
+ spawner: &task_manager.spawn_essential_handle(),
+ telemetry,
+ })
.map_err(Into::into)
}
@@ -499,7 +507,7 @@ pub fn shell_build_import_queue(
_: Option<TelemetryHandle>,
task_manager: &TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue<
+ sc_consensus::DefaultImportQueue<
Block,
TFullClient<Block, shell_runtime::RuntimeApi, ShellRuntimeExecutor>,
>,
@@ -671,10 +679,7 @@ where
{
async fn verify(
&mut self,
- origin: BlockOrigin,
- header: Header,
- justifications: Option<sp_runtime::Justifications>,
- body: Option<Vec<<Block as sp_runtime::traits::Block>::Extrinsic>>,
+ block_import: BlockImportParams<Block, ()>,
) -> Result<
(
BlockImportParams<Block, ()>,
@@ -682,7 +687,7 @@ where
),
String,
> {
- let block_id = BlockId::hash(*header.parent_hash());
+ let block_id = BlockId::hash(*block_import.header.parent_hash());
if self
.client
@@ -690,14 +695,9 @@ where
.has_api::<dyn AuraApi<Block, AuraId>>(&block_id)
.unwrap_or(false)
{
- self.aura_verifier
- .get_mut()
- .verify(origin, header, justifications, body)
- .await
+ self.aura_verifier.get_mut().verify(block_import).await
} else {
- self.relay_chain_verifier
- .verify(origin, header, justifications, body)
- .await
+ self.relay_chain_verifier.verify(block_import).await
}
}
}
@@ -709,7 +709,7 @@ pub fn statemint_build_import_queue<RuntimeApi, Executor>(
telemetry_handle: Option<TelemetryHandle>,
task_manager: &TaskManager,
) -> Result<
- sp_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
+ sc_consensus::DefaultImportQueue<Block, TFullClient<Block, RuntimeApi, Executor>>,
sc_service::Error,
>
where
@@ -786,10 +786,7 @@ pub async fn start_statemint_node<RuntimeApi, Executor>(
parachain_config: Configuration,
polkadot_config: Configuration,
id: ParaId,
-) -> sc_service::error::Result<(
- TaskManager,
- Arc<TFullClient<Block, RuntimeApi, Executor>>,
-)>
+) -> sc_service::error::Result<(TaskManager, Arc<TFullClient<Block, RuntimeApi, Executor>>)>
where
RuntimeApi: ConstructRuntimeApi<Block, TFullClient<Block, RuntimeApi, Executor>>
+ Send
@@ -831,39 +828,36 @@ where
let telemetry2 = telemetry.clone();
let prometheus_registry2 = prometheus_registry.map(|r| (*r).clone());
- let aura_consensus = BuildOnAccess::Uninitialized(Some(
- Box::new(move || {
- let slot_duration =
- cumulus_client_consensus_aura::slot_duration(&*client2).unwrap();
-
- let proposer_factory =
- sc_basic_authorship::ProposerFactory::with_proof_recording(
- spawn_handle,
- client2.clone(),
- transaction_pool2,
- prometheus_registry2.as_ref(),
- telemetry2.clone(),
- );
+ let aura_consensus = BuildOnAccess::Uninitialized(Some(Box::new(move || {
+ let slot_duration =
+ cumulus_client_consensus_aura::slot_duration(&*client2).unwrap();
- let relay_chain_backend2 = relay_chain_backend.clone();
- let relay_chain_client2 = relay_chain_client.clone();
-
- build_aura_consensus::<
- sp_consensus_aura::sr25519::AuthorityPair,
- _,
- _,
- _,
- _,
- _,
- _,
- _,
- _,
- _,
- >(BuildAuraConsensusParams {
- proposer_factory,
- create_inherent_data_providers:
- move |_, (relay_parent, validation_data)| {
- let parachain_inherent =
+ let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
+ spawn_handle,
+ client2.clone(),
+ transaction_pool2,
+ prometheus_registry2.as_ref(),
+ telemetry2.clone(),
+ );
+
+ let relay_chain_backend2 = relay_chain_backend.clone();
+ let relay_chain_client2 = relay_chain_client.clone();
+
+ build_aura_consensus::<
+ sp_consensus_aura::sr25519::AuthorityPair,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ _,
+ >(BuildAuraConsensusParams {
+ proposer_factory,
+ create_inherent_data_providers: move |_, (relay_parent, validation_data)| {
+ let parachain_inherent =
cumulus_primitives_parachain_inherent::ParachainInherentData::create_at_with_client(
relay_parent,
&relay_chain_client,
@@ -871,42 +865,39 @@ where
&validation_data,
id,
);
- async move {
- let time =
- sp_timestamp::InherentDataProvider::from_system_time();
+ async move {
+ let time = sp_timestamp::InherentDataProvider::from_system_time();
- let slot =
+ let slot =
sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_duration(
*time,
slot_duration.slot_duration(),
);
- let parachain_inherent =
- parachain_inherent.ok_or_else(|| {
- Box::<dyn std::error::Error + Send + Sync>::from(
- "Failed to create parachain inherent",
- )
- })?;
- Ok((time, slot, parachain_inherent))
- }
- },
- block_import: client2.clone(),
- relay_chain_client: relay_chain_client2,
- relay_chain_backend: relay_chain_backend2,
- para_client: client2.clone(),
- backoff_authoring_blocks: Option::<()>::None,
- sync_oracle,
- keystore,
- force_authoring,
- slot_duration,
- // We got around 500ms for proposing
- block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),
- // And a maximum of 750ms if slots are skipped
- max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)),
- telemetry: telemetry2,
- })
- }),
- ));
+ let parachain_inherent = parachain_inherent.ok_or_else(|| {
+ Box::<dyn std::error::Error + Send + Sync>::from(
+ "Failed to create parachain inherent",
+ )
+ })?;
+ Ok((time, slot, parachain_inherent))
+ }
+ },
+ block_import: client2.clone(),
+ relay_chain_client: relay_chain_client2,
+ relay_chain_backend: relay_chain_backend2,
+ para_client: client2.clone(),
+ backoff_authoring_blocks: Option::<()>::None,
+ sync_oracle,
+ keystore,
+ force_authoring,
+ slot_duration,
+ // We got around 500ms for proposing
+ block_proposal_slot_portion: SlotProportion::new(1f32 / 24f32),
+ // And a maximum of 750ms if slots are skipped
+ max_block_proposal_slot_portion: Some(SlotProportion::new(1f32 / 16f32)),
+ telemetry: telemetry2,
+ })
+ })));
let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
task_manager.spawn_handle(),
diff --git a/cumulus/test/relay-validation-worker-provider/build.rs b/cumulus/test/relay-validation-worker-provider/build.rs
index 05eb38c9d5a..838e2dfcdb7 100644
--- a/cumulus/test/relay-validation-worker-provider/build.rs
+++ b/cumulus/test/relay-validation-worker-provider/build.rs
@@ -26,7 +26,8 @@ const PROJECT_NAME: &str = "validation-worker";
const SKIP_ENV: &str = "SKIP_BUILD";
fn main() {
- if env::var(SKIP_ENV).is_ok() { return
+ if env::var(SKIP_ENV).is_ok() {
+ return;
}
let out_dir = PathBuf::from(env::var("OUT_DIR").expect("`OUT_DIR` is set by cargo"));
@@ -42,11 +43,13 @@ fn main() {
}
fn find_cargo_lock() -> PathBuf {
- let mut path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is set by cargo"));
+ let mut path = PathBuf::from(
+ env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is set by cargo"),
+ );
loop {
if path.join("Cargo.lock").exists() {
- return path.join("Cargo.lock")
+ return path.join("Cargo.lock");
}
if !path.pop() {
diff --git a/cumulus/test/service/Cargo.toml b/cumulus/test/service/Cargo.toml
index 483fc1c524d..164fbf16be5 100644
--- a/cumulus/test/service/Cargo.toml
+++ b/cumulus/test/service/Cargo.toml
@@ -17,6 +17,7 @@ sc-basic-authorship = { git = "https://github.com/paritytech/substrate", branch
sc-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-chain-spec = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
+sc-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate", branch = "master" }
sc-rpc = { git = "https://github.com/paritytech/substrate", branch = "master" }
@@ -28,7 +29,6 @@ sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-arithmetic = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-block-builder = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-offchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
diff --git a/cumulus/test/service/src/lib.rs b/cumulus/test/service/src/lib.rs
index 22576a2fecf..1a92338bb4c 100644
--- a/cumulus/test/service/src/lib.rs
+++ b/cumulus/test/service/src/lib.rs
@@ -99,7 +99,7 @@ pub fn new_partial(
Client,
TFullBackend<Block>,
(),
- sp_consensus::import_queue::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
+ sc_consensus::import_queue::BasicQueue<Block, PrefixedMemoryDB<BlakeTwo256>>,
sc_transaction_pool::FullPool<Block, Client>,
(),
>,
@@ -213,6 +213,7 @@ where
import_queue: import_queue.clone(),
on_demand: None,
block_announce_validator_builder: Some(Box::new(block_announce_validator_builder)),
+ warp_sync: None,
})?;
let rpc_extensions_builder = {
--
GitLab