From 2ec939221c4afb287a37373be04bd29b8f5a1d60 Mon Sep 17 00:00:00 2001 From: gupnik <17176722+gupnik@users.noreply.github.com> Date: Thu, 13 Jul 2023 19:00:28 +0530 Subject: [PATCH] Moves `Block` to `frame_system` instead of `construct_runtime` and removes `Header` and `BlockNumber` (#2790) * Fixes * Removes unused import * Uses Block and removes BlockNumber/Header from Chain * Fixes bridges * Fixes * Removes unused import * Fixes build * Uses correct RelayBlock * Minor fix * Fixes glutton-kusama * Uses correct RelayBlock * Minor fix * Fixes benchmark for pallet-bridge-parachains * Adds appropriate constraints * Minor fixes * Removes unused import * Fixes integrity tests * Minor fixes * Updates trait bounds * Uses custom bound for AsPrimitive * Fixes trait bounds * Revert "Fixes trait bounds" This reverts commit 0b0f42f583f3a616a88afe45fcd06d31e7d9a06f. * Revert "Uses custom bound for AsPrimitive" This reverts commit 838e5281adf8b6e9632a2abb9cd550db4ae24126. * No AsPrimitive trait bound for now * Removes bounds on Number * update lockfile for {"substrate", "polkadot"} * Formatting * ".git/.scripts/commands/fmt/fmt.sh" * Minor fix --------- Co-authored-by: parity-processbot <> --- Cargo.lock | 537 +++++++++--------- bridges/bin/runtime-common/src/integrity.rs | 6 +- bridges/bin/runtime-common/src/mock.rs | 27 +- .../src/parachains_benchmarking.rs | 2 +- .../src/refund_relayer_extension.rs | 9 +- bridges/modules/grandpa/src/call_ext.rs | 6 +- bridges/modules/grandpa/src/mock.rs | 14 +- bridges/modules/messages/src/lib.rs | 4 +- bridges/modules/messages/src/mock.rs | 10 +- .../modules/parachains/src/benchmarking.rs | 2 +- bridges/modules/parachains/src/lib.rs | 15 +- bridges/modules/parachains/src/mock.rs | 33 +- bridges/modules/relayers/src/lib.rs | 16 +- bridges/modules/relayers/src/mock.rs | 10 +- .../chain-bridge-hub-cumulus/src/lib.rs | 4 +- .../chain-bridge-hub-kusama/src/lib.rs | 4 +- .../chain-bridge-hub-polkadot/src/lib.rs | 4 +- .../chain-bridge-hub-rococo/src/lib.rs | 4 +- .../chain-bridge-hub-wococo/src/lib.rs | 4 +- bridges/primitives/chain-kusama/src/lib.rs | 3 +- bridges/primitives/chain-polkadot/src/lib.rs | 3 +- bridges/primitives/chain-rococo/src/lib.rs | 4 +- bridges/primitives/chain-wococo/src/lib.rs | 4 +- .../header-chain/src/justification.rs | 17 +- bridges/primitives/polkadot-core/src/lib.rs | 4 +- bridges/primitives/runtime/src/chain.rs | 47 +- .../collator-selection/src/benchmarking.rs | 8 +- pallets/collator-selection/src/lib.rs | 6 +- pallets/collator-selection/src/mock.rs | 11 +- pallets/dmp-queue/src/lib.rs | 12 +- pallets/parachain-system/src/lib.rs | 8 +- pallets/parachain-system/src/tests.rs | 18 +- pallets/xcmp-queue/src/lib.rs | 2 +- pallets/xcmp-queue/src/mock.rs | 10 +- .../pallets/template/src/mock.rs | 10 +- parachain-template/runtime/src/lib.rs | 11 +- parachains/common/src/impls.rs | 10 +- parachains/pallets/ping/src/lib.rs | 6 +- .../assets/asset-hub-kusama/src/lib.rs | 12 +- .../assets/asset-hub-polkadot/src/lib.rs | 14 +- .../assets/asset-hub-westend/src/lib.rs | 14 +- .../bridge-hubs/bridge-hub-kusama/src/lib.rs | 13 +- .../bridge-hub-polkadot/src/lib.rs | 13 +- .../bridge-hubs/bridge-hub-rococo/src/lib.rs | 13 +- .../bridge-hub-rococo/tests/tests.rs | 3 +- .../bridge-hubs/test-utils/src/test_cases.rs | 8 +- .../collectives-polkadot/src/lib.rs | 14 +- .../contracts/contracts-rococo/src/lib.rs | 10 +- .../glutton/glutton-kusama/src/lib.rs | 8 +- .../runtimes/starters/seedling/src/lib.rs | 11 +- parachains/runtimes/starters/shell/src/lib.rs | 11 +- parachains/runtimes/testing/penpal/src/lib.rs | 11 +- .../testing/rococo-parachain/src/lib.rs | 11 +- test/runtime/src/lib.rs | 11 +- 54 files changed, 449 insertions(+), 633 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 94b7ecec1ac..360e491bff9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -865,7 +865,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "hash-db", "log", @@ -3646,23 +3646,22 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "docify" -version = "0.1.13" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18b972b74c30cbe838fc6a07665132ff94f257350e26fd01d80bc59ee7fcf129" +checksum = "f6491709f76fb7ceb951244daf624d480198b427556084391d6e3c33d3ae74b9" dependencies = [ "docify_macros", ] [[package]] name = "docify_macros" -version = "0.1.13" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c93004d1011191c56df9e853dca42f2012e7488638bcd5078935f5ce43e06cf3" +checksum = "ffc5338a9f72ce29a81377d9039798fcc926fb471b2004666caf48e446dffbbf" dependencies = [ "common-path", "derive-syn-parse", - "lazy_static", - "prettyplease", + "once_cell", "proc-macro2", "quote", "regex", @@ -4192,7 +4191,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", ] @@ -4215,7 +4214,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-support-procedural", @@ -4240,7 +4239,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "Inflector", "array-bytes", @@ -4288,7 +4287,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -4299,7 +4298,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -4316,7 +4315,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -4345,7 +4344,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-recursion", "futures", @@ -4366,7 +4365,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "bitflags", "environmental", @@ -4400,7 +4399,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "Inflector", "cfg-expr", @@ -4418,7 +4417,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -4430,7 +4429,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "proc-macro2", "quote", @@ -4440,7 +4439,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "cfg-if", "frame-support", @@ -4459,7 +4458,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -4474,7 +4473,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "sp-api", @@ -4483,7 +4482,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "parity-scale-codec", @@ -5631,7 +5630,7 @@ checksum = "67c21572b4949434e4fc1e1978b99c5f77064153c59d998bf13ecd96fb5ecba7" [[package]] name = "kusama-runtime" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "frame-benchmarking", @@ -5731,7 +5730,7 @@ dependencies = [ [[package]] name = "kusama-runtime-constants" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-support", "polkadot-primitives", @@ -6670,7 +6669,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "futures", "log", @@ -6689,7 +6688,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "anyhow", "jsonrpsee", @@ -7180,7 +7179,7 @@ dependencies = [ [[package]] name = "pallet-alliance" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "frame-benchmarking", @@ -7201,7 +7200,7 @@ dependencies = [ [[package]] name = "pallet-asset-conversion" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7219,7 +7218,7 @@ dependencies = [ [[package]] name = "pallet-asset-conversion-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -7233,7 +7232,7 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7251,7 +7250,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7266,7 +7265,7 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -7282,7 +7281,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -7298,7 +7297,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -7312,7 +7311,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7336,7 +7335,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7356,7 +7355,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7371,7 +7370,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -7390,7 +7389,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -7414,7 +7413,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7520,7 +7519,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7564,7 +7563,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7581,7 +7580,7 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "bitflags", "environmental", @@ -7610,7 +7609,7 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "bitflags", "parity-scale-codec", @@ -7623,7 +7622,7 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "proc-macro2", "quote", @@ -7633,7 +7632,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7650,7 +7649,7 @@ dependencies = [ [[package]] name = "pallet-core-fellowship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7668,7 +7667,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7686,7 +7685,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7709,7 +7708,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7722,7 +7721,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7741,7 +7740,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "docify", "frame-benchmarking", @@ -7760,7 +7759,7 @@ dependencies = [ [[package]] name = "pallet-glutton" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "blake2", "frame-benchmarking", @@ -7778,7 +7777,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7801,7 +7800,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -7817,7 +7816,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7837,7 +7836,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7854,7 +7853,7 @@ dependencies = [ [[package]] name = "pallet-insecure-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -7868,7 +7867,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7885,7 +7884,7 @@ dependencies = [ [[package]] name = "pallet-message-queue" version = "7.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7904,7 +7903,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7921,7 +7920,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7937,7 +7936,7 @@ dependencies = [ [[package]] name = "pallet-nft-fractionalization" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7954,7 +7953,7 @@ dependencies = [ [[package]] name = "pallet-nfts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "enumflags2", "frame-benchmarking", @@ -7972,7 +7971,7 @@ dependencies = [ [[package]] name = "pallet-nfts-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "pallet-nfts", @@ -7983,7 +7982,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -7999,7 +7998,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -8016,7 +8015,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8036,7 +8035,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -8047,7 +8046,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -8064,7 +8063,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8103,7 +8102,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8120,7 +8119,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8135,7 +8134,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8153,7 +8152,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8168,7 +8167,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "assert_matches", "frame-benchmarking", @@ -8187,7 +8186,7 @@ dependencies = [ [[package]] name = "pallet-salary" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8205,7 +8204,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8222,7 +8221,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -8243,7 +8242,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8259,7 +8258,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8278,7 +8277,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -8301,7 +8300,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8312,7 +8311,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "log", "sp-arithmetic", @@ -8321,7 +8320,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "sp-api", @@ -8330,7 +8329,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8347,7 +8346,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8362,7 +8361,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8380,7 +8379,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8399,7 +8398,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-support", "frame-system", @@ -8415,7 +8414,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -8431,7 +8430,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -8443,7 +8442,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8460,7 +8459,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8475,7 +8474,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8491,7 +8490,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8506,7 +8505,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-benchmarking", "frame-support", @@ -8521,7 +8520,7 @@ dependencies = [ [[package]] name = "pallet-xcm" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bounded-collections", "frame-benchmarking", @@ -8542,7 +8541,7 @@ dependencies = [ [[package]] name = "pallet-xcm-benchmarks" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-benchmarking", "frame-support", @@ -9159,7 +9158,7 @@ dependencies = [ [[package]] name = "polkadot-approval-distribution" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "futures-timer", @@ -9177,7 +9176,7 @@ dependencies = [ [[package]] name = "polkadot-availability-bitfield-distribution" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "futures-timer", @@ -9192,7 +9191,7 @@ dependencies = [ [[package]] name = "polkadot-availability-distribution" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "derive_more", "fatality", @@ -9215,7 +9214,7 @@ dependencies = [ [[package]] name = "polkadot-availability-recovery" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "fatality", "futures", @@ -9236,7 +9235,7 @@ dependencies = [ [[package]] name = "polkadot-cli" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "clap", "frame-benchmarking-cli", @@ -9265,7 +9264,7 @@ dependencies = [ [[package]] name = "polkadot-collator-protocol" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "always-assert", "bitvec", @@ -9287,7 +9286,7 @@ dependencies = [ [[package]] name = "polkadot-core-primitives" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "parity-scale-codec", "scale-info", @@ -9299,7 +9298,7 @@ dependencies = [ [[package]] name = "polkadot-dispute-distribution" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "derive_more", "fatality", @@ -9324,7 +9323,7 @@ dependencies = [ [[package]] name = "polkadot-erasure-coding" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "parity-scale-codec", "polkadot-node-primitives", @@ -9338,7 +9337,7 @@ dependencies = [ [[package]] name = "polkadot-gossip-support" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "futures-timer", @@ -9358,7 +9357,7 @@ dependencies = [ [[package]] name = "polkadot-network-bridge" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "always-assert", "async-trait", @@ -9381,7 +9380,7 @@ dependencies = [ [[package]] name = "polkadot-node-collation-generation" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "parity-scale-codec", @@ -9399,7 +9398,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-approval-voting" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "derive_more", @@ -9428,7 +9427,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-av-store" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "futures", @@ -9450,7 +9449,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-backing" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "fatality", @@ -9469,7 +9468,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-bitfield-signing" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "polkadot-node-subsystem", @@ -9484,7 +9483,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-candidate-validation" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "async-trait", "futures", @@ -9504,7 +9503,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-api" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "polkadot-node-metrics", @@ -9519,7 +9518,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-chain-selection" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "futures-timer", @@ -9536,7 +9535,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-dispute-coordinator" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "fatality", "futures", @@ -9555,7 +9554,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-parachains-inherent" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "async-trait", "futures", @@ -9572,7 +9571,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-provisioner" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "fatality", @@ -9590,7 +9589,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "always-assert", "futures", @@ -9621,7 +9620,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-checker" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "polkadot-node-primitives", @@ -9637,7 +9636,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-common" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "cpu-time", "futures", @@ -9661,7 +9660,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-execute-worker" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "cpu-time", "futures", @@ -9681,7 +9680,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-pvf-prepare-worker" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "libc", @@ -9704,7 +9703,7 @@ dependencies = [ [[package]] name = "polkadot-node-core-runtime-api" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "futures", "lru 0.9.0", @@ -9719,7 +9718,7 @@ dependencies = [ [[package]] name = "polkadot-node-jaeger" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "lazy_static", "log", @@ -9737,7 +9736,7 @@ dependencies = [ [[package]] name = "polkadot-node-metrics" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bs58", "futures", @@ -9756,7 +9755,7 @@ dependencies = [ [[package]] name = "polkadot-node-network-protocol" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "async-channel", "async-trait", @@ -9779,7 +9778,7 @@ dependencies = [ [[package]] name = "polkadot-node-primitives" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bounded-vec", "futures", @@ -9801,7 +9800,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "polkadot-node-jaeger", "polkadot-node-subsystem-types", @@ -9811,7 +9810,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-test-helpers" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "async-trait", "futures", @@ -9829,7 +9828,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-types" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "async-trait", "derive_more", @@ -9853,7 +9852,7 @@ dependencies = [ [[package]] name = "polkadot-node-subsystem-util" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "async-trait", "derive_more", @@ -9886,7 +9885,7 @@ dependencies = [ [[package]] name = "polkadot-overseer" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "async-trait", "futures", @@ -9909,7 +9908,7 @@ dependencies = [ [[package]] name = "polkadot-parachain" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bounded-collections", "derive_more", @@ -10008,7 +10007,7 @@ dependencies = [ [[package]] name = "polkadot-performance-test" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "env_logger 0.9.0", "kusama-runtime", @@ -10026,7 +10025,7 @@ dependencies = [ [[package]] name = "polkadot-primitives" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "hex-literal 0.4.1", @@ -10052,7 +10051,7 @@ dependencies = [ [[package]] name = "polkadot-rpc" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "jsonrpsee", "mmr-rpc", @@ -10084,7 +10083,7 @@ dependencies = [ [[package]] name = "polkadot-runtime" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "frame-benchmarking", @@ -10179,7 +10178,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-common" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "frame-benchmarking", @@ -10225,7 +10224,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-constants" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-support", "polkadot-primitives", @@ -10239,7 +10238,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-metrics" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bs58", "parity-scale-codec", @@ -10251,7 +10250,7 @@ dependencies = [ [[package]] name = "polkadot-runtime-parachains" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitflags", "bitvec", @@ -10296,7 +10295,7 @@ dependencies = [ [[package]] name = "polkadot-service" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "async-trait", "frame-benchmarking", @@ -10414,7 +10413,7 @@ dependencies = [ [[package]] name = "polkadot-statement-distribution" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "arrayvec 0.5.2", "fatality", @@ -10436,7 +10435,7 @@ dependencies = [ [[package]] name = "polkadot-statement-table" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "parity-scale-codec", "polkadot-primitives", @@ -10446,7 +10445,7 @@ dependencies = [ [[package]] name = "polkadot-test-client" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-benchmarking", "parity-scale-codec", @@ -10474,7 +10473,7 @@ dependencies = [ [[package]] name = "polkadot-test-runtime" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "frame-election-provider-support", @@ -10535,7 +10534,7 @@ dependencies = [ [[package]] name = "polkadot-test-service" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-system", "futures", @@ -11314,7 +11313,7 @@ dependencies = [ [[package]] name = "rococo-runtime" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "binary-merkle-tree", "frame-benchmarking", @@ -11401,7 +11400,7 @@ dependencies = [ [[package]] name = "rococo-runtime-constants" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-support", "polkadot-primitives", @@ -11670,7 +11669,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "log", "sp-core", @@ -11681,7 +11680,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "futures", @@ -11709,7 +11708,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "futures", "futures-timer", @@ -11732,7 +11731,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -11747,7 +11746,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -11766,7 +11765,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11777,7 +11776,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "chrono", @@ -11816,7 +11815,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "fnv", "futures", @@ -11842,7 +11841,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "hash-db", "kvdb", @@ -11868,7 +11867,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "futures", @@ -11893,7 +11892,7 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "futures", @@ -11922,7 +11921,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "fork-tree", @@ -11958,7 +11957,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "futures", "jsonrpsee", @@ -11980,7 +11979,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "async-channel", @@ -12014,7 +12013,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "futures", "jsonrpsee", @@ -12033,7 +12032,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "fork-tree", "parity-scale-codec", @@ -12046,7 +12045,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "ahash 0.8.2", "array-bytes", @@ -12087,7 +12086,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "finality-grandpa", "futures", @@ -12107,7 +12106,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "futures", @@ -12130,7 +12129,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -12152,7 +12151,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -12164,7 +12163,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "anyhow", "cfg-if", @@ -12181,7 +12180,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "ansi_term", "futures", @@ -12197,7 +12196,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "parking_lot 0.12.1", @@ -12211,7 +12210,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "async-channel", @@ -12252,7 +12251,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-channel", "cid", @@ -12272,7 +12271,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "bitflags", @@ -12289,7 +12288,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "ahash 0.8.2", "futures", @@ -12307,7 +12306,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "async-channel", @@ -12328,7 +12327,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "async-channel", @@ -12362,7 +12361,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "futures", @@ -12380,7 +12379,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "bytes", @@ -12414,7 +12413,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -12423,7 +12422,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "futures", "jsonrpsee", @@ -12454,7 +12453,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12473,7 +12472,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "http", "jsonrpsee", @@ -12488,7 +12487,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "futures", @@ -12514,7 +12513,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "directories", @@ -12578,7 +12577,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "log", "parity-scale-codec", @@ -12589,7 +12588,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "clap", "fs4", @@ -12603,7 +12602,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -12622,7 +12621,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "futures", "libc", @@ -12641,7 +12640,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "chrono", "futures", @@ -12660,7 +12659,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "ansi_term", "atty", @@ -12689,7 +12688,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -12700,7 +12699,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "futures", @@ -12726,7 +12725,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "futures", @@ -12742,7 +12741,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-channel", "futures", @@ -13223,7 +13222,7 @@ checksum = "03b634d87b960ab1a38c4fe143b508576f075e7c978bfad18217645ebfdfa2ec" [[package]] name = "slot-range-helper" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "enumn", "parity-scale-codec", @@ -13300,7 +13299,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "hash-db", "log", @@ -13321,7 +13320,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "Inflector", "blake2", @@ -13335,7 +13334,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "scale-info", @@ -13348,7 +13347,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "16.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "integer-sqrt", "num-traits", @@ -13362,7 +13361,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "scale-info", @@ -13375,7 +13374,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "sp-api", "sp-inherents", @@ -13386,7 +13385,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "futures", "log", @@ -13404,7 +13403,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "futures", @@ -13419,7 +13418,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "parity-scale-codec", @@ -13436,7 +13435,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "parity-scale-codec", @@ -13455,7 +13454,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "lazy_static", "parity-scale-codec", @@ -13474,7 +13473,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "finality-grandpa", "log", @@ -13492,7 +13491,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "scale-info", @@ -13504,7 +13503,7 @@ dependencies = [ [[package]] name = "sp-core" version = "21.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "bitflags", @@ -13549,7 +13548,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "blake2b_simd", "byteorder", @@ -13562,7 +13561,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "9.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "quote", "sp-core-hashing", @@ -13572,7 +13571,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -13581,7 +13580,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "proc-macro2", "quote", @@ -13591,7 +13590,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.19.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "environmental", "parity-scale-codec", @@ -13602,7 +13601,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -13616,7 +13615,7 @@ dependencies = [ [[package]] name = "sp-io" version = "23.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "bytes", "ed25519", @@ -13641,7 +13640,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "lazy_static", "sp-core", @@ -13652,7 +13651,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.27.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "parking_lot 0.12.1", @@ -13664,7 +13663,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "thiserror", "zstd 0.12.3+zstd.1.5.2", @@ -13673,7 +13672,7 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -13684,7 +13683,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -13702,7 +13701,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "scale-info", @@ -13716,7 +13715,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "sp-api", "sp-core", @@ -13726,7 +13725,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "backtrace", "lazy_static", @@ -13736,7 +13735,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "rustc-hash", "serde", @@ -13746,7 +13745,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "24.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "either", "hash256-std-hasher", @@ -13768,7 +13767,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "17.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -13786,7 +13785,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "11.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "Inflector", "proc-macro-crate", @@ -13798,7 +13797,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "scale-info", @@ -13813,7 +13812,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -13827,7 +13826,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.28.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "hash-db", "log", @@ -13848,7 +13847,7 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "scale-info", @@ -13865,12 +13864,12 @@ dependencies = [ [[package]] name = "sp-std" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" [[package]] name = "sp-storage" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13883,7 +13882,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "parity-scale-codec", @@ -13896,7 +13895,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "10.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "sp-std", @@ -13908,7 +13907,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "sp-api", "sp-runtime", @@ -13917,7 +13916,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "parity-scale-codec", @@ -13932,7 +13931,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "ahash 0.8.2", "hash-db", @@ -13955,7 +13954,7 @@ dependencies = [ [[package]] name = "sp-version" version = "22.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13972,7 +13971,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "8.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -13983,7 +13982,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "14.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -13996,7 +13995,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "20.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "parity-scale-codec", "scale-info", @@ -14194,12 +14193,12 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -14218,7 +14217,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "hyper", "log", @@ -14230,7 +14229,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "jsonrpsee", @@ -14243,7 +14242,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -14260,7 +14259,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "array-bytes", "async-trait", @@ -14286,7 +14285,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "futures", "substrate-test-utils-derive", @@ -14296,7 +14295,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -14307,7 +14306,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "ansi_term", "build-helper", @@ -14436,7 +14435,7 @@ checksum = "13a4ec180a2de59b57434704ccfad967f789b12737738798fa08798cd5824c16" [[package]] name = "test-runtime-constants" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-support", "polkadot-primitives", @@ -14838,7 +14837,7 @@ dependencies = [ [[package]] name = "tracing-gum" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "polkadot-node-jaeger", "polkadot-primitives", @@ -14849,7 +14848,7 @@ dependencies = [ [[package]] name = "tracing-gum-proc-macro" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "expander 2.0.0", "proc-macro-crate", @@ -14979,7 +14978,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#47a1a0382c4431e8f238214cde84745f4a337957" +source = "git+https://github.com/paritytech/substrate?branch=master#ec3bedd5c8cd0caa77a312b53a3cf3306149276c" dependencies = [ "async-trait", "clap", @@ -15895,7 +15894,7 @@ dependencies = [ [[package]] name = "westend-runtime" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bitvec", "frame-benchmarking", @@ -15988,7 +15987,7 @@ dependencies = [ [[package]] name = "westend-runtime-constants" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-support", "polkadot-primitives", @@ -16379,7 +16378,7 @@ dependencies = [ [[package]] name = "xcm" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "bounded-collections", "derivative", @@ -16395,7 +16394,7 @@ dependencies = [ [[package]] name = "xcm-builder" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "frame-support", "frame-system", @@ -16449,7 +16448,7 @@ dependencies = [ [[package]] name = "xcm-executor" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "environmental", "frame-benchmarking", @@ -16469,7 +16468,7 @@ dependencies = [ [[package]] name = "xcm-procedural" version = "0.9.43" -source = "git+https://github.com/paritytech/polkadot?branch=master#32edc76f783132bb085a7e4339fe7b8316b1d7e7" +source = "git+https://github.com/paritytech/polkadot?branch=master#0b56bcdb07752f3c2f369963d2c47eced549320d" dependencies = [ "Inflector", "proc-macro2", diff --git a/bridges/bin/runtime-common/src/integrity.rs b/bridges/bin/runtime-common/src/integrity.rs index aa698b0b95e..a9e657049fc 100644 --- a/bridges/bin/runtime-common/src/integrity.rs +++ b/bridges/bin/runtime-common/src/integrity.rs @@ -38,15 +38,15 @@ macro_rules! assert_chain_types( // if one of asserts fail, then either bridge isn't configured properly (or alternatively - non-standard // configuration is used), or something has broke existing configuration (meaning that all bridged chains // and relays will stop functioning) - use frame_system::Config as SystemConfig; + use frame_system::{Config as SystemConfig, pallet_prelude::*}; use static_assertions::assert_type_eq_all; assert_type_eq_all!(<$r as SystemConfig>::Index, bp_runtime::IndexOf<$this>); - assert_type_eq_all!(<$r as SystemConfig>::BlockNumber, bp_runtime::BlockNumberOf<$this>); + assert_type_eq_all!(BlockNumberFor<$r>, bp_runtime::BlockNumberOf<$this>); assert_type_eq_all!(<$r as SystemConfig>::Hash, bp_runtime::HashOf<$this>); assert_type_eq_all!(<$r as SystemConfig>::Hashing, bp_runtime::HasherOf<$this>); assert_type_eq_all!(<$r as SystemConfig>::AccountId, bp_runtime::AccountIdOf<$this>); - assert_type_eq_all!(<$r as SystemConfig>::Header, bp_runtime::HeaderOf<$this>); + assert_type_eq_all!(HeaderFor<$r>, bp_runtime::HeaderOf<$this>); } } ); diff --git a/bridges/bin/runtime-common/src/mock.rs b/bridges/bin/runtime-common/src/mock.rs index 2b7f4784b37..322245aa0e8 100644 --- a/bridges/bin/runtime-common/src/mock.rs +++ b/bridges/bin/runtime-common/src/mock.rs @@ -63,12 +63,8 @@ pub type ThisChainHasher = BlakeTwo256; pub type ThisChainRuntimeCall = RuntimeCall; /// Runtime call origin at `ThisChain`. pub type ThisChainCallOrigin = RuntimeOrigin; -/// Header of `ThisChain`. -pub type ThisChainHeader = sp_runtime::generic::Header; -/// Block of `ThisChain`. -pub type ThisChainBlock = frame_system::mocking::MockBlock; -/// Unchecked extrinsic of `ThisChain`. -pub type ThisChainUncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; +// Block of `ThisChain`. +pub type ThisChainBlock = frame_system::mocking::MockBlockU32; /// Account identifier at the `BridgedChain`. pub type BridgedChainAccountId = u128; @@ -83,6 +79,8 @@ pub type BridgedChainHasher = BlakeTwo256; /// Header of the `BridgedChain`. pub type BridgedChainHeader = sp_runtime::generic::Header; +/// Block of the `BridgedChain`. +pub type BridgedChainBlock = frame_system::mocking::MockBlockU32; /// Rewards payment procedure. pub type TestPaymentProcedure = PayRewardFromAccount; @@ -108,10 +106,7 @@ pub const BRIDGED_CHAIN_MAX_EXTRINSIC_WEIGHT: usize = 2048; pub const BRIDGED_CHAIN_MAX_EXTRINSIC_SIZE: u32 = 1024; frame_support::construct_runtime! { - pub enum TestRuntime where - Block = ThisChainBlock, - NodeBlock = ThisChainBlock, - UncheckedExtrinsic = ThisChainUncheckedExtrinsic, + pub enum TestRuntime { System: frame_system::{Pallet, Call, Config, Storage, Event}, Utility: pallet_utility, @@ -150,12 +145,11 @@ impl frame_system::Config for TestRuntime { type RuntimeOrigin = RuntimeOrigin; type Index = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = ThisChainBlockNumber; type Hash = ThisChainHash; type Hashing = ThisChainHasher; type AccountId = ThisChainAccountId; type Lookup = IdentityLookup; - type Header = ThisChainHeader; + type Block = ThisChainBlock; type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU32<250>; type Version = (); @@ -318,10 +312,9 @@ impl From pub struct ThisUnderlyingChain; impl Chain for ThisUnderlyingChain { - type BlockNumber = ThisChainBlockNumber; + type Block = ThisChainBlock; type Hash = ThisChainHash; type Hasher = ThisChainHasher; - type Header = ThisChainHeader; type AccountId = ThisChainAccountId; type Balance = ThisChainBalance; type Index = u32; @@ -358,10 +351,9 @@ pub struct BridgedUnderlyingParachain; pub struct BridgedChainCall; impl Chain for BridgedUnderlyingChain { - type BlockNumber = BridgedChainBlockNumber; + type Block = BridgedChainBlock; type Hash = BridgedChainHash; type Hasher = BridgedChainHasher; - type Header = BridgedChainHeader; type AccountId = BridgedChainAccountId; type Balance = BridgedChainBalance; type Index = u32; @@ -384,10 +376,9 @@ impl ChainWithGrandpa for BridgedUnderlyingChain { } impl Chain for BridgedUnderlyingParachain { - type BlockNumber = BridgedChainBlockNumber; + type Block = BridgedChainBlock; type Hash = BridgedChainHash; type Hasher = BridgedChainHasher; - type Header = BridgedChainHeader; type AccountId = BridgedChainAccountId; type Balance = BridgedChainBalance; type Index = u32; diff --git a/bridges/bin/runtime-common/src/parachains_benchmarking.rs b/bridges/bin/runtime-common/src/parachains_benchmarking.rs index aad53673c3a..53095784cb1 100644 --- a/bridges/bin/runtime-common/src/parachains_benchmarking.rs +++ b/bridges/bin/runtime-common/src/parachains_benchmarking.rs @@ -46,7 +46,7 @@ where + pallet_bridge_grandpa::Config, PI: 'static, >::BridgedChain: - bp_runtime::Chain, + bp_runtime::Chain, { let parachain_head = ParaHead(vec![0u8; parachain_head_size as usize]); diff --git a/bridges/bin/runtime-common/src/refund_relayer_extension.rs b/bridges/bin/runtime-common/src/refund_relayer_extension.rs index c5419837316..1beacd981ee 100644 --- a/bridges/bin/runtime-common/src/refund_relayer_extension.rs +++ b/bridges/bin/runtime-common/src/refund_relayer_extension.rs @@ -24,7 +24,7 @@ use crate::messages_call_ext::{ }; use bp_messages::{LaneId, MessageNonce}; use bp_relayers::{RewardsAccountOwner, RewardsAccountParams}; -use bp_runtime::{Parachain, ParachainIdOf, RangeInclusiveExt, StaticStrProvider}; +use bp_runtime::{Chain, Parachain, ParachainIdOf, RangeInclusiveExt, StaticStrProvider}; use codec::{Decode, Encode}; use frame_support::{ dispatch::{CallableCallFor, DispatchInfo, Dispatchable, PostDispatchInfo}, @@ -47,7 +47,10 @@ use pallet_transaction_payment::{Config as TransactionPaymentConfig, OnChargeTra use pallet_utility::{Call as UtilityCall, Config as UtilityConfig, Pallet as UtilityPallet}; use scale_info::TypeInfo; use sp_runtime::{ - traits::{DispatchInfoOf, Get, PostDispatchInfoOf, SignedExtension, Zero}, + traits::{ + Block as BlockT, DispatchInfoOf, Get, Header as HeaderT, PostDispatchInfoOf, + SignedExtension, Zero, + }, transaction_validity::{ TransactionPriority, TransactionValidity, TransactionValidityError, ValidTransactionBuilder, }, @@ -278,6 +281,7 @@ where + GrandpaCallSubType + ParachainsCallSubType + MessagesCallSubType, + <<>::BridgedRelayChain as Chain>::Block as BlockT>::Header: HeaderT { fn expand_call<'a>(&self, call: &'a CallOf) -> Vec<&'a CallOf> { match call.is_sub_type() { @@ -525,6 +529,7 @@ where + GrandpaCallSubType + ParachainsCallSubType + MessagesCallSubType, + <<>::BridgedRelayChain as Chain>::Block as BlockT>::Header: HeaderT { const IDENTIFIER: &'static str = Id::STR; type AccountId = Runtime::AccountId; diff --git a/bridges/modules/grandpa/src/call_ext.rs b/bridges/modules/grandpa/src/call_ext.rs index b57aebb1ac1..868b6626955 100644 --- a/bridges/modules/grandpa/src/call_ext.rs +++ b/bridges/modules/grandpa/src/call_ext.rs @@ -19,6 +19,7 @@ use bp_header_chain::{justification::GrandpaJustification, ChainWithGrandpa}; use bp_runtime::BlockNumberOf; use codec::Encode; use frame_support::{dispatch::CallableCallFor, traits::IsSubType, weights::Weight, RuntimeDebug}; +use frame_system::pallet_prelude::HeaderFor; use sp_runtime::{ traits::{Header, Zero}, transaction_validity::{InvalidTransaction, TransactionValidity, ValidTransaction}, @@ -178,8 +179,9 @@ pub(crate) fn submit_finality_proof_info_from_args, I: 'static>( /// Returns maximal expected size of `submit_finality_proof` call arguments. fn max_expected_call_size, I: 'static>(required_precommits: u32) -> u32 { - let max_expected_justification_size = - GrandpaJustification::max_reasonable_size::(required_precommits); + let max_expected_justification_size = GrandpaJustification::>::max_reasonable_size::< + T::BridgedChain, + >(required_precommits); // call arguments are header and justification T::BridgedChain::MAX_HEADER_SIZE.saturating_add(max_expected_justification_size) diff --git a/bridges/modules/grandpa/src/mock.rs b/bridges/modules/grandpa/src/mock.rs index 29e2e02ccd0..2161b3e30aa 100644 --- a/bridges/modules/grandpa/src/mock.rs +++ b/bridges/modules/grandpa/src/mock.rs @@ -26,7 +26,7 @@ use frame_support::{ }; use sp_core::sr25519::Signature; use sp_runtime::{ - testing::{Header, H256}, + testing::H256, traits::{BlakeTwo256, IdentityLookup}, Perbill, }; @@ -36,17 +36,13 @@ pub type TestHeader = crate::BridgedHeader; pub type TestNumber = crate::BridgedBlockNumber; type Block = frame_system::mocking::MockBlock; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; pub const MAX_BRIDGED_AUTHORITIES: u32 = 5; use crate as grandpa; construct_runtime! { - pub enum TestRuntime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum TestRuntime { System: frame_system::{Pallet, Call, Config, Storage, Event}, Grandpa: grandpa::{Pallet, Call, Event}, @@ -63,12 +59,11 @@ impl frame_system::Config for TestRuntime { type RuntimeOrigin = RuntimeOrigin; type Index = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type Version = (); @@ -105,10 +100,9 @@ impl grandpa::Config for TestRuntime { pub struct TestBridgedChain; impl Chain for TestBridgedChain { - type BlockNumber = ::BlockNumber; + type Block = Block; type Hash = ::Hash; type Hasher = ::Hashing; - type Header = ::Header; type AccountId = AccountId; type Balance = u64; diff --git a/bridges/modules/messages/src/lib.rs b/bridges/modules/messages/src/lib.rs index d580a09c62a..3bfd5bc7e98 100644 --- a/bridges/modules/messages/src/lib.rs +++ b/bridges/modules/messages/src/lib.rs @@ -188,9 +188,9 @@ pub mod pallet { #[pallet::hooks] impl, I: 'static> Hooks> for Pallet where - u32: TryFrom<::BlockNumber>, + u32: TryFrom>, { - fn on_idle(_block: T::BlockNumber, remaining_weight: Weight) -> Weight { + fn on_idle(_block: BlockNumberFor, remaining_weight: Weight) -> Weight { // we'll need at least to read outbound lane state, kill a message and update lane state let db_weight = T::DbWeight::get(); if !remaining_weight.all_gte(db_weight.reads_writes(1, 2)) { diff --git a/bridges/modules/messages/src/mock.rs b/bridges/modules/messages/src/mock.rs index 4999b57bf51..b6dce22b636 100644 --- a/bridges/modules/messages/src/mock.rs +++ b/bridges/modules/messages/src/mock.rs @@ -39,7 +39,6 @@ use frame_support::{ use scale_info::TypeInfo; use sp_core::H256; use sp_runtime::{ - testing::Header as SubstrateHeader, traits::{BlakeTwo256, ConstU32, IdentityLookup}, BuildStorage, Perbill, }; @@ -71,15 +70,11 @@ pub type TestRelayer = u64; pub type TestDispatchLevelResult = (); type Block = frame_system::mocking::MockBlock; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; use crate as pallet_bridge_messages; frame_support::construct_runtime! { - pub enum TestRuntime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum TestRuntime { System: frame_system::{Pallet, Call, Config, Storage, Event}, Balances: pallet_balances::{Pallet, Call, Event}, @@ -100,12 +95,11 @@ impl frame_system::Config for TestRuntime { type RuntimeOrigin = RuntimeOrigin; type Index = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = SubstrateHeader; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = ConstU64<250>; type Version = (); diff --git a/bridges/modules/parachains/src/benchmarking.rs b/bridges/modules/parachains/src/benchmarking.rs index 59c4642cde9..f89fbb0f361 100644 --- a/bridges/modules/parachains/src/benchmarking.rs +++ b/bridges/modules/parachains/src/benchmarking.rs @@ -47,7 +47,7 @@ benchmarks_instance_pallet! { where >::BridgedChain: bp_runtime::Chain< - BlockNumber = RelayBlockNumber, + Block = crate::RelayBlock, Hash = RelayBlockHash, Hasher = RelayBlockHasher, >, diff --git a/bridges/modules/parachains/src/lib.rs b/bridges/modules/parachains/src/lib.rs index 4f78a45d4b7..6f28bfc1b08 100644 --- a/bridges/modules/parachains/src/lib.rs +++ b/bridges/modules/parachains/src/lib.rs @@ -63,6 +63,8 @@ pub type RelayBlockHash = bp_polkadot_core::Hash; pub type RelayBlockNumber = bp_polkadot_core::BlockNumber; /// Hasher of the bridged relay chain. pub type RelayBlockHasher = bp_polkadot_core::Hasher; +/// Block type of the bridged relay chain. +pub type RelayBlock = bp_polkadot_core::Block; /// Artifacts of the parachains head update. struct UpdateParachainHeadArtifacts { @@ -137,18 +139,15 @@ pub mod pallet { pub trait BoundedBridgeGrandpaConfig: pallet_bridge_grandpa::Config { - type BridgedRelayChain: Chain< - BlockNumber = RelayBlockNumber, - Hash = RelayBlockHash, - Hasher = RelayBlockHasher, - >; + type BridgedRelayChain: Chain; } impl BoundedBridgeGrandpaConfig for T where T: pallet_bridge_grandpa::Config, - T::BridgedChain: - Chain, + T::BridgedChain: Chain, + <::Block as sp_runtime::traits::Block>::Header: + sp_runtime::traits::Header, { type BridgedRelayChain = T::BridgedChain; } @@ -323,7 +322,7 @@ pub mod pallet { >::get(relay_block_hash) .ok_or(Error::::UnknownRelayChainBlock)?; ensure!( - relay_block.number == relay_block_number, + relay_block.number == relay_block_number.into(), Error::::InvalidRelayChainBlockNumber, ); diff --git a/bridges/modules/parachains/src/mock.rs b/bridges/modules/parachains/src/mock.rs index 14ed79566a0..38e897d5ae0 100644 --- a/bridges/modules/parachains/src/mock.rs +++ b/bridges/modules/parachains/src/mock.rs @@ -19,8 +19,8 @@ use bp_polkadot_core::parachains::ParaId; use bp_runtime::{Chain, Parachain}; use frame_support::{construct_runtime, parameter_types, traits::ConstU32, weights::Weight}; use sp_runtime::{ - testing::{Header, H256}, - traits::{BlakeTwo256, Header as HeaderT, IdentityLookup}, + testing::H256, + traits::{BlakeTwo256, Header, IdentityLookup}, MultiSignature, Perbill, }; @@ -33,7 +33,6 @@ pub type RelayBlockHeader = sp_runtime::generic::Header; type Block = frame_system::mocking::MockBlock; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; pub const PARAS_PALLET_NAME: &str = "Paras"; pub const UNTRACKED_PARACHAIN_ID: u32 = 10; @@ -49,10 +48,9 @@ pub type BigParachainHeader = sp_runtime::generic::Header; pub struct Parachain1; impl Chain for Parachain1 { - type BlockNumber = u64; + type Block = Block; type Hash = H256; type Hasher = RegularParachainHasher; - type Header = RegularParachainHeader; type AccountId = u64; type Balance = u64; type Index = u64; @@ -73,10 +71,9 @@ impl Parachain for Parachain1 { pub struct Parachain2; impl Chain for Parachain2 { - type BlockNumber = u64; + type Block = Block; type Hash = H256; type Hasher = RegularParachainHasher; - type Header = RegularParachainHeader; type AccountId = u64; type Balance = u64; type Index = u64; @@ -97,10 +94,9 @@ impl Parachain for Parachain2 { pub struct Parachain3; impl Chain for Parachain3 { - type BlockNumber = u64; + type Block = Block; type Hash = H256; type Hasher = RegularParachainHasher; - type Header = RegularParachainHeader; type AccountId = u64; type Balance = u64; type Index = u64; @@ -121,11 +117,12 @@ impl Parachain for Parachain3 { // this parachain is using u128 as block number and stored head data size exceeds limit pub struct BigParachain; +type BigBlock = frame_system::mocking::MockBlockU128; + impl Chain for BigParachain { - type BlockNumber = u128; + type Block = BigBlock; type Hash = H256; type Hasher = RegularParachainHasher; - type Header = BigParachainHeader; type AccountId = u64; type Balance = u64; type Index = u64; @@ -144,10 +141,7 @@ impl Parachain for BigParachain { } construct_runtime! { - pub enum TestRuntime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum TestRuntime { System: frame_system::{Pallet, Call, Config, Storage, Event}, Grandpa1: pallet_bridge_grandpa::::{Pallet, Event}, @@ -167,12 +161,11 @@ impl frame_system::Config for TestRuntime { type RuntimeOrigin = RuntimeOrigin; type Index = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = TestNumber; type Hash = H256; type Hashing = RegularParachainHasher; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); @@ -263,10 +256,9 @@ impl pallet_bridge_parachains::benchmarking::Config<()> for TestRuntime { pub struct TestBridgedChain; impl Chain for TestBridgedChain { - type BlockNumber = crate::RelayBlockNumber; + type Block = crate::RelayBlock; type Hash = crate::RelayBlockHash; type Hasher = crate::RelayBlockHasher; - type Header = RelayBlockHeader; type AccountId = AccountId; type Balance = u32; @@ -294,10 +286,9 @@ impl ChainWithGrandpa for TestBridgedChain { pub struct OtherBridgedChain; impl Chain for OtherBridgedChain { - type BlockNumber = u64; + type Block = Block; type Hash = crate::RelayBlockHash; type Hasher = crate::RelayBlockHasher; - type Header = sp_runtime::generic::Header; type AccountId = AccountId; type Balance = u32; diff --git a/bridges/modules/relayers/src/lib.rs b/bridges/modules/relayers/src/lib.rs index 54b888cf29d..a71c218443b 100644 --- a/bridges/modules/relayers/src/lib.rs +++ b/bridges/modules/relayers/src/lib.rs @@ -66,7 +66,7 @@ pub mod pallet { /// Pay rewards scheme. type PaymentProcedure: PaymentProcedure; /// Stake and slash scheme. - type StakeAndSlash: StakeAndSlash; + type StakeAndSlash: StakeAndSlash, Self::Reward>; /// Pallet call weights. type WeightInfo: WeightInfoExt; } @@ -117,7 +117,7 @@ pub mod pallet { /// Registration allows relayer to get priority boost for its message delivery transactions. #[pallet::call_index(1)] #[pallet::weight(T::WeightInfo::register())] - pub fn register(origin: OriginFor, valid_till: T::BlockNumber) -> DispatchResult { + pub fn register(origin: OriginFor, valid_till: BlockNumberFor) -> DispatchResult { let relayer = ensure_signed(origin)?; // valid till must be larger than the current block number and the lease must be larger @@ -330,10 +330,10 @@ pub mod pallet { } /// Return required registration lease. - pub(crate) fn required_registration_lease() -> T::BlockNumber { + pub(crate) fn required_registration_lease() -> BlockNumberFor { , T::Reward, >>::RequiredRegistrationLease::get() } @@ -342,7 +342,7 @@ pub mod pallet { pub(crate) fn required_stake() -> T::Reward { , T::Reward, >>::RequiredStake::get() } @@ -383,7 +383,7 @@ pub mod pallet { /// Relayer account that has been registered. relayer: T::AccountId, /// Relayer registration. - registration: Registration, + registration: Registration, T::Reward>, }, /// Relayer has been `deregistered`. Deregistered { @@ -395,7 +395,7 @@ pub mod pallet { /// Relayer account that has been `deregistered`. relayer: T::AccountId, /// Registration that was removed. - registration: Registration, + registration: Registration, T::Reward>, }, } @@ -445,7 +445,7 @@ pub mod pallet { _, Blake2_128Concat, T::AccountId, - Registration, + Registration, T::Reward>, OptionQuery, >; } diff --git a/bridges/modules/relayers/src/mock.rs b/bridges/modules/relayers/src/mock.rs index bb6f93c98b2..b0987c5e380 100644 --- a/bridges/modules/relayers/src/mock.rs +++ b/bridges/modules/relayers/src/mock.rs @@ -25,7 +25,6 @@ use bp_relayers::{ use frame_support::{parameter_types, traits::fungible::Mutate, weights::RuntimeDbWeight}; use sp_core::H256; use sp_runtime::{ - testing::Header as SubstrateHeader, traits::{BlakeTwo256, ConstU32, IdentityLookup}, BuildStorage, }; @@ -44,13 +43,9 @@ pub type TestStakeAndSlash = pallet_bridge_relayers::StakeAndSlashNamed< >; type Block = frame_system::mocking::MockBlock; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; frame_support::construct_runtime! { - pub enum TestRuntime where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum TestRuntime { System: frame_system::{Pallet, Call, Config, Storage, Event}, Balances: pallet_balances::{Pallet, Event}, @@ -70,12 +65,11 @@ impl frame_system::Config for TestRuntime { type RuntimeOrigin = RuntimeOrigin; type Index = u64; type RuntimeCall = RuntimeCall; - type BlockNumber = BlockNumber; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = SubstrateHeader; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = frame_support::traits::ConstU64<250>; type Version = (); diff --git a/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs b/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs index 8ff096d077f..d95bb90b795 100644 --- a/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs +++ b/bridges/primitives/chain-bridge-hub-cumulus/src/lib.rs @@ -17,8 +17,8 @@ #![cfg_attr(not(feature = "std"), no_std)] pub use bp_polkadot_core::{ - AccountId, AccountInfoStorageMapKeyProvider, AccountPublic, Balance, BlockNumber, Hash, Hasher, - Hashing, Header, Index, Nonce, Perbill, Signature, SignedBlock, UncheckedExtrinsic, + AccountId, AccountInfoStorageMapKeyProvider, AccountPublic, Balance, Block, BlockNumber, Hash, + Hasher, Hashing, Header, Index, Nonce, Perbill, Signature, SignedBlock, UncheckedExtrinsic, EXTRA_STORAGE_PROOF_SIZE, TX_EXTRA_BYTES, }; diff --git a/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs b/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs index 00b6c8301e4..e253045946e 100644 --- a/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs +++ b/bridges/primitives/chain-bridge-hub-kusama/src/lib.rs @@ -36,11 +36,9 @@ use sp_std::prelude::*; pub struct BridgeHubKusama; impl Chain for BridgeHubKusama { - type BlockNumber = BlockNumber; type Hash = Hash; type Hasher = Hasher; - type Header = Header; - + type Block = Block; type AccountId = AccountId; type Balance = Balance; type Index = Index; diff --git a/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs b/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs index 8bd9167b618..9c0233ed787 100644 --- a/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs +++ b/bridges/primitives/chain-bridge-hub-polkadot/src/lib.rs @@ -32,11 +32,9 @@ use sp_std::prelude::*; pub struct BridgeHubPolkadot; impl Chain for BridgeHubPolkadot { - type BlockNumber = BlockNumber; type Hash = Hash; type Hasher = Hasher; - type Header = Header; - + type Block = Block; type AccountId = AccountId; type Balance = Balance; type Index = Index; diff --git a/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs index 936e4d1beb7..80c8bbbdb48 100644 --- a/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs +++ b/bridges/primitives/chain-bridge-hub-rococo/src/lib.rs @@ -36,11 +36,9 @@ use sp_std::prelude::*; pub struct BridgeHubRococo; impl Chain for BridgeHubRococo { - type BlockNumber = BlockNumber; type Hash = Hash; type Hasher = Hasher; - type Header = Header; - + type Block = Block; type AccountId = AccountId; type Balance = Balance; type Index = Index; diff --git a/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs b/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs index 00704995c5e..b71916276e8 100644 --- a/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs +++ b/bridges/primitives/chain-bridge-hub-wococo/src/lib.rs @@ -32,11 +32,9 @@ use sp_std::prelude::*; pub struct BridgeHubWococo; impl Chain for BridgeHubWococo { - type BlockNumber = BlockNumber; type Hash = Hash; type Hasher = Hasher; - type Header = Header; - + type Block = Block; type AccountId = AccountId; type Balance = Balance; type Index = Index; diff --git a/bridges/primitives/chain-kusama/src/lib.rs b/bridges/primitives/chain-kusama/src/lib.rs index 5cef6ae0ee6..9d82f3bb69d 100644 --- a/bridges/primitives/chain-kusama/src/lib.rs +++ b/bridges/primitives/chain-kusama/src/lib.rs @@ -28,10 +28,9 @@ use frame_support::weights::Weight; pub struct Kusama; impl Chain for Kusama { - type BlockNumber = ::BlockNumber; + type Block = ::Block; type Hash = ::Hash; type Hasher = ::Hasher; - type Header = ::Header; type AccountId = ::AccountId; type Balance = ::Balance; diff --git a/bridges/primitives/chain-polkadot/src/lib.rs b/bridges/primitives/chain-polkadot/src/lib.rs index 51d9f6f0233..1e165958293 100644 --- a/bridges/primitives/chain-polkadot/src/lib.rs +++ b/bridges/primitives/chain-polkadot/src/lib.rs @@ -28,10 +28,9 @@ use frame_support::weights::Weight; pub struct Polkadot; impl Chain for Polkadot { - type BlockNumber = ::BlockNumber; + type Block = ::Block; type Hash = ::Hash; type Hasher = ::Hasher; - type Header = ::Header; type AccountId = ::AccountId; type Balance = ::Balance; diff --git a/bridges/primitives/chain-rococo/src/lib.rs b/bridges/primitives/chain-rococo/src/lib.rs index 0cb0b1d41e6..c07712f3866 100644 --- a/bridges/primitives/chain-rococo/src/lib.rs +++ b/bridges/primitives/chain-rococo/src/lib.rs @@ -28,11 +28,9 @@ use frame_support::{parameter_types, weights::Weight}; pub struct Rococo; impl Chain for Rococo { - type BlockNumber = ::BlockNumber; + type Block = ::Block; type Hash = ::Hash; type Hasher = ::Hasher; - type Header = ::Header; - type AccountId = ::AccountId; type Balance = ::Balance; type Index = ::Index; diff --git a/bridges/primitives/chain-wococo/src/lib.rs b/bridges/primitives/chain-wococo/src/lib.rs index 2df019496ab..0383bc2775f 100644 --- a/bridges/primitives/chain-wococo/src/lib.rs +++ b/bridges/primitives/chain-wococo/src/lib.rs @@ -31,11 +31,9 @@ use frame_support::weights::Weight; pub struct Wococo; impl Chain for Wococo { - type BlockNumber = ::BlockNumber; + type Block = ::Block; type Hash = ::Hash; type Hasher = ::Hasher; - type Header = ::Header; - type AccountId = ::AccountId; type Balance = ::Balance; type Index = ::Index; diff --git a/bridges/primitives/header-chain/src/justification.rs b/bridges/primitives/header-chain/src/justification.rs index 8433107fce2..a90f4bab94a 100644 --- a/bridges/primitives/header-chain/src/justification.rs +++ b/bridges/primitives/header-chain/src/justification.rs @@ -75,7 +75,7 @@ impl GrandpaJustification { /// any precise calculations - that's just an estimation. pub fn max_reasonable_size(required_precommits: u32) -> u32 where - C: Chain
+ ChainWithGrandpa, + C: Chain + ChainWithGrandpa, { // we don't need precise results here - just estimations, so some details // are removed from computations (e.g. bytes required to encode vector length) @@ -159,10 +159,7 @@ pub fn verify_and_optimize_justification( authorities_set_id: SetId, authorities_set: &VoterSet, justification: GrandpaJustification
, -) -> Result, Error> -where - Header::Number: finality_grandpa::BlockNumberOps, -{ +) -> Result, Error> { let mut optimizer = OptimizationCallbacks(Vec::new()); verify_justification_with_callbacks( finalized_target, @@ -180,10 +177,7 @@ pub fn verify_justification( authorities_set_id: SetId, authorities_set: &VoterSet, justification: &GrandpaJustification
, -) -> Result<(), Error> -where - Header::Number: finality_grandpa::BlockNumberOps, -{ +) -> Result<(), Error> { verify_justification_with_callbacks( finalized_target, authorities_set_id, @@ -259,10 +253,7 @@ fn verify_justification_with_callbacks, justification: &GrandpaJustification
, callbacks: &mut C, -) -> Result<(), Error> -where - Header::Number: finality_grandpa::BlockNumberOps, -{ +) -> Result<(), Error> { // ensure that it is justification for the expected header if (justification.commit.target_hash, justification.commit.target_number) != finalized_target { return Err(Error::InvalidJustificationTarget) diff --git a/bridges/primitives/polkadot-core/src/lib.rs b/bridges/primitives/polkadot-core/src/lib.rs index 3774d283fc4..b607c0a0b54 100644 --- a/bridges/primitives/polkadot-core/src/lib.rs +++ b/bridges/primitives/polkadot-core/src/lib.rs @@ -229,11 +229,9 @@ pub type Address = MultiAddress; pub struct PolkadotLike; impl Chain for PolkadotLike { - type BlockNumber = BlockNumber; type Hash = Hash; type Hasher = Hasher; - type Header = Header; - + type Block = Block; type AccountId = AccountId; type Balance = Balance; type Index = Index; diff --git a/bridges/primitives/runtime/src/chain.rs b/bridges/primitives/runtime/src/chain.rs index c79058cea90..b14dce50180 100644 --- a/bridges/primitives/runtime/src/chain.rs +++ b/bridges/primitives/runtime/src/chain.rs @@ -14,18 +14,18 @@ // You should have received a copy of the GNU General Public License // along with Parity Bridges Common. If not, see . -use crate::HeaderIdProvider; use codec::{Decode, Encode, MaxEncodedLen}; use frame_support::{weights::Weight, Parameter}; -use num_traits::{AsPrimitive, Bounded, CheckedSub, Saturating, SaturatingAdd, Zero}; +use num_traits::{Bounded, CheckedSub, SaturatingAdd, Zero}; use sp_runtime::{ traits::{ - AtLeast32Bit, AtLeast32BitUnsigned, Hash as HashT, Header as HeaderT, MaybeDisplay, - MaybeSerialize, MaybeSerializeDeserialize, Member, SimpleBitOps, Verify, + AtLeast32Bit, AtLeast32BitUnsigned, Block as BlockT, Hash as HashT, Header as HeaderT, + HeaderProvider, MaybeDisplay, MaybeSerialize, MaybeSerializeDeserialize, Member, + SimpleBitOps, Verify, }, FixedPointOperand, }; -use sp_std::{convert::TryFrom, fmt::Debug, hash::Hash, str::FromStr, vec, vec::Vec}; +use sp_std::{convert::TryFrom, fmt::Debug, hash::Hash, vec, vec::Vec}; /// Chain call, that is either SCALE-encoded, or decoded. #[derive(Debug, Clone, PartialEq)] @@ -91,27 +91,6 @@ impl Encode for EncodedOrDecodedCall { /// Minimal Substrate-based chain representation that may be used from no_std environment. pub trait Chain: Send + Sync + 'static { - /// A type that fulfills the abstract idea of what a Substrate block number is. - // Constraits come from the associated Number type of `sp_runtime::traits::Header` - // See here for more info: - // https://crates.parity.io/sp_runtime/traits/trait.Header.html#associatedtype.Number - // - // Note that the `AsPrimitive` trait is required by the GRANDPA justification - // verifier, and is not usually part of a Substrate Header's Number type. - type BlockNumber: Parameter - + Member - + MaybeSerializeDeserialize - + Hash - + Copy - + Default - + MaybeDisplay - + AtLeast32BitUnsigned - + FromStr - + AsPrimitive - + Default - + Saturating - + MaxEncodedLen; - /// A type that fulfills the abstract idea of what a Substrate hash is. // Constraits come from the associated Hash type of `sp_runtime::traits::Header` // See here for more info: @@ -136,13 +115,10 @@ pub trait Chain: Send + Sync + 'static { // https://crates.parity.io/sp_runtime/traits/trait.Header.html#associatedtype.Hashing type Hasher: HashT; - /// A type that fulfills the abstract idea of what a Substrate header is. + /// A type that fulfills the abstract idea of what a Substrate block is. // See here for more info: - // https://crates.parity.io/sp_runtime/traits/trait.Header.html - type Header: Parameter - + HeaderT - + HeaderIdProvider - + MaybeSerializeDeserialize; + // https://crates.parity.io/sp_runtime/traits/trait.Block.html + type Block: Parameter + BlockT + MaybeSerialize; /// The user account identifier type for the runtime. type AccountId: Parameter @@ -200,10 +176,9 @@ impl Chain for T where T: Send + Sync + 'static + UnderlyingChainProvider, { - type BlockNumber = ::BlockNumber; type Hash = ::Hash; type Hasher = ::Hasher; - type Header = ::Header; + type Block = ::Block; type AccountId = ::AccountId; type Balance = ::Balance; type Index = ::Index; @@ -244,7 +219,7 @@ impl frame_support::traits::Get for ParachainIdOf { pub type UnderlyingChainOf = ::Chain; /// Block number used by the chain. -pub type BlockNumberOf = ::BlockNumber; +pub type BlockNumberOf = <<::Block as HeaderProvider>::HeaderT as HeaderT>::Number; /// Hash type used by the chain. pub type HashOf = ::Hash; @@ -253,7 +228,7 @@ pub type HashOf = ::Hash; pub type HasherOf = ::Hasher; /// Header type used by the chain. -pub type HeaderOf = ::Header; +pub type HeaderOf = <::Block as HeaderProvider>::HeaderT; /// Account id type used by the chain. pub type AccountIdOf = ::AccountId; diff --git a/pallets/collator-selection/src/benchmarking.rs b/pallets/collator-selection/src/benchmarking.rs index 715135daf0b..816e2cd1d72 100644 --- a/pallets/collator-selection/src/benchmarking.rs +++ b/pallets/collator-selection/src/benchmarking.rs @@ -28,7 +28,7 @@ use frame_support::{ dispatch::DispatchResult, traits::{Currency, EnsureOrigin, Get, ReservableCurrency}, }; -use frame_system::{EventRecord, RawOrigin}; +use frame_system::{pallet_prelude::BlockNumberFor, EventRecord, RawOrigin}; use pallet_authorship::EventHandler; use pallet_session::{self as session, SessionManager}; use sp_std::prelude::*; @@ -289,7 +289,7 @@ benchmarks! { T::Currency::minimum_balance() * 4u32.into(), ); let author = account("author", 0, SEED); - let new_block: T::BlockNumber = 10u32.into(); + let new_block: BlockNumberFor = 10u32.into(); frame_system::Pallet::::set_block_number(new_block); assert!(T::Currency::free_balance(&author) == 0u32.into()); @@ -312,8 +312,8 @@ benchmarks! { register_validators::(c); register_candidates::(c); - let new_block: T::BlockNumber = 1800u32.into(); - let zero_block: T::BlockNumber = 0u32.into(); + let new_block: BlockNumberFor = 1800u32.into(); + let zero_block: BlockNumberFor = 0u32.into(); let candidates = >::get(); let non_removals = c.saturating_sub(r); diff --git a/pallets/collator-selection/src/lib.rs b/pallets/collator-selection/src/lib.rs index 9a4a5b09d44..539a4d8bd95 100644 --- a/pallets/collator-selection/src/lib.rs +++ b/pallets/collator-selection/src/lib.rs @@ -143,7 +143,7 @@ pub mod pallet { type MaxInvulnerables: Get; // Will be kicked if block is not produced in threshold. - type KickThreshold: Get; + type KickThreshold: Get>; /// A stable ID for a validator. type ValidatorId: Member + Parameter; @@ -195,7 +195,7 @@ pub mod pallet { #[pallet::storage] #[pallet::getter(fn last_authored_block)] pub type LastAuthoredBlock = - StorageMap<_, Twox64Concat, T::AccountId, T::BlockNumber, ValueQuery>; + StorageMap<_, Twox64Concat, T::AccountId, BlockNumberFor, ValueQuery>; /// Desired number of candidates. /// @@ -648,7 +648,7 @@ pub mod pallet { /// Keep track of number of authored blocks per authority, uncles are counted as well since /// they're a valid proof of being online. impl - pallet_authorship::EventHandler for Pallet + pallet_authorship::EventHandler> for Pallet { fn note_author(author: T::AccountId) { let pot = Self::account_id(); diff --git a/pallets/collator-selection/src/mock.rs b/pallets/collator-selection/src/mock.rs index e82af53f883..ccc1401c1b0 100644 --- a/pallets/collator-selection/src/mock.rs +++ b/pallets/collator-selection/src/mock.rs @@ -24,20 +24,16 @@ use frame_system as system; use frame_system::EnsureSignedBy; use sp_core::H256; use sp_runtime::{ - testing::{Header, UintAuthorityId}, + testing::UintAuthorityId, traits::{BlakeTwo256, IdentityLookup, OpaqueKeys}, BuildStorage, RuntimeAppPublic, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { System: frame_system, Timestamp: pallet_timestamp, @@ -62,12 +58,11 @@ impl system::Config for Test { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; type Index = u64; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs index 7bd225b7e2f..8bd2123936e 100644 --- a/pallets/dmp-queue/src/lib.rs +++ b/pallets/dmp-queue/src/lib.rs @@ -139,7 +139,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_idle(_now: T::BlockNumber, max_weight: Weight) -> Weight { + fn on_idle(_now: BlockNumberFor, max_weight: Weight) -> Weight { // on_idle processes additional messages with any remaining block weight. Self::service_queue(max_weight) } @@ -414,7 +414,6 @@ mod tests { use frame_support::{assert_noop, parameter_types, traits::OnIdle}; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, BuildStorage, DispatchError::BadOrigin, @@ -423,15 +422,11 @@ mod tests { use std::cell::RefCell; use xcm::latest::{MultiLocation, OriginKind}; - type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; type Xcm = xcm::latest::Xcm; frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { System: frame_system::{Pallet, Call, Config, Storage, Event}, DmpQueue: dmp_queue::{Pallet, Call, Storage, Event}, @@ -461,12 +456,11 @@ mod tests { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; type Index = u64; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockLength = (); diff --git a/pallets/parachain-system/src/lib.rs b/pallets/parachain-system/src/lib.rs index 5bc52dfc7ab..cb215272a00 100644 --- a/pallets/parachain-system/src/lib.rs +++ b/pallets/parachain-system/src/lib.rs @@ -44,7 +44,7 @@ use frame_support::{ weights::Weight, RuntimeDebug, }; -use frame_system::{ensure_none, ensure_root}; +use frame_system::{ensure_none, ensure_root, pallet_prelude::HeaderFor}; use polkadot_parachain::primitives::RelayChainBlockNumber; use scale_info::TypeInfo; use sp_runtime::{ @@ -197,7 +197,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_finalize(_: T::BlockNumber) { + fn on_finalize(_: BlockNumberFor) { >::kill(); >::kill(); @@ -281,7 +281,7 @@ pub mod pallet { HrmpOutboundMessages::::put(outbound_messages); } - fn on_initialize(_n: T::BlockNumber) -> Weight { + fn on_initialize(_n: BlockNumberFor) -> Weight { let mut weight = Weight::zero(); // To prevent removing `NewValidationCode` that was set by another `on_initialize` @@ -1016,7 +1016,7 @@ impl Pallet { /// /// This is expected to be used by the /// [`CollectCollationInfo`](cumulus_primitives_core::CollectCollationInfo) runtime api. - pub fn collect_collation_info(header: &T::Header) -> CollationInfo { + pub fn collect_collation_info(header: &HeaderFor) -> CollationInfo { CollationInfo { hrmp_watermark: HrmpWatermark::::get(), horizontal_messages: HrmpOutboundMessages::::get(), diff --git a/pallets/parachain-system/src/tests.rs b/pallets/parachain-system/src/tests.rs index a5312c5b3b9..ebf1a1b6f9d 100755 --- a/pallets/parachain-system/src/tests.rs +++ b/pallets/parachain-system/src/tests.rs @@ -29,12 +29,11 @@ use frame_support::{ traits::{OnFinalize, OnInitialize}, weights::Weight, }; -use frame_system::RawOrigin; +use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin}; use hex_literal::hex; use relay_chain::HrmpChannelId; use sp_core::{blake2_256, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, BuildStorage, DispatchErrorWithPostInfo, }; @@ -43,14 +42,10 @@ use std::cell::RefCell; use crate as parachain_system; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { System: frame_system::{Pallet, Call, Config, Storage, Event}, ParachainSystem: parachain_system::{Pallet, Call, Config, Storage, Inherent, Event, ValidateUnsigned}, @@ -77,12 +72,11 @@ impl frame_system::Config for Test { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; type Index = u64; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockLength = (); @@ -212,7 +206,7 @@ fn wasm_ext() -> sp_io::TestExternalities { } struct BlockTest { - n: ::BlockNumber, + n: BlockNumberFor, within_block: Box, after_block: Option>, } @@ -243,7 +237,7 @@ impl BlockTests { self } - fn add(self, n: ::BlockNumber, within_block: F) -> Self + fn add(self, n: BlockNumberFor, within_block: F) -> Self where F: 'static + Fn(), { @@ -252,7 +246,7 @@ impl BlockTests { fn add_with_post_test( self, - n: ::BlockNumber, + n: BlockNumberFor, within_block: F1, after_block: F2, ) -> Self diff --git a/pallets/xcmp-queue/src/lib.rs b/pallets/xcmp-queue/src/lib.rs index 12ee6dae25a..b7b3c64f218 100644 --- a/pallets/xcmp-queue/src/lib.rs +++ b/pallets/xcmp-queue/src/lib.rs @@ -115,7 +115,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_idle(_now: T::BlockNumber, max_weight: Weight) -> Weight { + fn on_idle(_now: BlockNumberFor, max_weight: Weight) -> Weight { // on_idle processes additional messages with any remaining block weight. Self::service_xcmp_queue(max_weight) } diff --git a/pallets/xcmp-queue/src/mock.rs b/pallets/xcmp-queue/src/mock.rs index 357da01776b..e3e4edb083d 100644 --- a/pallets/xcmp-queue/src/mock.rs +++ b/pallets/xcmp-queue/src/mock.rs @@ -25,7 +25,6 @@ use frame_support::{ use frame_system::EnsureRoot; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, BuildStorage, }; @@ -33,15 +32,11 @@ use xcm::prelude::*; use xcm_builder::{CurrencyAdapter, FixedWeightBounds, IsConcrete, NativeAsset, ParentIsPreset}; use xcm_executor::traits::ConvertOrigin; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { System: frame_system::{Pallet, Call, Config, Storage, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, @@ -67,12 +62,11 @@ impl frame_system::Config for Test { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; type Index = u64; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); diff --git a/parachain-template/pallets/template/src/mock.rs b/parachain-template/pallets/template/src/mock.rs index e8d1505198e..cdfbf3d7fd2 100644 --- a/parachain-template/pallets/template/src/mock.rs +++ b/parachain-template/pallets/template/src/mock.rs @@ -2,20 +2,15 @@ use frame_support::{parameter_types, traits::Everything}; use frame_system as system; use sp_core::H256; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, BuildStorage, }; -type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; // Configure a mock runtime to test the pallet. frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { System: frame_system::{Pallet, Call, Config, Storage, Event}, TemplateModule: crate::{Pallet, Call, Storage, Event}, @@ -35,12 +30,11 @@ impl system::Config for Test { type RuntimeOrigin = RuntimeOrigin; type RuntimeCall = RuntimeCall; type Index = u64; - type BlockNumber = u64; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = u64; type Lookup = IdentityLookup; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type Version = (); diff --git a/parachain-template/runtime/src/lib.rs b/parachain-template/runtime/src/lib.rs index c767092329e..87726f67ba7 100644 --- a/parachain-template/runtime/src/lib.rs +++ b/parachain-template/runtime/src/lib.rs @@ -270,14 +270,12 @@ impl frame_system::Config for Runtime { type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -467,10 +465,7 @@ impl pallet_parachain_template::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system = 0, diff --git a/parachains/common/src/impls.rs b/parachains/common/src/impls.rs index 29af484217f..db48a1d9658 100644 --- a/parachains/common/src/impls.rs +++ b/parachains/common/src/impls.rs @@ -131,21 +131,16 @@ mod tests { use polkadot_primitives::AccountId; use sp_core::{ConstU64, H256}; use sp_runtime::{ - testing::Header, traits::{BlakeTwo256, IdentityLookup}, BuildStorage, Perbill, }; use xcm::prelude::*; - type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; type Block = frame_system::mocking::MockBlock; const TEST_ACCOUNT: AccountId = AccountId::new([1; 32]); frame_support::construct_runtime!( - pub enum Test where - Block = Block, - NodeBlock = Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Test { System: frame_system::{Pallet, Call, Config, Storage, Event}, Balances: pallet_balances::{Pallet, Call, Storage, Config, Event}, @@ -164,13 +159,12 @@ mod tests { type BaseCallFilter = frame_support::traits::Everything; type RuntimeOrigin = RuntimeOrigin; type Index = u64; - type BlockNumber = u64; type RuntimeCall = RuntimeCall; type Hash = H256; type Hashing = BlakeTwo256; type AccountId = AccountId; type Lookup = IdentityLookup; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type BlockHashCount = BlockHashCount; type BlockLength = BlockLength; diff --git a/parachains/pallets/ping/src/lib.rs b/parachains/pallets/ping/src/lib.rs index 0260f05dad2..7425b5bd52f 100644 --- a/parachains/pallets/ping/src/lib.rs +++ b/parachains/pallets/ping/src/lib.rs @@ -72,7 +72,7 @@ pub mod pallet { /// The sent pings. #[pallet::storage] pub(super) type Pings = - StorageMap<_, Blake2_128Concat, u32, T::BlockNumber, OptionQuery>; + StorageMap<_, Blake2_128Concat, u32, BlockNumberFor, OptionQuery>; #[pallet::event] #[pallet::generate_deposit(pub(super) fn deposit_event)] @@ -80,7 +80,7 @@ pub mod pallet { PingSent(ParaId, u32, Vec, XcmHash, MultiAssets), Pinged(ParaId, u32, Vec), PongSent(ParaId, u32, Vec, XcmHash, MultiAssets), - Ponged(ParaId, u32, Vec, T::BlockNumber), + Ponged(ParaId, u32, Vec, BlockNumberFor), ErrorSendingPing(SendError, ParaId, u32, Vec), ErrorSendingPong(SendError, ParaId, u32, Vec), UnknownPong(ParaId, u32, Vec), @@ -96,7 +96,7 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_finalize(n: T::BlockNumber) { + fn on_finalize(n: BlockNumberFor) { for (para, payload) in Targets::::get().into_iter() { let seq = PingCount::::mutate(|seq| { *seq += 1; diff --git a/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs b/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs index 4013ff382e3..dd8db95960e 100644 --- a/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs +++ b/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs @@ -67,8 +67,8 @@ use pallet_nfts::PalletFeatures; pub use parachains_common as common; use parachains_common::{ impls::{AssetsToBlockAuthor, DealWithFees}, - opaque, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, - Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, + AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, Hash, Header, Index, + Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; use xcm_config::{ @@ -166,10 +166,9 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; type Lookup = AccountIdLookup; type Index = Index; - type BlockNumber = BlockNumber; type Hash = Hash; type Hashing = BlakeTwo256; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type BlockHashCount = BlockHashCount; @@ -736,10 +735,7 @@ impl pallet_nfts::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs b/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs index 0ef96c0ead9..02c58f89903 100644 --- a/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs +++ b/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs @@ -102,9 +102,9 @@ use pallet_nfts::PalletFeatures; pub use parachains_common as common; use parachains_common::{ impls::{AssetsToBlockAuthor, DealWithFees}, - opaque, AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, - BlockNumber, Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, - MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, + AccountId, AssetHubPolkadotAuraId as AuraId, AssetIdForTrustBackedAssets, Balance, BlockNumber, + Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, + NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; use xcm_config::{ DotLocation, FellowshipLocation, ForeignAssetsConvertedConcreteId, GovernanceLocation, @@ -184,10 +184,9 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; type Lookup = AccountIdLookup; type Index = Index; - type BlockNumber = BlockNumber; type Hash = Hash; type Hashing = BlakeTwo256; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type BlockHashCount = BlockHashCount; @@ -723,10 +722,7 @@ impl pallet_nfts::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/parachains/runtimes/assets/asset-hub-westend/src/lib.rs index 39ed032fd20..cd7c2a4b9be 100644 --- a/parachains/runtimes/assets/asset-hub-westend/src/lib.rs +++ b/parachains/runtimes/assets/asset-hub-westend/src/lib.rs @@ -52,9 +52,9 @@ use pallet_asset_conversion_tx_payment::AssetConversionAdapter; use pallet_nfts::PalletFeatures; pub use parachains_common as common; use parachains_common::{ - impls::DealWithFees, opaque, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, - BlockNumber, Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, - MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, + impls::DealWithFees, AccountId, AssetIdForTrustBackedAssets, AuraId, Balance, BlockNumber, + Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, + NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; use sp_api::impl_runtime_apis; use sp_core::{crypto::KeyTypeId, OpaqueMetadata}; @@ -148,10 +148,9 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; type Lookup = AccountIdLookup; type Index = Index; - type BlockNumber = BlockNumber; type Hash = Hash; type Hashing = BlakeTwo256; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type BlockHashCount = BlockHashCount; @@ -761,10 +760,7 @@ impl pallet_nfts::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs b/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs index ea743b5078f..b46d892dbf8 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/lib.rs @@ -69,7 +69,7 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate}; use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; use parachains_common::{ - impls::DealWithFees, opaque, AccountId, Balance, BlockNumber, Hash, Header, Index, Signature, + impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; @@ -181,14 +181,12 @@ impl frame_system::Config for Runtime { type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -400,10 +398,7 @@ impl pallet_utility::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs b/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs index 7a6ef0c7afc..206b496e5a4 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/lib.rs @@ -70,7 +70,7 @@ use polkadot_runtime_common::{BlockHashCount, SlowAdjustingFeeUpdate}; use weights::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight}; use parachains_common::{ - impls::DealWithFees, opaque, AccountId, Balance, BlockNumber, Hash, Header, Index, Signature, + impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; // XCM Imports @@ -181,14 +181,12 @@ impl frame_system::Config for Runtime { type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -400,10 +398,7 @@ impl pallet_utility::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs index 4ea0c032bb2..386034125b5 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs @@ -87,7 +87,7 @@ use bridge_runtime_common::{ messages_xcm_extension::{XcmAsPlainPayload, XcmBlobMessageDispatch}, }; use parachains_common::{ - impls::DealWithFees, opaque, AccountId, Balance, BlockNumber, Hash, Header, Index, Signature, + impls::DealWithFees, AccountId, Balance, BlockNumber, Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, HOURS, MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; use xcm_executor::XcmExecutor; @@ -195,14 +195,12 @@ impl frame_system::Config for Runtime { type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -545,10 +543,7 @@ impl pallet_bridge_relayers::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs index 6a1ec2793f2..eb12e7742dc 100644 --- a/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs +++ b/parachains/runtimes/bridge-hubs/bridge-hub-rococo/tests/tests.rs @@ -27,6 +27,7 @@ use bridge_hub_rococo_runtime::{ }; use codec::{Decode, Encode}; use frame_support::parameter_types; +use frame_system::pallet_prelude::HeaderFor; use parachains_common::{AccountId, AuraId, Balance}; use sp_keyring::AccountKeyring::Alice; use sp_runtime::{ @@ -81,7 +82,7 @@ fn construct_and_apply_extrinsic( r.unwrap() } -fn executive_init_block(header: &::Header) { +fn executive_init_block(header: &HeaderFor) { Executive::initialize_block(header) } diff --git a/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs b/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs index e20767ccde6..03be3f28619 100644 --- a/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs +++ b/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs @@ -38,6 +38,7 @@ use frame_support::{ assert_ok, traits::{Get, OriginTrait, PalletInfoAccess}, }; +use frame_system::pallet_prelude::{BlockNumberFor, HeaderFor}; use pallet_bridge_grandpa::BridgedHeader; use parachains_runtimes_test_utils::{ mock_open_hrmp_channel, AccountIdOf, BalanceOf, CollatorSessionKeys, ExtBuilder, RuntimeHelper, @@ -590,7 +591,7 @@ pub fn complex_relay_extrinsic_works, - executive_init_block: fn(&::Header), + executive_init_block: fn(&HeaderFor), construct_and_apply_extrinsic: fn( sp_keyring::AccountKeyring, pallet_utility::Call:: @@ -653,10 +654,9 @@ pub fn complex_relay_extrinsic_works::BlockNumber = 0u32.into(); + let zero: BlockNumberFor = 0u32.into(); let genesis_hash = frame_system::Pallet::::block_hash(zero); - let mut header: ::Header = - bp_test_utils::test_header(1u32.into()); + let mut header: HeaderFor = bp_test_utils::test_header(1u32.into()); header.set_parent_hash(genesis_hash); executive_init_block(&header); diff --git a/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs b/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs index b5f0923845f..64675afbd8b 100644 --- a/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs +++ b/parachains/runtimes/collectives/collectives-polkadot/src/lib.rs @@ -80,9 +80,9 @@ use frame_system::{ }; pub use parachains_common as common; use parachains_common::{ - impls::DealWithFees, opaque, AccountId, AuraId, Balance, BlockNumber, Hash, Header, Index, - Signature, AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MINUTES, - NORMAL_DISPATCH_RATIO, SLOT_DURATION, + impls::DealWithFees, AccountId, AuraId, Balance, BlockNumber, Hash, Header, Index, Signature, + AVERAGE_ON_INITIALIZE_RATIO, DAYS, HOURS, MAXIMUM_BLOCK_WEIGHT, MINUTES, NORMAL_DISPATCH_RATIO, + SLOT_DURATION, }; use xcm_config::{GovernanceLocation, XcmConfig, XcmOriginToTransactDispatchOrigin}; @@ -160,10 +160,9 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; type Lookup = AccountIdLookup; type Index = Index; - type BlockNumber = BlockNumber; type Hash = Hash; type Hashing = BlakeTwo256; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type BlockHashCount = BlockHashCount; @@ -551,10 +550,7 @@ impl pallet_preimage::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs index 9765f88cdfd..8aecd56f948 100644 --- a/parachains/runtimes/contracts/contracts-rococo/src/lib.rs +++ b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs @@ -57,7 +57,7 @@ use frame_support::{ use frame_system::limits::{BlockLength, BlockWeights}; pub use parachains_common as common; use parachains_common::{ - impls::DealWithFees, opaque, AccountId, BlockNumber, Hash, Header, Index, Signature, + impls::DealWithFees, AccountId, BlockNumber, Hash, Header, Index, Signature, AVERAGE_ON_INITIALIZE_RATIO, MAXIMUM_BLOCK_WEIGHT, MINUTES, NORMAL_DISPATCH_RATIO, SLOT_DURATION, }; @@ -175,10 +175,9 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; type Lookup = AccountIdLookup; type Index = Index; - type BlockNumber = BlockNumber; type Hash = Hash; type Hashing = BlakeTwo256; - type Header = Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type BlockHashCount = BlockHashCount; @@ -337,10 +336,7 @@ impl pallet_sudo::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/glutton/glutton-kusama/src/lib.rs b/parachains/runtimes/glutton/glutton-kusama/src/lib.rs index 487da2175f2..0661fb36ebf 100644 --- a/parachains/runtimes/glutton/glutton-kusama/src/lib.rs +++ b/parachains/runtimes/glutton/glutton-kusama/src/lib.rs @@ -143,10 +143,9 @@ impl frame_system::Config for Runtime { type RuntimeCall = RuntimeCall; type Lookup = AccountIdLookup; type Index = Index; - type BlockNumber = BlockNumber; type Hash = Hash; type Hashing = BlakeTwo256; - type Header = generic::Header; + type Block = Block; type RuntimeEvent = RuntimeEvent; type RuntimeOrigin = RuntimeOrigin; type BlockHashCount = BlockHashCount; @@ -197,10 +196,7 @@ impl pallet_sudo::Config for Runtime { } construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = generic::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system::{Pallet, Call, Storage, Config, Event} = 0, ParachainSystem: cumulus_pallet_parachain_system::{ diff --git a/parachains/runtimes/starters/seedling/src/lib.rs b/parachains/runtimes/starters/seedling/src/lib.rs index 2724f481f02..24fe8e0b693 100644 --- a/parachains/runtimes/starters/seedling/src/lib.rs +++ b/parachains/runtimes/starters/seedling/src/lib.rs @@ -126,14 +126,12 @@ impl frame_system::Config for Runtime { type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -182,10 +180,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl parachain_info::Config for Runtime {} construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = generic::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system::{Pallet, Call, Storage, Config, Event}, Sudo: pallet_sudo::{Pallet, Call, Storage, Config, Event}, diff --git a/parachains/runtimes/starters/shell/src/lib.rs b/parachains/runtimes/starters/shell/src/lib.rs index d72476abdc8..b29fac6415c 100644 --- a/parachains/runtimes/starters/shell/src/lib.rs +++ b/parachains/runtimes/starters/shell/src/lib.rs @@ -134,14 +134,12 @@ impl frame_system::Config for Runtime { type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -185,10 +183,7 @@ impl cumulus_pallet_parachain_system::Config for Runtime { impl parachain_info::Config for Runtime {} construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = generic::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system::{Pallet, Call, Storage, Config, Event}, ParachainSystem: cumulus_pallet_parachain_system::{ diff --git a/parachains/runtimes/testing/penpal/src/lib.rs b/parachains/runtimes/testing/penpal/src/lib.rs index cb2dd6c84d3..609c48f3560 100644 --- a/parachains/runtimes/testing/penpal/src/lib.rs +++ b/parachains/runtimes/testing/penpal/src/lib.rs @@ -318,14 +318,12 @@ impl frame_system::Config for Runtime { type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -551,10 +549,7 @@ impl pallet_sudo::Config for Runtime { // Create the runtime by composing the FRAME pallets that were previously configured. construct_runtime!( - pub enum Runtime where - Block = Block, - NodeBlock = opaque::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { // System support stuff. System: frame_system::{Pallet, Call, Config, Storage, Event} = 0, diff --git a/parachains/runtimes/testing/rococo-parachain/src/lib.rs b/parachains/runtimes/testing/rococo-parachain/src/lib.rs index da68f331fe9..2448c9b3030 100644 --- a/parachains/runtimes/testing/rococo-parachain/src/lib.rs +++ b/parachains/runtimes/testing/rococo-parachain/src/lib.rs @@ -179,14 +179,12 @@ impl frame_system::Config for Runtime { type Lookup = AccountIdLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -558,10 +556,7 @@ impl pallet_aura::Config for Runtime { } construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = generic::Block, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system::{Pallet, Call, Storage, Config, Event}, Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent}, diff --git a/test/runtime/src/lib.rs b/test/runtime/src/lib.rs index 25841acb11b..8cfd62df1f8 100644 --- a/test/runtime/src/lib.rs +++ b/test/runtime/src/lib.rs @@ -186,14 +186,12 @@ impl frame_system::Config for Runtime { type Lookup = IdentityLookup; /// The index type for storing how many extrinsics an account has signed. type Index = Index; - /// The index type for blocks. - type BlockNumber = BlockNumber; /// The type for hashing blocks and tries. type Hash = Hash; /// The hashing algorithm used. type Hashing = BlakeTwo256; - /// The header type. - type Header = generic::Header; + /// The block type. + type Block = Block; /// The ubiquitous event type. type RuntimeEvent = RuntimeEvent; /// The ubiquitous origin type. @@ -294,10 +292,7 @@ parameter_types! { impl test_pallet::Config for Runtime {} construct_runtime! { - pub enum Runtime where - Block = Block, - NodeBlock = NodeBlock, - UncheckedExtrinsic = UncheckedExtrinsic, + pub enum Runtime { System: frame_system, ParachainSystem: cumulus_pallet_parachain_system,