From 2e656dcd6ed1c8666f1e600134fe1d93a7142c00 Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Mon, 20 Mar 2023 13:20:22 +0000 Subject: [PATCH] Deprecate Currency: Companion for #12951 (#6780) * Some renames * Fix * Fix build for new APIs * Remove diener * Fixes * Fixes * Fix integration tests * Fixes * fix nis issuance * Update Cargo.toml * Polkadot doesn't have freezes/holds yet * No networks use freezes/holds * update lockfile for {"substrate"} * Fix tests There are more failing tests; just starting with the easy ones. Reserved balance does not count towards ED anymore, therefore reducing all the reserves by ED (1). Signed-off-by: Oliver Tale-Yazdi * Fixes for Polkadot pallets * Fix parachains benchmarks * Update Substrate Signed-off-by: Oliver Tale-Yazdi --------- Signed-off-by: Oliver Tale-Yazdi Co-authored-by: parity-processbot <> Co-authored-by: Oliver Tale-Yazdi --- polkadot/Cargo.lock | 372 +++++++++--------- polkadot/node/test/service/src/lib.rs | 9 +- .../node/test/service/tests/call-function.rs | 9 +- polkadot/runtime/common/src/assigned_slots.rs | 4 + polkadot/runtime/common/src/auctions.rs | 52 +-- polkadot/runtime/common/src/claims.rs | 13 +- polkadot/runtime/common/src/crowdloan/mod.rs | 18 +- polkadot/runtime/common/src/impls.rs | 14 +- .../runtime/common/src/integration_tests.rs | 6 +- .../runtime/common/src/paras_registrar.rs | 6 +- polkadot/runtime/common/src/purchase.rs | 13 +- polkadot/runtime/common/src/slots/mod.rs | 10 +- polkadot/runtime/kusama/src/lib.rs | 37 +- .../kusama/src/weights/pallet_balances.rs | 9 +- ...allet_balances_nis_counterpart_balances.rs | 9 +- .../parachains/src/hrmp/benchmarking.rs | 15 +- polkadot/runtime/parachains/src/mock.rs | 10 +- polkadot/runtime/polkadot/src/lib.rs | 4 + .../polkadot/src/weights/pallet_balances.rs | 9 +- polkadot/runtime/rococo/src/lib.rs | 37 +- .../rococo/src/weights/pallet_balances.rs | 9 +- ...allet_balances_nis_counterpart_balances.rs | 9 +- polkadot/runtime/test-runtime/src/lib.rs | 6 +- polkadot/runtime/westend/src/lib.rs | 4 + .../westend/src/weights/pallet_balances.rs | 10 +- .../src/fungible/mock.rs | 8 +- polkadot/xcm/pallet-xcm/src/mock.rs | 6 +- .../xcm/xcm-builder/src/fungibles_adapter.rs | 24 +- polkadot/xcm/xcm-builder/tests/mock/mod.rs | 6 +- .../xcm-simulator/example/src/parachain.rs | 16 +- .../xcm-simulator/example/src/relay_chain.rs | 16 +- .../xcm/xcm-simulator/fuzzer/src/parachain.rs | 6 +- .../xcm-simulator/fuzzer/src/relay_chain.rs | 10 +- 33 files changed, 481 insertions(+), 305 deletions(-) diff --git a/polkadot/Cargo.lock b/polkadot/Cargo.lock index 2e8855b7f0..0fab811021 100644 --- a/polkadot/Cargo.lock +++ b/polkadot/Cargo.lock @@ -466,7 +466,7 @@ dependencies = [ [[package]] name = "binary-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "hash-db", "log", @@ -2205,9 +2205,9 @@ dependencies = [ [[package]] name = "finality-grandpa" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e24e6c429951433ccb7c87fd528c60084834dcd14763182c1f83291bcde24c34" +checksum = "36530797b9bf31cd4ff126dcfee8170f86b00cfdcea3269d73133cc0415945c3" dependencies = [ "either", "futures", @@ -2295,7 +2295,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", ] @@ -2318,7 +2318,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-support-procedural", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "Inflector", "array-bytes", @@ -2390,7 +2390,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2401,7 +2401,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2418,7 +2418,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -2447,7 +2447,7 @@ dependencies = [ [[package]] name = "frame-remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "log", @@ -2463,7 +2463,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "bitflags", "environmental", @@ -2496,7 +2496,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "Inflector", "cfg-expr", @@ -2511,7 +2511,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2523,7 +2523,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "proc-macro2", "quote", @@ -2533,7 +2533,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -2568,7 +2568,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "log", @@ -2586,7 +2586,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -2601,7 +2601,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "sp-api", @@ -2610,7 +2610,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "parity-scale-codec", @@ -2792,7 +2792,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "chrono", "frame-election-provider-support", @@ -4571,7 +4571,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "log", @@ -4590,7 +4590,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "anyhow", "jsonrpsee", @@ -5152,7 +5152,7 @@ dependencies = [ [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5167,7 +5167,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5183,7 +5183,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5197,7 +5197,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5221,7 +5221,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5241,7 +5241,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-election-provider-support", "frame-remote-externalities", @@ -5260,7 +5260,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5275,7 +5275,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5294,7 +5294,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "binary-merkle-tree", @@ -5318,7 +5318,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5336,7 +5336,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5355,7 +5355,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5372,7 +5372,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5389,7 +5389,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5407,7 +5407,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5430,7 +5430,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5443,7 +5443,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5461,7 +5461,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5479,7 +5479,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5502,7 +5502,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5518,7 +5518,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5538,7 +5538,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5555,7 +5555,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5572,7 +5572,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5589,7 +5589,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5605,7 +5605,7 @@ dependencies = [ [[package]] name = "pallet-nis" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5621,7 +5621,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5638,7 +5638,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5658,7 +5658,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "pallet-nomination-pools", "parity-scale-codec", @@ -5669,7 +5669,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5686,7 +5686,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5710,7 +5710,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5727,7 +5727,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5742,7 +5742,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5760,7 +5760,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5775,7 +5775,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5794,7 +5794,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5811,7 +5811,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5832,7 +5832,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5848,7 +5848,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5862,7 +5862,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5885,7 +5885,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5896,7 +5896,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "log", "sp-arithmetic", @@ -5905,7 +5905,7 @@ dependencies = [ [[package]] name = "pallet-staking-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "sp-api", @@ -5914,7 +5914,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5931,7 +5931,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5945,7 +5945,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5963,7 +5963,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -5982,7 +5982,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-support", "frame-system", @@ -5998,7 +5998,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -6014,7 +6014,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -6026,7 +6026,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -6043,7 +6043,7 @@ dependencies = [ [[package]] name = "pallet-uniques" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -6058,7 +6058,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -6074,7 +6074,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -6089,7 +6089,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-benchmarking", "frame-support", @@ -9014,7 +9014,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "log", "sp-core", @@ -9025,7 +9025,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "futures", @@ -9053,7 +9053,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "futures-timer", @@ -9076,7 +9076,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -9091,7 +9091,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "memmap2", "sc-chain-spec-derive", @@ -9110,7 +9110,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9121,7 +9121,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "chrono", @@ -9161,7 +9161,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "fnv", "futures", @@ -9187,7 +9187,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "hash-db", "kvdb", @@ -9213,7 +9213,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "futures", @@ -9238,7 +9238,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "fork-tree", @@ -9277,7 +9277,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "jsonrpsee", @@ -9299,7 +9299,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "async-trait", @@ -9334,7 +9334,7 @@ dependencies = [ [[package]] name = "sc-consensus-beefy-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "jsonrpsee", @@ -9353,7 +9353,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "fork-tree", "parity-scale-codec", @@ -9366,7 +9366,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "ahash 0.8.2", "array-bytes", @@ -9406,7 +9406,7 @@ dependencies = [ [[package]] name = "sc-consensus-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "finality-grandpa", "futures", @@ -9426,7 +9426,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "futures", @@ -9449,7 +9449,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "lru 0.8.1", "parity-scale-codec", @@ -9473,7 +9473,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "sc-allocator", "sp-maybe-compressed-blob", @@ -9486,7 +9486,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "log", "sc-allocator", @@ -9499,7 +9499,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "anyhow", "cfg-if", @@ -9517,7 +9517,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "ansi_term", "futures", @@ -9533,7 +9533,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "async-trait", @@ -9548,7 +9548,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "async-channel", @@ -9592,7 +9592,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "cid", "futures", @@ -9612,7 +9612,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "async-trait", @@ -9640,7 +9640,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "ahash 0.8.2", "futures", @@ -9659,7 +9659,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "futures", @@ -9681,7 +9681,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "async-trait", @@ -9715,7 +9715,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "futures", @@ -9735,7 +9735,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "bytes", @@ -9766,7 +9766,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "libp2p", @@ -9779,7 +9779,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9788,7 +9788,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "jsonrpsee", @@ -9818,7 +9818,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9837,7 +9837,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "http", "jsonrpsee", @@ -9852,7 +9852,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "futures", @@ -9878,7 +9878,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "directories", @@ -9944,7 +9944,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "log", "parity-scale-codec", @@ -9955,7 +9955,7 @@ dependencies = [ [[package]] name = "sc-storage-monitor" version = "0.1.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "clap 4.0.15", "fs4", @@ -9971,7 +9971,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9990,7 +9990,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "libc", @@ -10009,7 +10009,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "chrono", "futures", @@ -10028,7 +10028,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "ansi_term", "atty", @@ -10059,7 +10059,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10070,7 +10070,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "futures", @@ -10097,7 +10097,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "futures", @@ -10111,7 +10111,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-channel", "futures", @@ -10626,7 +10626,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "hash-db", "log", @@ -10644,7 +10644,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "Inflector", "blake2", @@ -10658,7 +10658,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "scale-info", @@ -10671,7 +10671,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "integer-sqrt", "num-traits", @@ -10685,7 +10685,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "scale-info", @@ -10698,7 +10698,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "sp-api", @@ -10710,7 +10710,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "log", @@ -10728,7 +10728,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "futures", @@ -10743,7 +10743,7 @@ dependencies = [ [[package]] name = "sp-consensus-aura" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "parity-scale-codec", @@ -10761,7 +10761,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "merlin", @@ -10784,7 +10784,7 @@ dependencies = [ [[package]] name = "sp-consensus-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "lazy_static", "parity-scale-codec", @@ -10803,7 +10803,7 @@ dependencies = [ [[package]] name = "sp-consensus-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "finality-grandpa", "log", @@ -10821,7 +10821,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "scale-info", @@ -10833,7 +10833,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "scale-info", @@ -10846,7 +10846,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "base58", @@ -10889,7 +10889,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "blake2b_simd", "byteorder", @@ -10903,7 +10903,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "proc-macro2", "quote", @@ -10914,7 +10914,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10923,7 +10923,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "proc-macro2", "quote", @@ -10933,7 +10933,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "environmental", "parity-scale-codec", @@ -10944,7 +10944,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10959,7 +10959,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "bytes", "ed25519", @@ -10984,7 +10984,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "lazy_static", "sp-core", @@ -10995,7 +10995,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "merlin", @@ -11011,7 +11011,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "thiserror", "zstd", @@ -11020,7 +11020,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -11038,7 +11038,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "scale-info", @@ -11052,7 +11052,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "sp-api", "sp-core", @@ -11062,7 +11062,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "backtrace", "lazy_static", @@ -11072,7 +11072,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "rustc-hash", "serde", @@ -11082,7 +11082,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "either", "hash256-std-hasher", @@ -11104,7 +11104,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -11122,7 +11122,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "Inflector", "proc-macro-crate", @@ -11134,7 +11134,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "scale-info", @@ -11148,7 +11148,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "scale-info", @@ -11160,7 +11160,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "hash-db", "log", @@ -11180,12 +11180,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11198,7 +11198,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "futures-timer", @@ -11213,7 +11213,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "sp-std", @@ -11225,7 +11225,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "sp-api", "sp-runtime", @@ -11234,7 +11234,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "log", @@ -11250,11 +11250,11 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "ahash 0.8.2", "hash-db", - "hashbrown 0.12.3", + "hashbrown 0.13.2", "lazy_static", "memory-db", "nohash-hasher", @@ -11273,7 +11273,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "impl-serde", "parity-scale-codec", @@ -11290,7 +11290,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -11301,7 +11301,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "anyhow", "impl-trait-for-tuples", @@ -11315,7 +11315,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "parity-scale-codec", "scale-info", @@ -11535,7 +11535,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "platforms", ] @@ -11543,7 +11543,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -11562,7 +11562,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "hyper", "log", @@ -11574,7 +11574,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "jsonrpsee", @@ -11587,7 +11587,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "jsonrpsee", "log", @@ -11606,7 +11606,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "array-bytes", "async-trait", @@ -11632,7 +11632,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "futures", "substrate-test-utils-derive", @@ -11642,7 +11642,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -11653,7 +11653,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "ansi_term", "build-helper", @@ -12454,7 +12454,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#a2d4f7dfa97c1496f964c6fe833d5128f8319c77" +source = "git+https://github.com/paritytech/substrate?branch=master#9795fa31435426137d91936a52cab8e50ebe2f50" dependencies = [ "async-trait", "clap 4.0.15", diff --git a/polkadot/node/test/service/src/lib.rs b/polkadot/node/test/service/src/lib.rs index f95ee9f75e..c895bd707b 100644 --- a/polkadot/node/test/service/src/lib.rs +++ b/polkadot/node/test/service/src/lib.rs @@ -395,10 +395,11 @@ pub fn construct_transfer_extrinsic( dest: sp_keyring::AccountKeyring, value: Balance, ) -> UncheckedExtrinsic { - let function = polkadot_test_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer { - dest: MultiSigner::from(dest.public()).into_account().into(), - value, - }); + let function = + polkadot_test_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death { + dest: MultiSigner::from(dest.public()).into_account().into(), + value, + }); construct_extrinsic(client, function, origin, 0) } diff --git a/polkadot/node/test/service/tests/call-function.rs b/polkadot/node/test/service/tests/call-function.rs index 8678a0a08a..7e36f18d76 100644 --- a/polkadot/node/test/service/tests/call-function.rs +++ b/polkadot/node/test/service/tests/call-function.rs @@ -24,10 +24,11 @@ async fn call_function_actually_work() { let alice = run_validator_node(alice_config, None); - let function = polkadot_test_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer { - dest: Charlie.to_account_id().into(), - value: 1, - }); + let function = + polkadot_test_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death { + dest: Charlie.to_account_id().into(), + value: 1, + }); let output = alice.send_extrinsic(function, Bob).await.unwrap(); let res = output.result; diff --git a/polkadot/runtime/common/src/assigned_slots.rs b/polkadot/runtime/common/src/assigned_slots.rs index 96e14820f7..d766b08e73 100644 --- a/polkadot/runtime/common/src/assigned_slots.rs +++ b/polkadot/runtime/common/src/assigned_slots.rs @@ -631,6 +631,10 @@ mod tests { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } impl parachains_configuration::Config for Test { diff --git a/polkadot/runtime/common/src/auctions.rs b/polkadot/runtime/common/src/auctions.rs index a75ca812f7..03ceea7035 100644 --- a/polkadot/runtime/common/src/auctions.rs +++ b/polkadot/runtime/common/src/auctions.rs @@ -679,7 +679,7 @@ mod tests { assert_noop, assert_ok, assert_storage_noop, dispatch::DispatchError::BadOrigin, ord_parameter_types, parameter_types, - traits::{EitherOfDiverse, OnFinalize, OnInitialize}, + traits::{ConstU32, EitherOfDiverse, OnFinalize, OnInitialize}, }; use frame_system::{EnsureRoot, EnsureSignedBy}; use pallet_balances; @@ -748,6 +748,10 @@ mod tests { type MaxLocks = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } #[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Debug)] @@ -1412,24 +1416,25 @@ mod tests { let para_2 = ParaId::from(2_u32); // Make a bid and reserve a balance - assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 1, 4, 10)); - assert_eq!(Balances::reserved_balance(1), 10); - assert_eq!(ReservedAmounts::::get((1, para_1)), Some(10)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 1, 4, 9)); + assert_eq!(Balances::reserved_balance(1), 9); + assert_eq!(ReservedAmounts::::get((1, para_1)), Some(9)); assert_eq!(Balances::reserved_balance(2), 0); assert_eq!(ReservedAmounts::::get((2, para_2)), None); // Bigger bid, reserves new balance and returns funds - assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 1, 4, 20)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 1, 4, 19)); assert_eq!(Balances::reserved_balance(1), 0); assert_eq!(ReservedAmounts::::get((1, para_1)), None); - assert_eq!(Balances::reserved_balance(2), 20); - assert_eq!(ReservedAmounts::::get((2, para_2)), Some(20)); + assert_eq!(Balances::reserved_balance(2), 19); + assert_eq!(ReservedAmounts::::get((2, para_2)), Some(19)); }); } #[test] fn initialize_winners_in_ending_period_works() { new_test_ext().execute_with(|| { + assert_eq!(::ExistentialDeposit::get(), 1); run_to_block(1); assert_ok!(Auctions::new_auction(RuntimeOrigin::signed(6), 9, 1)); let para_1 = ParaId::from(1_u32); @@ -1437,16 +1442,16 @@ mod tests { let para_3 = ParaId::from(3_u32); // Make bids - assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 1, 4, 10)); - assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 3, 4, 20)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 1, 4, 9)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 3, 4, 19)); assert_eq!( Auctions::auction_status(System::block_number()), AuctionStatus::::StartingPeriod ); let mut winning = [None; SlotRange::SLOT_RANGE_COUNT]; - winning[SlotRange::ZeroThree as u8 as usize] = Some((1, para_1, 10)); - winning[SlotRange::TwoThree as u8 as usize] = Some((2, para_2, 20)); + winning[SlotRange::ZeroThree as u8 as usize] = Some((1, para_1, 9)); + winning[SlotRange::TwoThree as u8 as usize] = Some((2, para_2, 19)); assert_eq!(Auctions::winning(0), Some(winning)); run_to_block(9); @@ -1468,14 +1473,14 @@ mod tests { AuctionStatus::::EndingPeriod(1, 0) ); assert_eq!(Auctions::winning(1), Some(winning)); - assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 3, 4, 30)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 3, 4, 29)); run_to_block(12); assert_eq!( Auctions::auction_status(System::block_number()), AuctionStatus::::EndingPeriod(2, 0) ); - winning[SlotRange::TwoThree as u8 as usize] = Some((3, para_3, 30)); + winning[SlotRange::TwoThree as u8 as usize] = Some((3, para_3, 29)); assert_eq!(Auctions::winning(2), Some(winning)); }); } @@ -1542,6 +1547,7 @@ mod tests { #[test] fn less_winning_samples_work() { new_test_ext().execute_with(|| { + assert_eq!(::ExistentialDeposit::get(), 1); EndingPeriod::set(30); SampleLength::set(10); @@ -1552,16 +1558,16 @@ mod tests { let para_3 = ParaId::from(3_u32); // Make bids - assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 11, 14, 10)); - assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 13, 14, 20)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(1), para_1, 1, 11, 14, 9)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(2), para_2, 1, 13, 14, 19)); assert_eq!( Auctions::auction_status(System::block_number()), AuctionStatus::::StartingPeriod ); let mut winning = [None; SlotRange::SLOT_RANGE_COUNT]; - winning[SlotRange::ZeroThree as u8 as usize] = Some((1, para_1, 10)); - winning[SlotRange::TwoThree as u8 as usize] = Some((2, para_2, 20)); + winning[SlotRange::ZeroThree as u8 as usize] = Some((1, para_1, 9)); + winning[SlotRange::TwoThree as u8 as usize] = Some((2, para_2, 19)); assert_eq!(Auctions::winning(0), Some(winning)); run_to_block(9); @@ -1578,8 +1584,8 @@ mod tests { assert_eq!(Auctions::winning(0), Some(winning)); // New bids update the current winning - assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 14, 14, 30)); - winning[SlotRange::ThreeThree as u8 as usize] = Some((3, para_3, 30)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 14, 14, 29)); + winning[SlotRange::ThreeThree as u8 as usize] = Some((3, para_3, 29)); assert_eq!(Auctions::winning(0), Some(winning)); run_to_block(20); @@ -1590,8 +1596,8 @@ mod tests { assert_eq!(Auctions::winning(1), Some(winning)); run_to_block(25); // Overbid mid sample - assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 13, 14, 30)); - winning[SlotRange::TwoThree as u8 as usize] = Some((3, para_3, 30)); + assert_ok!(Auctions::bid(RuntimeOrigin::signed(3), para_3, 1, 13, 14, 29)); + winning[SlotRange::TwoThree as u8 as usize] = Some((3, para_3, 29)); assert_eq!(Auctions::winning(1), Some(winning)); run_to_block(30); @@ -1611,8 +1617,8 @@ mod tests { assert_eq!( leases(), vec![ - ((3.into(), 13), LeaseData { leaser: 3, amount: 30 }), - ((3.into(), 14), LeaseData { leaser: 3, amount: 30 }), + ((3.into(), 13), LeaseData { leaser: 3, amount: 29 }), + ((3.into(), 14), LeaseData { leaser: 3, amount: 29 }), ] ); }); diff --git a/polkadot/runtime/common/src/claims.rs b/polkadot/runtime/common/src/claims.rs index 82bca143e1..7d3cdcb47d 100644 --- a/polkadot/runtime/common/src/claims.rs +++ b/polkadot/runtime/common/src/claims.rs @@ -717,13 +717,14 @@ mod tests { assert_err, assert_noop, assert_ok, dispatch::{DispatchError::BadOrigin, GetDispatchInfo, Pays}, ord_parameter_types, parameter_types, - traits::{ExistenceRequirement, GenesisBuild, WithdrawReasons}, + traits::{ConstU32, ExistenceRequirement, GenesisBuild, WithdrawReasons}, }; use pallet_balances; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, Identity, IdentityLookup}, transaction_validity::TransactionLongevity, + TokenError, }; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; @@ -786,6 +787,10 @@ mod tests { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } parameter_types! { @@ -1206,7 +1211,7 @@ mod tests { 180, ExistenceRequirement::AllowDeath ), - pallet_balances::Error::::LiquidityRestrictions, + TokenError::Frozen, ); }); } @@ -1294,6 +1299,8 @@ mod tests { #[test] fn claiming_while_vested_doesnt_work() { new_test_ext().execute_with(|| { + CurrencyOf::::make_free_balance_be(&69, total_claims()); + assert_eq!(Balances::free_balance(69), total_claims()); // A user is already vested assert_ok!(::VestingSchedule::add_vesting_schedule( &69, @@ -1301,8 +1308,6 @@ mod tests { 100, 10 )); - CurrencyOf::::make_free_balance_be(&69, total_claims()); - assert_eq!(Balances::free_balance(69), total_claims()); assert_ok!(Claims::mint_claim( RuntimeOrigin::root(), eth(&bob()), diff --git a/polkadot/runtime/common/src/crowdloan/mod.rs b/polkadot/runtime/common/src/crowdloan/mod.rs index e8a2654044..a4f2d3ba69 100644 --- a/polkadot/runtime/common/src/crowdloan/mod.rs +++ b/polkadot/runtime/common/src/crowdloan/mod.rs @@ -419,6 +419,7 @@ pub mod pallet { let deposit = T::SubmissionDeposit::get(); + frame_system::Pallet::::inc_providers(&Self::fund_account_id(fund_index)); CurrencyOf::::reserve(&depositor, deposit)?; Funds::::insert( @@ -575,6 +576,7 @@ pub mod pallet { // can take care of that. debug_assert!(Self::contribution_iterator(fund.fund_index).count().is_zero()); + frame_system::Pallet::::dec_providers(&Self::fund_account_id(fund.fund_index))?; CurrencyOf::::unreserve(&fund.depositor, fund.deposit); Funds::::remove(index); Self::deposit_event(Event::::Dissolved { para_id: index }); @@ -861,7 +863,7 @@ mod tests { use frame_support::{ assert_noop, assert_ok, parameter_types, - traits::{OnFinalize, OnInitialize}, + traits::{ConstU32, OnFinalize, OnInitialize}, }; use primitives::Id as ParaId; use sp_core::H256; @@ -943,6 +945,10 @@ mod tests { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } #[derive(Copy, Clone, Eq, PartialEq, Debug)] @@ -987,9 +993,10 @@ mod tests { let fund = Funds::::get(para).unwrap(); let account_id = Crowdloan::fund_account_id(fund.fund_index); if winner { + let ed = ::ExistentialDeposit::get(); let free_balance = Balances::free_balance(&account_id); - Balances::reserve(&account_id, free_balance) - .expect("should be able to reserve free balance"); + Balances::reserve(&account_id, free_balance - ed) + .expect("should be able to reserve free balance minus ED"); } else { let reserved_balance = Balances::reserved_balance(&account_id); Balances::unreserve(&account_id, reserved_balance); @@ -1613,7 +1620,7 @@ mod tests { let account_id = Crowdloan::fund_account_id(index); // user sends the crowdloan funds trying to make an accounting error - assert_ok!(Balances::transfer(RuntimeOrigin::signed(1), account_id, 10)); + assert_ok!(Balances::transfer_allow_death(RuntimeOrigin::signed(1), account_id, 10)); // overfunded now assert_eq!(Balances::free_balance(&account_id), 110); @@ -1782,6 +1789,7 @@ mod tests { #[test] fn withdraw_from_finished_works() { new_test_ext().execute_with(|| { + assert_eq!(::ExistentialDeposit::get(), 1); let para = new_para(); let index = NextFundIndex::::get(); let account_id = Crowdloan::fund_account_id(index); @@ -1793,7 +1801,7 @@ mod tests { assert_ok!(Crowdloan::contribute(RuntimeOrigin::signed(2), para, 100, None)); assert_ok!(Crowdloan::contribute(RuntimeOrigin::signed(3), para, 50, None)); // simulate the reserving of para's funds. this actually happens in the Slots pallet. - assert_ok!(Balances::reserve(&account_id, 150)); + assert_ok!(Balances::reserve(&account_id, 149)); run_to_block(19); assert_noop!( diff --git a/polkadot/runtime/common/src/impls.rs b/polkadot/runtime/common/src/impls.rs index de6e415b86..42760eab10 100644 --- a/polkadot/runtime/common/src/impls.rs +++ b/polkadot/runtime/common/src/impls.rs @@ -102,11 +102,15 @@ pub fn era_payout( mod tests { use super::*; use frame_support::{ - dispatch::DispatchClass, parameter_types, traits::FindAuthor, weights::Weight, PalletId, + dispatch::DispatchClass, + parameter_types, + traits::{ConstU32, FindAuthor}, + weights::Weight, + PalletId, }; use frame_system::limits; use primitives::AccountId; - use sp_core::H256; + use sp_core::{ConstU64, H256}; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, IdentityLookup}, @@ -176,12 +180,16 @@ mod tests { type Balance = u64; type RuntimeEvent = RuntimeEvent; type DustRemoval = (); - type ExistentialDeposit = (); + type ExistentialDeposit = ConstU64<1>; type AccountStore = System; type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } parameter_types! { diff --git a/polkadot/runtime/common/src/integration_tests.rs b/polkadot/runtime/common/src/integration_tests.rs index 1a1971e6ae..8f0d27c122 100644 --- a/polkadot/runtime/common/src/integration_tests.rs +++ b/polkadot/runtime/common/src/integration_tests.rs @@ -24,7 +24,7 @@ use crate::{ }; use frame_support::{ assert_noop, assert_ok, parameter_types, - traits::{Currency, GenesisBuild, OnFinalize, OnInitialize}, + traits::{ConstU32, Currency, GenesisBuild, OnFinalize, OnInitialize}, weights::Weight, PalletId, }; @@ -178,6 +178,10 @@ impl pallet_balances::Config for Test { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } impl configuration::Config for Test { diff --git a/polkadot/runtime/common/src/paras_registrar.rs b/polkadot/runtime/common/src/paras_registrar.rs index 2fe16f1416..b41a5c5559 100644 --- a/polkadot/runtime/common/src/paras_registrar.rs +++ b/polkadot/runtime/common/src/paras_registrar.rs @@ -658,7 +658,7 @@ mod tests { assert_noop, assert_ok, error::BadOrigin, parameter_types, - traits::{GenesisBuild, OnFinalize, OnInitialize}, + traits::{ConstU32, GenesisBuild, OnFinalize, OnInitialize}, }; use frame_system::limits; use pallet_balances::Error as BalancesError; @@ -750,6 +750,10 @@ mod tests { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } impl shared::Config for Test {} diff --git a/polkadot/runtime/common/src/purchase.rs b/polkadot/runtime/common/src/purchase.rs index 47190c5f26..95e2794998 100644 --- a/polkadot/runtime/common/src/purchase.rs +++ b/polkadot/runtime/common/src/purchase.rs @@ -485,11 +485,10 @@ mod tests { ord_parameter_types, parameter_types, traits::{Currency, WithdrawReasons}, }; - use pallet_balances::Error as BalancesError; use sp_runtime::{ testing::Header, traits::{BlakeTwo256, Dispatchable, IdentifyAccount, Identity, IdentityLookup, Verify}, - MultiSignature, + ArithmeticError, MultiSignature, }; type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic; @@ -554,6 +553,10 @@ mod tests { type MaxReserves = (); type ReserveIdentifier = [u8; 8]; type WeightInfo = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } parameter_types! { @@ -815,6 +818,7 @@ mod tests { ); // Account with vesting + Balances::make_free_balance_be(&alice(), 100); assert_ok!(::VestingSchedule::add_vesting_schedule( &alice(), 100, @@ -1127,6 +1131,7 @@ mod tests { // Wrong Origin assert_noop!(Purchase::payout(RuntimeOrigin::signed(alice()), alice(),), BadOrigin); // Account with Existing Vesting Schedule + Balances::make_free_balance_be(&bob(), 100); assert_ok!( ::VestingSchedule::add_vesting_schedule(&bob(), 100, 1, 50,) ); @@ -1163,8 +1168,8 @@ mod tests { Permill::zero(), )); assert_noop!( - Purchase::payout(RuntimeOrigin::signed(payment_account()), alice(),), - BalancesError::::InsufficientBalance + Purchase::payout(RuntimeOrigin::signed(payment_account()), alice()), + ArithmeticError::Underflow ); }); } diff --git a/polkadot/runtime/common/src/slots/mod.rs b/polkadot/runtime/common/src/slots/mod.rs index 2c3fd39ae0..c9f3388e66 100644 --- a/polkadot/runtime/common/src/slots/mod.rs +++ b/polkadot/runtime/common/src/slots/mod.rs @@ -568,6 +568,10 @@ mod tests { type MaxLocks = (); type MaxReserves = (); type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<1>; + type MaxFreezes = ConstU32<1>; } parameter_types! { @@ -844,9 +848,9 @@ mod tests { // max_num different people are reserved for leases to Para ID 1 for i in 1u32..=max_num { let j: u64 = i.into(); - assert_ok!(Slots::lease_out(1.into(), &j, j * 10, i * i, i)); - assert_eq!(Slots::deposit_held(1.into(), &j), j * 10); - assert_eq!(Balances::reserved_balance(j), j * 10); + assert_ok!(Slots::lease_out(1.into(), &j, j * 10 - 1, i * i, i)); + assert_eq!(Slots::deposit_held(1.into(), &j), j * 10 - 1); + assert_eq!(Balances::reserved_balance(j), j * 10 - 1); } assert_ok!(Slots::clear_all_leases(RuntimeOrigin::root(), 1.into())); diff --git a/polkadot/runtime/kusama/src/lib.rs b/polkadot/runtime/kusama/src/lib.rs index 03c04ad9cb..54a3f648f3 100644 --- a/polkadot/runtime/kusama/src/lib.rs +++ b/polkadot/runtime/kusama/src/lib.rs @@ -34,6 +34,7 @@ use runtime_common::{ prod_or_fast, slots, BalanceToU256, BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, U256ToBalance, }; +use scale_info::TypeInfo; use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*}; use runtime_parachains::{ @@ -303,6 +304,10 @@ impl pallet_balances::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; type WeightInfo = weights::pallet_balances::WeightInfo; + type FreezeIdentifier = (); + type MaxFreezes = (); + type HoldIdentifier = HoldReason; + type MaxHolds = ConstU32<1>; } parameter_types! { @@ -1236,7 +1241,6 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ConstU128<10_000_000_000>; // One KTC cent type AccountStore = StorageMapShim< pallet_balances::Account, - frame_system::Provider, AccountId, pallet_balances::AccountData, >; @@ -1244,10 +1248,13 @@ impl pallet_balances::Config for Runtime { type MaxReserves = ConstU32<4>; type ReserveIdentifier = [u8; 8]; type WeightInfo = weights::pallet_balances_nis_counterpart_balances::WeightInfo; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { - pub IgnoredIssuance: Balance = Treasury::pot(); pub const NisBasePeriod: BlockNumber = 7 * DAYS; pub const MinBid: Balance = 100 * QUID; pub MinReceipt: Perquintill = Perquintill::from_rational(1u64, 10_000_000u64); @@ -1256,7 +1263,27 @@ parameter_types! { pub const ThawThrottle: (Perquintill, BlockNumber) = (Perquintill::from_percent(25), 5); pub storage NisTarget: Perquintill = Perquintill::zero(); pub const NisPalletId: PalletId = PalletId(*b"py/nis "); - pub const NisReserveId: [u8; 8] = *b"py/nis "; + pub const NisHoldReason: HoldReason = HoldReason::Nis(HoldReasonNis::NftReceipt); +} + +/// A reason for placing a hold on funds. +#[derive( + Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, MaxEncodedLen, Debug, TypeInfo, +)] +pub enum HoldReason { + /// Some reason of the NIS pallet. + #[codec(index = 38)] + Nis(HoldReasonNis), +} + +/// A reason for the NIS pallet placing a hold on funds. +#[derive( + Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, MaxEncodedLen, Debug, TypeInfo, +)] +pub enum HoldReasonNis { + /// The NIS Pallet has reserved it for a non-fungible receipt. + #[codec(index = 0)] + NftReceipt = 0, } impl pallet_nis::Config for Runtime { @@ -1268,7 +1295,7 @@ impl pallet_nis::Config for Runtime { type Counterpart = NisCounterpartBalances; type CounterpartAmount = WithMaximumOf>; type Deficit = (); // Mint - type IgnoredIssuance = IgnoredIssuance; + type IgnoredIssuance = (); type Target = NisTarget; type PalletId = NisPalletId; type QueueCount = ConstU32<500>; @@ -1280,7 +1307,7 @@ impl pallet_nis::Config for Runtime { type IntakePeriod = IntakePeriod; type MaxIntakeWeight = MaxIntakeWeight; type ThawThrottle = ThawThrottle; - type ReserveId = NisReserveId; + type HoldReason = NisHoldReason; } parameter_types! { diff --git a/polkadot/runtime/kusama/src/weights/pallet_balances.rs b/polkadot/runtime/kusama/src/weights/pallet_balances.rs index ebe7d8bc43..1187d68ae8 100644 --- a/polkadot/runtime/kusama/src/weights/pallet_balances.rs +++ b/polkadot/runtime/kusama/src/weights/pallet_balances.rs @@ -45,7 +45,7 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_balances::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) - fn transfer() -> Weight { + fn transfer_allow_death() -> Weight { // Minimum execution time: 40_902 nanoseconds. Weight::from_parts(41_638_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(1 as u64)) @@ -59,14 +59,14 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) - fn set_balance_creating() -> Weight { + fn force_set_balance_creating() -> Weight { // Minimum execution time: 23_901 nanoseconds. Weight::from_parts(24_238_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) - fn set_balance_killing() -> Weight { + fn force_set_balance_killing() -> Weight { // Minimum execution time: 26_402 nanoseconds. Weight::from_parts(27_026_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(1 as u64)) @@ -93,4 +93,7 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } + fn upgrade_accounts(_: u32) -> Weight { + Weight::from_parts(0, 0) + } } diff --git a/polkadot/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs b/polkadot/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs index cdd715608a..521efd5b95 100644 --- a/polkadot/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs +++ b/polkadot/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs @@ -51,7 +51,7 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) /// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) /// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - fn transfer() -> Weight { + fn transfer_allow_death() -> Weight { // Proof Size summary in bytes: // Measured: `219` // Estimated: `11258` @@ -79,7 +79,7 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen) /// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) /// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - fn set_balance_creating() -> Weight { + fn force_set_balance_creating() -> Weight { // Proof Size summary in bytes: // Measured: `219` // Estimated: `5078` @@ -95,7 +95,7 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) /// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) /// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - fn set_balance_killing() -> Weight { + fn force_set_balance_killing() -> Weight { // Proof Size summary in bytes: // Measured: `393` // Estimated: `8671` @@ -147,4 +147,7 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } + fn upgrade_accounts(_: u32) -> Weight { + Weight::from_parts(0, 0) + } } diff --git a/polkadot/runtime/parachains/src/hrmp/benchmarking.rs b/polkadot/runtime/parachains/src/hrmp/benchmarking.rs index 562e735e6a..a2d0e0a2c5 100644 --- a/polkadot/runtime/parachains/src/hrmp/benchmarking.rs +++ b/polkadot/runtime/parachains/src/hrmp/benchmarking.rs @@ -69,6 +69,7 @@ where ::RuntimeOrigin: From, { let config = Configuration::::config(); + let ed = T::Currency::minimum_balance(); let deposit: BalanceOf = config.hrmp_sender_deposit.unique_saturated_into(); let capacity = config.hrmp_channel_max_capacity; let message_size = config.hrmp_channel_max_message_size; @@ -83,10 +84,10 @@ where // Make both a parachain if they are already not. if !Paras::::is_parachain(sender) { - register_parachain_with_balance::(sender, deposit); + register_parachain_with_balance::(sender, deposit + ed); } if !Paras::::is_parachain(recipient) { - register_parachain_with_balance::(recipient, deposit); + register_parachain_with_balance::(recipient, deposit + ed); } assert_ok!(Hrmp::::hrmp_init_open_channel( @@ -147,9 +148,10 @@ frame_benchmarking::benchmarks! { let recipient_id: ParaId = 2u32.into(); // make sure para is registered, and has enough balance. + let ed = T::Currency::minimum_balance(); let deposit: BalanceOf = Configuration::::config().hrmp_sender_deposit.unique_saturated_into(); - register_parachain_with_balance::(sender_id, deposit); - register_parachain_with_balance::(recipient_id, deposit); + register_parachain_with_balance::(sender_id, deposit + ed); + register_parachain_with_balance::(recipient_id, deposit + ed); let capacity = Configuration::::config().hrmp_channel_max_capacity; let message_size = Configuration::::config().hrmp_channel_max_message_size; @@ -302,12 +304,13 @@ frame_benchmarking::benchmarks! { let recipient_id: ParaId = 2u32.into(); // make sure para is registered, and has enough balance. + let ed = T::Currency::minimum_balance(); let sender_deposit: BalanceOf = Configuration::::config().hrmp_sender_deposit.unique_saturated_into(); let recipient_deposit: BalanceOf = Configuration::::config().hrmp_recipient_deposit.unique_saturated_into(); - register_parachain_with_balance::(sender_id, sender_deposit); - register_parachain_with_balance::(recipient_id, recipient_deposit); + register_parachain_with_balance::(sender_id, sender_deposit + ed); + register_parachain_with_balance::(recipient_id, recipient_deposit + ed); let capacity = Configuration::::config().hrmp_channel_max_capacity; let message_size = Configuration::::config().hrmp_channel_max_message_size; diff --git a/polkadot/runtime/parachains/src/mock.rs b/polkadot/runtime/parachains/src/mock.rs index ee7a79c17d..fb6946a016 100644 --- a/polkadot/runtime/parachains/src/mock.rs +++ b/polkadot/runtime/parachains/src/mock.rs @@ -25,7 +25,7 @@ use crate::{ use frame_support::{ parameter_types, - traits::{GenesisBuild, ValidatorSet, ValidatorSetWithIdentification}, + traits::{ConstU32, GenesisBuild, ValidatorSet, ValidatorSetWithIdentification}, weights::Weight, }; use frame_support_test::TestRandomness; @@ -113,11 +113,11 @@ impl frame_system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); - type MaxConsumers = frame_support::traits::ConstU32<16>; + type MaxConsumers = ConstU32<16>; } parameter_types! { - pub static ExistentialDeposit: u64 = 0; + pub static ExistentialDeposit: u64 = 1; } impl pallet_balances::Config for Test { @@ -130,6 +130,10 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { diff --git a/polkadot/runtime/polkadot/src/lib.rs b/polkadot/runtime/polkadot/src/lib.rs index 98b8f69d2e..12441342f8 100644 --- a/polkadot/runtime/polkadot/src/lib.rs +++ b/polkadot/runtime/polkadot/src/lib.rs @@ -296,6 +296,10 @@ impl pallet_balances::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; type WeightInfo = weights::pallet_balances::WeightInfo; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { diff --git a/polkadot/runtime/polkadot/src/weights/pallet_balances.rs b/polkadot/runtime/polkadot/src/weights/pallet_balances.rs index 7b4d22eb0d..8828c2ac9e 100644 --- a/polkadot/runtime/polkadot/src/weights/pallet_balances.rs +++ b/polkadot/runtime/polkadot/src/weights/pallet_balances.rs @@ -47,7 +47,7 @@ pub struct WeightInfo(PhantomData); impl pallet_balances::WeightInfo for WeightInfo { /// Storage: System Account (r:1 w:1) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) - fn transfer() -> Weight { + fn transfer_allow_death() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3593` @@ -71,7 +71,7 @@ impl pallet_balances::WeightInfo for WeightInfo { } /// Storage: System Account (r:1 w:1) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) - fn set_balance_creating() -> Weight { + fn force_set_balance_creating() -> Weight { // Proof Size summary in bytes: // Measured: `174` // Estimated: `3593` @@ -83,7 +83,7 @@ impl pallet_balances::WeightInfo for WeightInfo { } /// Storage: System Account (r:1 w:1) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) - fn set_balance_killing() -> Weight { + fn force_set_balance_killing() -> Weight { // Proof Size summary in bytes: // Measured: `174` // Estimated: `3593` @@ -129,4 +129,7 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } + fn upgrade_accounts(_: u32) -> Weight { + Weight::from_parts(0, 0) + } } diff --git a/polkadot/runtime/rococo/src/lib.rs b/polkadot/runtime/rococo/src/lib.rs index 3e5a8849b8..0d5f9a74a6 100644 --- a/polkadot/runtime/rococo/src/lib.rs +++ b/polkadot/runtime/rococo/src/lib.rs @@ -34,6 +34,7 @@ use runtime_common::{ paras_registrar, paras_sudo_wrapper, prod_or_fast, slots, BlockHashCount, BlockLength, SlowAdjustingFeeUpdate, }; +use scale_info::TypeInfo; use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*}; use runtime_parachains::{ @@ -281,6 +282,10 @@ impl pallet_balances::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; type WeightInfo = weights::pallet_balances::WeightInfo; + type FreezeIdentifier = (); + type MaxFreezes = ConstU32<1>; + type HoldIdentifier = HoldReason; + type MaxHolds = ConstU32<1>; } parameter_types! { @@ -1169,7 +1174,6 @@ impl pallet_balances::Config for Runtime { type ExistentialDeposit = ConstU128<10_000_000_000>; // One RTC cent type AccountStore = StorageMapShim< pallet_balances::Account, - frame_system::Provider, AccountId, pallet_balances::AccountData, >; @@ -1177,10 +1181,13 @@ impl pallet_balances::Config for Runtime { type MaxReserves = ConstU32<4>; type ReserveIdentifier = [u8; 8]; type WeightInfo = weights::pallet_balances_nis_counterpart_balances::WeightInfo; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { - pub IgnoredIssuance: Balance = Treasury::pot(); pub const NisBasePeriod: BlockNumber = 30 * DAYS; pub const MinBid: Balance = 100 * UNITS; pub MinReceipt: Perquintill = Perquintill::from_rational(1u64, 10_000_000u64); @@ -1189,7 +1196,27 @@ parameter_types! { pub const ThawThrottle: (Perquintill, BlockNumber) = (Perquintill::from_percent(25), 5); pub storage NisTarget: Perquintill = Perquintill::zero(); pub const NisPalletId: PalletId = PalletId(*b"py/nis "); - pub const NisReserveId: [u8; 8] = *b"py/nis "; + pub const NisHoldReason: HoldReason = HoldReason::Nis(HoldReasonNis::NftReceipt); +} + +/// A reason for placing a hold on funds. +#[derive( + Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, MaxEncodedLen, Debug, TypeInfo, +)] +pub enum HoldReason { + /// Some reason of the NIS pallet. + #[codec(index = 38)] + Nis(HoldReasonNis), +} + +/// A reason for the NIS pallet placing a hold on funds. +#[derive( + Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, MaxEncodedLen, Debug, TypeInfo, +)] +pub enum HoldReasonNis { + /// The NIS Pallet has reserved it for a non-fungible receipt. + #[codec(index = 0)] + NftReceipt = 0, } impl pallet_nis::Config for Runtime { @@ -1201,7 +1228,7 @@ impl pallet_nis::Config for Runtime { type Counterpart = NisCounterpartBalances; type CounterpartAmount = WithMaximumOf>; type Deficit = (); // Mint - type IgnoredIssuance = IgnoredIssuance; + type IgnoredIssuance = (); type Target = NisTarget; type PalletId = NisPalletId; type QueueCount = ConstU32<300>; @@ -1213,7 +1240,7 @@ impl pallet_nis::Config for Runtime { type IntakePeriod = IntakePeriod; type MaxIntakeWeight = MaxIntakeWeight; type ThawThrottle = ThawThrottle; - type ReserveId = NisReserveId; + type HoldReason = NisHoldReason; } parameter_types! { diff --git a/polkadot/runtime/rococo/src/weights/pallet_balances.rs b/polkadot/runtime/rococo/src/weights/pallet_balances.rs index 94599ca312..463f0a2e87 100644 --- a/polkadot/runtime/rococo/src/weights/pallet_balances.rs +++ b/polkadot/runtime/rococo/src/weights/pallet_balances.rs @@ -45,7 +45,7 @@ use sp_std::marker::PhantomData; pub struct WeightInfo(PhantomData); impl pallet_balances::WeightInfo for WeightInfo { // Storage: System Account (r:1 w:1) - fn transfer() -> Weight { + fn transfer_allow_death() -> Weight { // Minimum execution time: 40_106 nanoseconds. Weight::from_parts(40_750_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(1 as u64)) @@ -59,14 +59,14 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) - fn set_balance_creating() -> Weight { + fn force_set_balance_creating() -> Weight { // Minimum execution time: 23_902 nanoseconds. Weight::from_parts(24_338_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } // Storage: System Account (r:1 w:1) - fn set_balance_killing() -> Weight { + fn force_set_balance_killing() -> Weight { // Minimum execution time: 26_492 nanoseconds. Weight::from_parts(26_866_000 as u64, 0) .saturating_add(T::DbWeight::get().reads(1 as u64)) @@ -93,4 +93,7 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(1 as u64)) .saturating_add(T::DbWeight::get().writes(1 as u64)) } + fn upgrade_accounts(_: u32) -> Weight { + Weight::from_parts(0, 0) + } } diff --git a/polkadot/runtime/rococo/src/weights/pallet_balances_nis_counterpart_balances.rs b/polkadot/runtime/rococo/src/weights/pallet_balances_nis_counterpart_balances.rs index 3f6c52e814..045f062734 100644 --- a/polkadot/runtime/rococo/src/weights/pallet_balances_nis_counterpart_balances.rs +++ b/polkadot/runtime/rococo/src/weights/pallet_balances_nis_counterpart_balances.rs @@ -51,7 +51,7 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) /// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) /// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - fn transfer() -> Weight { + fn transfer_allow_death() -> Weight { // Proof Size summary in bytes: // Measured: `219` // Estimated: `11258` @@ -79,7 +79,7 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: NisCounterpartBalances Account (max_values: None, max_size: Some(112), added: 2587, mode: MaxEncodedLen) /// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) /// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - fn set_balance_creating() -> Weight { + fn force_set_balance_creating() -> Weight { // Proof Size summary in bytes: // Measured: `219` // Estimated: `5078` @@ -95,7 +95,7 @@ impl pallet_balances::WeightInfo for WeightInfo { /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) /// Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) /// Proof: NisCounterpartBalances TotalIssuance (max_values: Some(1), max_size: Some(16), added: 511, mode: MaxEncodedLen) - fn set_balance_killing() -> Weight { + fn force_set_balance_killing() -> Weight { // Proof Size summary in bytes: // Measured: `393` // Estimated: `8671` @@ -147,4 +147,7 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } + fn upgrade_accounts(_: u32) -> Weight { + Weight::from_parts(0, 0) + } } diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs index 2247adfe17..e2d881b429 100644 --- a/polkadot/runtime/test-runtime/src/lib.rs +++ b/polkadot/runtime/test-runtime/src/lib.rs @@ -56,7 +56,7 @@ use runtime_common::{ claims, impl_runtime_weights, paras_sudo_wrapper, BlockHashCount, BlockLength, SlowAdjustingFeeUpdate, }; -use sp_core::OpaqueMetadata; +use sp_core::{ConstU32, OpaqueMetadata}; use sp_mmr_primitives as mmr; use sp_runtime::{ create_runtime_str, @@ -217,6 +217,10 @@ impl pallet_balances::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; type WeightInfo = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs index 06e48de4c3..9b213e0078 100644 --- a/polkadot/runtime/westend/src/lib.rs +++ b/polkadot/runtime/westend/src/lib.rs @@ -258,6 +258,10 @@ impl pallet_balances::Config for Runtime { type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; type WeightInfo = weights::pallet_balances::WeightInfo; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { diff --git a/polkadot/runtime/westend/src/weights/pallet_balances.rs b/polkadot/runtime/westend/src/weights/pallet_balances.rs index 10582a691d..812ba9137c 100644 --- a/polkadot/runtime/westend/src/weights/pallet_balances.rs +++ b/polkadot/runtime/westend/src/weights/pallet_balances.rs @@ -47,7 +47,7 @@ pub struct WeightInfo(PhantomData); impl pallet_balances::WeightInfo for WeightInfo { /// Storage: System Account (r:1 w:1) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) - fn transfer() -> Weight { + fn transfer_allow_death() -> Weight { // Proof Size summary in bytes: // Measured: `0` // Estimated: `3593` @@ -71,7 +71,7 @@ impl pallet_balances::WeightInfo for WeightInfo { } /// Storage: System Account (r:1 w:1) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) - fn set_balance_creating() -> Weight { + fn force_set_balance_creating() -> Weight { // Proof Size summary in bytes: // Measured: `174` // Estimated: `3593` @@ -83,7 +83,7 @@ impl pallet_balances::WeightInfo for WeightInfo { } /// Storage: System Account (r:1 w:1) /// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen) - fn set_balance_killing() -> Weight { + fn force_set_balance_killing() -> Weight { // Proof Size summary in bytes: // Measured: `174` // Estimated: `3593` @@ -129,4 +129,8 @@ impl pallet_balances::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(1)) .saturating_add(T::DbWeight::get().writes(1)) } + fn upgrade_accounts(_: u32) -> Weight { + Weight::from_parts(0, 0) + } + } diff --git a/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs b/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs index e3a02a9bcf..56bbd913a0 100644 --- a/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs +++ b/polkadot/xcm/pallet-xcm-benchmarks/src/fungible/mock.rs @@ -20,7 +20,7 @@ use crate::{fungible as xcm_balances_benchmark, mock::*}; use frame_benchmarking::BenchmarkError; use frame_support::{ parameter_types, - traits::{Everything, Nothing}, + traits::{ConstU32, Everything, Nothing}, weights::Weight, }; use sp_core::H256; @@ -77,7 +77,7 @@ impl frame_system::Config for Test { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); - type MaxConsumers = frame_support::traits::ConstU32<16>; + type MaxConsumers = ConstU32<16>; } parameter_types! { @@ -94,6 +94,10 @@ impl pallet_balances::Config for Test { type ExistentialDeposit = ExistentialDeposit; type AccountStore = System; type WeightInfo = (); + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { diff --git a/polkadot/xcm/pallet-xcm/src/mock.rs b/polkadot/xcm/pallet-xcm/src/mock.rs index 74e69c55b3..1e23af66b2 100644 --- a/polkadot/xcm/pallet-xcm/src/mock.rs +++ b/polkadot/xcm/pallet-xcm/src/mock.rs @@ -17,7 +17,7 @@ use codec::Encode; use frame_support::{ construct_runtime, parameter_types, - traits::{Everything, Nothing}, + traits::{ConstU32, Everything, Nothing}, weights::Weight, }; use polkadot_parachain::primitives::Id as ParaId; @@ -242,6 +242,10 @@ impl pallet_balances::Config for Test { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { diff --git a/polkadot/xcm/xcm-builder/src/fungibles_adapter.rs b/polkadot/xcm/xcm-builder/src/fungibles_adapter.rs index c20fc99267..33e4513931 100644 --- a/polkadot/xcm/xcm-builder/src/fungibles_adapter.rs +++ b/polkadot/xcm/xcm-builder/src/fungibles_adapter.rs @@ -16,7 +16,12 @@ //! Adapters to work with `frame_support::traits::tokens::fungibles` through XCM. -use frame_support::traits::{tokens::fungibles, Contains, Get}; +use frame_support::traits::{ + tokens::{ + fungibles, Fortitude::Polite, Precision::Exact, Preservation::Preserve, Provenance::Minted, + }, + Contains, Get, +}; use sp_std::{marker::PhantomData, prelude::*, result}; use xcm::latest::prelude::*; use xcm_executor::traits::{Convert, Error as MatchError, MatchesFungibles, TransactAsset}; @@ -26,7 +31,7 @@ pub struct FungiblesTransferAdapter, ); impl< - Assets: fungibles::Transfer, + Assets: fungibles::Mutate, Matcher: MatchesFungibles, AccountIdConverter: Convert, AccountId: Clone, // can't get away without it since Currency is generic over it. @@ -49,7 +54,7 @@ impl< .map_err(|()| MatchError::AccountIdConversionFailed)?; let dest = AccountIdConverter::convert_ref(to) .map_err(|()| MatchError::AccountIdConversionFailed)?; - Assets::transfer(asset_id, &source, &dest, amount, true) + Assets::transfer(asset_id, &source, &dest, amount, Preserve) .map_err(|e| XcmError::FailedToTransactAsset(e.into()))?; Ok(what.clone().into()) } @@ -153,14 +158,14 @@ impl< { fn can_accrue_checked(asset_id: Assets::AssetId, amount: Assets::Balance) -> XcmResult { let checking_account = CheckingAccount::get(); - Assets::can_deposit(asset_id, &checking_account, amount, true) + Assets::can_deposit(asset_id, &checking_account, amount, Minted) .into_result() .map_err(|_| XcmError::NotDepositable) } fn can_reduce_checked(asset_id: Assets::AssetId, amount: Assets::Balance) -> XcmResult { let checking_account = CheckingAccount::get(); Assets::can_withdraw(asset_id, &checking_account, amount) - .into_result() + .into_result(false) .map_err(|_| XcmError::NotWithdrawable) .map(|_| ()) } @@ -171,7 +176,7 @@ impl< } fn reduce_checked(asset_id: Assets::AssetId, amount: Assets::Balance) { let checking_account = CheckingAccount::get(); - let ok = Assets::burn_from(asset_id, &checking_account, amount).is_ok(); + let ok = Assets::burn_from(asset_id, &checking_account, amount, Exact, Polite).is_ok(); debug_assert!(ok, "`can_reduce_checked` must have returned `true` immediately prior; qed"); } } @@ -280,7 +285,8 @@ impl< let who = AccountIdConverter::convert_ref(who) .map_err(|()| MatchError::AccountIdConversionFailed)?; Assets::mint_into(asset_id, &who, amount) - .map_err(|e| XcmError::FailedToTransactAsset(e.into())) + .map_err(|e| XcmError::FailedToTransactAsset(e.into()))?; + Ok(()) } fn withdraw_asset( @@ -297,7 +303,7 @@ impl< let (asset_id, amount) = Matcher::matches_fungibles(what)?; let who = AccountIdConverter::convert_ref(who) .map_err(|()| MatchError::AccountIdConversionFailed)?; - Assets::burn_from(asset_id, &who, amount) + Assets::burn_from(asset_id, &who, amount, Exact, Polite) .map_err(|e| XcmError::FailedToTransactAsset(e.into()))?; Ok(what.clone().into()) } @@ -312,7 +318,7 @@ pub struct FungiblesAdapter< CheckingAccount, >(PhantomData<(Assets, Matcher, AccountIdConverter, AccountId, CheckAsset, CheckingAccount)>); impl< - Assets: fungibles::Mutate + fungibles::Transfer, + Assets: fungibles::Mutate, Matcher: MatchesFungibles, AccountIdConverter: Convert, AccountId: Clone, // can't get away without it since Currency is generic over it. diff --git a/polkadot/xcm/xcm-builder/tests/mock/mod.rs b/polkadot/xcm/xcm-builder/tests/mock/mod.rs index a265bff1e3..450ef18186 100644 --- a/polkadot/xcm/xcm-builder/tests/mock/mod.rs +++ b/polkadot/xcm/xcm-builder/tests/mock/mod.rs @@ -16,7 +16,7 @@ use frame_support::{ construct_runtime, parameter_types, - traits::{Everything, Nothing}, + traits::{ConstU32, Everything, Nothing}, weights::Weight, }; use parity_scale_codec::Encode; @@ -116,6 +116,10 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } impl shared::Config for Runtime {} diff --git a/polkadot/xcm/xcm-simulator/example/src/parachain.rs b/polkadot/xcm/xcm-simulator/example/src/parachain.rs index 9801a847b7..344ccfb9db 100644 --- a/polkadot/xcm/xcm-simulator/example/src/parachain.rs +++ b/polkadot/xcm/xcm-simulator/example/src/parachain.rs @@ -22,7 +22,7 @@ use frame_support::{ traits::{EnsureOrigin, EnsureOriginWithArg, Everything, EverythingBut, Nothing}, weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}, }; -use sp_core::H256; +use sp_core::{ConstU32, H256}; use sp_runtime::{ testing::Header, traits::{Hash, IdentityLookup}, @@ -85,7 +85,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); - type MaxConsumers = frame_support::traits::ConstU32<16>; + type MaxConsumers = ConstU32<16>; } parameter_types! { @@ -104,6 +104,10 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } #[cfg(feature = "runtime-benchmarks")] @@ -130,9 +134,9 @@ impl pallet_uniques::Config for Runtime { type MetadataDepositBase = frame_support::traits::ConstU128<1_000>; type AttributeDepositBase = frame_support::traits::ConstU128<1_000>; type DepositPerByte = frame_support::traits::ConstU128<1>; - type StringLimit = frame_support::traits::ConstU32<64>; - type KeyLimit = frame_support::traits::ConstU32<64>; - type ValueLimit = frame_support::traits::ConstU32<128>; + type StringLimit = ConstU32<64>; + type KeyLimit = ConstU32<64>; + type ValueLimit = ConstU32<128>; type Locker = (); type WeightInfo = (); #[cfg(feature = "runtime-benchmarks")] @@ -416,7 +420,7 @@ impl pallet_xcm::Config for Runtime { type CurrencyMatcher = (); type TrustedLockers = (); type SovereignAccountOf = LocationToAccountId; - type MaxLockers = frame_support::traits::ConstU32<8>; + type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; diff --git a/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs b/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs index 9e095270e6..b44200378a 100644 --- a/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs +++ b/polkadot/xcm/xcm-simulator/example/src/relay_chain.rs @@ -21,7 +21,7 @@ use frame_support::{ traits::{AsEnsureOriginWithArg, Everything, Nothing}, weights::Weight, }; -use sp_core::H256; +use sp_core::{ConstU32, H256}; use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32}; use polkadot_parachain::primitives::Id as ParaId; @@ -67,7 +67,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); - type MaxConsumers = frame_support::traits::ConstU32<16>; + type MaxConsumers = ConstU32<16>; } parameter_types! { @@ -86,6 +86,10 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } impl pallet_uniques::Config for Runtime { @@ -100,9 +104,9 @@ impl pallet_uniques::Config for Runtime { type MetadataDepositBase = frame_support::traits::ConstU128<1_000>; type AttributeDepositBase = frame_support::traits::ConstU128<1_000>; type DepositPerByte = frame_support::traits::ConstU128<1>; - type StringLimit = frame_support::traits::ConstU32<64>; - type KeyLimit = frame_support::traits::ConstU32<64>; - type ValueLimit = frame_support::traits::ConstU32<128>; + type StringLimit = ConstU32<64>; + type KeyLimit = ConstU32<64>; + type ValueLimit = ConstU32<128>; type Locker = (); type WeightInfo = (); #[cfg(feature = "runtime-benchmarks")] @@ -213,7 +217,7 @@ impl pallet_xcm::Config for Runtime { type CurrencyMatcher = IsConcrete; type TrustedLockers = (); type SovereignAccountOf = LocationToAccountId; - type MaxLockers = frame_support::traits::ConstU32<8>; + type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest; diff --git a/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs b/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs index adf134124c..66e9673394 100644 --- a/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs +++ b/polkadot/xcm/xcm-simulator/fuzzer/src/parachain.rs @@ -22,7 +22,7 @@ use frame_support::{ traits::{Everything, Nothing}, weights::{constants::WEIGHT_REF_TIME_PER_SECOND, Weight}, }; -use sp_core::H256; +use sp_core::{ConstU32, H256}; use sp_runtime::{ testing::Header, traits::{Hash, IdentityLookup}, @@ -94,6 +94,10 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } parameter_types! { diff --git a/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs b/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs index fe08a056cd..3d49a71cc9 100644 --- a/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs +++ b/polkadot/xcm/xcm-simulator/fuzzer/src/relay_chain.rs @@ -21,7 +21,7 @@ use frame_support::{ traits::{Everything, Nothing}, weights::Weight, }; -use sp_core::H256; +use sp_core::{ConstU32, H256}; use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32}; use polkadot_parachain::primitives::Id as ParaId; @@ -66,7 +66,7 @@ impl frame_system::Config for Runtime { type SystemWeightInfo = (); type SS58Prefix = (); type OnSetCode = (); - type MaxConsumers = frame_support::traits::ConstU32<16>; + type MaxConsumers = ConstU32<16>; } parameter_types! { @@ -85,6 +85,10 @@ impl pallet_balances::Config for Runtime { type WeightInfo = (); type MaxReserves = MaxReserves; type ReserveIdentifier = [u8; 8]; + type HoldIdentifier = (); + type FreezeIdentifier = (); + type MaxHolds = ConstU32<0>; + type MaxFreezes = ConstU32<0>; } impl shared::Config for Runtime {} @@ -177,7 +181,7 @@ impl pallet_xcm::Config for Runtime { type CurrencyMatcher = (); type TrustedLockers = (); type SovereignAccountOf = SovereignAccountOf; - type MaxLockers = frame_support::traits::ConstU32<8>; + type MaxLockers = ConstU32<8>; type WeightInfo = pallet_xcm::TestWeightInfo; #[cfg(feature = "runtime-benchmarks")] type ReachableDest = ReachableDest;