From 1004e35054e10ff722f11b0ea64d7648a1b5cea3 Mon Sep 17 00:00:00 2001 From: pgherveou Date: Fri, 12 May 2023 10:53:15 +0200 Subject: [PATCH] Contracts: Use RuntimeUpgrade hooks instead of Hooks::on_runtime_upgrade --- Cargo.lock | 459 ++++++++++-------- Cargo.toml | 260 ++++++++++ pallets/dmp-queue/src/lib.rs | 4 - pallets/dmp-queue/src/migration.rs | 11 +- pallets/parachain-system/src/lib.rs | 6 +- pallets/parachain-system/src/migration.rs | 12 +- pallets/xcmp-queue/src/lib.rs | 4 - pallets/xcmp-queue/src/migration.rs | 11 +- .../contracts/contracts-rococo/Cargo.toml | 1 + .../contracts/contracts-rococo/src/lib.rs | 10 +- .../contracts-rococo/src/xcm_config.rs | 1 + 11 files changed, 568 insertions(+), 211 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8eb6208340b..0baa190a181 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -585,7 +585,6 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "hash-db", "log", @@ -3762,7 +3761,6 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", ] @@ -3785,7 +3783,6 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-support-procedural", @@ -3810,7 +3807,6 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "Inflector", "array-bytes 4.2.0", @@ -3857,7 +3853,6 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -3868,7 +3863,6 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -3885,7 +3879,6 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -3914,7 +3907,6 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-recursion", "futures", @@ -3934,7 +3926,6 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "bitflags", "environmental", @@ -3967,7 +3958,6 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "Inflector", "cfg-expr", @@ -3983,7 +3973,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -3995,7 +3984,6 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro2", "quote", @@ -4005,7 +3993,6 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "cfg-if", "frame-support", @@ -4024,7 +4011,6 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -4039,7 +4025,6 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "sp-api", @@ -4048,7 +4033,6 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "parity-scale-codec", @@ -6017,7 +6001,6 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "log", @@ -6036,7 +6019,6 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "anyhow", "jsonrpsee", @@ -6541,7 +6523,6 @@ dependencies = [ [[package]] name = "pallet-alliance" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "frame-benchmarking", @@ -6562,7 +6543,6 @@ dependencies = [ [[package]] name = "pallet-asset-tx-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -6580,7 +6560,6 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -6595,7 +6574,6 @@ dependencies = [ [[package]] name = "pallet-aura" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -6611,7 +6589,6 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -6627,7 +6604,6 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -6641,7 +6617,6 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -6665,7 +6640,6 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -6685,7 +6659,6 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -6700,7 +6673,6 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -6719,7 +6691,6 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "binary-merkle-tree", @@ -6743,7 +6714,6 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -6849,7 +6819,6 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -6893,7 +6862,6 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -6910,7 +6878,6 @@ dependencies = [ [[package]] name = "pallet-contracts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "bitflags", "environmental", @@ -6940,7 +6907,6 @@ dependencies = [ [[package]] name = "pallet-contracts-primitives" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "bitflags", "parity-scale-codec", @@ -6953,7 +6919,6 @@ dependencies = [ [[package]] name = "pallet-contracts-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro2", "quote", @@ -6963,7 +6928,6 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "assert_matches", "frame-benchmarking", @@ -6980,7 +6944,6 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -6998,7 +6961,6 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7021,7 +6983,6 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7034,7 +6995,6 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7052,7 +7012,6 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7070,7 +7029,6 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7093,7 +7051,6 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "enumflags2", "frame-benchmarking", @@ -7109,7 +7066,6 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7129,7 +7085,6 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7146,7 +7101,6 @@ dependencies = [ [[package]] name = "pallet-insecure-randomness-collective-flip" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -7160,7 +7114,6 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7177,7 +7130,6 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7194,7 +7146,6 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7210,7 +7161,6 @@ dependencies = [ [[package]] name = "pallet-nfts" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "enumflags2", "frame-benchmarking", @@ -7228,7 +7178,6 @@ dependencies = [ [[package]] name = "pallet-nfts-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "pallet-nfts", @@ -7239,7 +7188,6 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7255,7 +7203,6 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -7272,7 +7219,6 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7292,7 +7238,6 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -7303,7 +7248,6 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -7320,7 +7264,6 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7359,7 +7302,6 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7376,7 +7318,6 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7391,7 +7332,6 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7409,7 +7349,6 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7424,7 +7363,6 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "assert_matches", "frame-benchmarking", @@ -7443,7 +7381,6 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7460,7 +7397,6 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -7481,7 +7417,6 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7497,7 +7432,6 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -7511,7 +7445,6 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -7534,7 +7467,6 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -7545,7 +7477,6 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "log", "sp-arithmetic", @@ -7554,7 +7485,6 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "sp-api", @@ -7563,7 +7493,6 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7580,7 +7509,6 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7595,7 +7523,6 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7613,7 +7540,6 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7632,7 +7558,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-support", "frame-system", @@ -7648,7 +7573,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -7664,7 +7588,6 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -7676,7 +7599,6 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7693,7 +7615,6 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7708,7 +7629,6 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7724,7 +7644,6 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -7739,7 +7658,6 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-benchmarking", "frame-support", @@ -10825,7 +10743,6 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "log", "sp-core", @@ -10836,7 +10753,6 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "futures", @@ -10864,7 +10780,6 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "futures-timer", @@ -10887,7 +10802,6 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -10902,7 +10816,6 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -10921,7 +10834,6 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10932,7 +10844,6 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "chrono", @@ -10972,7 +10883,6 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "fnv", "futures", @@ -10999,7 +10909,6 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "hash-db", "kvdb", @@ -11025,7 +10934,6 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "futures", @@ -11050,7 +10958,6 @@ dependencies = [ [[package]] name = "sc-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "futures", @@ -11079,7 +10986,6 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "fork-tree", @@ -11115,7 +11021,6 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "jsonrpsee", @@ -11137,7 +11042,6 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -11172,7 +11076,6 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "jsonrpsee", @@ -11191,7 +11094,6 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "fork-tree", "parity-scale-codec", @@ -11204,7 +11106,6 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "ahash 0.8.2", "array-bytes 4.2.0", @@ -11244,7 +11145,6 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "finality-grandpa", "futures", @@ -11264,7 +11164,6 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "futures", @@ -11287,7 +11186,6 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -11311,7 +11209,6 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -11324,7 +11221,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "log", "sc-allocator", @@ -11337,7 +11233,6 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "anyhow", "cfg-if", @@ -11355,7 +11250,6 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "ansi_term", "futures", @@ -11371,7 +11265,6 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "parking_lot 0.12.1", @@ -11385,7 +11278,6 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "async-channel", @@ -11430,7 +11322,6 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "cid", "futures", @@ -11450,7 +11341,6 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -11478,7 +11368,6 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "ahash 0.8.2", "futures", @@ -11497,7 +11386,6 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "futures", @@ -11519,7 +11407,6 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -11553,7 +11440,6 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "futures", @@ -11573,7 +11459,6 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "bytes", @@ -11604,7 +11489,6 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "libp2p", @@ -11617,7 +11501,6 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -11626,7 +11509,6 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "jsonrpsee", @@ -11657,7 +11539,6 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -11676,7 +11557,6 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "http", "jsonrpsee", @@ -11691,7 +11571,6 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "futures", @@ -11717,7 +11596,6 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "directories", @@ -11783,7 +11661,6 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "log", "parity-scale-codec", @@ -11794,7 +11671,6 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "clap 4.2.7", "fs4", @@ -11810,7 +11686,6 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -11829,7 +11704,6 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "libc", @@ -11848,7 +11722,6 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "chrono", "futures", @@ -11867,7 +11740,6 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "ansi_term", "atty", @@ -11898,7 +11770,6 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11909,7 +11780,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "futures", @@ -11936,7 +11806,6 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "futures", @@ -11950,7 +11819,6 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-channel", "futures", @@ -12508,7 +12376,6 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "hash-db", "log", @@ -12528,7 +12395,6 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "Inflector", "blake2", @@ -12542,7 +12408,6 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "scale-info", @@ -12555,7 +12420,6 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "integer-sqrt", "num-traits", @@ -12569,7 +12433,6 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "scale-info", @@ -12582,7 +12445,6 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "sp-api", @@ -12594,7 +12456,6 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "log", @@ -12612,7 +12473,6 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "futures", @@ -12627,7 +12487,6 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "parity-scale-codec", @@ -12645,7 +12504,6 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "parity-scale-codec", @@ -12666,7 +12524,6 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "lazy_static", "parity-scale-codec", @@ -12685,7 +12542,6 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "finality-grandpa", "log", @@ -12703,7 +12559,6 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "scale-info", @@ -12715,7 +12570,6 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "bitflags", @@ -12759,7 +12613,6 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "blake2b_simd", "byteorder", @@ -12773,7 +12626,6 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro2", "quote", @@ -12784,7 +12636,6 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -12793,7 +12644,6 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro2", "quote", @@ -12803,7 +12653,6 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "environmental", "parity-scale-codec", @@ -12814,7 +12663,6 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -12829,7 +12677,6 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "bytes", "ed25519", @@ -12855,7 +12702,6 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "lazy_static", "sp-core", @@ -12866,7 +12712,6 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "parity-scale-codec", @@ -12880,7 +12725,6 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "thiserror", "zstd 0.12.3+zstd.1.5.2", @@ -12889,7 +12733,6 @@ dependencies = [ [[package]] name = "sp-metadata-ir" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-metadata", "parity-scale-codec", @@ -12900,7 +12743,6 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -12918,7 +12760,6 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "scale-info", @@ -12932,7 +12773,6 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "sp-api", "sp-core", @@ -12942,7 +12782,6 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "backtrace", "lazy_static", @@ -12952,7 +12791,6 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "rustc-hash", "serde", @@ -12962,7 +12800,6 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "either", "hash256-std-hasher", @@ -12984,7 +12821,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -13002,7 +12838,6 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "Inflector", "proc-macro-crate", @@ -13014,7 +12849,6 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "serde", "serde_json", @@ -13023,7 +12857,6 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "scale-info", @@ -13037,7 +12870,6 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "scale-info", @@ -13050,7 +12882,6 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "hash-db", "log", @@ -13070,7 +12901,6 @@ dependencies = [ [[package]] name = "sp-statement-store" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "log", "parity-scale-codec", @@ -13088,12 +12918,10 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13106,7 +12934,6 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "futures-timer", @@ -13121,7 +12948,6 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "sp-std", @@ -13133,7 +12959,6 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "sp-api", "sp-runtime", @@ -13142,7 +12967,6 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "log", @@ -13158,7 +12982,6 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "ahash 0.8.2", "hash-db", @@ -13181,7 +13004,6 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "impl-serde", "parity-scale-codec", @@ -13198,7 +13020,6 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -13209,7 +13030,6 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -13223,7 +13043,6 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "parity-scale-codec", "scale-info", @@ -13558,7 +13377,6 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "platforms 2.0.0", ] @@ -13566,7 +13384,6 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -13585,7 +13402,6 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "hyper", "log", @@ -13597,7 +13413,6 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "jsonrpsee", @@ -13610,7 +13425,6 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "jsonrpsee", "log", @@ -13629,7 +13443,6 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "array-bytes 4.2.0", "async-trait", @@ -13655,7 +13468,6 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "futures", "substrate-test-utils-derive", @@ -13665,7 +13477,6 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -13676,7 +13487,6 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "ansi_term", "build-helper", @@ -14330,7 +14140,6 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#e6a13b807a88d25aa1cd0d320edb9412c3692c67" dependencies = [ "async-trait", "clap 4.2.7", @@ -16014,3 +15823,271 @@ dependencies = [ "libc", "pkg-config", ] + +[[patch.unused]] +name = "chain-spec-builder" +version = "2.0.0" + +[[patch.unused]] +name = "frame-benchmarking-pallet-pov" +version = "4.0.0-dev" + +[[patch.unused]] +name = "frame-election-solution-type-fuzzer" +version = "2.0.0-alpha.5" + +[[patch.unused]] +name = "frame-support-test" +version = "3.0.0" + +[[patch.unused]] +name = "frame-support-test-compile-pass" +version = "4.0.0-dev" + +[[patch.unused]] +name = "frame-support-test-pallet" +version = "4.0.0-dev" + +[[patch.unused]] +name = "generate-bags" +version = "4.0.0-dev" + +[[patch.unused]] +name = "kitchensink-runtime" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-bench" +version = "0.9.0-dev" + +[[patch.unused]] +name = "node-cli" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-executor" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-inspect" +version = "0.9.0-dev" + +[[patch.unused]] +name = "node-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "node-rpc" +version = "3.0.0-dev" + +[[patch.unused]] +name = "node-runtime-generate-bags" +version = "3.0.0" + +[[patch.unused]] +name = "node-template" +version = "4.0.0-dev" + +[[patch.unused]] +name = "node-template-release" +version = "3.0.0" + +[[patch.unused]] +name = "node-template-runtime" +version = "4.0.0-dev" + +[[patch.unused]] +name = "node-testing" +version = "3.0.0-dev" + +[[patch.unused]] +name = "pallet-asset-rate" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-atomic-swap" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-bags-list-fuzzer" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-bags-list-remote-tests" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-core-fellowship" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-dev-mode" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-election-provider-e2e-test" +version = "1.0.0" + +[[patch.unused]] +name = "pallet-example-basic" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-example-offchain-worker" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-glutton" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-lottery" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-message-queue" +version = "7.0.0-dev" + +[[patch.unused]] +name = "pallet-nicks" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-node-authorization" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-nomination-pools-fuzzer" +version = "2.0.0" + +[[patch.unused]] +name = "pallet-nomination-pools-test-staking" +version = "1.0.0" + +[[patch.unused]] +name = "pallet-remark" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-root-offences" +version = "1.0.0-dev" + +[[patch.unused]] +name = "pallet-root-testing" +version = "1.0.0-dev" + +[[patch.unused]] +name = "pallet-salary" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-scored-pool" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-statement" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-template" +version = "4.0.0-dev" + +[[patch.unused]] +name = "pallet-transaction-storage" +version = "4.0.0-dev" + +[[patch.unused]] +name = "sc-consensus-manual-seal" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-consensus-pow" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-network-statement" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sc-network-test" +version = "0.8.0" + +[[patch.unused]] +name = "sc-runtime-test" +version = "2.0.0" + +[[patch.unused]] +name = "sc-service-test" +version = "2.0.0" + +[[patch.unused]] +name = "sc-statement-store" +version = "4.0.0-dev" + +[[patch.unused]] +name = "sp-api-test" +version = "2.0.1" + +[[patch.unused]] +name = "sp-application-crypto-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-arithmetic-fuzzer" +version = "2.0.0" + +[[patch.unused]] +name = "sp-consensus-pow" +version = "0.10.0-dev" + +[[patch.unused]] +name = "sp-npos-elections-fuzzer" +version = "2.0.0-alpha.5" + +[[patch.unused]] +name = "sp-runtime-interface-test" +version = "2.0.0" + +[[patch.unused]] +name = "sp-runtime-interface-test-wasm" +version = "2.0.0" + +[[patch.unused]] +name = "sp-runtime-interface-test-wasm-deprecated" +version = "2.0.0" + +[[patch.unused]] +name = "sp-test-primitives" +version = "2.0.0" + +[[patch.unused]] +name = "subkey" +version = "3.0.0" + +[[patch.unused]] +name = "substrate-cli-test-utils" +version = "0.1.0" + +[[patch.unused]] +name = "substrate-frame-cli" +version = "4.0.0-dev" + +[[patch.unused]] +name = "substrate-frame-rpc-support" +version = "3.0.0" + +[[patch.unused]] +name = "substrate-test-runtime" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-runtime-client" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-runtime-transaction-pool" +version = "2.0.0" + +[[patch.unused]] +name = "substrate-test-utils-test-crate" +version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 4ceb8d5c04a..f3f883b9fb4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,3 +66,263 @@ inherits = "release" lto = true codegen-units = 1 +[patch."https://github.com/paritytech/substrate"] +node-template = { path = "/Users/pg/github/substrate/bin/node-template/node" } +frame-benchmarking = { path = "/Users/pg/github/substrate/frame/benchmarking" } +frame-support = { path = "/Users/pg/github/substrate/frame/support" } +frame-support-procedural = { path = "/Users/pg/github/substrate/frame/support/procedural" } +frame-support-procedural-tools = { path = "/Users/pg/github/substrate/frame/support/procedural/tools" } +frame-support-procedural-tools-derive = { path = "/Users/pg/github/substrate/frame/support/procedural/tools/derive" } +sp-api = { path = "/Users/pg/github/substrate/primitives/api" } +sp-api-proc-macro = { path = "/Users/pg/github/substrate/primitives/api/proc-macro" } +sp-core = { path = "/Users/pg/github/substrate/primitives/core" } +sp-core-hashing = { path = "/Users/pg/github/substrate/primitives/core/hashing" } +sp-std = { path = "/Users/pg/github/substrate/primitives/std" } +sp-debug-derive = { path = "/Users/pg/github/substrate/primitives/debug-derive" } +sp-externalities = { path = "/Users/pg/github/substrate/primitives/externalities" } +sp-storage = { path = "/Users/pg/github/substrate/primitives/storage" } +sp-runtime-interface = { path = "/Users/pg/github/substrate/primitives/runtime-interface" } +sp-runtime-interface-proc-macro = { path = "/Users/pg/github/substrate/primitives/runtime-interface/proc-macro" } +sp-tracing = { path = "/Users/pg/github/substrate/primitives/tracing" } +sp-wasm-interface = { path = "/Users/pg/github/substrate/primitives/wasm-interface" } +sp-io = { path = "/Users/pg/github/substrate/primitives/io" } +sp-keystore = { path = "/Users/pg/github/substrate/primitives/keystore" } +sp-state-machine = { path = "/Users/pg/github/substrate/primitives/state-machine" } +sp-panic-handler = { path = "/Users/pg/github/substrate/primitives/panic-handler" } +sp-trie = { path = "/Users/pg/github/substrate/primitives/trie" } +sp-runtime = { path = "/Users/pg/github/substrate/primitives/runtime" } +sp-application-crypto = { path = "/Users/pg/github/substrate/primitives/application-crypto" } +sp-arithmetic = { path = "/Users/pg/github/substrate/primitives/arithmetic" } +sp-weights = { path = "/Users/pg/github/substrate/primitives/weights" } +substrate-test-runtime-client = { path = "/Users/pg/github/substrate/test-utils/runtime/client" } +sc-block-builder = { path = "/Users/pg/github/substrate/client/block-builder" } +sc-client-api = { path = "/Users/pg/github/substrate/client/api" } +substrate-prometheus-endpoint = { path = "/Users/pg/github/substrate/utils/prometheus" } +sc-executor = { path = "/Users/pg/github/substrate/client/executor" } +sc-executor-common = { path = "/Users/pg/github/substrate/client/executor/common" } +sc-allocator = { path = "/Users/pg/github/substrate/client/allocator" } +sp-maybe-compressed-blob = { path = "/Users/pg/github/substrate/primitives/maybe-compressed-blob" } +sc-executor-wasmi = { path = "/Users/pg/github/substrate/client/executor/wasmi" } +sc-executor-wasmtime = { path = "/Users/pg/github/substrate/client/executor/wasmtime" } +sc-runtime-test = { path = "/Users/pg/github/substrate/client/executor/runtime-test" } +substrate-wasm-builder = { path = "/Users/pg/github/substrate/utils/wasm-builder" } +sp-version = { path = "/Users/pg/github/substrate/primitives/version" } +sp-core-hashing-proc-macro = { path = "/Users/pg/github/substrate/primitives/core/hashing/proc-macro" } +sp-version-proc-macro = { path = "/Users/pg/github/substrate/primitives/version/proc-macro" } +sc-tracing = { path = "/Users/pg/github/substrate/client/tracing" } +sc-rpc-server = { path = "/Users/pg/github/substrate/client/rpc-servers" } +sc-tracing-proc-macro = { path = "/Users/pg/github/substrate/client/tracing/proc-macro" } +sp-blockchain = { path = "/Users/pg/github/substrate/primitives/blockchain" } +sp-consensus = { path = "/Users/pg/github/substrate/primitives/consensus/common" } +sp-inherents = { path = "/Users/pg/github/substrate/primitives/inherents" } +sp-test-primitives = { path = "/Users/pg/github/substrate/primitives/test-primitives" } +sp-database = { path = "/Users/pg/github/substrate/primitives/database" } +sp-rpc = { path = "/Users/pg/github/substrate/primitives/rpc" } +substrate-test-runtime = { path = "/Users/pg/github/substrate/test-utils/runtime" } +frame-executive = { path = "/Users/pg/github/substrate/frame/executive" } +frame-system = { path = "/Users/pg/github/substrate/frame/system" } +frame-try-runtime = { path = "/Users/pg/github/substrate/frame/try-runtime" } +pallet-balances = { path = "/Users/pg/github/substrate/frame/balances" } +pallet-transaction-payment = { path = "/Users/pg/github/substrate/frame/transaction-payment" } +frame-system-rpc-runtime-api = { path = "/Users/pg/github/substrate/frame/system/rpc/runtime-api" } +pallet-babe = { path = "/Users/pg/github/substrate/frame/babe" } +pallet-authorship = { path = "/Users/pg/github/substrate/frame/authorship" } +pallet-session = { path = "/Users/pg/github/substrate/frame/session" } +pallet-timestamp = { path = "/Users/pg/github/substrate/frame/timestamp" } +sp-timestamp = { path = "/Users/pg/github/substrate/primitives/timestamp" } +sp-session = { path = "/Users/pg/github/substrate/primitives/session" } +sp-staking = { path = "/Users/pg/github/substrate/primitives/staking" } +sp-consensus-babe = { path = "/Users/pg/github/substrate/primitives/consensus/babe" } +sp-consensus-slots = { path = "/Users/pg/github/substrate/primitives/consensus/slots" } +frame-election-provider-support = { path = "/Users/pg/github/substrate/frame/election-provider-support" } +frame-election-provider-solution-type = { path = "/Users/pg/github/substrate/frame/election-provider-support/solution-type" } +sp-npos-elections = { path = "/Users/pg/github/substrate/primitives/npos-elections" } +substrate-test-utils = { path = "/Users/pg/github/substrate/test-utils" } +substrate-test-utils-derive = { path = "/Users/pg/github/substrate/test-utils/derive" } +sc-service = { path = "/Users/pg/github/substrate/client/service" } +sc-chain-spec = { path = "/Users/pg/github/substrate/client/chain-spec" } +sc-chain-spec-derive = { path = "/Users/pg/github/substrate/client/chain-spec/derive" } +sc-network = { path = "/Users/pg/github/substrate/client/network" } +sc-consensus = { path = "/Users/pg/github/substrate/client/consensus/common" } +sc-utils = { path = "/Users/pg/github/substrate/client/utils" } +sc-network-common = { path = "/Users/pg/github/substrate/client/network/common" } +sc-peerset = { path = "/Users/pg/github/substrate/client/peerset" } +sp-consensus-grandpa = { path = "/Users/pg/github/substrate/primitives/consensus/grandpa" } +sc-network-light = { path = "/Users/pg/github/substrate/client/network/light" } +sc-network-sync = { path = "/Users/pg/github/substrate/client/network/sync" } +fork-tree = { path = "/Users/pg/github/substrate/utils/fork-tree" } +sc-telemetry = { path = "/Users/pg/github/substrate/client/telemetry" } +sc-client-db = { path = "/Users/pg/github/substrate/client/db" } +sc-state-db = { path = "/Users/pg/github/substrate/client/state-db" } +kitchensink-runtime = { path = "/Users/pg/github/substrate/bin/node/runtime" } +frame-benchmarking-pallet-pov = { path = "/Users/pg/github/substrate/frame/benchmarking/pov" } +frame-system-benchmarking = { path = "/Users/pg/github/substrate/frame/system/benchmarking" } +node-primitives = { path = "/Users/pg/github/substrate/bin/node/primitives" } +pallet-alliance = { path = "/Users/pg/github/substrate/frame/alliance" } +pallet-collective = { path = "/Users/pg/github/substrate/frame/collective" } +pallet-identity = { path = "/Users/pg/github/substrate/frame/identity" } +pallet-asset-rate = { path = "/Users/pg/github/substrate/frame/asset-rate" } +pallet-asset-tx-payment = { path = "/Users/pg/github/substrate/frame/transaction-payment/asset-tx-payment" } +pallet-assets = { path = "/Users/pg/github/substrate/frame/assets" } +pallet-authority-discovery = { path = "/Users/pg/github/substrate/frame/authority-discovery" } +sp-authority-discovery = { path = "/Users/pg/github/substrate/primitives/authority-discovery" } +pallet-bags-list = { path = "/Users/pg/github/substrate/frame/bags-list" } +pallet-bounties = { path = "/Users/pg/github/substrate/frame/bounties" } +pallet-treasury = { path = "/Users/pg/github/substrate/frame/treasury" } +pallet-utility = { path = "/Users/pg/github/substrate/frame/utility" } +pallet-root-testing = { path = "/Users/pg/github/substrate/frame/root-testing" } +pallet-child-bounties = { path = "/Users/pg/github/substrate/frame/child-bounties" } +pallet-contracts = { path = "/Users/pg/github/substrate/frame/contracts" } +pallet-contracts-primitives = { path = "/Users/pg/github/substrate/frame/contracts/primitives" } +pallet-contracts-proc-macro = { path = "/Users/pg/github/substrate/frame/contracts/proc-macro" } +pallet-insecure-randomness-collective-flip = { path = "/Users/pg/github/substrate/frame/insecure-randomness-collective-flip" } +pallet-proxy = { path = "/Users/pg/github/substrate/frame/proxy" } +pallet-conviction-voting = { path = "/Users/pg/github/substrate/frame/conviction-voting" } +pallet-scheduler = { path = "/Users/pg/github/substrate/frame/scheduler" } +pallet-preimage = { path = "/Users/pg/github/substrate/frame/preimage" } +pallet-core-fellowship = { path = "/Users/pg/github/substrate/frame/core-fellowship" } +pallet-democracy = { path = "/Users/pg/github/substrate/frame/democracy" } +pallet-election-provider-multi-phase = { path = "/Users/pg/github/substrate/frame/election-provider-multi-phase" } +pallet-election-provider-support-benchmarking = { path = "/Users/pg/github/substrate/frame/election-provider-support/benchmarking" } +pallet-elections-phragmen = { path = "/Users/pg/github/substrate/frame/elections-phragmen" } +pallet-fast-unstake = { path = "/Users/pg/github/substrate/frame/fast-unstake" } +pallet-staking = { path = "/Users/pg/github/substrate/frame/staking" } +pallet-staking-reward-curve = { path = "/Users/pg/github/substrate/frame/staking/reward-curve" } +pallet-glutton = { path = "/Users/pg/github/substrate/frame/glutton" } +pallet-grandpa = { path = "/Users/pg/github/substrate/frame/grandpa" } +pallet-offences = { path = "/Users/pg/github/substrate/frame/offences" } +sp-keyring = { path = "/Users/pg/github/substrate/primitives/keyring" } +pallet-im-online = { path = "/Users/pg/github/substrate/frame/im-online" } +pallet-indices = { path = "/Users/pg/github/substrate/frame/indices" } +pallet-lottery = { path = "/Users/pg/github/substrate/frame/lottery" } +frame-support-test = { path = "/Users/pg/github/substrate/frame/support/test" } +frame-support-test-pallet = { path = "/Users/pg/github/substrate/frame/support/test/pallet" } +pallet-membership = { path = "/Users/pg/github/substrate/frame/membership" } +pallet-message-queue = { path = "/Users/pg/github/substrate/frame/message-queue" } +pallet-mmr = { path = "/Users/pg/github/substrate/frame/merkle-mountain-range" } +sp-mmr-primitives = { path = "/Users/pg/github/substrate/primitives/merkle-mountain-range" } +pallet-multisig = { path = "/Users/pg/github/substrate/frame/multisig" } +pallet-nfts = { path = "/Users/pg/github/substrate/frame/nfts" } +pallet-nfts-runtime-api = { path = "/Users/pg/github/substrate/frame/nfts/runtime-api" } +pallet-nis = { path = "/Users/pg/github/substrate/frame/nis" } +pallet-nomination-pools = { path = "/Users/pg/github/substrate/frame/nomination-pools" } +pallet-nomination-pools-benchmarking = { path = "/Users/pg/github/substrate/frame/nomination-pools/benchmarking" } +pallet-nomination-pools-runtime-api = { path = "/Users/pg/github/substrate/frame/nomination-pools/runtime-api" } +pallet-offences-benchmarking = { path = "/Users/pg/github/substrate/frame/offences/benchmarking" } +pallet-ranked-collective = { path = "/Users/pg/github/substrate/frame/ranked-collective" } +pallet-recovery = { path = "/Users/pg/github/substrate/frame/recovery" } +pallet-referenda = { path = "/Users/pg/github/substrate/frame/referenda" } +pallet-remark = { path = "/Users/pg/github/substrate/frame/remark" } +pallet-salary = { path = "/Users/pg/github/substrate/frame/salary" } +pallet-session-benchmarking = { path = "/Users/pg/github/substrate/frame/session/benchmarking" } +pallet-society = { path = "/Users/pg/github/substrate/frame/society" } +pallet-staking-runtime-api = { path = "/Users/pg/github/substrate/frame/staking/runtime-api" } +pallet-state-trie-migration = { path = "/Users/pg/github/substrate/frame/state-trie-migration" } +frame-remote-externalities = { path = "/Users/pg/github/substrate/utils/frame/remote-externalities" } +substrate-rpc-client = { path = "/Users/pg/github/substrate/utils/frame/rpc/client" } +sc-rpc-api = { path = "/Users/pg/github/substrate/client/rpc-api" } +sc-transaction-pool-api = { path = "/Users/pg/github/substrate/client/transaction-pool/api" } +substrate-state-trie-migration-rpc = { path = "/Users/pg/github/substrate/utils/frame/rpc/state-trie-migration-rpc" } +pallet-statement = { path = "/Users/pg/github/substrate/frame/statement" } +sp-statement-store = { path = "/Users/pg/github/substrate/primitives/statement-store" } +pallet-sudo = { path = "/Users/pg/github/substrate/frame/sudo" } +pallet-tips = { path = "/Users/pg/github/substrate/frame/tips" } +pallet-transaction-payment-rpc-runtime-api = { path = "/Users/pg/github/substrate/frame/transaction-payment/rpc/runtime-api" } +pallet-transaction-storage = { path = "/Users/pg/github/substrate/frame/transaction-storage" } +sp-transaction-storage-proof = { path = "/Users/pg/github/substrate/primitives/transaction-storage-proof" } +pallet-uniques = { path = "/Users/pg/github/substrate/frame/uniques" } +pallet-vesting = { path = "/Users/pg/github/substrate/frame/vesting" } +pallet-whitelist = { path = "/Users/pg/github/substrate/frame/whitelist" } +sp-block-builder = { path = "/Users/pg/github/substrate/primitives/block-builder" } +sp-offchain = { path = "/Users/pg/github/substrate/primitives/offchain" } +sp-transaction-pool = { path = "/Users/pg/github/substrate/primitives/transaction-pool" } +sc-informant = { path = "/Users/pg/github/substrate/client/informant" } +sc-keystore = { path = "/Users/pg/github/substrate/client/keystore" } +sc-network-bitswap = { path = "/Users/pg/github/substrate/client/network/bitswap" } +sc-network-transactions = { path = "/Users/pg/github/substrate/client/network/transactions" } +sc-offchain = { path = "/Users/pg/github/substrate/client/offchain" } +sc-transaction-pool = { path = "/Users/pg/github/substrate/client/transaction-pool" } +substrate-test-runtime-transaction-pool = { path = "/Users/pg/github/substrate/test-utils/runtime/transaction-pool" } +sc-rpc = { path = "/Users/pg/github/substrate/client/rpc" } +sc-rpc-spec-v2 = { path = "/Users/pg/github/substrate/client/rpc-spec-v2" } +sc-storage-monitor = { path = "/Users/pg/github/substrate/client/storage-monitor" } +sc-sysinfo = { path = "/Users/pg/github/substrate/client/sysinfo" } +pallet-beefy-mmr = { path = "/Users/pg/github/substrate/frame/beefy-mmr" } +binary-merkle-tree = { path = "/Users/pg/github/substrate/utils/binary-merkle-tree" } +pallet-beefy = { path = "/Users/pg/github/substrate/frame/beefy" } +sp-consensus-beefy = { path = "/Users/pg/github/substrate/primitives/consensus/beefy" } +sp-consensus-aura = { path = "/Users/pg/github/substrate/primitives/consensus/aura" } +substrate-test-client = { path = "/Users/pg/github/substrate/test-utils/client" } +sp-runtime-interface-test-wasm = { path = "/Users/pg/github/substrate/primitives/runtime-interface/test-wasm" } +sp-serializer = { path = "/Users/pg/github/substrate/primitives/serializer" } +sp-metadata-ir = { path = "/Users/pg/github/substrate/primitives/metadata-ir" } +frame-benchmarking-cli = { path = "/Users/pg/github/substrate/utils/frame/benchmarking-cli" } +sc-cli = { path = "/Users/pg/github/substrate/client/cli" } +node-template-runtime = { path = "/Users/pg/github/substrate/bin/node-template/runtime" } +pallet-aura = { path = "/Users/pg/github/substrate/frame/aura" } +pallet-template = { path = "/Users/pg/github/substrate/bin/node-template/pallets/template" } +pallet-transaction-payment-rpc = { path = "/Users/pg/github/substrate/frame/transaction-payment/rpc" } +sc-basic-authorship = { path = "/Users/pg/github/substrate/client/basic-authorship" } +sc-proposer-metrics = { path = "/Users/pg/github/substrate/client/proposer-metrics" } +sc-consensus-aura = { path = "/Users/pg/github/substrate/client/consensus/aura" } +sc-consensus-slots = { path = "/Users/pg/github/substrate/client/consensus/slots" } +sc-network-test = { path = "/Users/pg/github/substrate/client/network/test" } +sc-consensus-grandpa = { path = "/Users/pg/github/substrate/client/consensus/grandpa" } +sc-network-gossip = { path = "/Users/pg/github/substrate/client/network-gossip" } +sc-statement-store = { path = "/Users/pg/github/substrate/client/statement-store" } +substrate-frame-rpc-system = { path = "/Users/pg/github/substrate/utils/frame/rpc/system" } +try-runtime-cli = { path = "/Users/pg/github/substrate/utils/frame/try-runtime/cli" } +substrate-cli-test-utils = { path = "/Users/pg/github/substrate/test-utils/cli" } +substrate-build-script-utils = { path = "/Users/pg/github/substrate/utils/build-script-utils" } +node-bench = { path = "/Users/pg/github/substrate/bin/node/bench" } +node-testing = { path = "/Users/pg/github/substrate/bin/node/testing" } +node-executor = { path = "/Users/pg/github/substrate/bin/node/executor" } +node-cli = { path = "/Users/pg/github/substrate/bin/node/cli" } +node-inspect = { path = "/Users/pg/github/substrate/bin/node/inspect" } +node-rpc = { path = "/Users/pg/github/substrate/bin/node/rpc" } +mmr-rpc = { path = "/Users/pg/github/substrate/client/merkle-mountain-range/rpc" } +sc-consensus-babe = { path = "/Users/pg/github/substrate/client/consensus/babe" } +sc-consensus-epochs = { path = "/Users/pg/github/substrate/client/consensus/epochs" } +sc-consensus-babe-rpc = { path = "/Users/pg/github/substrate/client/consensus/babe/rpc" } +sc-consensus-grandpa-rpc = { path = "/Users/pg/github/substrate/client/consensus/grandpa/rpc" } +sc-sync-state-rpc = { path = "/Users/pg/github/substrate/client/sync-state-rpc" } +sc-authority-discovery = { path = "/Users/pg/github/substrate/client/authority-discovery" } +sc-network-statement = { path = "/Users/pg/github/substrate/client/network/statement" } +sc-service-test = { path = "/Users/pg/github/substrate/client/service/test" } +substrate-frame-cli = { path = "/Users/pg/github/substrate/utils/frame/frame-utilities-cli" } +chain-spec-builder = { path = "/Users/pg/github/substrate/bin/utils/chain-spec-builder" } +subkey = { path = "/Users/pg/github/substrate/bin/utils/subkey" } +sc-consensus-beefy = { path = "/Users/pg/github/substrate/client/consensus/beefy" } +sc-consensus-beefy-rpc = { path = "/Users/pg/github/substrate/client/consensus/beefy/rpc" } +sc-consensus-manual-seal = { path = "/Users/pg/github/substrate/client/consensus/manual-seal" } +sc-consensus-pow = { path = "/Users/pg/github/substrate/client/consensus/pow" } +sp-consensus-pow = { path = "/Users/pg/github/substrate/primitives/consensus/pow" } +mmr-gadget = { path = "/Users/pg/github/substrate/client/merkle-mountain-range" } +pallet-atomic-swap = { path = "/Users/pg/github/substrate/frame/atomic-swap" } +pallet-bags-list-fuzzer = { path = "/Users/pg/github/substrate/frame/bags-list/fuzzer" } +pallet-bags-list-remote-tests = { path = "/Users/pg/github/substrate/frame/bags-list/remote-tests" } +pallet-election-provider-e2e-test = { path = "/Users/pg/github/substrate/frame/election-provider-multi-phase/test-staking-e2e" } +frame-election-solution-type-fuzzer = { path = "/Users/pg/github/substrate/frame/election-provider-support/solution-type/fuzzer" } +pallet-example-basic = { path = "/Users/pg/github/substrate/frame/examples/basic" } +pallet-example-offchain-worker = { path = "/Users/pg/github/substrate/frame/examples/offchain-worker" } +pallet-dev-mode = { path = "/Users/pg/github/substrate/frame/examples/dev-mode" } +pallet-nicks = { path = "/Users/pg/github/substrate/frame/nicks" } +pallet-node-authorization = { path = "/Users/pg/github/substrate/frame/node-authorization" } +pallet-nomination-pools-fuzzer = { path = "/Users/pg/github/substrate/frame/nomination-pools/fuzzer" } +pallet-nomination-pools-test-staking = { path = "/Users/pg/github/substrate/frame/nomination-pools/test-staking" } +pallet-scored-pool = { path = "/Users/pg/github/substrate/frame/scored-pool" } +pallet-staking-reward-fn = { path = "/Users/pg/github/substrate/frame/staking/reward-fn" } +pallet-root-offences = { path = "/Users/pg/github/substrate/frame/root-offences" } +frame-support-test-compile-pass = { path = "/Users/pg/github/substrate/frame/support/test/compile_pass" } +sp-api-test = { path = "/Users/pg/github/substrate/primitives/api/test" } +sp-application-crypto-test = { path = "/Users/pg/github/substrate/primitives/application-crypto/test" } +sp-arithmetic-fuzzer = { path = "/Users/pg/github/substrate/primitives/arithmetic/fuzzer" } +sp-npos-elections-fuzzer = { path = "/Users/pg/github/substrate/primitives/npos-elections/fuzzer" } +sp-runtime-interface-test = { path = "/Users/pg/github/substrate/primitives/runtime-interface/test" } +sp-runtime-interface-test-wasm-deprecated = { path = "/Users/pg/github/substrate/primitives/runtime-interface/test-wasm-deprecated" } +node-template-release = { path = "/Users/pg/github/substrate/scripts/ci/node-template-release" } +substrate-test-utils-test-crate = { path = "/Users/pg/github/substrate/test-utils/test-crate" } +substrate-frame-rpc-support = { path = "/Users/pg/github/substrate/utils/frame/rpc/support" } +generate-bags = { path = "/Users/pg/github/substrate/utils/frame/generate-bags" } +node-runtime-generate-bags = { path = "/Users/pg/github/substrate/utils/frame/generate-bags/node-runtime" } + diff --git a/pallets/dmp-queue/src/lib.rs b/pallets/dmp-queue/src/lib.rs index 082fceaf14c..3b5f1a4faa4 100644 --- a/pallets/dmp-queue/src/lib.rs +++ b/pallets/dmp-queue/src/lib.rs @@ -139,10 +139,6 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_runtime_upgrade() -> Weight { - migration::migrate_to_latest::() - } - fn on_idle(_now: T::BlockNumber, max_weight: Weight) -> Weight { // on_idle processes additional messages with any remaining block weight. Self::service_queue(max_weight) diff --git a/pallets/dmp-queue/src/migration.rs b/pallets/dmp-queue/src/migration.rs index 5e1d357e142..8011cf4c086 100644 --- a/pallets/dmp-queue/src/migration.rs +++ b/pallets/dmp-queue/src/migration.rs @@ -19,7 +19,7 @@ use crate::{Config, Configuration, Overweight, Pallet, DEFAULT_POV_SIZE}; use frame_support::{ pallet_prelude::*, - traits::StorageVersion, + traits::{OnRuntimeUpgrade, StorageVersion}, weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight}, }; @@ -28,7 +28,7 @@ pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(1); /// Migrates the pallet storage to the most recent version, checking and setting the /// `StorageVersion`. -pub fn migrate_to_latest() -> Weight { +fn migrate_to_latest() -> Weight { let mut weight = T::DbWeight::get().reads(1); if StorageVersion::get::>() == 0 { @@ -46,6 +46,13 @@ pub fn migrate_to_latest() -> Weight { weight } +pub struct Migration(PhantomData); +impl OnRuntimeUpgrade for Migration { + fn on_runtime_upgrade() -> Weight { + migrate_to_latest::() + } +} + mod v0 { use super::*; use codec::{Decode, Encode}; diff --git a/pallets/parachain-system/src/lib.rs b/pallets/parachain-system/src/lib.rs index 36ef8d57195..d746e8644f3 100644 --- a/pallets/parachain-system/src/lib.rs +++ b/pallets/parachain-system/src/lib.rs @@ -57,7 +57,7 @@ use sp_runtime::{ use sp_std::{cmp, collections::btree_map::BTreeMap, prelude::*}; use xcm::latest::XcmHash; -mod migration; +pub mod migration; mod relay_state_snapshot; #[macro_use] pub mod validate_block; @@ -197,10 +197,6 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_runtime_upgrade() -> Weight { - migration::on_runtime_upgrade::() - } - fn on_finalize(_: T::BlockNumber) { >::kill(); >::kill(); diff --git a/pallets/parachain-system/src/migration.rs b/pallets/parachain-system/src/migration.rs index e3d1e11a51b..0085bdaf4ba 100644 --- a/pallets/parachain-system/src/migration.rs +++ b/pallets/parachain-system/src/migration.rs @@ -16,7 +16,8 @@ use crate::{Config, Pallet, ReservedDmpWeightOverride, ReservedXcmpWeightOverride}; use frame_support::{ - traits::{Get, StorageVersion}, + pallet_prelude::*, + traits::{Get, OnRuntimeUpgrade, StorageVersion}, weights::Weight, }; @@ -24,7 +25,7 @@ use frame_support::{ pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(2); /// Call this during the next runtime upgrade for this module. -pub fn on_runtime_upgrade() -> Weight { +fn on_runtime_upgrade() -> Weight { let mut weight: Weight = T::DbWeight::get().reads(2); if StorageVersion::get::>() == 0 { @@ -44,6 +45,13 @@ pub fn on_runtime_upgrade() -> Weight { weight } +pub struct Migration(PhantomData); +impl OnRuntimeUpgrade for Migration { + fn on_runtime_upgrade() -> Weight { + on_runtime_upgrade::() + } +} + /// V2: Migrate to 2D weights for ReservedXcmpWeightOverride and ReservedDmpWeightOverride. mod v2 { use super::*; diff --git a/pallets/xcmp-queue/src/lib.rs b/pallets/xcmp-queue/src/lib.rs index 0dc76aa80a1..f4ef4ffb813 100644 --- a/pallets/xcmp-queue/src/lib.rs +++ b/pallets/xcmp-queue/src/lib.rs @@ -115,10 +115,6 @@ pub mod pallet { #[pallet::hooks] impl Hooks> for Pallet { - fn on_runtime_upgrade() -> Weight { - migration::migrate_to_latest::() - } - fn on_idle(_now: T::BlockNumber, max_weight: Weight) -> Weight { // on_idle processes additional messages with any remaining block weight. Self::service_xcmp_queue(max_weight) diff --git a/pallets/xcmp-queue/src/migration.rs b/pallets/xcmp-queue/src/migration.rs index fd1301b9491..28a1f159df9 100644 --- a/pallets/xcmp-queue/src/migration.rs +++ b/pallets/xcmp-queue/src/migration.rs @@ -19,7 +19,7 @@ use crate::{Config, Overweight, Pallet, QueueConfig, DEFAULT_POV_SIZE}; use frame_support::{ pallet_prelude::*, - traits::StorageVersion, + traits::{OnRuntimeUpgrade, StorageVersion}, weights::{constants::WEIGHT_REF_TIME_PER_MILLIS, Weight}, }; @@ -28,7 +28,7 @@ pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(2); /// Migrates the pallet storage to the most recent version, checking and setting the /// `StorageVersion`. -pub fn migrate_to_latest() -> Weight { +fn migrate_to_latest() -> Weight { let mut weight = T::DbWeight::get().reads(1); if StorageVersion::get::>() == 1 { @@ -46,6 +46,13 @@ pub fn migrate_to_latest() -> Weight { weight } +pub struct Migration(PhantomData); +impl OnRuntimeUpgrade for Migration { + fn on_runtime_upgrade() -> Weight { + migrate_to_latest::() + } +} + mod v1 { use super::*; use codec::{Decode, Encode}; diff --git a/parachains/runtimes/contracts/contracts-rococo/Cargo.toml b/parachains/runtimes/contracts/contracts-rococo/Cargo.toml index 1bbf4b09294..49a939c068d 100644 --- a/parachains/runtimes/contracts/contracts-rococo/Cargo.toml +++ b/parachains/runtimes/contracts/contracts-rococo/Cargo.toml @@ -86,6 +86,7 @@ std = [ "frame-support/std", "frame-system-rpc-runtime-api/std", "frame-system/std", + "frame-try-runtime/std", "kusama-runtime-constants/std", "pallet-aura/std", "pallet-authorship/std", diff --git a/parachains/runtimes/contracts/contracts-rococo/src/lib.rs b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs index 38d32895363..386819ac0c0 100644 --- a/parachains/runtimes/contracts/contracts-rococo/src/lib.rs +++ b/parachains/runtimes/contracts/contracts-rococo/src/lib.rs @@ -97,7 +97,15 @@ pub type UncheckedExtrinsic = /// Extrinsic type that has already been checked. pub type CheckedExtrinsic = generic::CheckedExtrinsic; -pub type Migrations = (pallet_contracts::Migration,); +pub type Migrations = ( + cumulus_pallet_parachain_system::migration::Migration, + cumulus_pallet_xcmp_queue::migration::Migration, + pallet_balances::migration::MigrateToTrackInactive, + pallet_multisig::migrations::v1::MigrateToV1, + pallet_contracts::Migration, + pallet_xcm::migration::v1::MigrateToV1, + cumulus_pallet_dmp_queue::migration::Migration, +); type EventRecord = frame_system::EventRecord< ::RuntimeEvent, diff --git a/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs b/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs index e79d06b1aa1..fa1d2db3db7 100644 --- a/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs +++ b/parachains/runtimes/contracts/contracts-rococo/src/xcm_config.rs @@ -43,6 +43,7 @@ parameter_types! { pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); pub const ExecutiveBody: BodyId = BodyId::Executive; + pub CheckingAccount: AccountId = PolkadotXcm::check_account(); } /// We allow root and the Relay Chain council to execute privileged collator selection operations.