From 99d49ad7c93bb283166ae4344e1a5e19149c96c5 Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Wed, 9 Jun 2021 03:07:04 -0700 Subject: [PATCH] Companion for #8990 (#3194) * Use new naming scheme for all Event enums generated by construct_runtime * Use new naming scheme for all GenesisConfig fields generated by construct_runtime * Fix overlooked GenesisConfig field renaming * update Substrate Co-authored-by: parity-processbot <> --- polkadot/Cargo.lock | 320 +++++++++--------- .../bridges/bin/millau/node/src/chain_spec.rs | 14 +- .../bridges/bin/rialto/node/src/chain_spec.rs | 22 +- .../bridges/bin/rialto/runtime/src/lib.rs | 10 +- .../bin/rialto/runtime/src/rialto_poa.rs | 2 +- polkadot/bridges/modules/dispatch/src/lib.rs | 18 +- polkadot/bridges/modules/messages/src/lib.rs | 8 +- .../relays/bin-ethereum/src/instances.rs | 4 +- polkadot/node/service/src/chain_spec.rs | 248 +++++++------- polkadot/node/test/service/src/chain_spec.rs | 20 +- polkadot/runtime/kusama/src/lib.rs | 2 +- polkadot/runtime/parachains/src/hrmp.rs | 6 +- polkadot/runtime/rococo/src/lib.rs | 2 +- polkadot/runtime/westend/src/lib.rs | 2 +- 14 files changed, 338 insertions(+), 340 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 3f4f6ff330..cf19706118 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "Inflector" version = "0.11.4" @@ -481,7 +479,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#a58179d4f59f4c31c7a09d5b0ce14df8450743a3" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget#a58179d4f59f4c31c7a09d5b0ce14df8450743a3" dependencies = [ "beefy-primitives", "futures 0.3.14", @@ -509,7 +507,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#a58179d4f59f4c31c7a09d5b0ce14df8450743a3" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget#a58179d4f59f4c31c7a09d5b0ce14df8450743a3" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -530,7 +528,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#a58179d4f59f4c31c7a09d5b0ce14df8450743a3" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget#a58179d4f59f4c31c7a09d5b0ce14df8450743a3" dependencies = [ "parity-scale-codec", "sp-api", @@ -1905,7 +1903,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", ] @@ -1923,7 +1921,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -1942,7 +1940,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "Inflector", "chrono", @@ -1965,7 +1963,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -1978,7 +1976,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -1993,7 +1991,7 @@ dependencies = [ [[package]] name = "frame-metadata" version = "13.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "serde", @@ -2004,7 +2002,7 @@ dependencies = [ [[package]] name = "frame-support" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "bitflags", "frame-metadata", @@ -2031,7 +2029,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2043,7 +2041,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate 1.0.0", @@ -2055,7 +2053,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "proc-macro2", "quote", @@ -2065,7 +2063,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-metadata", "frame-support", @@ -2085,7 +2083,7 @@ dependencies = [ [[package]] name = "frame-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "impl-trait-for-tuples", @@ -2102,7 +2100,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -2116,7 +2114,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "sp-api", @@ -2125,7 +2123,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "parity-scale-codec", @@ -4071,7 +4069,7 @@ dependencies = [ [[package]] name = "max-encoded-len" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "impl-trait-for-tuples", "max-encoded-len-derive", @@ -4082,7 +4080,7 @@ dependencies = [ [[package]] name = "max-encoded-len-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -4585,7 +4583,7 @@ checksum = "13370dae44474229701bb69b90b4f4dca6404cb0357a2d50d635f1171dc3aa7b" [[package]] name = "pallet-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -4600,7 +4598,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -4614,7 +4612,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4637,7 +4635,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4652,7 +4650,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "0.1.0" -source = "git+https://github.com/paritytech/grandpa-bridge-gadget?branch=master#a58179d4f59f4c31c7a09d5b0ce14df8450743a3" +source = "git+https://github.com/paritytech/grandpa-bridge-gadget#a58179d4f59f4c31c7a09d5b0ce14df8450743a3" dependencies = [ "beefy-primitives", "frame-support", @@ -4667,7 +4665,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4703,7 +4701,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4719,7 +4717,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4734,7 +4732,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4755,7 +4753,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4772,7 +4770,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4786,7 +4784,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "3.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4808,7 +4806,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4823,7 +4821,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4842,7 +4840,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4858,7 +4856,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4873,7 +4871,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -4890,7 +4888,7 @@ dependencies = [ [[package]] name = "pallet-mmr-primitives" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -4906,7 +4904,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -4924,7 +4922,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -4939,7 +4937,7 @@ dependencies = [ [[package]] name = "pallet-nicks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -4952,7 +4950,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -4968,7 +4966,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4990,7 +4988,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5006,7 +5004,7 @@ dependencies = [ [[package]] name = "pallet-randomness-collective-flip" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -5019,7 +5017,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "enumflags2", "frame-support", @@ -5033,7 +5031,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5048,7 +5046,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -5067,7 +5065,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5083,7 +5081,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -5096,7 +5094,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5120,7 +5118,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -5131,7 +5129,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "log", "sp-arithmetic", @@ -5140,7 +5138,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -5153,7 +5151,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5171,7 +5169,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5186,7 +5184,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-support", "frame-system", @@ -5202,7 +5200,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -5219,7 +5217,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5230,7 +5228,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5246,7 +5244,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-benchmarking", "frame-support", @@ -5261,7 +5259,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "enumflags2", "frame-benchmarking", @@ -7511,7 +7509,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "env_logger 0.8.2", "hex", @@ -7813,7 +7811,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "derive_more", @@ -7842,7 +7840,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "futures-timer 3.0.2", @@ -7865,7 +7863,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -7881,7 +7879,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -7902,7 +7900,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -7913,7 +7911,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "chrono", "fdlimit", @@ -7951,7 +7949,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "fnv", @@ -7985,7 +7983,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "blake2-rfc", "hash-db", @@ -8015,7 +8013,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parking_lot 0.11.1", "sc-client-api", @@ -8027,7 +8025,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "derive_more", @@ -8073,7 +8071,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "futures 0.3.14", @@ -8097,7 +8095,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8110,7 +8108,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "futures 0.3.14", @@ -8138,7 +8136,7 @@ dependencies = [ [[package]] name = "sc-consensus-uncles" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "sc-client-api", "sp-authorship", @@ -8149,7 +8147,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "lazy_static", @@ -8178,7 +8176,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "parity-scale-codec", @@ -8195,7 +8193,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "log", "parity-scale-codec", @@ -8210,7 +8208,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "log", "parity-scale-codec", @@ -8227,7 +8225,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "derive_more", @@ -8268,7 +8266,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "finality-grandpa", @@ -8292,7 +8290,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-warp-sync" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "futures 0.3.14", @@ -8313,7 +8311,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "ansi_term 0.12.1", "futures 0.3.14", @@ -8331,7 +8329,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "derive_more", @@ -8351,7 +8349,7 @@ dependencies = [ [[package]] name = "sc-light" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "hash-db", "lazy_static", @@ -8370,7 +8368,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-std", "async-trait", @@ -8423,7 +8421,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "futures-timer 3.0.2", @@ -8440,7 +8438,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "bytes 0.5.6", "fnv", @@ -8468,7 +8466,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "libp2p", @@ -8481,7 +8479,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -8490,7 +8488,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "hash-db", @@ -8525,7 +8523,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "futures 0.3.14", @@ -8550,7 +8548,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.1.29", "jsonrpc-core", @@ -8568,7 +8566,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "directories", @@ -8633,7 +8631,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "log", "parity-scale-codec", @@ -8648,7 +8646,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "jsonrpc-core", "jsonrpc-core-client", @@ -8668,7 +8666,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "chrono", "futures 0.3.14", @@ -8688,7 +8686,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "ansi_term 0.12.1", "atty", @@ -8725,7 +8723,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -8736,7 +8734,7 @@ dependencies = [ [[package]] name = "sc-transaction-graph" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "futures 0.3.14", @@ -8758,7 +8756,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "futures-diagnose", @@ -9239,7 +9237,7 @@ dependencies = [ [[package]] name = "sp-allocator" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "log", "sp-core", @@ -9251,7 +9249,7 @@ dependencies = [ [[package]] name = "sp-api" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "hash-db", "log", @@ -9268,7 +9266,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "blake2-rfc", "proc-macro-crate 1.0.0", @@ -9280,7 +9278,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "max-encoded-len", "parity-scale-codec", @@ -9293,7 +9291,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "integer-sqrt", "num-traits", @@ -9307,7 +9305,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "sp-api", @@ -9319,7 +9317,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "parity-scale-codec", @@ -9331,7 +9329,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "sp-api", @@ -9343,7 +9341,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "log", @@ -9361,7 +9359,7 @@ dependencies = [ [[package]] name = "sp-chain-spec" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "serde", "serde_json", @@ -9370,7 +9368,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "futures 0.3.14", @@ -9397,7 +9395,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "merlin", @@ -9419,7 +9417,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "sp-arithmetic", @@ -9429,7 +9427,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "schnorrkel", @@ -9441,7 +9439,7 @@ dependencies = [ [[package]] name = "sp-core" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "base58", "blake2-rfc", @@ -9486,7 +9484,7 @@ dependencies = [ [[package]] name = "sp-database" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "kvdb", "parking_lot 0.11.1", @@ -9495,7 +9493,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "proc-macro2", "quote", @@ -9505,7 +9503,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "environmental", "parity-scale-codec", @@ -9516,7 +9514,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "finality-grandpa", "log", @@ -9533,7 +9531,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -9547,7 +9545,7 @@ dependencies = [ [[package]] name = "sp-io" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "hash-db", @@ -9572,7 +9570,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "lazy_static", "sp-core", @@ -9583,7 +9581,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "derive_more", @@ -9600,7 +9598,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "ruzstd", "zstd", @@ -9609,7 +9607,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "serde", @@ -9622,7 +9620,7 @@ dependencies = [ [[package]] name = "sp-npos-elections-compact" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "proc-macro-crate 1.0.0", "proc-macro2", @@ -9633,7 +9631,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "sp-api", "sp-core", @@ -9643,7 +9641,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "backtrace", ] @@ -9651,7 +9649,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "rustc-hash", "serde", @@ -9662,7 +9660,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "either", "hash256-std-hasher", @@ -9684,7 +9682,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -9701,7 +9699,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "Inflector", "proc-macro-crate 1.0.0", @@ -9713,7 +9711,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "serde", "serde_json", @@ -9722,7 +9720,7 @@ dependencies = [ [[package]] name = "sp-session" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "sp-api", @@ -9735,7 +9733,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "sp-runtime", @@ -9745,7 +9743,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "hash-db", "log", @@ -9768,12 +9766,12 @@ dependencies = [ [[package]] name = "sp-std" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" [[package]] name = "sp-storage" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9786,7 +9784,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "log", "sp-core", @@ -9799,7 +9797,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "futures-timer 3.0.2", @@ -9816,7 +9814,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "erased-serde", "log", @@ -9834,7 +9832,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "derive_more", "futures 0.3.14", @@ -9850,7 +9848,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "log", @@ -9865,7 +9863,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "hash-db", "memory-db", @@ -9879,7 +9877,7 @@ dependencies = [ [[package]] name = "sp-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "futures-core", @@ -9891,7 +9889,7 @@ dependencies = [ [[package]] name = "sp-version" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "impl-serde", "parity-scale-codec", @@ -9904,7 +9902,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "parity-scale-codec", "proc-macro-crate 1.0.0", @@ -9916,7 +9914,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10073,7 +10071,7 @@ dependencies = [ [[package]] name = "substrate-browser-utils" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "chrono", "console_error_panic_hook", @@ -10099,7 +10097,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "platforms", ] @@ -10107,7 +10105,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-system-rpc-runtime-api", "futures 0.3.14", @@ -10130,7 +10128,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-std", "derive_more", @@ -10144,7 +10142,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "async-trait", "futures 0.1.29", @@ -10173,7 +10171,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "futures 0.3.14", "substrate-test-utils-derive", @@ -10183,7 +10181,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "proc-macro-crate 1.0.0", "quote", @@ -10948,7 +10946,7 @@ checksum = "e604eb7b43c06650e854be16a2a03155743d3752dd1c943f6829e26b7a36e382" [[package]] name = "try-runtime-cli" version = "0.9.0" -source = "git+https://github.com/paritytech/substrate?branch=master#f775d0de6bddeba53ab35bc662fb076291e5260e" +source = "git+https://github.com/paritytech/substrate#d6ac9f551b71d9c7b69afcebfc68ace310ef74ee" dependencies = [ "frame-try-runtime", "log", diff --git a/polkadot/bridges/bin/millau/node/src/chain_spec.rs b/polkadot/bridges/bin/millau/node/src/chain_spec.rs index 374c0f739c..a6f95119ca 100644 --- a/polkadot/bridges/bin/millau/node/src/chain_spec.rs +++ b/polkadot/bridges/bin/millau/node/src/chain_spec.rs @@ -175,27 +175,27 @@ fn testnet_genesis( _enable_println: bool, ) -> GenesisConfig { GenesisConfig { - frame_system: SystemConfig { + system: SystemConfig { code: WASM_BINARY.expect("Millau development WASM not available").to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: BalancesConfig { + balances: BalancesConfig { balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 40)).collect(), }, - pallet_aura: AuraConfig { + aura: AuraConfig { authorities: Vec::new(), }, - pallet_grandpa: GrandpaConfig { + grandpa: GrandpaConfig { authorities: Vec::new(), }, - pallet_sudo: SudoConfig { key: root_key }, - pallet_session: SessionConfig { + sudo: SudoConfig { key: root_key }, + session: SessionConfig { keys: initial_authorities .iter() .map(|x| (x.0.clone(), x.0.clone(), session_keys(x.1.clone(), x.2.clone()))) .collect::>(), }, - pallet_bridge_grandpa_Instance1: BridgeWestendGrandpaConfig { + bridge_westend_grandpa: BridgeWestendGrandpaConfig { // for our deployments to avoid multiple same-nonces transactions: // //Alice is already used to initialize Rialto<->Millau bridge // => let's use //George to initialize Westend->Millau bridge diff --git a/polkadot/bridges/bin/rialto/node/src/chain_spec.rs b/polkadot/bridges/bin/rialto/node/src/chain_spec.rs index cf14845df1..2b8706c16d 100644 --- a/polkadot/bridges/bin/rialto/node/src/chain_spec.rs +++ b/polkadot/bridges/bin/rialto/node/src/chain_spec.rs @@ -16,7 +16,7 @@ use bp_rialto::derive_account_from_millau_id; use rialto_runtime::{ - AccountId, AuraConfig, BalancesConfig, BridgeKovanConfig, BridgeRialtoPoAConfig, GenesisConfig, GrandpaConfig, + AccountId, AuraConfig, BalancesConfig, BridgeKovanConfig, BridgeRialtoPoaConfig, GenesisConfig, GrandpaConfig, SessionConfig, SessionKeys, Signature, SudoConfig, SystemConfig, WASM_BINARY, }; use serde_json::json; @@ -176,23 +176,23 @@ fn testnet_genesis( _enable_println: bool, ) -> GenesisConfig { GenesisConfig { - frame_system: SystemConfig { + system: SystemConfig { code: WASM_BINARY.expect("Rialto development WASM not available").to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: BalancesConfig { + balances: BalancesConfig { balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 40)).collect(), }, - pallet_aura: AuraConfig { + aura: AuraConfig { authorities: Vec::new(), }, - pallet_bridge_eth_poa_Instance1: load_rialto_poa_bridge_config(), - pallet_bridge_eth_poa_Instance2: load_kovan_bridge_config(), - pallet_grandpa: GrandpaConfig { + bridge_rialto_poa: load_rialto_poa_bridge_config(), + bridge_kovan: load_kovan_bridge_config(), + grandpa: GrandpaConfig { authorities: Vec::new(), }, - pallet_sudo: SudoConfig { key: root_key }, - pallet_session: SessionConfig { + sudo: SudoConfig { key: root_key }, + session: SessionConfig { keys: initial_authorities .iter() .map(|x| (x.0.clone(), x.0.clone(), session_keys(x.1.clone(), x.2.clone()))) @@ -201,8 +201,8 @@ fn testnet_genesis( } } -fn load_rialto_poa_bridge_config() -> BridgeRialtoPoAConfig { - BridgeRialtoPoAConfig { +fn load_rialto_poa_bridge_config() -> BridgeRialtoPoaConfig { + BridgeRialtoPoaConfig { initial_header: rialto_runtime::rialto_poa::genesis_header(), initial_difficulty: 0.into(), initial_validators: rialto_runtime::rialto_poa::genesis_validators(), diff --git a/polkadot/bridges/bin/rialto/runtime/src/lib.rs b/polkadot/bridges/bin/rialto/runtime/src/lib.rs index 5259a10493..d0d59ea14f 100644 --- a/polkadot/bridges/bin/rialto/runtime/src/lib.rs +++ b/polkadot/bridges/bin/rialto/runtime/src/lib.rs @@ -497,7 +497,7 @@ construct_runtime!( NodeBlock = opaque::Block, UncheckedExtrinsic = UncheckedExtrinsic { - BridgeRialtoPoA: pallet_bridge_eth_poa::::{Pallet, Call, Config, Storage, ValidateUnsigned}, + BridgeRialtoPoa: pallet_bridge_eth_poa::::{Pallet, Call, Config, Storage, ValidateUnsigned}, BridgeKovan: pallet_bridge_eth_poa::::{Pallet, Call, Config, Storage, ValidateUnsigned}, BridgeRialtoCurrencyExchange: pallet_bridge_currency_exchange::::{Pallet, Call}, BridgeKovanCurrencyExchange: pallet_bridge_currency_exchange::::{Pallet, Call}, @@ -597,21 +597,21 @@ impl_runtime_apis! { impl bp_eth_poa::RialtoPoAHeaderApi for Runtime { fn best_block() -> (u64, bp_eth_poa::H256) { - let best_block = BridgeRialtoPoA::best_block(); + let best_block = BridgeRialtoPoa::best_block(); (best_block.number, best_block.hash) } fn finalized_block() -> (u64, bp_eth_poa::H256) { - let finalized_block = BridgeRialtoPoA::finalized_block(); + let finalized_block = BridgeRialtoPoa::finalized_block(); (finalized_block.number, finalized_block.hash) } fn is_import_requires_receipts(header: bp_eth_poa::AuraHeader) -> bool { - BridgeRialtoPoA::is_import_requires_receipts(header) + BridgeRialtoPoa::is_import_requires_receipts(header) } fn is_known_block(hash: bp_eth_poa::H256) -> bool { - BridgeRialtoPoA::is_known_block(hash) + BridgeRialtoPoa::is_known_block(hash) } } diff --git a/polkadot/bridges/bin/rialto/runtime/src/rialto_poa.rs b/polkadot/bridges/bin/rialto/runtime/src/rialto_poa.rs index 83b263975a..9bc74a2eba 100644 --- a/polkadot/bridges/bin/rialto/runtime/src/rialto_poa.rs +++ b/polkadot/bridges/bin/rialto/runtime/src/rialto_poa.rs @@ -130,7 +130,7 @@ impl InclusionProofVerifier for RialtoBlockchain { fn verify_transaction_inclusion_proof(proof: &Self::TransactionInclusionProof) -> Option { let is_transaction_finalized = - crate::BridgeRialtoPoA::verify_transaction_finalized(proof.block, proof.index, &proof.proof); + crate::BridgeRialtoPoa::verify_transaction_finalized(proof.block, proof.index, &proof.proof); if !is_transaction_finalized { return None; diff --git a/polkadot/bridges/modules/dispatch/src/lib.rs b/polkadot/bridges/modules/dispatch/src/lib.rs index 0b0074c20b..5ac2825c8c 100644 --- a/polkadot/bridges/modules/dispatch/src/lib.rs +++ b/polkadot/bridges/modules/dispatch/src/lib.rs @@ -510,7 +510,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageVersionSpecMismatch( + event: Event::Dispatch(call_dispatch::Event::::MessageVersionSpecMismatch( bridge, id, TEST_SPEC_VERSION, @@ -538,7 +538,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageWeightMismatch( + event: Event::Dispatch(call_dispatch::Event::::MessageWeightMismatch( bridge, id, 1345000, 0, )), topics: vec![], @@ -566,7 +566,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageSignatureMismatch( + event: Event::Dispatch(call_dispatch::Event::::MessageSignatureMismatch( bridge, id )), topics: vec![], @@ -588,7 +588,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageRejected(bridge, id)), + event: Event::Dispatch(call_dispatch::Event::::MessageRejected(bridge, id)), topics: vec![], }], ); @@ -612,7 +612,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageCallDecodeFailed( + event: Event::Dispatch(call_dispatch::Event::::MessageCallDecodeFailed( bridge, id )), topics: vec![], @@ -639,7 +639,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageCallRejected(bridge, id)), + event: Event::Dispatch(call_dispatch::Event::::MessageCallRejected(bridge, id)), topics: vec![], }], ); @@ -660,7 +660,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageDispatched( + event: Event::Dispatch(call_dispatch::Event::::MessageDispatched( bridge, id, Ok(()) @@ -687,7 +687,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageDispatched( + event: Event::Dispatch(call_dispatch::Event::::MessageDispatched( bridge, id, Ok(()) @@ -714,7 +714,7 @@ mod tests { System::events(), vec![EventRecord { phase: Phase::Initialization, - event: Event::call_dispatch(call_dispatch::Event::::MessageDispatched( + event: Event::Dispatch(call_dispatch::Event::::MessageDispatched( bridge, id, Ok(()) diff --git a/polkadot/bridges/modules/messages/src/lib.rs b/polkadot/bridges/modules/messages/src/lib.rs index 9e2563498f..15e8c7166b 100644 --- a/polkadot/bridges/modules/messages/src/lib.rs +++ b/polkadot/bridges/modules/messages/src/lib.rs @@ -878,7 +878,7 @@ mod tests { System::::events(), vec![EventRecord { phase: Phase::Initialization, - event: TestEvent::pallet_bridge_messages(RawEvent::MessageAccepted(TEST_LANE_ID, 1)), + event: TestEvent::Messages(RawEvent::MessageAccepted(TEST_LANE_ID, 1)), topics: vec![], }], ); @@ -907,7 +907,7 @@ mod tests { System::::events(), vec![EventRecord { phase: Phase::Initialization, - event: TestEvent::pallet_bridge_messages(RawEvent::MessagesDelivered(TEST_LANE_ID, 1, 1)), + event: TestEvent::Messages(RawEvent::MessagesDelivered(TEST_LANE_ID, 1, 1)), topics: vec![], }], ); @@ -987,7 +987,7 @@ mod tests { System::::events(), vec![EventRecord { phase: Phase::Initialization, - event: TestEvent::pallet_bridge_messages(RawEvent::ParameterUpdated(parameter)), + event: TestEvent::Messages(RawEvent::ParameterUpdated(parameter)), topics: vec![], }], ); @@ -1011,7 +1011,7 @@ mod tests { System::::events(), vec![EventRecord { phase: Phase::Initialization, - event: TestEvent::pallet_bridge_messages(RawEvent::ParameterUpdated(parameter)), + event: TestEvent::Messages(RawEvent::ParameterUpdated(parameter)), topics: vec![], }], ); diff --git a/polkadot/bridges/relays/bin-ethereum/src/instances.rs b/polkadot/bridges/relays/bin-ethereum/src/instances.rs index 0d2a508f45..30752cc59e 100644 --- a/polkadot/bridges/relays/bin-ethereum/src/instances.rs +++ b/polkadot/bridges/relays/bin-ethereum/src/instances.rs @@ -60,7 +60,7 @@ impl BridgeInstance for RialtoPoA { .collect(), ); - rialto_runtime::Call::BridgeRialtoPoA(pallet_call) + rialto_runtime::Call::BridgeRialtoPoa(pallet_call) } fn build_unsigned_header_call(&self, header: QueuedEthereumHeader) -> Call { @@ -69,7 +69,7 @@ impl BridgeInstance for RialtoPoA { into_substrate_ethereum_receipts(header.extra()), ); - rialto_runtime::Call::BridgeRialtoPoA(pallet_call) + rialto_runtime::Call::BridgeRialtoPoa(pallet_call) } fn build_currency_exchange_call(&self, proof: Proof) -> Call { diff --git a/polkadot/node/service/src/chain_spec.rs b/polkadot/node/service/src/chain_spec.rs index 1ab99f040b..f9ebe94d0d 100644 --- a/polkadot/node/service/src/chain_spec.rs +++ b/polkadot/node/service/src/chain_spec.rs @@ -290,19 +290,19 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene const STASH: u128 = 100 * DOT; polkadot::GenesisConfig { - frame_system: polkadot::SystemConfig { + system: polkadot::SystemConfig { code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: polkadot::BalancesConfig { + balances: polkadot::BalancesConfig { balances: endowed_accounts .iter() .map(|k: &AccountId| (k.clone(), ENDOWMENT)) .chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH))) .collect(), }, - pallet_indices: polkadot::IndicesConfig { indices: vec![] }, - pallet_session: polkadot::SessionConfig { + indices: polkadot::IndicesConfig { indices: vec![] }, + session: polkadot::SessionConfig { keys: initial_authorities .iter() .map(|x| { @@ -321,7 +321,7 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene }) .collect::>(), }, - pallet_staking: polkadot::StakingConfig { + staking: polkadot::StakingConfig { validator_count: 50, minimum_validator_count: 4, stakers: initial_authorities @@ -340,30 +340,30 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - pallet_elections_phragmen: Default::default(), - pallet_democracy: Default::default(), - pallet_collective_Instance1: polkadot::CouncilConfig { + phragmen_election: Default::default(), + democracy: Default::default(), + council: polkadot::CouncilConfig { members: vec![], phantom: Default::default(), }, - pallet_collective_Instance2: polkadot::TechnicalCommitteeConfig { + technical_committee: polkadot::TechnicalCommitteeConfig { members: vec![], phantom: Default::default(), }, - pallet_membership_Instance1: Default::default(), - pallet_babe: polkadot::BabeConfig { + technical_membership: Default::default(), + babe: polkadot::BabeConfig { authorities: Default::default(), epoch_config: Some(polkadot::BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_im_online: Default::default(), - pallet_authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] }, + grandpa: Default::default(), + im_online: Default::default(), + authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] }, claims: polkadot::ClaimsConfig { claims: vec![], vesting: vec![], }, - pallet_vesting: polkadot::VestingConfig { vesting: vec![] }, - pallet_treasury: Default::default(), + vesting: polkadot::VestingConfig { vesting: vec![] }, + treasury: Default::default(), } } @@ -464,19 +464,19 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi const STASH: u128 = 100 * WND; westend::GenesisConfig { - frame_system: westend::SystemConfig { + system: westend::SystemConfig { code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: westend::BalancesConfig { + balances: westend::BalancesConfig { balances: endowed_accounts .iter() .map(|k: &AccountId| (k.clone(), ENDOWMENT)) .chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH))) .collect(), }, - pallet_indices: westend::IndicesConfig { indices: vec![] }, - pallet_session: westend::SessionConfig { + indices: westend::IndicesConfig { indices: vec![] }, + session: westend::SessionConfig { keys: initial_authorities .iter() .map(|x| { @@ -495,7 +495,7 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi }) .collect::>(), }, - pallet_staking: westend::StakingConfig { + staking: westend::StakingConfig { validator_count: 50, minimum_validator_count: 4, stakers: initial_authorities @@ -514,21 +514,21 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - pallet_babe: westend::BabeConfig { + babe: westend::BabeConfig { authorities: Default::default(), epoch_config: Some(westend::BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_im_online: Default::default(), - pallet_authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] }, - pallet_vesting: westend::VestingConfig { vesting: vec![] }, - pallet_sudo: westend::SudoConfig { + grandpa: Default::default(), + im_online: Default::default(), + authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] }, + vesting: westend::VestingConfig { vesting: vec![] }, + sudo: westend::SudoConfig { key: endowed_accounts[0].clone(), }, parachains_configuration: westend::ParachainsConfigurationConfig { config: default_parachains_host_configuration(), }, - parachains_paras: Default::default(), + paras: Default::default(), } } @@ -660,19 +660,19 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC const STASH: u128 = 100 * KSM; kusama::GenesisConfig { - frame_system: kusama::SystemConfig { + system: kusama::SystemConfig { code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: kusama::BalancesConfig { + balances: kusama::BalancesConfig { balances: endowed_accounts .iter() .map(|k: &AccountId| (k.clone(), ENDOWMENT)) .chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH))) .collect(), }, - pallet_indices: kusama::IndicesConfig { indices: vec![] }, - pallet_session: kusama::SessionConfig { + indices: kusama::IndicesConfig { indices: vec![] }, + session: kusama::SessionConfig { keys: initial_authorities .iter() .map(|x| { @@ -691,7 +691,7 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC }) .collect::>(), }, - pallet_staking: kusama::StakingConfig { + staking: kusama::StakingConfig { validator_count: 50, minimum_validator_count: 4, stakers: initial_authorities @@ -710,35 +710,35 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - pallet_elections_phragmen: Default::default(), - pallet_democracy: Default::default(), - pallet_collective_Instance1: kusama::CouncilConfig { + phragmen_election: Default::default(), + democracy: Default::default(), + council: kusama::CouncilConfig { members: vec![], phantom: Default::default(), }, - pallet_collective_Instance2: kusama::TechnicalCommitteeConfig { + technical_committee: kusama::TechnicalCommitteeConfig { members: vec![], phantom: Default::default(), }, - pallet_membership_Instance1: Default::default(), - pallet_babe: kusama::BabeConfig { + technical_membership: Default::default(), + babe: kusama::BabeConfig { authorities: Default::default(), epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_im_online: Default::default(), - pallet_authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] }, + grandpa: Default::default(), + im_online: Default::default(), + authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] }, claims: kusama::ClaimsConfig { claims: vec![], vesting: vec![], }, - pallet_vesting: kusama::VestingConfig { vesting: vec![] }, - pallet_treasury: Default::default(), + vesting: kusama::VestingConfig { vesting: vec![] }, + treasury: Default::default(), parachains_configuration: kusama::ParachainsConfigurationConfig { config: default_parachains_host_configuration(), }, - pallet_gilt: Default::default(), - parachains_paras: Default::default(), + gilt: Default::default(), + paras: Default::default(), } } @@ -931,21 +931,21 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime:: const STASH: u128 = 100 * ROC; rococo_runtime::GenesisConfig { - frame_system: rococo_runtime::SystemConfig { + system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }, - pallet_balances: rococo_runtime::BalancesConfig { + balances: rococo_runtime::BalancesConfig { balances: endowed_accounts.iter() .map(|k: &AccountId| (k.clone(), ENDOWMENT)) .chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH))) .collect(), }, - pallet_beefy: Default::default(), - pallet_indices: rococo_runtime::IndicesConfig { + beefy: Default::default(), + indices: rococo_runtime::IndicesConfig { indices: vec![], }, - pallet_session: rococo_runtime::SessionConfig { + session: rococo_runtime::SessionConfig { keys: initial_authorities.iter().map(|x| ( x.0.clone(), x.0.clone(), @@ -960,33 +960,33 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime:: ), )).collect::>(), }, - pallet_babe: rococo_runtime::BabeConfig { + babe: rococo_runtime::BabeConfig { authorities: Default::default(), epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_im_online: Default::default(), - pallet_collective: Default::default(), - pallet_membership: Default::default(), - pallet_authority_discovery: rococo_runtime::AuthorityDiscoveryConfig { + grandpa: Default::default(), + im_online: Default::default(), + collective: Default::default(), + membership: Default::default(), + authority_discovery: rococo_runtime::AuthorityDiscoveryConfig { keys: vec![], }, - pallet_sudo: rococo_runtime::SudoConfig { + sudo: rococo_runtime::SudoConfig { key: endowed_accounts[0].clone(), }, - parachains_paras: rococo_runtime::ParasConfig { + paras: rococo_runtime::ParasConfig { paras: vec![], _phdata: Default::default(), }, - parachains_hrmp: Default::default(), + hrmp: Default::default(), parachains_configuration: rococo_runtime::ParachainsConfigurationConfig { config: default_parachains_host_configuration(), }, - pallet_bridge_grandpa: rococo_runtime::BridgeRococoGrandpaConfig { + bridge_rococo_grandpa: rococo_runtime::BridgeRococoGrandpaConfig { owner: Some(endowed_accounts[0].clone()), ..Default::default() }, - pallet_bridge_grandpa_Instance1: rococo_runtime::BridgeWococoGrandpaConfig { + bridge_wococo_grandpa: rococo_runtime::BridgeWococoGrandpaConfig { owner: Some(endowed_accounts[0].clone()), ..Default::default() }, @@ -1182,18 +1182,18 @@ pub fn polkadot_testnet_genesis( const STASH: u128 = 100 * DOT; polkadot::GenesisConfig { - frame_system: polkadot::SystemConfig { + system: polkadot::SystemConfig { code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }, - pallet_indices: polkadot::IndicesConfig { indices: vec![] }, - pallet_balances: polkadot::BalancesConfig { + indices: polkadot::IndicesConfig { indices: vec![] }, + balances: polkadot::BalancesConfig { balances: endowed_accounts .iter() .map(|k| (k.clone(), ENDOWMENT)) .collect(), }, - pallet_session: polkadot::SessionConfig { + session: polkadot::SessionConfig { keys: initial_authorities .iter() .map(|x| { @@ -1212,7 +1212,7 @@ pub fn polkadot_testnet_genesis( }) .collect::>(), }, - pallet_staking: polkadot::StakingConfig { + staking: polkadot::StakingConfig { minimum_validator_count: 1, validator_count: 2, stakers: initial_authorities @@ -1231,30 +1231,30 @@ pub fn polkadot_testnet_genesis( slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - pallet_elections_phragmen: Default::default(), - pallet_democracy: polkadot::DemocracyConfig::default(), - pallet_collective_Instance1: polkadot::CouncilConfig { + phragmen_election: Default::default(), + democracy: polkadot::DemocracyConfig::default(), + council: polkadot::CouncilConfig { members: vec![], phantom: Default::default(), }, - pallet_collective_Instance2: polkadot::TechnicalCommitteeConfig { + technical_committee: polkadot::TechnicalCommitteeConfig { members: vec![], phantom: Default::default(), }, - pallet_membership_Instance1: Default::default(), - pallet_babe: polkadot::BabeConfig { + technical_membership: Default::default(), + babe: polkadot::BabeConfig { authorities: Default::default(), epoch_config: Some(polkadot::BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_im_online: Default::default(), - pallet_authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] }, + grandpa: Default::default(), + im_online: Default::default(), + authority_discovery: polkadot::AuthorityDiscoveryConfig { keys: vec![] }, claims: polkadot::ClaimsConfig { claims: vec![], vesting: vec![], }, - pallet_vesting: polkadot::VestingConfig { vesting: vec![] }, - pallet_treasury: Default::default(), + vesting: polkadot::VestingConfig { vesting: vec![] }, + treasury: Default::default(), } } @@ -1281,18 +1281,18 @@ pub fn kusama_testnet_genesis( const STASH: u128 = 100 * KSM; kusama::GenesisConfig { - frame_system: kusama::SystemConfig { + system: kusama::SystemConfig { code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }, - pallet_indices: kusama::IndicesConfig { indices: vec![] }, - pallet_balances: kusama::BalancesConfig { + indices: kusama::IndicesConfig { indices: vec![] }, + balances: kusama::BalancesConfig { balances: endowed_accounts .iter() .map(|k| (k.clone(), ENDOWMENT)) .collect(), }, - pallet_session: kusama::SessionConfig { + session: kusama::SessionConfig { keys: initial_authorities .iter() .map(|x| { @@ -1311,7 +1311,7 @@ pub fn kusama_testnet_genesis( }) .collect::>(), }, - pallet_staking: kusama::StakingConfig { + staking: kusama::StakingConfig { minimum_validator_count: 1, validator_count: 2, stakers: initial_authorities @@ -1330,35 +1330,35 @@ pub fn kusama_testnet_genesis( slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - pallet_elections_phragmen: Default::default(), - pallet_democracy: kusama::DemocracyConfig::default(), - pallet_collective_Instance1: kusama::CouncilConfig { + phragmen_election: Default::default(), + democracy: kusama::DemocracyConfig::default(), + council: kusama::CouncilConfig { members: vec![], phantom: Default::default(), }, - pallet_collective_Instance2: kusama::TechnicalCommitteeConfig { + technical_committee: kusama::TechnicalCommitteeConfig { members: vec![], phantom: Default::default(), }, - pallet_membership_Instance1: Default::default(), - pallet_babe: kusama::BabeConfig { + technical_membership: Default::default(), + babe: kusama::BabeConfig { authorities: Default::default(), epoch_config: Some(kusama::BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_im_online: Default::default(), - pallet_authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] }, + grandpa: Default::default(), + im_online: Default::default(), + authority_discovery: kusama::AuthorityDiscoveryConfig { keys: vec![] }, claims: kusama::ClaimsConfig { claims: vec![], vesting: vec![], }, - pallet_vesting: kusama::VestingConfig { vesting: vec![] }, - pallet_treasury: Default::default(), + vesting: kusama::VestingConfig { vesting: vec![] }, + treasury: Default::default(), parachains_configuration: kusama::ParachainsConfigurationConfig { config: default_parachains_host_configuration(), }, - pallet_gilt: Default::default(), - parachains_paras: Default::default(), + gilt: Default::default(), + paras: Default::default(), } } @@ -1385,18 +1385,18 @@ pub fn westend_testnet_genesis( const STASH: u128 = 100 * DOT; westend::GenesisConfig { - frame_system: westend::SystemConfig { + system: westend::SystemConfig { code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }, - pallet_indices: westend::IndicesConfig { indices: vec![] }, - pallet_balances: westend::BalancesConfig { + indices: westend::IndicesConfig { indices: vec![] }, + balances: westend::BalancesConfig { balances: endowed_accounts .iter() .map(|k| (k.clone(), ENDOWMENT)) .collect(), }, - pallet_session: westend::SessionConfig { + session: westend::SessionConfig { keys: initial_authorities .iter() .map(|x| { @@ -1415,7 +1415,7 @@ pub fn westend_testnet_genesis( }) .collect::>(), }, - pallet_staking: westend::StakingConfig { + staking: westend::StakingConfig { minimum_validator_count: 1, validator_count: 2, stakers: initial_authorities @@ -1434,19 +1434,19 @@ pub fn westend_testnet_genesis( slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - pallet_babe: westend::BabeConfig { + babe: westend::BabeConfig { authorities: Default::default(), epoch_config: Some(westend::BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_im_online: Default::default(), - pallet_authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] }, - pallet_vesting: westend::VestingConfig { vesting: vec![] }, - pallet_sudo: westend::SudoConfig { key: root_key }, + grandpa: Default::default(), + im_online: Default::default(), + authority_discovery: westend::AuthorityDiscoveryConfig { keys: vec![] }, + vesting: westend::VestingConfig { vesting: vec![] }, + sudo: westend::SudoConfig { key: root_key }, parachains_configuration: westend::ParachainsConfigurationConfig { config: default_parachains_host_configuration(), }, - parachains_paras: Default::default(), + paras: Default::default(), } } @@ -1473,18 +1473,18 @@ pub fn rococo_testnet_genesis( const ENDOWMENT: u128 = 1_000_000 * DOT; rococo_runtime::GenesisConfig { - frame_system: rococo_runtime::SystemConfig { + system: rococo_runtime::SystemConfig { code: wasm_binary.to_vec(), changes_trie_config: Default::default(), }, - pallet_beefy: Default::default(), - pallet_indices: rococo_runtime::IndicesConfig { + beefy: Default::default(), + indices: rococo_runtime::IndicesConfig { indices: vec![], }, - pallet_balances: rococo_runtime::BalancesConfig { + balances: rococo_runtime::BalancesConfig { balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect(), }, - pallet_session: rococo_runtime::SessionConfig { + session: rococo_runtime::SessionConfig { keys: initial_authorities.iter().map(|x| ( x.0.clone(), x.0.clone(), @@ -1499,31 +1499,31 @@ pub fn rococo_testnet_genesis( ), )).collect::>(), }, - pallet_babe: rococo_runtime::BabeConfig { + babe: rococo_runtime::BabeConfig { authorities: Default::default(), epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_im_online: Default::default(), - pallet_collective: Default::default(), - pallet_membership: Default::default(), - pallet_authority_discovery: rococo_runtime::AuthorityDiscoveryConfig { + grandpa: Default::default(), + im_online: Default::default(), + collective: Default::default(), + membership: Default::default(), + authority_discovery: rococo_runtime::AuthorityDiscoveryConfig { keys: vec![], }, - pallet_sudo: rococo_runtime::SudoConfig { key: root_key.clone() }, + sudo: rococo_runtime::SudoConfig { key: root_key.clone() }, parachains_configuration: rococo_runtime::ParachainsConfigurationConfig { config: default_parachains_host_configuration(), }, - parachains_hrmp: Default::default(), - parachains_paras: rococo_runtime::ParasConfig { + hrmp: Default::default(), + paras: rococo_runtime::ParasConfig { paras: vec![], _phdata: Default::default(), }, - pallet_bridge_grandpa: rococo_runtime::BridgeRococoGrandpaConfig { + bridge_rococo_grandpa: rococo_runtime::BridgeRococoGrandpaConfig { owner: Some(root_key.clone()), ..Default::default() }, - pallet_bridge_grandpa_Instance1: rococo_runtime::BridgeWococoGrandpaConfig { + bridge_wococo_grandpa: rococo_runtime::BridgeWococoGrandpaConfig { owner: Some(root_key.clone()), ..Default::default() }, diff --git a/polkadot/node/test/service/src/chain_spec.rs b/polkadot/node/test/service/src/chain_spec.rs index 6c0bdace85..1c24d2270c 100644 --- a/polkadot/node/test/service/src/chain_spec.rs +++ b/polkadot/node/test/service/src/chain_spec.rs @@ -114,18 +114,18 @@ fn polkadot_testnet_genesis( const STASH: u128 = 100 * DOTS; runtime::GenesisConfig { - frame_system: runtime::SystemConfig { + system: runtime::SystemConfig { code: runtime::WASM_BINARY.expect("Wasm binary must be built for testing").to_vec(), ..Default::default() }, - pallet_indices: runtime::IndicesConfig { indices: vec![] }, - pallet_balances: runtime::BalancesConfig { + indices: runtime::IndicesConfig { indices: vec![] }, + balances: runtime::BalancesConfig { balances: endowed_accounts .iter() .map(|k| (k.clone(), ENDOWMENT)) .collect(), }, - pallet_session: runtime::SessionConfig { + session: runtime::SessionConfig { keys: initial_authorities .iter() .map(|x| { @@ -143,7 +143,7 @@ fn polkadot_testnet_genesis( }) .collect::>(), }, - pallet_staking: runtime::StakingConfig { + staking: runtime::StakingConfig { minimum_validator_count: 1, validator_count: 2, stakers: initial_authorities @@ -162,18 +162,18 @@ fn polkadot_testnet_genesis( slash_reward_fraction: Perbill::from_percent(10), ..Default::default() }, - pallet_babe: runtime::BabeConfig { + babe: runtime::BabeConfig { authorities: vec![], epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG), }, - pallet_grandpa: Default::default(), - pallet_authority_discovery: runtime::AuthorityDiscoveryConfig { keys: vec![] }, + grandpa: Default::default(), + authority_discovery: runtime::AuthorityDiscoveryConfig { keys: vec![] }, claims: runtime::ClaimsConfig { claims: vec![], vesting: vec![], }, - pallet_vesting: runtime::VestingConfig { vesting: vec![] }, - pallet_sudo: runtime::SudoConfig { key: root_key }, + vesting: runtime::VestingConfig { vesting: vec![] }, + sudo: runtime::SudoConfig { key: root_key }, parachains_configuration: runtime::ParachainsConfigurationConfig { config: polkadot_runtime_parachains::configuration::HostConfiguration { validation_upgrade_frequency: 10u32, diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index 1d93d6589b..de6b93d8d2 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -1638,7 +1638,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - Event::parachains_inclusion(ev) => { + Event::ParasInclusion(ev) => { Some(ev) } _ => None, diff --git a/polkadot/runtime/parachains/src/hrmp.rs b/polkadot/runtime/parachains/src/hrmp.rs index 62d635a20e..a04fd465dd 100644 --- a/polkadot/runtime/parachains/src/hrmp.rs +++ b/polkadot/runtime/parachains/src/hrmp.rs @@ -1552,13 +1552,13 @@ mod tests { Hrmp::hrmp_init_open_channel(para_a_origin.into(), para_b, 2, 8).unwrap(); assert_storage_consistency_exhaustive(); assert!(System::events().iter().any(|record| - record.event == MockEvent::hrmp(Event::OpenChannelRequested(para_a, para_b, 2, 8)) + record.event == MockEvent::Hrmp(Event::OpenChannelRequested(para_a, para_b, 2, 8)) )); Hrmp::hrmp_accept_open_channel(para_b_origin.into(), para_a).unwrap(); assert_storage_consistency_exhaustive(); assert!(System::events().iter().any(|record| - record.event == MockEvent::hrmp(Event::OpenChannelAccepted(para_a, para_b)) + record.event == MockEvent::Hrmp(Event::OpenChannelAccepted(para_a, para_b)) )); // Advance to a block 6, but without session change. That means that the channel has @@ -1605,7 +1605,7 @@ mod tests { assert!(!channel_exists(para_a, para_b)); assert_storage_consistency_exhaustive(); assert!(System::events().iter().any(|record| - record.event == MockEvent::hrmp(Event::ChannelClosed(para_b, channel_id.clone())) + record.event == MockEvent::Hrmp(Event::ChannelClosed(para_b, channel_id.clone())) )); }); } diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs index a1cbbf3162..74b036794c 100644 --- a/polkadot/runtime/rococo/src/lib.rs +++ b/polkadot/runtime/rococo/src/lib.rs @@ -1120,7 +1120,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { runtime_api_impl::candidate_events::(|ev| { match ev { - Event::parachains_inclusion(ev) => { + Event::Inclusion(ev) => { Some(ev) } _ => None, diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index c4e6cf729c..4c6ff7b569 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -1236,7 +1236,7 @@ sp_api::impl_runtime_apis! { fn candidate_events() -> Vec> { parachains_runtime_api_impl::candidate_events::(|ev| { match ev { - Event::parachains_inclusion(ev) => { + Event::ParasInclusion(ev) => { Some(ev) } _ => None,