From e9f8178eb8d6d87a73214b21a0058ecaf0bb958d Mon Sep 17 00:00:00 2001 From: kianenigma Date: Thu, 11 Aug 2022 13:18:07 +0430 Subject: [PATCH 1/7] Update polkadot inflation to take into account auctions --- Cargo.lock | 344 ++++++++++++++++++------------------ runtime/common/Cargo.toml | 2 + runtime/common/src/impls.rs | 41 +++++ runtime/kusama/Cargo.toml | 2 - runtime/kusama/src/lib.rs | 41 +---- runtime/polkadot/src/lib.rs | 28 ++- 6 files changed, 242 insertions(+), 216 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c2aa2e8d52b3..692f0bbbee46 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -423,7 +423,7 @@ dependencies = [ [[package]] name = "beefy-gadget" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "beefy-primitives", @@ -459,7 +459,7 @@ dependencies = [ [[package]] name = "beefy-gadget-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "beefy-gadget", "beefy-primitives", @@ -479,7 +479,7 @@ dependencies = [ [[package]] name = "beefy-merkle-tree" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "beefy-primitives", "sp-api", @@ -488,7 +488,7 @@ dependencies = [ [[package]] name = "beefy-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "scale-info", @@ -1960,7 +1960,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "fork-tree" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", ] @@ -1978,7 +1978,7 @@ dependencies = [ [[package]] name = "frame-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -2000,7 +2000,7 @@ dependencies = [ [[package]] name = "frame-benchmarking-cli" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "Inflector", "chrono", @@ -2051,7 +2051,7 @@ dependencies = [ [[package]] name = "frame-election-provider-solution-type" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -2062,7 +2062,7 @@ dependencies = [ [[package]] name = "frame-election-provider-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-election-provider-solution-type", "frame-support", @@ -2078,7 +2078,7 @@ dependencies = [ [[package]] name = "frame-executive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -2106,7 +2106,7 @@ dependencies = [ [[package]] name = "frame-support" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "bitflags", "frame-metadata", @@ -2136,7 +2136,7 @@ dependencies = [ [[package]] name = "frame-support-procedural" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "Inflector", "frame-support-procedural-tools", @@ -2148,7 +2148,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support-procedural-tools-derive", "proc-macro-crate", @@ -2160,7 +2160,7 @@ dependencies = [ [[package]] name = "frame-support-procedural-tools-derive" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "proc-macro2", "quote", @@ -2170,7 +2170,7 @@ dependencies = [ [[package]] name = "frame-support-test" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-support-test-pallet", @@ -2193,7 +2193,7 @@ dependencies = [ [[package]] name = "frame-support-test-pallet" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -2204,7 +2204,7 @@ dependencies = [ [[package]] name = "frame-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "log", @@ -2221,7 +2221,7 @@ dependencies = [ [[package]] name = "frame-system-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -2236,7 +2236,7 @@ dependencies = [ [[package]] name = "frame-system-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "sp-api", @@ -2245,7 +2245,7 @@ dependencies = [ [[package]] name = "frame-try-runtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "sp-api", @@ -2427,7 +2427,7 @@ dependencies = [ [[package]] name = "generate-bags" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "chrono", "frame-election-provider-support", @@ -3217,7 +3217,6 @@ dependencies = [ "pallet-session-benchmarking", "pallet-society", "pallet-staking", - "pallet-staking-reward-fn", "pallet-timestamp", "pallet-tips", "pallet-transaction-payment", @@ -4800,7 +4799,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4" [[package]] name = "pallet-assets" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4814,7 +4813,7 @@ dependencies = [ [[package]] name = "pallet-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -4830,7 +4829,7 @@ dependencies = [ [[package]] name = "pallet-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -4845,7 +4844,7 @@ dependencies = [ [[package]] name = "pallet-babe" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4869,7 +4868,7 @@ dependencies = [ [[package]] name = "pallet-bags-list" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -4889,7 +4888,7 @@ dependencies = [ [[package]] name = "pallet-bags-list-remote-tests" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-election-provider-support", "frame-support", @@ -4908,7 +4907,7 @@ dependencies = [ [[package]] name = "pallet-balances" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4923,7 +4922,7 @@ dependencies = [ [[package]] name = "pallet-beefy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "beefy-primitives", "frame-support", @@ -4939,7 +4938,7 @@ dependencies = [ [[package]] name = "pallet-beefy-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "beefy-merkle-tree", "beefy-primitives", @@ -4962,7 +4961,7 @@ dependencies = [ [[package]] name = "pallet-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4980,7 +4979,7 @@ dependencies = [ [[package]] name = "pallet-child-bounties" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -4999,7 +4998,7 @@ dependencies = [ [[package]] name = "pallet-collective" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5016,7 +5015,7 @@ dependencies = [ [[package]] name = "pallet-democracy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5032,7 +5031,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-multi-phase" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5055,7 +5054,7 @@ dependencies = [ [[package]] name = "pallet-election-provider-support-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5068,7 +5067,7 @@ dependencies = [ [[package]] name = "pallet-elections-phragmen" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5086,7 +5085,7 @@ dependencies = [ [[package]] name = "pallet-gilt" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5101,7 +5100,7 @@ dependencies = [ [[package]] name = "pallet-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5124,7 +5123,7 @@ dependencies = [ [[package]] name = "pallet-identity" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "enumflags2", "frame-benchmarking", @@ -5140,7 +5139,7 @@ dependencies = [ [[package]] name = "pallet-im-online" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5160,7 +5159,7 @@ dependencies = [ [[package]] name = "pallet-indices" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5177,7 +5176,7 @@ dependencies = [ [[package]] name = "pallet-membership" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5194,7 +5193,7 @@ dependencies = [ [[package]] name = "pallet-mmr" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "ckb-merkle-mountain-range", "frame-benchmarking", @@ -5212,7 +5211,7 @@ dependencies = [ [[package]] name = "pallet-mmr-rpc" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -5227,7 +5226,7 @@ dependencies = [ [[package]] name = "pallet-multisig" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5242,7 +5241,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -5259,7 +5258,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-benchmarking" version = "1.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5278,7 +5277,7 @@ dependencies = [ [[package]] name = "pallet-nomination-pools-runtime-api" version = "1.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "sp-api", @@ -5288,7 +5287,7 @@ dependencies = [ [[package]] name = "pallet-offences" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -5305,7 +5304,7 @@ dependencies = [ [[package]] name = "pallet-offences-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5328,7 +5327,7 @@ dependencies = [ [[package]] name = "pallet-preimage" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5344,7 +5343,7 @@ dependencies = [ [[package]] name = "pallet-proxy" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5359,7 +5358,7 @@ dependencies = [ [[package]] name = "pallet-recovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5374,7 +5373,7 @@ dependencies = [ [[package]] name = "pallet-scheduler" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5390,7 +5389,7 @@ dependencies = [ [[package]] name = "pallet-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -5411,7 +5410,7 @@ dependencies = [ [[package]] name = "pallet-session-benchmarking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5427,7 +5426,7 @@ dependencies = [ [[package]] name = "pallet-society" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -5441,7 +5440,7 @@ dependencies = [ [[package]] name = "pallet-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-election-provider-support", @@ -5464,7 +5463,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-curve" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -5475,7 +5474,7 @@ dependencies = [ [[package]] name = "pallet-staking-reward-fn" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "log", "sp-arithmetic", @@ -5484,7 +5483,7 @@ dependencies = [ [[package]] name = "pallet-sudo" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -5498,7 +5497,7 @@ dependencies = [ [[package]] name = "pallet-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5516,7 +5515,7 @@ dependencies = [ [[package]] name = "pallet-tips" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5535,7 +5534,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-support", "frame-system", @@ -5551,7 +5550,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "jsonrpsee", "pallet-transaction-payment-rpc-runtime-api", @@ -5566,7 +5565,7 @@ dependencies = [ [[package]] name = "pallet-transaction-payment-rpc-runtime-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "pallet-transaction-payment", "parity-scale-codec", @@ -5577,7 +5576,7 @@ dependencies = [ [[package]] name = "pallet-treasury" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5594,7 +5593,7 @@ dependencies = [ [[package]] name = "pallet-utility" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -5610,7 +5609,7 @@ dependencies = [ [[package]] name = "pallet-vesting" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-benchmarking", "frame-support", @@ -7038,6 +7037,7 @@ dependencies = [ "pallet-election-provider-multi-phase", "pallet-session", "pallet-staking", + "pallet-staking-reward-fn", "pallet-timestamp", "pallet-transaction-payment", "pallet-treasury", @@ -8082,7 +8082,7 @@ dependencies = [ [[package]] name = "remote-externalities" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "env_logger 0.9.0", "jsonrpsee", @@ -8424,7 +8424,7 @@ dependencies = [ [[package]] name = "sc-allocator" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "log", "sp-core", @@ -8435,7 +8435,7 @@ dependencies = [ [[package]] name = "sc-authority-discovery" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "futures-timer", @@ -8462,7 +8462,7 @@ dependencies = [ [[package]] name = "sc-basic-authorship" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "futures-timer", @@ -8485,7 +8485,7 @@ dependencies = [ [[package]] name = "sc-block-builder" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "sc-client-api", @@ -8501,7 +8501,7 @@ dependencies = [ [[package]] name = "sc-chain-spec" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "impl-trait-for-tuples", "memmap2 0.5.0", @@ -8518,7 +8518,7 @@ dependencies = [ [[package]] name = "sc-chain-spec-derive" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -8529,7 +8529,7 @@ dependencies = [ [[package]] name = "sc-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "chrono", "clap", @@ -8568,7 +8568,7 @@ dependencies = [ [[package]] name = "sc-client-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "fnv", "futures", @@ -8596,7 +8596,7 @@ dependencies = [ [[package]] name = "sc-client-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "hash-db", "kvdb", @@ -8621,7 +8621,7 @@ dependencies = [ [[package]] name = "sc-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "futures", @@ -8645,7 +8645,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "fork-tree", @@ -8687,7 +8687,7 @@ dependencies = [ [[package]] name = "sc-consensus-babe-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "jsonrpsee", @@ -8709,7 +8709,7 @@ dependencies = [ [[package]] name = "sc-consensus-epochs" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "fork-tree", "parity-scale-codec", @@ -8722,7 +8722,7 @@ dependencies = [ [[package]] name = "sc-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "futures", @@ -8747,7 +8747,7 @@ dependencies = [ [[package]] name = "sc-executor" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "lazy_static", "lru 0.7.7", @@ -8774,7 +8774,7 @@ dependencies = [ [[package]] name = "sc-executor-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "environmental", "parity-scale-codec", @@ -8791,7 +8791,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmi" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "log", "parity-scale-codec", @@ -8806,7 +8806,7 @@ dependencies = [ [[package]] name = "sc-executor-wasmtime" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "cfg-if 1.0.0", "libc", @@ -8826,7 +8826,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "ahash", "async-trait", @@ -8867,7 +8867,7 @@ dependencies = [ [[package]] name = "sc-finality-grandpa-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "finality-grandpa", "futures", @@ -8888,7 +8888,7 @@ dependencies = [ [[package]] name = "sc-informant" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "ansi_term", "futures", @@ -8905,7 +8905,7 @@ dependencies = [ [[package]] name = "sc-keystore" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "hex", @@ -8920,7 +8920,7 @@ dependencies = [ [[package]] name = "sc-network" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "asynchronous-codec", @@ -8969,7 +8969,7 @@ dependencies = [ [[package]] name = "sc-network-common" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "bitflags", @@ -8990,7 +8990,7 @@ dependencies = [ [[package]] name = "sc-network-gossip" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "ahash", "futures", @@ -9008,7 +9008,7 @@ dependencies = [ [[package]] name = "sc-network-light" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "hex", @@ -9029,7 +9029,7 @@ dependencies = [ [[package]] name = "sc-network-sync" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "fork-tree", "futures", @@ -9057,7 +9057,7 @@ dependencies = [ [[package]] name = "sc-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "bytes", "fnv", @@ -9086,7 +9086,7 @@ dependencies = [ [[package]] name = "sc-peerset" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "libp2p", @@ -9099,7 +9099,7 @@ dependencies = [ [[package]] name = "sc-proposer-metrics" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "log", "substrate-prometheus-endpoint", @@ -9108,7 +9108,7 @@ dependencies = [ [[package]] name = "sc-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "hash-db", @@ -9138,7 +9138,7 @@ dependencies = [ [[package]] name = "sc-rpc-api" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "jsonrpsee", @@ -9161,7 +9161,7 @@ dependencies = [ [[package]] name = "sc-rpc-server" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "jsonrpsee", @@ -9174,7 +9174,7 @@ dependencies = [ [[package]] name = "sc-service" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "directories", @@ -9241,7 +9241,7 @@ dependencies = [ [[package]] name = "sc-state-db" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "log", "parity-scale-codec", @@ -9255,7 +9255,7 @@ dependencies = [ [[package]] name = "sc-sync-state-rpc" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "jsonrpsee", "parity-scale-codec", @@ -9274,7 +9274,7 @@ dependencies = [ [[package]] name = "sc-sysinfo" version = "6.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "libc", @@ -9293,7 +9293,7 @@ dependencies = [ [[package]] name = "sc-telemetry" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "chrono", "futures", @@ -9311,7 +9311,7 @@ dependencies = [ [[package]] name = "sc-tracing" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "ansi_term", "atty", @@ -9342,7 +9342,7 @@ dependencies = [ [[package]] name = "sc-tracing-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -9353,7 +9353,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "futures-timer", @@ -9379,7 +9379,7 @@ dependencies = [ [[package]] name = "sc-transaction-pool-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "log", @@ -9392,7 +9392,7 @@ dependencies = [ [[package]] name = "sc-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "futures-timer", @@ -9877,7 +9877,7 @@ dependencies = [ [[package]] name = "sp-api" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "hash-db", "log", @@ -9894,7 +9894,7 @@ dependencies = [ [[package]] name = "sp-api-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "blake2", "proc-macro-crate", @@ -9906,7 +9906,7 @@ dependencies = [ [[package]] name = "sp-application-crypto" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "scale-info", @@ -9919,7 +9919,7 @@ dependencies = [ [[package]] name = "sp-arithmetic" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "integer-sqrt", "num-traits", @@ -9934,7 +9934,7 @@ dependencies = [ [[package]] name = "sp-authority-discovery" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "scale-info", @@ -9947,7 +9947,7 @@ dependencies = [ [[package]] name = "sp-authorship" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "parity-scale-codec", @@ -9959,7 +9959,7 @@ dependencies = [ [[package]] name = "sp-block-builder" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "sp-api", @@ -9971,7 +9971,7 @@ dependencies = [ [[package]] name = "sp-blockchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "log", @@ -9989,7 +9989,7 @@ dependencies = [ [[package]] name = "sp-consensus" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "futures", @@ -10008,7 +10008,7 @@ dependencies = [ [[package]] name = "sp-consensus-babe" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "merlin", @@ -10031,7 +10031,7 @@ dependencies = [ [[package]] name = "sp-consensus-slots" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10045,7 +10045,7 @@ dependencies = [ [[package]] name = "sp-consensus-vrf" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10058,7 +10058,7 @@ dependencies = [ [[package]] name = "sp-core" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "base58", "bitflags", @@ -10104,7 +10104,7 @@ dependencies = [ [[package]] name = "sp-core-hashing" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "blake2", "byteorder", @@ -10118,7 +10118,7 @@ dependencies = [ [[package]] name = "sp-core-hashing-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "proc-macro2", "quote", @@ -10129,7 +10129,7 @@ dependencies = [ [[package]] name = "sp-database" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "kvdb", "parking_lot 0.12.0", @@ -10138,7 +10138,7 @@ dependencies = [ [[package]] name = "sp-debug-derive" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "proc-macro2", "quote", @@ -10148,7 +10148,7 @@ dependencies = [ [[package]] name = "sp-externalities" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "environmental", "parity-scale-codec", @@ -10159,7 +10159,7 @@ dependencies = [ [[package]] name = "sp-finality-grandpa" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "finality-grandpa", "log", @@ -10177,7 +10177,7 @@ dependencies = [ [[package]] name = "sp-inherents" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "impl-trait-for-tuples", @@ -10191,7 +10191,7 @@ dependencies = [ [[package]] name = "sp-io" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "bytes", "futures", @@ -10217,7 +10217,7 @@ dependencies = [ [[package]] name = "sp-keyring" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "lazy_static", "sp-core", @@ -10228,7 +10228,7 @@ dependencies = [ [[package]] name = "sp-keystore" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "futures", @@ -10245,7 +10245,7 @@ dependencies = [ [[package]] name = "sp-maybe-compressed-blob" version = "4.1.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "thiserror", "zstd", @@ -10254,7 +10254,7 @@ dependencies = [ [[package]] name = "sp-mmr-primitives" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "log", "parity-scale-codec", @@ -10269,7 +10269,7 @@ dependencies = [ [[package]] name = "sp-npos-elections" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10283,7 +10283,7 @@ dependencies = [ [[package]] name = "sp-offchain" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "sp-api", "sp-core", @@ -10293,7 +10293,7 @@ dependencies = [ [[package]] name = "sp-panic-handler" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "backtrace", "lazy_static", @@ -10303,7 +10303,7 @@ dependencies = [ [[package]] name = "sp-rpc" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "rustc-hash", "serde", @@ -10313,7 +10313,7 @@ dependencies = [ [[package]] name = "sp-runtime" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "either", "hash256-std-hasher", @@ -10335,7 +10335,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "bytes", "impl-trait-for-tuples", @@ -10353,7 +10353,7 @@ dependencies = [ [[package]] name = "sp-runtime-interface-proc-macro" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "Inflector", "proc-macro-crate", @@ -10365,7 +10365,7 @@ dependencies = [ [[package]] name = "sp-sandbox" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "log", "parity-scale-codec", @@ -10379,7 +10379,7 @@ dependencies = [ [[package]] name = "sp-serializer" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "serde", "serde_json", @@ -10388,7 +10388,7 @@ dependencies = [ [[package]] name = "sp-session" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10402,7 +10402,7 @@ dependencies = [ [[package]] name = "sp-staking" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "scale-info", @@ -10413,7 +10413,7 @@ dependencies = [ [[package]] name = "sp-state-machine" version = "0.12.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "hash-db", "log", @@ -10435,12 +10435,12 @@ dependencies = [ [[package]] name = "sp-std" version = "4.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" [[package]] name = "sp-storage" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10453,7 +10453,7 @@ dependencies = [ [[package]] name = "sp-tasks" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "log", "sp-core", @@ -10466,7 +10466,7 @@ dependencies = [ [[package]] name = "sp-timestamp" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "futures-timer", @@ -10482,7 +10482,7 @@ dependencies = [ [[package]] name = "sp-tracing" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "sp-std", @@ -10494,7 +10494,7 @@ dependencies = [ [[package]] name = "sp-transaction-pool" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "sp-api", "sp-runtime", @@ -10503,7 +10503,7 @@ dependencies = [ [[package]] name = "sp-transaction-storage-proof" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "log", @@ -10519,7 +10519,7 @@ dependencies = [ [[package]] name = "sp-trie" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "hash-db", "memory-db", @@ -10535,7 +10535,7 @@ dependencies = [ [[package]] name = "sp-version" version = "5.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "impl-serde", "parity-scale-codec", @@ -10552,7 +10552,7 @@ dependencies = [ [[package]] name = "sp-version-proc-macro" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "parity-scale-codec", "proc-macro2", @@ -10563,7 +10563,7 @@ dependencies = [ [[package]] name = "sp-wasm-interface" version = "6.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "impl-trait-for-tuples", "log", @@ -10737,7 +10737,7 @@ dependencies = [ [[package]] name = "substrate-build-script-utils" version = "3.0.0" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "platforms", ] @@ -10745,7 +10745,7 @@ dependencies = [ [[package]] name = "substrate-frame-rpc-system" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "frame-system-rpc-runtime-api", "futures", @@ -10766,7 +10766,7 @@ dependencies = [ [[package]] name = "substrate-prometheus-endpoint" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures-util", "hyper", @@ -10779,7 +10779,7 @@ dependencies = [ [[package]] name = "substrate-state-trie-migration-rpc" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "jsonrpsee", "log", @@ -10800,7 +10800,7 @@ dependencies = [ [[package]] name = "substrate-test-client" version = "2.0.1" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "async-trait", "futures", @@ -10826,7 +10826,7 @@ dependencies = [ [[package]] name = "substrate-test-utils" version = "4.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "futures", "substrate-test-utils-derive", @@ -10836,7 +10836,7 @@ dependencies = [ [[package]] name = "substrate-test-utils-derive" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -10847,7 +10847,7 @@ dependencies = [ [[package]] name = "substrate-wasm-builder" version = "5.0.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "ansi_term", "build-helper", @@ -11561,7 +11561,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "try-runtime-cli" version = "0.10.0-dev" -source = "git+https://github.com/paritytech/substrate?branch=master#fece0657f20e15df94be5833b164dfacd44823eb" +source = "git+https://github.com/paritytech/substrate?branch=master#a1a9b475c354d873f91135ed5fa028ac9ef6a2c4" dependencies = [ "clap", "jsonrpsee", diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml index f9bd21faf573..26d4f42195a1 100644 --- a/runtime/common/Cargo.toml +++ b/runtime/common/Cargo.toml @@ -31,6 +31,7 @@ pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "m pallet-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } +pallet-staking-reward-fn = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-vesting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -85,6 +86,7 @@ std = [ "pallet-beefy-mmr/std", "pallet-session/std", "pallet-staking/std", + "pallet-staking-reward-fn/std", "pallet-timestamp/std", "pallet-vesting/std", "pallet-transaction-payment/std", diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index bce847c82a83..0e55a4939eeb 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -18,6 +18,8 @@ use crate::NegativeImbalance; use frame_support::traits::{Currency, Imbalance, OnUnbalanced}; +use primitives::v2::Balance; +use sp_runtime::Perquintill; /// Logic for the author to get a portion of fees. pub struct ToAuthor(sp_std::marker::PhantomData); @@ -57,6 +59,45 @@ where } } +pub fn era_payout( + total_staked: Balance, + non_gilt_issuance: Balance, + max_annual_inflation: Perquintill, + period_fraction: Perquintill, + auctioned_slots: u64, +) -> (Balance, Balance) { + use pallet_staking_reward_fn::compute_inflation; + use sp_runtime::traits::Saturating; + + let min_annual_inflation = Perquintill::from_rational(25u64, 1000u64); + let delta_annual_inflation = max_annual_inflation.saturating_sub(min_annual_inflation); + + // 30% reserved for up to 60 slots. + let auction_proportion = Perquintill::from_rational(auctioned_slots.min(60), 200u64); + + // Therefore the ideal amount at stake (as a percentage of total issuance) is 75% less the + // 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 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 rest = max_payout.saturating_sub(staking_payout); + + let other_issuance = non_gilt_issuance.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 + // treasury amount with: `rest = rest.min(cap_rest);` + } + (staking_payout, rest) +} + #[cfg(test)] mod tests { use super::*; diff --git a/runtime/kusama/Cargo.toml b/runtime/kusama/Cargo.toml index 07481dee1e09..35c67fbf21b7 100644 --- a/runtime/kusama/Cargo.toml +++ b/runtime/kusama/Cargo.toml @@ -68,7 +68,6 @@ pallet-session = { git = "https://github.com/paritytech/substrate", branch = "ma pallet-society = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } -pallet-staking-reward-fn = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system = {git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } pallet-timestamp = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false } @@ -161,7 +160,6 @@ std = [ "pallet-session/std", "pallet-society/std", "pallet-staking/std", - "pallet-staking-reward-fn/std", "pallet-timestamp/std", "pallet-tips/std", "pallet-treasury/std", diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 33a211e3bfde..b210953620dc 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -513,45 +513,6 @@ impl pallet_bags_list::Config for Runtime { type Score = sp_npos_elections::VoteWeight; } -fn era_payout( - total_staked: Balance, - non_gilt_issuance: Balance, - max_annual_inflation: Perquintill, - period_fraction: Perquintill, - auctioned_slots: u64, -) -> (Balance, Balance) { - use pallet_staking_reward_fn::compute_inflation; - use sp_arithmetic::traits::Saturating; - - let min_annual_inflation = Perquintill::from_rational(25u64, 1000u64); - let delta_annual_inflation = max_annual_inflation.saturating_sub(min_annual_inflation); - - // 30% reserved for up to 60 slots. - let auction_proportion = Perquintill::from_rational(auctioned_slots.min(60), 200u64); - - // Therefore the ideal amount at stake (as a percentage of total issuance) is 75% less the 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 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 rest = max_payout.saturating_sub(staking_payout); - - let other_issuance = non_gilt_issuance.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 treasury amount - // with: `rest = rest.min(cap_rest);` - } - (staking_payout, rest) -} - pub struct EraPayout; impl pallet_staking::EraPayout for EraPayout { fn era_payout( @@ -565,7 +526,7 @@ impl pallet_staking::EraPayout for EraPayout { const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100; - era_payout( + runtime_common::impls::era_payout( total_staked, Gilt::issuance().non_gilt, MAX_ANNUAL_INFLATION, diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index d26864a376f6..020dc240ad09 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -22,7 +22,7 @@ use pallet_transaction_payment::CurrencyAdapter; use runtime_common::{ - auctions, claims, crowdloan, impl_runtime_weights, impls::DealWithFees, paras_registrar, + auctions, claims, crowdloan, impl_runtime_weights, impls::{DealWithFees}, paras_registrar, prod_or_fast, slots, BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, }; @@ -588,6 +588,30 @@ type SlashCancelOrigin = EitherOfDiverse< pallet_collective::EnsureProportionAtLeast, >; +pub struct EraPayout; +impl pallet_staking::EraPayout for EraPayout { + fn era_payout( + total_staked: Balance, + _total_issuance: Balance, + era_duration_millis: u64, + ) -> (Balance, Balance) { + // TODO: #3011 Update with proper auctioned slots tracking. + // This should be fine for the first year of parachains. + let auctioned_slots: u64 = auctions::Pallet::::auction_counter().into(); + const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); + const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100; + + runtime_common::impls::era_payout( + total_staked, + // Polkadot has no notion of gilts, the entire issuance is non-guilt. + Balances::total_issuance(), + MAX_ANNUAL_INFLATION, + Perquintill::from_rational(era_duration_millis, MILLISECONDS_PER_YEAR), + auctioned_slots, + ) + } +} + impl pallet_staking::Config for Runtime { type MaxNominations = MaxNominations; type Currency = Balances; @@ -604,7 +628,7 @@ impl pallet_staking::Config for Runtime { // A super-majority of the council can cancel the slash. type SlashCancelOrigin = SlashCancelOrigin; type SessionInterface = Self; - type EraPayout = pallet_staking::ConvertCurve; + type EraPayout = EraPayout; type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator; type OffendingValidatorsThreshold = OffendingValidatorsThreshold; type NextNewSession = Session; From 5bd849cc95ca80194bdabf161b4191a3fe29efce Mon Sep 17 00:00:00 2001 From: kianenigma Date: Thu, 6 Oct 2022 14:14:17 +0100 Subject: [PATCH 2/7] a possible solution -- but needs a rather untrivial data seeding --- runtime/common/src/auctions.rs | 12 +++++++++++- runtime/kusama/src/lib.rs | 18 +++++++++++++++--- runtime/polkadot/src/lib.rs | 20 ++++++++++++++++---- 3 files changed, 42 insertions(+), 8 deletions(-) diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index f9181a7eac7b..16d2a2a6e859 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -178,6 +178,13 @@ pub mod pallet { #[pallet::getter(fn auction_counter)] pub type AuctionCounter = StorageValue<_, AuctionIndex, ValueQuery>; + // TODO: needs a migration to seed the initial data. + // TODO: will this work with how para-ids are swapped/extended? + #[pallet::storage] + #[pallet::getter(fn auctioned_winner_para_ids)] + #[pallet::unbounded] + pub type AuctionedWinnerParaIds = StorageValue<_, Vec, ValueQuery>; + /// Information relating to the current auction, if there is one. /// /// The first item in the tuple is the lease period index that the first of the four @@ -609,7 +616,10 @@ impl Pallet { }); } }, - Ok(()) => {}, // Nothing to report. + Ok(()) => { + // record the winner para-ids. + AuctionedWinnerParaIds::::mutate(|a| a.push(para)); + }, } } diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 2524620ae919..d83b3d63dd16 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -511,9 +511,21 @@ impl pallet_staking::EraPayout for EraPayout { _total_issuance: Balance, era_duration_millis: u64, ) -> (Balance, Balance) { - // TODO: #3011 Update with proper auctioned slots tracking. - // This should be fine for the first year of parachains. - let auctioned_slots: u64 = auctions::Pallet::::auction_counter().into(); + let auctioned_slots = { + // all para-ids that have been leased out. + let auctioned_winner_para_ids = Auctions::auctioned_winner_para_ids(); + // and all para-ids that are not active. + let active_para_ids = Paras::parachains(); + // the intersection of which is the number of parachain's which we should take into + // account for inflation. + auctioned_winner_para_ids + .into_iter() + .filter(|i| active_para_ids.contains(i)) + .count() as u64 + // note: we could speed up this block a bit with sorting and binary searching, but it + // does not seem worthwhile for a few hundred parachains at most. + }; + const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index fb5eeb0718ec..35b56eab229a 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -22,7 +22,7 @@ use pallet_transaction_payment::CurrencyAdapter; use runtime_common::{ - auctions, claims, crowdloan, impl_runtime_weights, impls::{DealWithFees}, paras_registrar, + auctions, claims, crowdloan, impl_runtime_weights, impls::DealWithFees, paras_registrar, prod_or_fast, slots, BlockHashCount, BlockLength, CurrencyToVote, SlowAdjustingFeeUpdate, }; @@ -543,9 +543,21 @@ impl pallet_staking::EraPayout for EraPayout { _total_issuance: Balance, era_duration_millis: u64, ) -> (Balance, Balance) { - // TODO: #3011 Update with proper auctioned slots tracking. - // This should be fine for the first year of parachains. - let auctioned_slots: u64 = auctions::Pallet::::auction_counter().into(); + let auctioned_slots = { + // all para-ids that have been leased out. + let auctioned_winner_para_ids = Auctions::auctioned_winner_para_ids(); + // and all para-ids that are not active. + let active_para_ids = Paras::parachains(); + // the intersection of which is the number of parachain's which we should take into + // account for inflation. + auctioned_winner_para_ids + .into_iter() + .filter(|i| active_para_ids.contains(i)) + .count() as u64 + // note: we could speed up this block a bit with sorting and binary searching, but it + // does not seem worthwhile for a few hundred parachains at most. + }; + const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100; From 10d3984ea4cef4bd01aa8da1e67e471537ff80fc Mon Sep 17 00:00:00 2001 From: kianenigma Date: Thu, 6 Oct 2022 14:31:31 +0100 Subject: [PATCH 3/7] some additional comments --- runtime/common/src/auctions.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index 16d2a2a6e859..0c95b39ab3ee 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -178,8 +178,9 @@ pub mod pallet { #[pallet::getter(fn auction_counter)] pub type AuctionCounter = StorageValue<_, AuctionIndex, ValueQuery>; - // TODO: needs a migration to seed the initial data. - // TODO: will this work with how para-ids are swapped/extended? + // TODO: Migration: + // We need to go over https://kusama.subscan.io/event?module=auctions&event=auctionclosed&page=1&address=&startDate=&endDate=&startBlock=&endBlock=&timeType=date&version=9291, and grab the paraId of the `slots::Leased` events emitted in the same block, if any. + // TODO: will this work with how para-ids are swapped/extended? Yes afaik. We should not care how stuff is swapped/extended. We only want to track: how many parachains got auctions, that are currently active. #[pallet::storage] #[pallet::getter(fn auctioned_winner_para_ids)] #[pallet::unbounded] From e1a3dee0201cfb9b4b977c5b19f5f177ac09a020 Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Thu, 13 Oct 2022 20:41:56 +0800 Subject: [PATCH 4/7] Use LOWEST_PUBLIC_ID as a guide to filter out system/common good para ids --- runtime/common/src/auctions.rs | 13 +------------ runtime/kusama/src/lib.rs | 22 ++++++++-------------- runtime/polkadot/src/lib.rs | 22 ++++++++-------------- 3 files changed, 17 insertions(+), 40 deletions(-) diff --git a/runtime/common/src/auctions.rs b/runtime/common/src/auctions.rs index 0c95b39ab3ee..f9181a7eac7b 100644 --- a/runtime/common/src/auctions.rs +++ b/runtime/common/src/auctions.rs @@ -178,14 +178,6 @@ pub mod pallet { #[pallet::getter(fn auction_counter)] pub type AuctionCounter = StorageValue<_, AuctionIndex, ValueQuery>; - // TODO: Migration: - // We need to go over https://kusama.subscan.io/event?module=auctions&event=auctionclosed&page=1&address=&startDate=&endDate=&startBlock=&endBlock=&timeType=date&version=9291, and grab the paraId of the `slots::Leased` events emitted in the same block, if any. - // TODO: will this work with how para-ids are swapped/extended? Yes afaik. We should not care how stuff is swapped/extended. We only want to track: how many parachains got auctions, that are currently active. - #[pallet::storage] - #[pallet::getter(fn auctioned_winner_para_ids)] - #[pallet::unbounded] - pub type AuctionedWinnerParaIds = StorageValue<_, Vec, ValueQuery>; - /// Information relating to the current auction, if there is one. /// /// The first item in the tuple is the lease period index that the first of the four @@ -617,10 +609,7 @@ impl Pallet { }); } }, - Ok(()) => { - // record the winner para-ids. - AuctionedWinnerParaIds::::mutate(|a| a.push(para)); - }, + Ok(()) => {}, // Nothing to report. } } diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index d83b3d63dd16..43ec4a7829fe 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -26,6 +26,7 @@ use primitives::v2::{ CoreState, GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment, Nonce, OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes, SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, + LOWEST_PUBLIC_ID, }; use runtime_common::{ auctions, claims, crowdloan, impl_runtime_weights, impls::DealWithFees, paras_registrar, @@ -511,20 +512,13 @@ impl pallet_staking::EraPayout for EraPayout { _total_issuance: Balance, era_duration_millis: u64, ) -> (Balance, Balance) { - let auctioned_slots = { - // all para-ids that have been leased out. - let auctioned_winner_para_ids = Auctions::auctioned_winner_para_ids(); - // and all para-ids that are not active. - let active_para_ids = Paras::parachains(); - // the intersection of which is the number of parachain's which we should take into - // account for inflation. - auctioned_winner_para_ids - .into_iter() - .filter(|i| active_para_ids.contains(i)) - .count() as u64 - // note: we could speed up this block a bit with sorting and binary searching, but it - // does not seem worthwhile for a few hundred parachains at most. - }; + // all para-ids that are currently active. + let auctioned_slots = Paras::parachains() + .into_iter() + // all active para-ids that do not belong to a system or common good chain is the number + // of parachains that we should take into account for inflation. + .filter(|i| i >= LOWEST_PUBLIC_ID) + .count() as u64; const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100; diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 35b56eab229a..0ea4743fb72a 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -58,6 +58,7 @@ use primitives::v2::{ CoreState, GroupRotationInfo, Hash, Id as ParaId, InboundDownwardMessage, InboundHrmpMessage, Moment, Nonce, OccupiedCoreAssumption, PersistedValidationData, ScrapedOnChainVotes, SessionInfo, Signature, ValidationCode, ValidationCodeHash, ValidatorId, ValidatorIndex, + LOWEST_PUBLIC_ID, }; use sp_core::OpaqueMetadata; use sp_mmr_primitives as mmr; @@ -543,20 +544,13 @@ impl pallet_staking::EraPayout for EraPayout { _total_issuance: Balance, era_duration_millis: u64, ) -> (Balance, Balance) { - let auctioned_slots = { - // all para-ids that have been leased out. - let auctioned_winner_para_ids = Auctions::auctioned_winner_para_ids(); - // and all para-ids that are not active. - let active_para_ids = Paras::parachains(); - // the intersection of which is the number of parachain's which we should take into - // account for inflation. - auctioned_winner_para_ids - .into_iter() - .filter(|i| active_para_ids.contains(i)) - .count() as u64 - // note: we could speed up this block a bit with sorting and binary searching, but it - // does not seem worthwhile for a few hundred parachains at most. - }; + // all para-ids that are not active. + let auctioned_slots = Paras::parachains() + .into_iter() + // all active para-ids that do not belong to a system or common good chain is the number + // of parachains that we should take into account for inflation. + .filter(|i| i >= LOWEST_PUBLIC_ID) + .count() as u64; const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); const MILLISECONDS_PER_YEAR: u64 = 1000 * 3600 * 24 * 36525 / 100; From b522abe119af873afddb05de2c5e68c5ef67c255 Mon Sep 17 00:00:00 2001 From: Keith Yeung Date: Thu, 13 Oct 2022 21:35:20 +0800 Subject: [PATCH 5/7] Fixes --- runtime/kusama/src/lib.rs | 2 +- runtime/polkadot/src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/kusama/src/lib.rs b/runtime/kusama/src/lib.rs index 43ec4a7829fe..1045c51af9d8 100644 --- a/runtime/kusama/src/lib.rs +++ b/runtime/kusama/src/lib.rs @@ -517,7 +517,7 @@ impl pallet_staking::EraPayout for EraPayout { .into_iter() // all active para-ids that do not belong to a system or common good chain is the number // of parachains that we should take into account for inflation. - .filter(|i| i >= LOWEST_PUBLIC_ID) + .filter(|i| *i >= LOWEST_PUBLIC_ID) .count() as u64; const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 0ea4743fb72a..b21f87f7d36e 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -549,7 +549,7 @@ impl pallet_staking::EraPayout for EraPayout { .into_iter() // all active para-ids that do not belong to a system or common good chain is the number // of parachains that we should take into account for inflation. - .filter(|i| i >= LOWEST_PUBLIC_ID) + .filter(|i| *i >= LOWEST_PUBLIC_ID) .count() as u64; const MAX_ANNUAL_INFLATION: Perquintill = Perquintill::from_percent(10); From 5de49f5bad1d4d4be62af9a541ef0df588cb850d Mon Sep 17 00:00:00 2001 From: Shawn Tabrizi Date: Mon, 24 Oct 2022 08:41:26 -0400 Subject: [PATCH 6/7] move tests --- runtime/common/src/impls.rs | 40 +++++++++++++++++++++++++++++++++++++ runtime/kusama/src/tests.rs | 34 ------------------------------- 2 files changed, 40 insertions(+), 34 deletions(-) diff --git a/runtime/common/src/impls.rs b/runtime/common/src/impls.rs index c28b68474047..2b10c79cfdff 100644 --- a/runtime/common/src/impls.rs +++ b/runtime/common/src/impls.rs @@ -250,4 +250,44 @@ mod tests { assert_eq!(Balances::free_balance(Treasury::account_id()), 8); }); } + + #[test] + fn compute_inflation_should_give_sensible_results() { + assert_eq!( + pallet_staking_reward_fn::compute_inflation( + Perquintill::from_percent(75), + Perquintill::from_percent(75), + Perquintill::from_percent(5), + ), + Perquintill::one() + ); + assert_eq!( + pallet_staking_reward_fn::compute_inflation( + Perquintill::from_percent(50), + Perquintill::from_percent(75), + Perquintill::from_percent(5), + ), + Perquintill::from_rational(2u64, 3u64) + ); + assert_eq!( + pallet_staking_reward_fn::compute_inflation( + Perquintill::from_percent(80), + Perquintill::from_percent(75), + Perquintill::from_percent(5), + ), + Perquintill::from_rational(1u64, 2u64) + ); + } + + #[test] + fn era_payout_should_give_sensible_results() { + assert_eq!( + era_payout(75, 100, Perquintill::from_percent(10), Perquintill::one(), 0,), + (10, 0) + ); + assert_eq!( + era_payout(80, 100, Perquintill::from_percent(10), Perquintill::one(), 0,), + (6, 4) + ); + } } diff --git a/runtime/kusama/src/tests.rs b/runtime/kusama/src/tests.rs index 12d02da131f8..ef09a9dc6131 100644 --- a/runtime/kusama/src/tests.rs +++ b/runtime/kusama/src/tests.rs @@ -137,40 +137,6 @@ fn nominator_limit() { println!("can support {} nominators to yield a weight of {}", active, weight_with(active)); } -#[test] -fn compute_inflation_should_give_sensible_results() { - assert_eq!( - pallet_staking_reward_fn::compute_inflation( - Perquintill::from_percent(75), - Perquintill::from_percent(75), - Perquintill::from_percent(5), - ), - Perquintill::one() - ); - assert_eq!( - pallet_staking_reward_fn::compute_inflation( - Perquintill::from_percent(50), - Perquintill::from_percent(75), - Perquintill::from_percent(5), - ), - Perquintill::from_rational(2u64, 3u64) - ); - assert_eq!( - pallet_staking_reward_fn::compute_inflation( - Perquintill::from_percent(80), - Perquintill::from_percent(75), - Perquintill::from_percent(5), - ), - Perquintill::from_rational(1u64, 2u64) - ); -} - -#[test] -fn era_payout_should_give_sensible_results() { - assert_eq!(era_payout(75, 100, Perquintill::from_percent(10), Perquintill::one(), 0,), (10, 0)); - assert_eq!(era_payout(80, 100, Perquintill::from_percent(10), Perquintill::one(), 0,), (6, 4)); -} - #[test] fn call_size() { RuntimeCall::assert_size_under(230); From 14f3abcce7b8a33b4f9dd4bea291d2b5fadf8a86 Mon Sep 17 00:00:00 2001 From: kianenigma Date: Sun, 6 Nov 2022 17:11:47 +0000 Subject: [PATCH 7/7] fix --- runtime/polkadot/src/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs index 791d31811718..ebcf9ec1d8a6 100644 --- a/runtime/polkadot/src/lib.rs +++ b/runtime/polkadot/src/lib.rs @@ -541,7 +541,7 @@ pub struct EraPayout; impl pallet_staking::EraPayout for EraPayout { fn era_payout( total_staked: Balance, - _total_issuance: Balance, + total_issuance: Balance, era_duration_millis: u64, ) -> (Balance, Balance) { // all para-ids that are not active. @@ -558,7 +558,7 @@ 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. - Balances::total_issuance(), + total_issuance, MAX_ANNUAL_INFLATION, Perquintill::from_rational(era_duration_millis, MILLISECONDS_PER_YEAR), auctioned_slots,