From f39dbaf2814cf177e250bd8743831efdf2b75cf5 Mon Sep 17 00:00:00 2001 From: Gavin Wood Date: Mon, 5 Dec 2022 16:34:34 +0000 Subject: [PATCH] Introduce NIS functionality into Kusama/Rococo (#6352) * Integrate NIS into Kusama/Rococo * Missing files * Fix * Fix * Formatting * Add Kusama weights Signed-off-by: Oliver Tale-Yazdi * Add Rococo weights Signed-off-by: Oliver Tale-Yazdi * Use weights Signed-off-by: Oliver Tale-Yazdi * Bump * Bump * ".git/.scripts/bench-bot.sh" runtime kusama-dev pallet_nis * ".git/.scripts/bench-bot.sh" runtime rococo-dev pallet_nis Signed-off-by: Oliver Tale-Yazdi Co-authored-by: Oliver Tale-Yazdi Co-authored-by: command-bot <> --- Cargo.lock | 395 +++++++++--------- node/service/src/chain_spec.rs | 8 +- runtime/common/src/impls.rs | 10 +- runtime/kusama/Cargo.toml | 8 +- runtime/kusama/src/lib.rs | 76 ++-- runtime/kusama/src/weights/mod.rs | 3 +- ...allet_balances_nis_counterpart_balances.rs | 105 +++++ runtime/kusama/src/weights/pallet_gilt.rs | 119 ------ runtime/kusama/src/weights/pallet_nis.rs | 122 ++++++ runtime/polkadot/src/lib.rs | 1 - runtime/rococo/Cargo.toml | 6 +- runtime/rococo/src/lib.rs | 72 +++- runtime/rococo/src/weights/mod.rs | 3 +- ...allet_balances_nis_counterpart_balances.rs | 105 +++++ runtime/rococo/src/weights/pallet_gilt.rs | 119 ------ runtime/rococo/src/weights/pallet_nis.rs | 122 ++++++ 16 files changed, 774 insertions(+), 500 deletions(-) create mode 100644 runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs delete mode 100644 runtime/kusama/src/weights/pallet_gilt.rs create mode 100644 runtime/kusama/src/weights/pallet_nis.rs create mode 100644 runtime/rococo/src/weights/pallet_balances_nis_counterpart_balances.rs delete mode 100644 runtime/rococo/src/weights/pallet_gilt.rs create mode 100644 runtime/rococo/src/weights/pallet_nis.rs diff --git a/Cargo.lock b/Cargo.lock index f5fce2487e19..c0fc30d1bad6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -410,7 +410,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "async-trait", @@ -447,7 +447,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -467,7 +467,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "beefy-primitives", "sp-api", @@ -477,7 +477,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "scale-info", @@ -2007,7 +2007,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", ] @@ -2031,7 +2031,7 @@ checksum = "85dcb89d2b10c5f6133de2efd8c11959ce9dbb46a2f7a4cab208c4eeda6ce1ab" [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -2054,7 +2054,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "Inflector", "array-bytes", @@ -2106,7 +2106,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2117,7 +2117,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2133,7 +2133,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -2162,7 +2162,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "bitflags", "frame-metadata", @@ -2194,7 +2194,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "Inflector", "cfg-expr", @@ -2208,7 +2208,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2220,7 +2220,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "proc-macro2", "quote", @@ -2230,7 +2230,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2253,7 +2253,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -2264,7 +2264,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "log", @@ -2282,7 +2282,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -2297,7 +2297,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "sp-api", @@ -2306,7 +2306,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "parity-scale-codec", @@ -2477,7 +2477,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "chrono", "frame-election-provider-support", @@ -3232,13 +3232,13 @@ dependencies = [ "pallet-election-provider-support-benchmarking", "pallet-elections-phragmen", "pallet-fast-unstake", - "pallet-gilt", "pallet-grandpa", "pallet-identity", "pallet-im-online", "pallet-indices", "pallet-membership", "pallet-multisig", + "pallet-nis", "pallet-nomination-pools", "pallet-nomination-pools-benchmarking", "pallet-nomination-pools-runtime-api", @@ -4086,7 +4086,7 @@ dependencies = [ [[package]] name = "mmr-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "beefy-primitives", "futures", @@ -4106,7 +4106,7 @@ dependencies = [ [[package]] name = "mmr-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "anyhow", "jsonrpsee", @@ -4611,7 +4611,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4625,7 +4625,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -4641,7 +4641,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -4656,7 +4656,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4680,7 +4680,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4700,7 +4700,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4719,7 +4719,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4734,7 +4734,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "beefy-primitives", "frame-support", @@ -4750,7 +4750,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "beefy-merkle-tree", @@ -4773,7 +4773,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4791,7 +4791,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4810,7 +4810,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4827,7 +4827,7 @@ dependencies = [ [[package]] name = "pallet-conviction-voting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "assert_matches", "frame-benchmarking", @@ -4844,7 +4844,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4862,7 +4862,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4886,7 +4886,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4899,7 +4899,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4917,7 +4917,7 @@ dependencies = [ [[package]] name = "pallet-fast-unstake" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4932,25 +4932,10 @@ dependencies = [ "sp-std", ] -[[package]] -name = "pallet-gilt" -version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" -dependencies = [ - "frame-benchmarking", - "frame-support", - "frame-system", - "parity-scale-codec", - "scale-info", - "sp-arithmetic", - "sp-runtime", - "sp-std", -] - [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -4973,7 +4958,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "enumflags2", "frame-benchmarking", @@ -4989,7 +4974,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5009,7 +4994,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5026,7 +5011,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5043,7 +5028,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5060,7 +5045,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5073,10 +5058,26 @@ dependencies = [ "sp-std", ] +[[package]] +name = "pallet-nis" +version = "4.0.0-dev" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" +dependencies = [ + "frame-benchmarking", + "frame-support", + "frame-system", + "parity-scale-codec", + "scale-info", + "sp-arithmetic", + "sp-core", + "sp-runtime", + "sp-std", +] + [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -5093,7 +5094,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5113,7 +5114,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "sp-api", @@ -5123,7 +5124,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -5140,7 +5141,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5163,7 +5164,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5180,7 +5181,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5195,7 +5196,7 @@ dependencies = [ [[package]] name = "pallet-ranked-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5213,7 +5214,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5228,7 +5229,7 @@ dependencies = [ [[package]] name = "pallet-referenda" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "assert_matches", "frame-benchmarking", @@ -5246,7 +5247,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5262,7 +5263,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -5283,7 +5284,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5299,7 +5300,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -5313,7 +5314,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5336,7 +5337,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5347,7 +5348,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "log", "sp-arithmetic", @@ -5356,7 +5357,7 @@ dependencies = [ [[package]] name = "pallet-state-trie-migration" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5373,7 +5374,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -5387,7 +5388,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5405,7 +5406,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5424,7 +5425,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-support", "frame-system", @@ -5440,7 +5441,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5456,7 +5457,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5468,7 +5469,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5485,7 +5486,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5501,7 +5502,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -5516,7 +5517,7 @@ dependencies = [ [[package]] name = "pallet-whitelist" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-benchmarking", "frame-support", @@ -7995,7 +7996,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "env_logger 0.9.0", "log", @@ -8126,7 +8127,6 @@ dependencies = [ "pallet-collective", "pallet-democracy", "pallet-elections-phragmen", - "pallet-gilt", "pallet-grandpa", "pallet-identity", "pallet-im-online", @@ -8134,6 +8134,7 @@ dependencies = [ "pallet-membership", "pallet-mmr", "pallet-multisig", + "pallet-nis", "pallet-offences", "pallet-preimage", "pallet-proxy", @@ -8335,7 +8336,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "log", "sp-core", @@ -8346,7 +8347,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "futures", @@ -8373,7 +8374,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "futures-timer", @@ -8396,7 +8397,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8412,7 +8413,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "impl-trait-for-tuples", "memmap2", @@ -8429,7 +8430,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8440,7 +8441,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "chrono", @@ -8480,7 +8481,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "fnv", "futures", @@ -8508,7 +8509,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "hash-db", "kvdb", @@ -8533,7 +8534,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "futures", @@ -8557,7 +8558,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "fork-tree", @@ -8598,7 +8599,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "jsonrpsee", @@ -8620,7 +8621,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8633,7 +8634,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "futures", @@ -8657,7 +8658,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "lazy_static", "lru", @@ -8683,7 +8684,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "environmental", "parity-scale-codec", @@ -8699,7 +8700,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "log", "parity-scale-codec", @@ -8714,7 +8715,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "cfg-if", "libc", @@ -8734,7 +8735,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "ahash", "array-bytes", @@ -8775,7 +8776,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "finality-grandpa", "futures", @@ -8796,7 +8797,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "ansi_term", "futures", @@ -8813,7 +8814,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "async-trait", @@ -8828,7 +8829,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "async-trait", @@ -8875,7 +8876,7 @@ dependencies = [ [[package]] name = "sc-network-bitswap" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "cid", "futures", @@ -8895,7 +8896,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "bitflags", @@ -8921,7 +8922,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "ahash", "futures", @@ -8939,7 +8940,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "futures", @@ -8960,7 +8961,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "async-trait", @@ -8991,7 +8992,7 @@ dependencies = [ [[package]] name = "sc-network-transactions" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "futures", @@ -9010,7 +9011,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "bytes", @@ -9040,7 +9041,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "libp2p", @@ -9053,7 +9054,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9062,7 +9063,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "hash-db", @@ -9092,7 +9093,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "jsonrpsee", @@ -9115,7 +9116,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "jsonrpsee", @@ -9128,7 +9129,7 @@ dependencies = [ [[package]] name = "sc-rpc-spec-v2" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "hex", @@ -9147,7 +9148,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "directories", @@ -9218,7 +9219,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "log", "parity-scale-codec", @@ -9232,7 +9233,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9251,7 +9252,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "libc", @@ -9270,7 +9271,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "chrono", "futures", @@ -9288,7 +9289,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "ansi_term", "atty", @@ -9319,7 +9320,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9330,7 +9331,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "futures", @@ -9357,7 +9358,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "futures", @@ -9371,7 +9372,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "futures-timer", @@ -9852,7 +9853,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "hash-db", "log", @@ -9870,7 +9871,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "blake2", "proc-macro-crate", @@ -9882,7 +9883,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "scale-info", @@ -9895,7 +9896,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "integer-sqrt", "num-traits", @@ -9910,7 +9911,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "scale-info", @@ -9923,7 +9924,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "parity-scale-codec", @@ -9935,7 +9936,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "sp-api", @@ -9947,7 +9948,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "log", @@ -9965,7 +9966,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "futures", @@ -9984,7 +9985,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "merlin", @@ -10007,7 +10008,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "scale-info", @@ -10021,7 +10022,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "scale-info", @@ -10034,7 +10035,7 @@ dependencies = [ [[package]] name = "sp-core" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "base58", @@ -10079,7 +10080,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "blake2", "byteorder", @@ -10093,7 +10094,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "proc-macro2", "quote", @@ -10104,7 +10105,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "kvdb", "parking_lot 0.12.1", @@ -10113,7 +10114,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "proc-macro2", "quote", @@ -10123,7 +10124,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "environmental", "parity-scale-codec", @@ -10134,7 +10135,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "finality-grandpa", "log", @@ -10152,7 +10153,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10166,7 +10167,7 @@ dependencies = [ [[package]] name = "sp-io" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "bytes", "ed25519-dalek", @@ -10193,7 +10194,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "lazy_static", "sp-core", @@ -10204,7 +10205,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "futures", @@ -10221,7 +10222,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "thiserror", "zstd", @@ -10230,7 +10231,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "ckb-merkle-mountain-range", "log", @@ -10248,7 +10249,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "scale-info", @@ -10262,7 +10263,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "sp-api", "sp-core", @@ -10272,7 +10273,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "backtrace", "lazy_static", @@ -10282,7 +10283,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "rustc-hash", "serde", @@ -10292,7 +10293,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "either", "hash256-std-hasher", @@ -10315,7 +10316,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10333,7 +10334,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "Inflector", "proc-macro-crate", @@ -10345,7 +10346,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "log", "parity-scale-codec", @@ -10359,7 +10360,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "scale-info", @@ -10373,7 +10374,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "scale-info", @@ -10384,7 +10385,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.13.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "hash-db", "log", @@ -10406,12 +10407,12 @@ dependencies = [ [[package]] name = "sp-std" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" [[package]] name = "sp-storage" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10424,7 +10425,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "futures-timer", @@ -10440,7 +10441,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "sp-std", @@ -10452,7 +10453,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "sp-api", "sp-runtime", @@ -10461,7 +10462,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "log", @@ -10477,7 +10478,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "ahash", "hash-db", @@ -10500,7 +10501,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10517,7 +10518,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10528,7 +10529,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "7.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "impl-trait-for-tuples", "log", @@ -10541,7 +10542,7 @@ dependencies = [ [[package]] name = "sp-weights" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "impl-trait-for-tuples", "parity-scale-codec", @@ -10756,7 +10757,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "platforms", ] @@ -10764,7 +10765,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -10785,7 +10786,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures-util", "hyper", @@ -10798,7 +10799,7 @@ dependencies = [ [[package]] name = "substrate-rpc-client" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "async-trait", "jsonrpsee", @@ -10811,7 +10812,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "jsonrpsee", "log", @@ -10832,7 +10833,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "array-bytes", "async-trait", @@ -10858,7 +10859,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "futures", "substrate-test-utils-derive", @@ -10868,7 +10869,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10879,7 +10880,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "ansi_term", "build-helper", @@ -11588,7 +11589,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#2bde8c1a44d8e376e3e6e5d2dd7266124ff5efa2" +source = "git+https://github.com/paritytech/substrate?branch=master#2704ab3d348f18f9db03e87a725e4807b91660d8" dependencies = [ "clap", "frame-try-runtime", diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index e2c0a7bfdf94..8650499d064c 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -767,10 +767,10 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC configuration: kusama::ConfigurationConfig { config: default_parachains_host_configuration(), }, - gilt: Default::default(), paras: Default::default(), xcm_pallet: Default::default(), nomination_pools: Default::default(), + nis_counterpart_balances: Default::default(), } } @@ -1073,11 +1073,11 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime:: configuration: rococo_runtime::ConfigurationConfig { config: default_parachains_host_configuration(), }, - gilt: Default::default(), registrar: rococo_runtime::RegistrarConfig { next_free_para_id: polkadot_primitives::v2::LOWEST_PUBLIC_ID, }, xcm_pallet: Default::default(), + nis_counterpart_balances: Default::default(), } } @@ -1466,10 +1466,10 @@ pub fn kusama_testnet_genesis( configuration: kusama::ConfigurationConfig { config: default_parachains_host_configuration(), }, - gilt: Default::default(), paras: Default::default(), xcm_pallet: Default::default(), nomination_pools: Default::default(), + nis_counterpart_balances: Default::default(), } } @@ -1629,12 +1629,12 @@ pub fn rococo_testnet_genesis( ..default_parachains_host_configuration() }, }, - gilt: Default::default(), paras: rococo_runtime::ParasConfig { paras: vec![] }, registrar: rococo_runtime::RegistrarConfig { next_free_para_id: polkadot_primitives::v2::LOWEST_PUBLIC_ID, }, xcm_pallet: Default::default(), + nis_counterpart_balances: Default::default(), } } diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index 2b10c79cfdff..51dbdd80c781 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -61,7 +61,7 @@ where pub fn era_payout( total_staked: Balance, - non_gilt_issuance: Balance, + total_stakable: Balance, max_annual_inflation: Perquintill, period_fraction: Perquintill, auctioned_slots: u64, @@ -79,17 +79,17 @@ pub fn era_payout( // amount that we expect to be taken up with auctions. let ideal_stake = Perquintill::from_percent(75).saturating_sub(auction_proportion); - let stake = Perquintill::from_rational(total_staked, non_gilt_issuance); + let stake = Perquintill::from_rational(total_staked, total_stakable); let falloff = Perquintill::from_percent(5); let adjustment = compute_inflation(stake, ideal_stake, falloff); let staking_inflation = min_annual_inflation.saturating_add(delta_annual_inflation * adjustment); - let max_payout = period_fraction * max_annual_inflation * non_gilt_issuance; - let staking_payout = (period_fraction * staking_inflation) * non_gilt_issuance; + let max_payout = period_fraction * max_annual_inflation * total_stakable; + let staking_payout = (period_fraction * staking_inflation) * total_stakable; let rest = max_payout.saturating_sub(staking_payout); - let other_issuance = non_gilt_issuance.saturating_sub(total_staked); + let other_issuance = total_stakable.saturating_sub(total_staked); if total_staked > other_issuance { let _cap_rest = Perquintill::from_rational(other_issuance, total_staked) * staking_payout; // We don't do anything with this, but if we wanted to, we could introduce a cap on the diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 96f98a1c10d0..868b5112bbdc 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -54,7 +54,7 @@ pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/su pallet-fast-unstake = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-gilt = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-nis = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -150,7 +150,7 @@ std = [ "pallet-election-provider-multi-phase/std", "pallet-fast-unstake/std", "pallet-democracy/std", - "pallet-gilt/std", + "pallet-nis/std", "pallet-grandpa/std", "pallet-identity/std", "pallet-im-online/std", @@ -216,7 +216,7 @@ runtime-benchmarks = [ "pallet-election-provider-multi-phase/runtime-benchmarks", "pallet-election-provider-support-benchmarking/runtime-benchmarks", "pallet-fast-unstake/runtime-benchmarks", - "pallet-gilt/runtime-benchmarks", + "pallet-nis/runtime-benchmarks", "pallet-grandpa/runtime-benchmarks", "pallet-identity/runtime-benchmarks", "pallet-im-online/runtime-benchmarks", @@ -267,7 +267,7 @@ try-runtime = [ "pallet-election-provider-multi-phase/try-runtime", "pallet-fast-unstake/try-runtime", "pallet-democracy/try-runtime", - "pallet-gilt/try-runtime", + "pallet-nis/try-runtime", "pallet-grandpa/try-runtime", "pallet-identity/try-runtime", "pallet-im-online/try-runtime", diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index c9a9691953ea..20dbc6ac7ec9 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -20,6 +20,7 @@ // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. #![recursion_limit = "256"] +use pallet_nis::WithMaximumOf; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use primitives::v2::{ AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CommittedCandidateReceipt, @@ -53,7 +54,7 @@ use frame_support::{ construct_runtime, parameter_types, traits::{ ConstU32, Contains, EitherOf, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, - LockIdentifier, PrivilegeCmp, WithdrawReasons, + LockIdentifier, PrivilegeCmp, StorageMapShim, WithdrawReasons, }, weights::ConstantMultiplier, PalletId, RuntimeDebug, @@ -63,7 +64,7 @@ use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId}; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_session::historical as session_historical; use pallet_transaction_payment::{CurrencyAdapter, FeeDetails, RuntimeDispatchInfo}; -use sp_core::OpaqueMetadata; +use sp_core::{ConstU128, OpaqueMetadata}; use sp_mmr_primitives as mmr; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, @@ -537,7 +538,7 @@ impl pallet_staking::EraPayout for EraPayout { runtime_common::impls::era_payout( total_staked, - Gilt::issuance().non_gilt, + Nis::issuance().other, MAX_ANNUAL_INFLATION, Perquintill::from_rational(era_duration_millis, MILLISECONDS_PER_YEAR), auctioned_slots, @@ -1027,7 +1028,7 @@ impl InstanceFilter for ProxyType { RuntimeCall::Scheduler(..) | RuntimeCall::Proxy(..) | RuntimeCall::Multisig(..) | - RuntimeCall::Gilt(..) | + RuntimeCall::Nis(..) | RuntimeCall::Registrar(paras_registrar::Call::register {..}) | RuntimeCall::Registrar(paras_registrar::Call::deregister {..}) | // Specifically omitting Registrar `swap` @@ -1246,33 +1247,57 @@ impl auctions::Config for Runtime { type WeightInfo = weights::runtime_common_auctions::WeightInfo; } +type NisCounterpartInstance = pallet_balances::Instance2; +impl pallet_balances::Config for Runtime { + type Balance = Balance; + type DustRemoval = (); + type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ConstU128<10_000_000_000>; // One KTC cent + type AccountStore = StorageMapShim< + pallet_balances::Account, + frame_system::Provider, + AccountId, + pallet_balances::AccountData, + >; + type MaxLocks = ConstU32<4>; + type MaxReserves = ConstU32<4>; + type ReserveIdentifier = [u8; 8]; + type WeightInfo = weights::pallet_balances_nis_counterpart_balances::WeightInfo; +} + parameter_types! { pub IgnoredIssuance: Balance = Treasury::pot(); - pub const QueueCount: u32 = 300; - pub const MaxQueueLen: u32 = 1000; - pub const FifoQueueLen: u32 = 250; - pub const GiltPeriod: BlockNumber = 30 * DAYS; - pub const MinFreeze: Balance = 10_000 * CENTS; + pub const NisBasePeriod: BlockNumber = 30 * DAYS; + pub const MinBid: Balance = 100 * QUID; + pub MinReceipt: Perquintill = Perquintill::from_rational(1u64, 10_000_000u64); pub const IntakePeriod: BlockNumber = 5 * MINUTES; - pub const MaxIntakeBids: u32 = 100; + pub MaxIntakeWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10; + pub const ThawThrottle: (Perquintill, BlockNumber) = (Perquintill::from_percent(25), 5); + pub storage NisTarget: Perquintill = Perquintill::zero(); + pub const NisPalletId: PalletId = PalletId(*b"py/nis "); } -impl pallet_gilt::Config for Runtime { +impl pallet_nis::Config for Runtime { + type WeightInfo = weights::pallet_nis::WeightInfo; type RuntimeEvent = RuntimeEvent; type Currency = Balances; type CurrencyBalance = Balance; - type AdminOrigin = EnsureRoot; + type FundOrigin = frame_system::EnsureSigned; + type Counterpart = NisCounterpartBalances; + type CounterpartAmount = WithMaximumOf>; type Deficit = (); // Mint - type Surplus = (); // Burn type IgnoredIssuance = IgnoredIssuance; - type QueueCount = QueueCount; - type MaxQueueLen = MaxQueueLen; - type FifoQueueLen = FifoQueueLen; - type Period = GiltPeriod; - type MinFreeze = MinFreeze; + type Target = NisTarget; + type PalletId = NisPalletId; + type QueueCount = ConstU32<300>; + type MaxQueueLen = ConstU32<1000>; + type FifoQueueLen = ConstU32<250>; + type BasePeriod = NisBasePeriod; + type MinBid = MinBid; + type MinReceipt = MinReceipt; type IntakePeriod = IntakePeriod; - type MaxIntakeBids = MaxIntakeBids; - type WeightInfo = weights::pallet_gilt::WeightInfo; + type MaxIntakeWeight = MaxIntakeWeight; + type ThawThrottle = ThawThrottle; } parameter_types! { @@ -1386,8 +1411,10 @@ construct_runtime! { // Election pallet. Only works with staking, but placed here to maintain indices. ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event, ValidateUnsigned} = 37, - // Gilts pallet. - Gilt: pallet_gilt::{Pallet, Call, Storage, Event, Config} = 38, + // NIS pallet. + Nis: pallet_nis::{Pallet, Call, Storage, Event} = 38, +// pub type NisCounterpartInstance = pallet_balances::Instance2; + NisCounterpartBalances: pallet_balances:: = 45, // Provides a semi-sorted list of nominators for staking. VoterList: pallet_bags_list::::{Pallet, Call, Storage, Event} = 39, @@ -1477,7 +1504,7 @@ mod benches { define_benchmarks!( // Polkadot // NOTE: Make sure to prefix these with `runtime_common::` so - // the that path resolves correctly in the generated file. + // that the path resolves correctly in the generated file. [runtime_common::auctions, Auctions] [runtime_common::crowdloan, Crowdloan] [runtime_common::claims, Claims] @@ -1492,6 +1519,7 @@ mod benches { [runtime_parachains::ump, Ump] // Substrate [pallet_balances, Balances] + [pallet_balances, NisCounterpartBalances] [pallet_bags_list, VoterList] [frame_benchmarking::baseline, Baseline::] [pallet_bounties, Bounties] @@ -1504,7 +1532,7 @@ mod benches { [pallet_election_provider_multi_phase, ElectionProviderMultiPhase] [frame_election_provider_support, ElectionProviderBench::] [pallet_fast_unstake, FastUnstake] - [pallet_gilt, Gilt] + [pallet_nis, Nis] [pallet_identity, Identity] [pallet_im_online, ImOnline] [pallet_indices, Indices] diff --git a/runtime/kusama/src/weights/mod.rs b/runtime/kusama/src/weights/mod.rs index 2f9e2d35c211..c277b2beb819 100644 --- a/runtime/kusama/src/weights/mod.rs +++ b/runtime/kusama/src/weights/mod.rs @@ -19,6 +19,7 @@ pub mod frame_election_provider_support; pub mod frame_system; pub mod pallet_bags_list; pub mod pallet_balances; +pub mod pallet_balances_nis_counterpart_balances; pub mod pallet_bounties; pub mod pallet_child_bounties; pub mod pallet_collective_council; @@ -28,12 +29,12 @@ pub mod pallet_democracy; pub mod pallet_election_provider_multi_phase; pub mod pallet_elections_phragmen; pub mod pallet_fast_unstake; -pub mod pallet_gilt; pub mod pallet_identity; pub mod pallet_im_online; pub mod pallet_indices; pub mod pallet_membership; pub mod pallet_multisig; +pub mod pallet_nis; pub mod pallet_nomination_pools; pub mod pallet_preimage; pub mod pallet_proxy; diff --git a/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs b/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs new file mode 100644 index 000000000000..fcaa58c5fbda --- /dev/null +++ b/runtime/kusama/src/weights/pallet_balances_nis_counterpart_balances.rs @@ -0,0 +1,105 @@ +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_balances` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-11-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=kusama-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet-balances +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/kusama/src/weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for `pallet_balances`. +pub struct WeightInfo(PhantomData); +impl pallet_balances::WeightInfo for WeightInfo { + // Storage: NisCounterpartBalances Account (r:2 w:2) + // Storage: System Account (r:1 w:1) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + fn transfer() -> Weight { + // Minimum execution time: 41_890 nanoseconds. + Weight::from_ref_time(42_832_000) + .saturating_add(T::DbWeight::get().reads(4)) + .saturating_add(T::DbWeight::get().writes(4)) + } + // Storage: NisCounterpartBalances Account (r:2 w:2) + // Storage: System Account (r:1 w:1) + fn transfer_keep_alive() -> Weight { + // Minimum execution time: 30_130 nanoseconds. + Weight::from_ref_time(31_076_000) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) + } + // Storage: NisCounterpartBalances Account (r:1 w:1) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + fn set_balance_creating() -> Weight { + // Minimum execution time: 20_254 nanoseconds. + Weight::from_ref_time(20_956_000) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: NisCounterpartBalances Account (r:1 w:1) + // Storage: System Account (r:1 w:1) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + fn set_balance_killing() -> Weight { + // Minimum execution time: 27_767 nanoseconds. + Weight::from_ref_time(28_472_000) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) + } + // Storage: NisCounterpartBalances Account (r:2 w:2) + // Storage: System Account (r:2 w:2) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + fn force_transfer() -> Weight { + // Minimum execution time: 41_369 nanoseconds. + Weight::from_ref_time(41_831_000) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(5)) + } + // Storage: NisCounterpartBalances Account (r:2 w:2) + // Storage: System Account (r:1 w:1) + fn transfer_all() -> Weight { + // Minimum execution time: 37_413 nanoseconds. + Weight::from_ref_time(38_587_000) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) + } + // Storage: NisCounterpartBalances Account (r:1 w:1) + fn force_unreserve() -> Weight { + // Minimum execution time: 19_049 nanoseconds. + Weight::from_ref_time(19_464_000) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } +} diff --git a/runtime/kusama/src/weights/pallet_gilt.rs b/runtime/kusama/src/weights/pallet_gilt.rs deleted file mode 100644 index 3ab2d6d41709..000000000000 --- a/runtime/kusama/src/weights/pallet_gilt.rs +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright 2017-2022 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. - -// Polkadot is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Polkadot is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . -//! Autogenerated weights for `pallet_gilt` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-09-08, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 - -// Executed Command: -// ./target/production/polkadot -// benchmark -// pallet -// --chain=kusama-dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_gilt -// --extrinsic=* -// --execution=wasm -// --wasm-execution=compiled -// --header=./file_header.txt -// --output=./runtime/kusama/src/weights/ - -#![cfg_attr(rustfmt, rustfmt_skip)] -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::{traits::Get, weights::{Weight}}; -use sp_std::marker::PhantomData; - -/// Weight functions for `pallet_gilt`. -pub struct WeightInfo(PhantomData); -impl pallet_gilt::WeightInfo for WeightInfo { - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - /// The range of component `l` is `[0, 999]`. - fn place_bid(l: u32, ) -> Weight { - Weight::from_ref_time(33_022_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(81_000 as u64).saturating_mul(l as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - fn place_bid_max() -> Weight { - Weight::from_ref_time(105_031_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - /// The range of component `l` is `[1, 1000]`. - fn retract_bid(l: u32, ) -> Weight { - Weight::from_ref_time(33_573_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(62_000 as u64).saturating_mul(l as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Gilt ActiveTotal (r:1 w:1) - fn set_target() -> Weight { - Weight::from_ref_time(6_386_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Gilt Active (r:1 w:1) - // Storage: Gilt ActiveTotal (r:1 w:1) - fn thaw() -> Weight { - Weight::from_ref_time(45_459_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Gilt ActiveTotal (r:1 w:0) - fn pursue_target_noop() -> Weight { - Weight::from_ref_time(2_669_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - } - // Storage: Gilt ActiveTotal (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt Active (r:0 w:1) - /// The range of component `b` is `[1, 1000]`. - fn pursue_target_per_item(b: u32, ) -> Weight { - Weight::from_ref_time(33_549_000 as u64) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(3_979_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(b as u64))) - } - // Storage: Gilt ActiveTotal (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt Active (r:0 w:1) - /// The range of component `q` is `[1, 300]`. - fn pursue_target_per_queue(q: u32, ) -> Weight { - Weight::from_ref_time(28_306_000 as u64) - // Standard Error: 6_000 - .saturating_add(Weight::from_ref_time(6_651_000 as u64).saturating_mul(q as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(q as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(q as u64))) - } -} diff --git a/runtime/kusama/src/weights/pallet_nis.rs b/runtime/kusama/src/weights/pallet_nis.rs new file mode 100644 index 000000000000..857b20a14e98 --- /dev/null +++ b/runtime/kusama/src/weights/pallet_nis.rs @@ -0,0 +1,122 @@ +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_nis` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-12-05, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("kusama-dev"), DB CACHE: 1024 + +// Executed Command: +// /home/benchbot/cargo_target_dir/production/polkadot +// benchmark +// pallet +// --steps=50 +// --repeat=20 +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json +// --pallet=pallet_nis +// --chain=kusama-dev +// --header=./file_header.txt +// --output=./runtime/kusama/src/weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for `pallet_nis`. +pub struct WeightInfo(PhantomData); +impl pallet_nis::WeightInfo for WeightInfo { + // Storage: Nis Queues (r:1 w:1) + // Storage: Nis QueueTotals (r:1 w:1) + /// The range of component `l` is `[0, 999]`. + fn place_bid(l: u32, ) -> Weight { + // Minimum execution time: 31_836 nanoseconds. + Weight::from_ref_time(33_284_190) + // Standard Error: 663 + .saturating_add(Weight::from_ref_time(70_316).saturating_mul(l.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: Nis Queues (r:1 w:1) + // Storage: Nis QueueTotals (r:1 w:1) + fn place_bid_max() -> Weight { + // Minimum execution time: 100_161 nanoseconds. + Weight::from_ref_time(102_736_000) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: Nis Queues (r:1 w:1) + // Storage: Nis QueueTotals (r:1 w:1) + /// The range of component `l` is `[1, 1000]`. + fn retract_bid(l: u32, ) -> Weight { + // Minimum execution time: 36_993 nanoseconds. + Weight::from_ref_time(34_181_184) + // Standard Error: 634 + .saturating_add(Weight::from_ref_time(56_251).saturating_mul(l.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: Nis Summary (r:1 w:0) + // Storage: System Account (r:1 w:1) + fn fund_deficit() -> Weight { + // Minimum execution time: 40_822 nanoseconds. + Weight::from_ref_time(41_752_000) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(1)) + } + // Storage: Nis Receipts (r:1 w:1) + // Storage: Nis Summary (r:1 w:1) + // Storage: NisCounterpartBalances Account (r:1 w:1) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn thaw() -> Weight { + // Minimum execution time: 61_305 nanoseconds. + Weight::from_ref_time(61_909_000) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(5)) + } + // Storage: Nis Summary (r:1 w:1) + // Storage: System Account (r:1 w:0) + // Storage: Nis QueueTotals (r:1 w:1) + fn process_queues() -> Weight { + // Minimum execution time: 32_369 nanoseconds. + Weight::from_ref_time(33_715_000) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: Nis Queues (r:1 w:1) + fn process_queue() -> Weight { + // Minimum execution time: 4_065 nanoseconds. + Weight::from_ref_time(4_212_000) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } + // Storage: System Account (r:1 w:0) + // Storage: Nis Receipts (r:0 w:1) + fn process_bid() -> Weight { + // Minimum execution time: 12_606 nanoseconds. + Weight::from_ref_time(12_994_000) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } +} diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 4e15d4feb9c4..be1430a62f9e 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -578,7 +578,6 @@ impl pallet_staking::EraPayout for EraPayout { runtime_common::impls::era_payout( total_staked, - // Polkadot has no notion of gilts, the entire issuance is non-guilt. total_issuance, MAX_ANNUAL_INFLATION, Perquintill::from_rational(era_duration_millis, MILLISECONDS_PER_YEAR), diff --git a/runtime/rococo/Cargo.toml b/runtime/rococo/Cargo.toml index 1f06cffd190c..ba433a81e5a8 100644 --- a/runtime/rococo/Cargo.toml +++ b/runtime/rococo/Cargo.toml @@ -49,13 +49,13 @@ pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = " pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-grandpa = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-gilt = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-im-online = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-indices = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-membership = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-mmr = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-nis = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-offences = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-preimage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-proxy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -130,7 +130,7 @@ std = [ "pallet-collective/std", "pallet-elections-phragmen/std", "pallet-democracy/std", - "pallet-gilt/std", + "pallet-nis/std", "pallet-grandpa/std", "pallet-identity/std", "pallet-im-online/std", @@ -188,7 +188,7 @@ runtime-benchmarks = [ "pallet-collective/runtime-benchmarks", "pallet-democracy/runtime-benchmarks", "pallet-elections-phragmen/runtime-benchmarks", - "pallet-gilt/runtime-benchmarks", + "pallet-nis/runtime-benchmarks", "pallet-grandpa/runtime-benchmarks", "pallet-identity/runtime-benchmarks", "pallet-im-online/runtime-benchmarks", diff --git a/runtime/rococo/src/lib.rs b/runtime/rococo/src/lib.rs index 8f3599686672..763184e8bda6 100644 --- a/runtime/rococo/src/lib.rs +++ b/runtime/rococo/src/lib.rs @@ -20,6 +20,7 @@ // `construct_runtime!` does a lot of recursion and requires us to increase the limit to 256. #![recursion_limit = "256"] +use pallet_nis::WithMaximumOf; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; use primitives::v2::{ AccountId, AccountIndex, Balance, BlockNumber, CandidateEvent, CandidateHash, @@ -55,7 +56,7 @@ use frame_support::{ construct_runtime, parameter_types, traits::{ Contains, EitherOfDiverse, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, - PrivilegeCmp, WithdrawReasons, + PrivilegeCmp, StorageMapShim, WithdrawReasons, }, weights::ConstantMultiplier, PalletId, RuntimeDebug, @@ -65,7 +66,7 @@ use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId}; use pallet_im_online::sr25519::AuthorityId as ImOnlineId; use pallet_session::historical as session_historical; use pallet_transaction_payment::{CurrencyAdapter, FeeDetails, RuntimeDispatchInfo}; -use sp_core::{OpaqueMetadata, H256}; +use sp_core::{ConstU128, OpaqueMetadata, H256}; use sp_mmr_primitives as mmr; use sp_runtime::{ create_runtime_str, generic, impl_opaque_keys, @@ -954,7 +955,7 @@ impl InstanceFilter for ProxyType { RuntimeCall::Scheduler(..) | RuntimeCall::Proxy(..) | RuntimeCall::Multisig(..) | - RuntimeCall::Gilt(..) | + RuntimeCall::Nis(..) | RuntimeCall::Registrar(paras_registrar::Call::register {..}) | RuntimeCall::Registrar(paras_registrar::Call::deregister {..}) | // Specifically omitting Registrar `swap` @@ -1186,33 +1187,57 @@ impl auctions::Config for Runtime { type WeightInfo = weights::runtime_common_auctions::WeightInfo; } +type NisCounterpartInstance = pallet_balances::Instance2; +impl pallet_balances::Config for Runtime { + type Balance = Balance; + type DustRemoval = (); + type RuntimeEvent = RuntimeEvent; + type ExistentialDeposit = ConstU128<10_000_000_000>; // One RTC cent + type AccountStore = StorageMapShim< + pallet_balances::Account, + frame_system::Provider, + AccountId, + pallet_balances::AccountData, + >; + type MaxLocks = ConstU32<4>; + type MaxReserves = ConstU32<4>; + type ReserveIdentifier = [u8; 8]; + type WeightInfo = weights::pallet_balances_nis_counterpart_balances::WeightInfo; +} + parameter_types! { pub IgnoredIssuance: Balance = Treasury::pot(); - pub const QueueCount: u32 = 300; - pub const MaxQueueLen: u32 = 1000; - pub const FifoQueueLen: u32 = 250; - pub const GiltPeriod: BlockNumber = 30 * DAYS; - pub const MinFreeze: Balance = 10_000 * CENTS; + pub const NisBasePeriod: BlockNumber = 30 * DAYS; + pub const MinBid: Balance = 100 * UNITS; + pub MinReceipt: Perquintill = Perquintill::from_rational(1u64, 10_000_000u64); pub const IntakePeriod: BlockNumber = 5 * MINUTES; - pub const MaxIntakeBids: u32 = 100; + pub MaxIntakeWeight: Weight = MAXIMUM_BLOCK_WEIGHT / 10; + pub const ThawThrottle: (Perquintill, BlockNumber) = (Perquintill::from_percent(25), 5); + pub storage NisTarget: Perquintill = Perquintill::zero(); + pub const NisPalletId: PalletId = PalletId(*b"py/nis "); } -impl pallet_gilt::Config for Runtime { +impl pallet_nis::Config for Runtime { + type WeightInfo = weights::pallet_nis::WeightInfo; type RuntimeEvent = RuntimeEvent; type Currency = Balances; type CurrencyBalance = Balance; - type AdminOrigin = MoreThanHalfCouncil; + type FundOrigin = frame_system::EnsureSigned; + type Counterpart = NisCounterpartBalances; + type CounterpartAmount = WithMaximumOf>; type Deficit = (); // Mint - type Surplus = (); // Burn type IgnoredIssuance = IgnoredIssuance; - type QueueCount = QueueCount; - type MaxQueueLen = MaxQueueLen; - type FifoQueueLen = FifoQueueLen; - type Period = GiltPeriod; - type MinFreeze = MinFreeze; + type Target = NisTarget; + type PalletId = NisPalletId; + type QueueCount = ConstU32<300>; + type MaxQueueLen = ConstU32<1000>; + type FifoQueueLen = ConstU32<250>; + type BasePeriod = NisBasePeriod; + type MinBid = MinBid; + type MinReceipt = MinReceipt; type IntakePeriod = IntakePeriod; - type MaxIntakeBids = MaxIntakeBids; - type WeightInfo = weights::pallet_gilt::WeightInfo; + type MaxIntakeWeight = MaxIntakeWeight; + type ThawThrottle = ThawThrottle; } impl pallet_beefy::Config for Runtime { @@ -1375,8 +1400,10 @@ construct_runtime! { // Tips module. Tips: pallet_tips::{Pallet, Call, Storage, Event} = 36, - // Gilts pallet. - Gilt: pallet_gilt::{Pallet, Call, Storage, Event, Config} = 38, + // NIS pallet. + Nis: pallet_nis::{Pallet, Call, Storage, Event} = 38, +// pub type NisCounterpartInstance = pallet_balances::Instance2; + NisCounterpartBalances: pallet_balances:: = 45, // Parachains pallets. Start indices at 50 to leave room. ParachainsOrigin: parachains_origin::{Pallet, Origin} = 50, @@ -1510,6 +1537,7 @@ mod benches { [runtime_parachains::ump, Ump] // Substrate [pallet_balances, Balances] + [pallet_balances, NisCounterpartBalances] [frame_benchmarking::baseline, Baseline::] [pallet_bounties, Bounties] [pallet_child_bounties, ChildBounties] @@ -1517,7 +1545,7 @@ mod benches { [pallet_collective, TechnicalCommittee] [pallet_democracy, Democracy] [pallet_elections_phragmen, PhragmenElection] - [pallet_gilt, Gilt] + [pallet_nis, Nis] [pallet_identity, Identity] [pallet_im_online, ImOnline] [pallet_indices, Indices] diff --git a/runtime/rococo/src/weights/mod.rs b/runtime/rococo/src/weights/mod.rs index 712783bc3e6c..f1657f95aa19 100644 --- a/runtime/rococo/src/weights/mod.rs +++ b/runtime/rococo/src/weights/mod.rs @@ -17,18 +17,19 @@ pub mod frame_system; pub mod pallet_balances; +pub mod pallet_balances_nis_counterpart_balances; pub mod pallet_bounties; pub mod pallet_child_bounties; pub mod pallet_collective_council; pub mod pallet_collective_technical_committee; pub mod pallet_democracy; pub mod pallet_elections_phragmen; -pub mod pallet_gilt; pub mod pallet_identity; pub mod pallet_im_online; pub mod pallet_indices; pub mod pallet_membership; pub mod pallet_multisig; +pub mod pallet_nis; pub mod pallet_preimage; pub mod pallet_proxy; pub mod pallet_scheduler; diff --git a/runtime/rococo/src/weights/pallet_balances_nis_counterpart_balances.rs b/runtime/rococo/src/weights/pallet_balances_nis_counterpart_balances.rs new file mode 100644 index 000000000000..70be4fc4b642 --- /dev/null +++ b/runtime/rococo/src/weights/pallet_balances_nis_counterpart_balances.rs @@ -0,0 +1,105 @@ +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_balances` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-11-28, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm2`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024 + +// Executed Command: +// ./target/production/polkadot +// benchmark +// pallet +// --chain=rococo-dev +// --steps=50 +// --repeat=20 +// --pallet=pallet-balances +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --header=./file_header.txt +// --output=./runtime/rococo/src/weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for `pallet_balances`. +pub struct WeightInfo(PhantomData); +impl pallet_balances::WeightInfo for WeightInfo { + // Storage: NisCounterpartBalances Account (r:2 w:2) + // Storage: System Account (r:1 w:1) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + fn transfer() -> Weight { + // Minimum execution time: 41_176 nanoseconds. + Weight::from_ref_time(42_293_000) + .saturating_add(T::DbWeight::get().reads(4)) + .saturating_add(T::DbWeight::get().writes(4)) + } + // Storage: NisCounterpartBalances Account (r:2 w:2) + // Storage: System Account (r:1 w:1) + fn transfer_keep_alive() -> Weight { + // Minimum execution time: 29_743 nanoseconds. + Weight::from_ref_time(30_329_000) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) + } + // Storage: NisCounterpartBalances Account (r:1 w:1) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + fn set_balance_creating() -> Weight { + // Minimum execution time: 19_825 nanoseconds. + Weight::from_ref_time(20_774_000) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: NisCounterpartBalances Account (r:1 w:1) + // Storage: System Account (r:1 w:1) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + fn set_balance_killing() -> Weight { + // Minimum execution time: 27_783 nanoseconds. + Weight::from_ref_time(28_462_000) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) + } + // Storage: NisCounterpartBalances Account (r:2 w:2) + // Storage: System Account (r:2 w:2) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + fn force_transfer() -> Weight { + // Minimum execution time: 40_433 nanoseconds. + Weight::from_ref_time(41_444_000) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(5)) + } + // Storage: NisCounterpartBalances Account (r:2 w:2) + // Storage: System Account (r:1 w:1) + fn transfer_all() -> Weight { + // Minimum execution time: 37_439 nanoseconds. + Weight::from_ref_time(38_570_000) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(3)) + } + // Storage: NisCounterpartBalances Account (r:1 w:1) + fn force_unreserve() -> Weight { + // Minimum execution time: 18_366 nanoseconds. + Weight::from_ref_time(19_170_000) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } +} diff --git a/runtime/rococo/src/weights/pallet_gilt.rs b/runtime/rococo/src/weights/pallet_gilt.rs deleted file mode 100644 index b873684e2311..000000000000 --- a/runtime/rococo/src/weights/pallet_gilt.rs +++ /dev/null @@ -1,119 +0,0 @@ -// Copyright 2017-2022 Parity Technologies (UK) Ltd. -// This file is part of Polkadot. - -// Polkadot is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. - -// Polkadot is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License -// along with Polkadot. If not, see . -//! Autogenerated weights for `pallet_gilt` -//! -//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev -//! DATE: 2022-08-19, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` -//! HOSTNAME: `bm4`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` -//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024 - -// Executed Command: -// ./target/production/polkadot -// benchmark -// pallet -// --chain=rococo-dev -// --steps=50 -// --repeat=20 -// --pallet=pallet_gilt -// --extrinsic=* -// --execution=wasm -// --wasm-execution=compiled -// --header=./file_header.txt -// --output=./runtime/rococo/src/weights/pallet_gilt.rs - -#![cfg_attr(rustfmt, rustfmt_skip)] -#![allow(unused_parens)] -#![allow(unused_imports)] - -use frame_support::{traits::Get, weights::Weight}; -use sp_std::marker::PhantomData; - -/// Weight functions for `pallet_gilt`. -pub struct WeightInfo(PhantomData); -impl pallet_gilt::WeightInfo for WeightInfo { - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - /// The range of component `l` is `[0, 999]`. - fn place_bid(l: u32, ) -> Weight { - Weight::from_ref_time(36_767_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(115_000 as u64).saturating_mul(l as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - fn place_bid_max() -> Weight { - Weight::from_ref_time(119_333_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - /// The range of component `l` is `[1, 1000]`. - fn retract_bid(l: u32, ) -> Weight { - Weight::from_ref_time(37_108_000 as u64) - // Standard Error: 0 - .saturating_add(Weight::from_ref_time(94_000 as u64).saturating_mul(l as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Gilt ActiveTotal (r:1 w:1) - fn set_target() -> Weight { - Weight::from_ref_time(5_188_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - .saturating_add(T::DbWeight::get().writes(1 as u64)) - } - // Storage: Gilt Active (r:1 w:1) - // Storage: Gilt ActiveTotal (r:1 w:1) - fn thaw() -> Weight { - Weight::from_ref_time(43_654_000 as u64) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - } - // Storage: Gilt ActiveTotal (r:1 w:0) - fn pursue_target_noop() -> Weight { - Weight::from_ref_time(1_584_000 as u64) - .saturating_add(T::DbWeight::get().reads(1 as u64)) - } - // Storage: Gilt ActiveTotal (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt Active (r:0 w:1) - /// The range of component `b` is `[1, 1000]`. - fn pursue_target_per_item(b: u32, ) -> Weight { - Weight::from_ref_time(21_464_000 as u64) - // Standard Error: 2_000 - .saturating_add(Weight::from_ref_time(4_387_000 as u64).saturating_mul(b as u64)) - .saturating_add(T::DbWeight::get().reads(3 as u64)) - .saturating_add(T::DbWeight::get().writes(3 as u64)) - .saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(b as u64))) - } - // Storage: Gilt ActiveTotal (r:1 w:1) - // Storage: Gilt QueueTotals (r:1 w:1) - // Storage: Gilt Queues (r:1 w:1) - // Storage: Gilt Active (r:0 w:1) - /// The range of component `q` is `[1, 300]`. - fn pursue_target_per_queue(q: u32, ) -> Weight { - Weight::from_ref_time(12_881_000 as u64) - // Standard Error: 8_000 - .saturating_add(Weight::from_ref_time(8_285_000 as u64).saturating_mul(q as u64)) - .saturating_add(T::DbWeight::get().reads(2 as u64)) - .saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(q as u64))) - .saturating_add(T::DbWeight::get().writes(2 as u64)) - .saturating_add(T::DbWeight::get().writes((2 as u64).saturating_mul(q as u64))) - } -} diff --git a/runtime/rococo/src/weights/pallet_nis.rs b/runtime/rococo/src/weights/pallet_nis.rs new file mode 100644 index 000000000000..f7126cc77d95 --- /dev/null +++ b/runtime/rococo/src/weights/pallet_nis.rs @@ -0,0 +1,122 @@ +// Copyright 2017-2022 Parity Technologies (UK) Ltd. +// This file is part of Polkadot. + +// Polkadot is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Polkadot is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Polkadot. If not, see . +//! Autogenerated weights for `pallet_nis` +//! +//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev +//! DATE: 2022-12-05, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]` +//! HOSTNAME: `bm3`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz` +//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("rococo-dev"), DB CACHE: 1024 + +// Executed Command: +// /home/benchbot/cargo_target_dir/production/polkadot +// benchmark +// pallet +// --steps=50 +// --repeat=20 +// --extrinsic=* +// --execution=wasm +// --wasm-execution=compiled +// --heap-pages=4096 +// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/polkadot/.git/.artifacts/bench.json +// --pallet=pallet_nis +// --chain=rococo-dev +// --header=./file_header.txt +// --output=./runtime/rococo/src/weights/ + +#![cfg_attr(rustfmt, rustfmt_skip)] +#![allow(unused_parens)] +#![allow(unused_imports)] + +use frame_support::{traits::Get, weights::Weight}; +use sp_std::marker::PhantomData; + +/// Weight functions for `pallet_nis`. +pub struct WeightInfo(PhantomData); +impl pallet_nis::WeightInfo for WeightInfo { + // Storage: Nis Queues (r:1 w:1) + // Storage: Nis QueueTotals (r:1 w:1) + /// The range of component `l` is `[0, 999]`. + fn place_bid(l: u32, ) -> Weight { + // Minimum execution time: 32_457 nanoseconds. + Weight::from_ref_time(33_597_943) + // Standard Error: 673 + .saturating_add(Weight::from_ref_time(70_280).saturating_mul(l.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: Nis Queues (r:1 w:1) + // Storage: Nis QueueTotals (r:1 w:1) + fn place_bid_max() -> Weight { + // Minimum execution time: 100_314 nanoseconds. + Weight::from_ref_time(102_734_000) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: Nis Queues (r:1 w:1) + // Storage: Nis QueueTotals (r:1 w:1) + /// The range of component `l` is `[1, 1000]`. + fn retract_bid(l: u32, ) -> Weight { + // Minimum execution time: 37_304 nanoseconds. + Weight::from_ref_time(34_619_946) + // Standard Error: 610 + .saturating_add(Weight::from_ref_time(56_607).saturating_mul(l.into())) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: Nis Summary (r:1 w:0) + // Storage: System Account (r:1 w:1) + fn fund_deficit() -> Weight { + // Minimum execution time: 40_499 nanoseconds. + Weight::from_ref_time(41_972_000) + .saturating_add(T::DbWeight::get().reads(2)) + .saturating_add(T::DbWeight::get().writes(1)) + } + // Storage: Nis Receipts (r:1 w:1) + // Storage: Nis Summary (r:1 w:1) + // Storage: NisCounterpartBalances Account (r:1 w:1) + // Storage: NisCounterpartBalances TotalIssuance (r:1 w:1) + // Storage: System Account (r:1 w:1) + fn thaw() -> Weight { + // Minimum execution time: 59_864 nanoseconds. + Weight::from_ref_time(60_602_000) + .saturating_add(T::DbWeight::get().reads(5)) + .saturating_add(T::DbWeight::get().writes(5)) + } + // Storage: Nis Summary (r:1 w:1) + // Storage: System Account (r:1 w:0) + // Storage: Nis QueueTotals (r:1 w:1) + fn process_queues() -> Weight { + // Minimum execution time: 32_098 nanoseconds. + Weight::from_ref_time(33_421_000) + .saturating_add(T::DbWeight::get().reads(3)) + .saturating_add(T::DbWeight::get().writes(2)) + } + // Storage: Nis Queues (r:1 w:1) + fn process_queue() -> Weight { + // Minimum execution time: 4_011 nanoseconds. + Weight::from_ref_time(4_159_000) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } + // Storage: System Account (r:1 w:0) + // Storage: Nis Receipts (r:0 w:1) + fn process_bid() -> Weight { + // Minimum execution time: 12_778 nanoseconds. + Weight::from_ref_time(13_083_000) + .saturating_add(T::DbWeight::get().reads(1)) + .saturating_add(T::DbWeight::get().writes(1)) + } +}