Generate storage info for Pallet Staking

bin/node/cli/Cargo.toml

@@ -133,7 +133,7 @@ criterion = { version = "0.3.5", features = [ "async_tokio" ] }
 tokio = { version = "1.15", features = ["macros", "time"] }
 jsonrpsee-ws-client = "0.4.1"
 wait-timeout = "0.2"
-remote-externalities = { path = "../../../utils/frame/remote-externalities" }
+remote-externalities = { version = "0.10.0-dev", path = "../../../utils/frame/remote-externalities" }
 pallet-timestamp = { version = "4.0.0-dev", path = "../../../frame/timestamp" }
 
 [build-dependencies]

bin/node/runtime/src/lib.rs

@@ -26,9 +26,9 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::{
 	construct_runtime, parameter_types,
 	traits::{
-		ConstU128, ConstU16, ConstU32, Currency, EnsureOneOf, EqualPrivilegeOnly, Everything,
-		Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing, OnUnbalanced,
-		U128CurrencyToVote,
+		ConstU128, ConstU16, ConstU32, ConstU64, Currency, EnsureOneOf, EqualPrivilegeOnly,
+		Everything, Imbalance, InstanceFilter, KeyOwnerProofSystem, LockIdentifier, Nothing,
+		OnUnbalanced, U128CurrencyToVote,
 	},
 	weights::{
 		constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight, WEIGHT_PER_SECOND},
@@ -503,7 +503,7 @@ impl pallet_session::Config for Runtime {
 }
 
 impl pallet_session::historical::Config for Runtime {
-	type FullIdentification = pallet_staking::Exposure<AccountId, Balance>;
+	type FullIdentification = pallet_staking::Exposure<AccountId, Balance, MaxIndividualExposures>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Runtime>;
 }
 
@@ -523,8 +523,8 @@ parameter_types! {
 	pub const BondingDuration: pallet_staking::EraIndex = 24 * 28;
 	pub const SlashDeferDuration: pallet_staking::EraIndex = 24 * 7; // 1/4 the bonding duration.
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
-	pub const MaxNominatorRewardedPerValidator: u32 = 256;
 	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
+	pub const MaxIndividualExposures: u32 = 10_000;
 	pub OffchainRepeat: BlockNumber = 5;
 }
 
@@ -541,7 +541,6 @@ impl pallet_staking::BenchmarkingConfig for StakingBenchmarkingConfig {
 }
 
 impl pallet_staking::Config for Runtime {
-	const MAX_NOMINATIONS: u32 = MAX_NOMINATIONS;
 	type Currency = Balances;
 	type UnixTime = Timestamp;
 	type CurrencyToVote = U128CurrencyToVote;
@@ -560,14 +559,23 @@ impl pallet_staking::Config for Runtime {
 	type SessionInterface = Self;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
 	type NextNewSession = Session;
-	type MaxNominatorRewardedPerValidator = MaxNominatorRewardedPerValidator;
+	type MaxRewardableIndividualExposures = ConstU32<256>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type ElectionProvider = ElectionProviderMultiPhase;
 	type GenesisElectionProvider = onchain::OnChainSequentialPhragmen<Self>;
 	// Alternatively, use pallet_staking::UseNominatorsMap<Runtime> to just use the nominators map.
 	// Note that the aforementioned does not scale to a very large number of nominators.
 	type SortedListProvider = BagsList;
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;
+	type MaxIndividualExposures = MaxIndividualExposures;
+	type MaxNominations = ConstU32<MAX_NOMINATIONS>;
+	type MaxUnappliedSlashes = ConstU32<1_000>;
+	type MaxInvulnerablesCount = ConstU32<10>;
+	type MaxHistoryDepth = ConstU32<10_000>;
+	type MaxReportersCount = ConstU32<1_000>;
+	type MaxPriorSlashingSpans = ConstU32<1_000>;
+	type MaxValidatorsCount = ConstU32<4_000>;
+	type MaxUnlockingChunks = ConstU32<32>;
 	type BenchmarkingConfig = StakingBenchmarkingConfig;
 }
 
@@ -584,7 +592,6 @@ parameter_types! {
 	pub SolutionImprovementThreshold: Perbill = Perbill::from_rational(1u32, 10_000);
 
 	// miner configs
-	pub const MultiPhaseUnsignedPriority: TransactionPriority = StakingUnsignedPriority::get() - 1u64;
 	pub MinerMaxWeight: Weight = RuntimeBlockWeights::get()
 		.get(DispatchClass::Normal)
 		.max_extrinsic.expect("Normal extrinsics have a weight limit configured; qed")
@@ -657,7 +664,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
 	type OffchainRepeat = OffchainRepeat;
 	type MinerMaxWeight = MinerMaxWeight;
 	type MinerMaxLength = MinerMaxLength;
-	type MinerTxPriority = MultiPhaseUnsignedPriority;
+	type MinerTxPriority = ConstU64<{ TransactionPriority::max_value() / 2 - 1u64 }>;
 	type SignedMaxSubmissions = ConstU32<10>;
 	type SignedRewardBase = SignedRewardBase;
 	type SignedDepositBase = SignedDepositBase;
@@ -969,7 +976,6 @@ impl pallet_sudo::Config for Runtime {
 parameter_types! {
 	pub const ImOnlineUnsignedPriority: TransactionPriority = TransactionPriority::max_value();
 	/// We prioritize im-online heartbeats over election solution submission.
-	pub const StakingUnsignedPriority: TransactionPriority = TransactionPriority::max_value() / 2;
 	pub const MaxAuthorities: u32 = 100;
 	pub const MaxKeys: u32 = 10_000;
 	pub const MaxPeerInHeartbeats: u32 = 10_000;

frame/babe/src/mock.rs

@@ -125,7 +125,7 @@ impl pallet_session::Config for Test {
 }
 
 impl pallet_session::historical::Config for Test {
-	type FullIdentification = pallet_staking::Exposure<u64, u128>;
+	type FullIdentification = pallet_staking::Exposure<u64, u128, MaxIndividualExposures>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Self>;
 }
 
@@ -172,6 +172,7 @@ parameter_types! {
 	pub const SlashDeferDuration: EraIndex = 0;
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
 	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(16);
+	pub const MaxIndividualExposures: u32 = 64;
 }
 
 impl onchain::Config for Test {
@@ -180,7 +181,6 @@ impl onchain::Config for Test {
 }
 
 impl pallet_staking::Config for Test {
-	const MAX_NOMINATIONS: u32 = 16;
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type Event = Event;
@@ -194,7 +194,16 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type UnixTime = pallet_timestamp::Pallet<Test>;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxRewardableIndividualExposures = ConstU32<64>;
+	type MaxIndividualExposures = MaxIndividualExposures;
+	type MaxNominations = ConstU32<16>;
+	type MaxUnappliedSlashes = ConstU32<1_000>;
+	type MaxInvulnerablesCount = ConstU32<10>;
+	type MaxHistoryDepth = ConstU32<10_000>;
+	type MaxReportersCount = ConstU32<1_000>;
+	type MaxPriorSlashingSpans = ConstU32<1_000>;
+	type MaxValidatorsCount = ConstU32<4_000>;
+	type MaxUnlockingChunks = ConstU32<32>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type NextNewSession = Session;
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;

frame/babe/src/tests.rs

@@ -415,7 +415,7 @@ fn report_equivocation_current_session_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(1, validator),
-				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: Default::default() },
 			);
 		}
 
@@ -456,7 +456,7 @@ fn report_equivocation_current_session_works() {
 		assert_eq!(Staking::slashable_balance_of(&offending_validator_id), 0);
 		assert_eq!(
 			Staking::eras_stakers(2, offending_validator_id),
-			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
+			pallet_staking::Exposure { total: 0, own: 0, others: Default::default() },
 		);
 
 		// check that the balances of all other validators are left intact.
@@ -469,7 +469,7 @@ fn report_equivocation_current_session_works() {
 			assert_eq!(Staking::slashable_balance_of(validator), 10_000);
 			assert_eq!(
 				Staking::eras_stakers(2, validator),
-				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: Default::default() },
 			);
 		}
 	})
@@ -528,7 +528,7 @@ fn report_equivocation_old_session_works() {
 		assert_eq!(Staking::slashable_balance_of(&offending_validator_id), 0);
 		assert_eq!(
 			Staking::eras_stakers(3, offending_validator_id),
-			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
+			pallet_staking::Exposure { total: 0, own: 0, others: Default::default() },
 		);
 	})
 }

frame/election-provider-multi-phase/src/benchmarking.rs

@@ -152,7 +152,7 @@ fn set_up_data_provider<T: Config>(v: u32, t: u32) {
 		info,
 		"setting up with voters = {} [degree = {}], targets = {}",
 		v,
-		T::DataProvider::MAXIMUM_VOTES_PER_VOTER,
+		<T::DataProvider as ElectionDataProvider>::MaximumVotesPerVoter::get(),
 		t
 	);
 
@@ -165,8 +165,9 @@ fn set_up_data_provider<T: Config>(v: u32, t: u32) {
 		})
 		.collect::<Vec<_>>();
 	// we should always have enough voters to fill.
-	assert!(targets.len() > T::DataProvider::MAXIMUM_VOTES_PER_VOTER as usize);
-	targets.truncate(T::DataProvider::MAXIMUM_VOTES_PER_VOTER as usize);
+	let max_votes = <T::DataProvider as ElectionDataProvider>::MaximumVotesPerVoter::get() as usize;
+	assert!(targets.len() > max_votes);
+	targets.truncate(max_votes);
 
 	// fill voters.
 	(0..v).for_each(|i| {

frame/election-provider-multi-phase/src/lib.rs

@@ -820,7 +820,7 @@ pub mod pallet {
 			// NOTE that this pallet does not really need to enforce this in runtime. The
 			// solution cannot represent any voters more than `LIMIT` anyhow.
 			assert_eq!(
-				<T::DataProvider as ElectionDataProvider>::MAXIMUM_VOTES_PER_VOTER,
+				<T::DataProvider as ElectionDataProvider>::MaximumVotesPerVoter::get(),
 				<SolutionOf<T> as NposSolution>::LIMIT as u32,
 			);
 		}

frame/election-provider-multi-phase/src/mock.rs

@@ -440,10 +440,11 @@ pub type Extrinsic = sp_runtime::testing::TestXt<Call, ()>;
 pub struct ExtBuilder {}
 
 pub struct StakingMock;
+
 impl ElectionDataProvider for StakingMock {
 	type AccountId = AccountId;
 	type BlockNumber = u64;
-	const MAXIMUM_VOTES_PER_VOTER: u32 = <TestNposSolution as NposSolution>::LIMIT as u32;
+	type MaximumVotesPerVoter = ConstU32<{ <TestNposSolution as NposSolution>::LIMIT as u32 }>;
 	fn targets(maybe_max_len: Option<usize>) -> data_provider::Result<Vec<AccountId>> {
 		let targets = Targets::get();
 

frame/election-provider-support/src/lib.rs

@@ -101,7 +101,7 @@
 //!     impl<T: Config> ElectionDataProvider for Pallet<T> {
 //!         type AccountId = AccountId;
 //!         type BlockNumber = BlockNumber;
-//!         const MAXIMUM_VOTES_PER_VOTER: u32 = 1;
+//!         type MaximumVotesPerVoter = frame_support::pallet_prelude::ConstU32<1>;
 //!
 //!         fn desired_targets() -> data_provider::Result<u32> {
 //!             Ok(1)
@@ -191,7 +191,7 @@ pub trait ElectionDataProvider {
 	type BlockNumber;
 
 	/// Maximum number of votes per voter that this data provider is providing.
-	const MAXIMUM_VOTES_PER_VOTER: u32;
+	type MaximumVotesPerVoter: Get<u32>;
 
 	/// All possible targets for the election, i.e. the candidates.
 	///
@@ -266,8 +266,8 @@ pub struct TestDataProvider<X>(sp_std::marker::PhantomData<X>);
 impl<AccountId, BlockNumber> ElectionDataProvider for TestDataProvider<(AccountId, BlockNumber)> {
 	type AccountId = AccountId;
 	type BlockNumber = BlockNumber;
+	type MaximumVotesPerVoter = frame_support::pallet_prelude::ConstU32<0>;
 
-	const MAXIMUM_VOTES_PER_VOTER: u32 = 0;
 	fn targets(_maybe_max_len: Option<usize>) -> data_provider::Result<Vec<AccountId>> {
 		Ok(Default::default())
 	}

frame/election-provider-support/src/onchain.rs

@@ -165,10 +165,12 @@ mod tests {
 		use crate::data_provider;
 
 		pub struct DataProvider;
+
 		impl ElectionDataProvider for DataProvider {
 			type AccountId = AccountId;
 			type BlockNumber = BlockNumber;
-			const MAXIMUM_VOTES_PER_VOTER: u32 = 2;
+			type MaximumVotesPerVoter = frame_support::pallet_prelude::ConstU32<2>;
+
 			fn voters(
 				_: Option<usize>,
 			) -> data_provider::Result<Vec<(AccountId, VoteWeight, Vec<AccountId>)>> {

frame/grandpa/src/mock.rs

@@ -129,7 +129,7 @@ impl pallet_session::Config for Test {
 }
 
 impl pallet_session::historical::Config for Test {
-	type FullIdentification = pallet_staking::Exposure<u64, u128>;
+	type FullIdentification = pallet_staking::Exposure<u64, u128, MaxIndividualExposures>;
 	type FullIdentificationOf = pallet_staking::ExposureOf<Self>;
 }
 
@@ -176,9 +176,8 @@ parameter_types! {
 	pub const SlashDeferDuration: EraIndex = 0;
 	pub const AttestationPeriod: u64 = 100;
 	pub const RewardCurve: &'static PiecewiseLinear<'static> = &REWARD_CURVE;
-	pub const ElectionLookahead: u64 = 0;
-	pub const StakingUnsignedPriority: u64 = u64::MAX / 2;
 	pub const OffendingValidatorsThreshold: Perbill = Perbill::from_percent(17);
+	pub const MaxIndividualExposures: u32 = 64;
 }
 
 impl onchain::Config for Test {
@@ -187,7 +186,6 @@ impl onchain::Config for Test {
 }
 
 impl pallet_staking::Config for Test {
-	const MAX_NOMINATIONS: u32 = 16;
 	type RewardRemainder = ();
 	type CurrencyToVote = frame_support::traits::SaturatingCurrencyToVote;
 	type Event = Event;
@@ -201,7 +199,16 @@ impl pallet_staking::Config for Test {
 	type SessionInterface = Self;
 	type UnixTime = pallet_timestamp::Pallet<Test>;
 	type EraPayout = pallet_staking::ConvertCurve<RewardCurve>;
-	type MaxNominatorRewardedPerValidator = ConstU32<64>;
+	type MaxRewardableIndividualExposures = ConstU32<64>;
+	type MaxIndividualExposures = MaxIndividualExposures;
+	type MaxNominations = ConstU32<16>;
+	type MaxUnappliedSlashes = ConstU32<1_000>;
+	type MaxInvulnerablesCount = ConstU32<10>;
+	type MaxHistoryDepth = ConstU32<10_000>;
+	type MaxReportersCount = ConstU32<1_000>;
+	type MaxPriorSlashingSpans = ConstU32<1_000>;
+	type MaxValidatorsCount = ConstU32<4_000>;
+	type MaxUnlockingChunks = ConstU32<32>;
 	type OffendingValidatorsThreshold = OffendingValidatorsThreshold;
 	type NextNewSession = Session;
 	type ElectionProvider = onchain::OnChainSequentialPhragmen<Self>;

frame/grandpa/src/tests.rs

@@ -335,7 +335,7 @@ fn report_equivocation_current_set_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(1, validator),
-				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: Default::default() },
 			);
 		}
 
@@ -373,7 +373,7 @@ fn report_equivocation_current_set_works() {
 		assert_eq!(Staking::slashable_balance_of(&equivocation_validator_id), 0);
 		assert_eq!(
 			Staking::eras_stakers(2, equivocation_validator_id),
-			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
+			pallet_staking::Exposure { total: 0, own: 0, others: Default::default() },
 		);
 
 		// check that the balances of all other validators are left intact.
@@ -387,7 +387,7 @@ fn report_equivocation_current_set_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(2, validator),
-				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: Default::default() },
 			);
 		}
 	});
@@ -419,7 +419,7 @@ fn report_equivocation_old_set_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(2, validator),
-				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: Default::default() },
 			);
 		}
 
@@ -452,7 +452,7 @@ fn report_equivocation_old_set_works() {
 
 		assert_eq!(
 			Staking::eras_stakers(3, equivocation_validator_id),
-			pallet_staking::Exposure { total: 0, own: 0, others: vec![] },
+			pallet_staking::Exposure { total: 0, own: 0, others: Default::default() },
 		);
 
 		// check that the balances of all other validators are left intact.
@@ -466,7 +466,7 @@ fn report_equivocation_old_set_works() {
 
 			assert_eq!(
 				Staking::eras_stakers(3, validator),
-				pallet_staking::Exposure { total: 10_000, own: 10_000, others: vec![] },
+				pallet_staking::Exposure { total: 10_000, own: 10_000, others: Default::default() },
 			);
 		}
 	});