Revert "Adds target approvals buffering below a threshold (#5168)"

This reverts commit 933e159.
paritytech · Aug 5, 2024 · 260f052 · 260f052
1 parent 933e159
commit 260f052
Show file tree

Hide file tree

Showing 20 changed files with 29 additions and 637 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/polkadot/runtime/westend/src/lib.rs b/polkadot/runtime/westend/src/lib.rs
@@ -590,7 +590,6 @@ parameter_types! {
 	pub const TargetBagThresholds: &'static [u128] = &bag_thresholds::TARGET_THRESHOLDS;
 
 	pub const VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Lazy;
-	pub const ScoreStrictUpdateThreshold: Option<u128> = Some(10);
 }
 
 type VoterBagsListInstance = pallet_bags_list::Instance1;
@@ -617,8 +616,6 @@ impl pallet_stake_tracker::Config for Runtime {
 	type VoterList = VoterList;
 	type TargetList = TargetList;
 	type VoterUpdateMode = VoterUpdateMode;
-	type ScoreStrictUpdateThreshold = ScoreStrictUpdateThreshold;
-	type WeightInfo = pallet_stake_tracker::weights::SubstrateWeight<Runtime>;
 }
 
 pallet_staking_reward_curve::build! {
@@ -670,8 +667,6 @@ impl pallet_staking::Config for Runtime {
 	type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
 	type VoterList = VoterList;
 	type TargetList = TargetList;
-	#[cfg(any(feature = "try-runtime", test))]
-	type TargetUnsettledApprovals = pallet_stake_tracker::UnsettledTargetScores<Self>;
 	type NominationsQuota = pallet_staking::FixedNominationsQuota<{ MaxNominations::get() }>;
 	type MaxUnlockingChunks = frame_support::traits::ConstU32<32>;
 	type HistoryDepth = frame_support::traits::ConstU32<84>;

diff --git a/substrate/bin/node/runtime/src/lib.rs b/substrate/bin/node/runtime/src/lib.rs
@@ -697,8 +697,6 @@ impl pallet_staking::Config for Runtime {
 	type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
 	type VoterList = VoterList;
 	type TargetList = TargetList;
-	#[cfg(any(feature = "try-runtime", test))]
-	type TargetUnsettledApprovals = pallet_stake_tracker::UnsettledTargetScores<Self>;
 	type NominationsQuota = pallet_staking::FixedNominationsQuota<MAX_QUOTA_NOMINATIONS>;
 	type MaxUnlockingChunks = ConstU32<32>;
 	type MaxControllersInDeprecationBatch = MaxControllersInDeprecationBatch;
@@ -711,8 +709,6 @@ impl pallet_staking::Config for Runtime {
 
 parameter_types! {
 	pub const VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Lazy;
-	// disables the lazy approvals update.
-	pub const ScoreStrictUpdateThreshold: Option<u128> = None;
 }
 
 impl pallet_stake_tracker::Config for Runtime {
@@ -721,8 +717,6 @@ impl pallet_stake_tracker::Config for Runtime {
 	type VoterList = VoterList;
 	type TargetList = TargetList;
 	type VoterUpdateMode = VoterUpdateMode;
-	type ScoreStrictUpdateThreshold = ScoreStrictUpdateThreshold;
-	type WeightInfo = pallet_stake_tracker::weights::SubstrateWeight<Runtime>;
 }
 
 impl pallet_fast_unstake::Config for Runtime {
@@ -2652,7 +2646,6 @@ mod benches {
 		[pallet_session, SessionBench::<Runtime>]
 		[pallet_society, Society]
 		[pallet_staking, Staking]
-		[pallet_stake_tracker, StakeTracker]
 		[pallet_state_trie_migration, StateTrieMigration]
 		[pallet_sudo, Sudo]
 		[frame_system, SystemBench::<Runtime>]

diff --git a/substrate/frame/delegated-staking/src/mock.rs b/substrate/frame/delegated-staking/src/mock.rs
@@ -110,8 +110,6 @@ impl pallet_staking::Config for Runtime {
 	type GenesisElectionProvider = Self::ElectionProvider;
 	type VoterList = pallet_staking::UseNominatorsAndValidatorsMap<Self>;
 	type TargetList = TargetBagsList;
-	#[cfg(any(feature = "try-runtime", test))]
-	type TargetUnsettledApprovals = pallet_stake_tracker::UnsettledTargetScores<Self>;
 	type EventListeners = (StakeTracker, Pools, DelegatedStaking);
 }
 
@@ -131,7 +129,6 @@ impl pallet_bags_list::Config<TargetBagsListInstance> for Runtime {
 
 parameter_types! {
 	pub static VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Lazy;
-	pub static ScoreStrictUpdateThreshold: Option<u128> = None;
 }
 
 impl pallet_stake_tracker::Config for Runtime {
@@ -140,8 +137,6 @@ impl pallet_stake_tracker::Config for Runtime {
 	type VoterList = pallet_staking::UseNominatorsAndValidatorsMap<Self>;
 	type TargetList = TargetBagsList;
 	type VoterUpdateMode = VoterUpdateMode;
-	type ScoreStrictUpdateThreshold = ScoreStrictUpdateThreshold;
-	type WeightInfo = ();
 }
 
 parameter_types! {

diff --git a/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs b/substrate/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
@@ -256,7 +256,6 @@ impl pallet_bags_list::Config<TargetBagsListInstance> for Runtime {
 
 parameter_types! {
 	pub static UpdateMode: VoterUpdateMode = VoterUpdateMode::Lazy;
-	pub static ScoreStrictUpdateThreshold: Option<u128> = None;
 }
 
 impl pallet_stake_tracker::Config for Runtime {
@@ -265,8 +264,6 @@ impl pallet_stake_tracker::Config for Runtime {
 	type VoterList = VoterBagsList;
 	type TargetList = TargetBagsList;
 	type VoterUpdateMode = UpdateMode;
-	type ScoreStrictUpdateThreshold = ScoreStrictUpdateThreshold;
-	type WeightInfo = ();
 }
 
 pub struct BalanceToU256;
@@ -333,8 +330,6 @@ impl pallet_staking::Config for Runtime {
 	type VoterList = VoterBagsList;
 	type NominationsQuota = pallet_staking::FixedNominationsQuota<MAX_QUOTA_NOMINATIONS>;
 	type TargetList = TargetBagsList;
-	#[cfg(any(feature = "try-runtime", test))]
-	type TargetUnsettledApprovals = pallet_stake_tracker::UnsettledTargetScores<Self>;
 	type MaxUnlockingChunks = MaxUnlockingChunks;
 	type EventListeners = (StakeTracker, Pools);
 	type WeightInfo = pallet_staking::weights::SubstrateWeight<Runtime>;

diff --git a/substrate/frame/nomination-pools/src/mock.rs b/substrate/frame/nomination-pools/src/mock.rs
@@ -174,10 +174,6 @@ impl sp_staking::StakingInterface for StakingMock {
 		Ok(())
 	}
 
-	fn validate(who: &Self::AccountId) -> sp_runtime::DispatchResult {
-		unimplemented!()
-	}
-
 	fn nominate(_: &Self::AccountId, nominations: Vec<Self::AccountId>) -> DispatchResult {
 		Nominations::set(&Some(nominations));
 		Ok(())

diff --git a/substrate/frame/nomination-pools/test-delegate-stake/src/mock.rs b/substrate/frame/nomination-pools/test-delegate-stake/src/mock.rs
@@ -108,7 +108,6 @@ impl pallet_staking::Config for Runtime {
 
 parameter_types! {
 	pub static VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Lazy;
-	pub static ScoreStrictUpdateThreshold: Option<u128> = None;
 }
 
 impl pallet_stake_tracker::Config for Runtime {
@@ -117,8 +116,6 @@ impl pallet_stake_tracker::Config for Runtime {
 	type VoterList = VoterList;
 	type TargetList = pallet_staking::UseValidatorsMap<Self>;
 	type VoterUpdateMode = VoterUpdateMode;
-	type ScoreStrictUpdateThreshold = ScoreStrictUpdateThreshold;
-	type WeightInfo = ();
 }
 
 parameter_types! {

diff --git a/substrate/frame/nomination-pools/test-transfer-stake/src/mock.rs b/substrate/frame/nomination-pools/test-transfer-stake/src/mock.rs
@@ -100,7 +100,6 @@ impl pallet_staking::Config for Runtime {
 
 parameter_types! {
 	pub static VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Lazy;
-	pub static ScoreStrictUpdateThreshold: Option<u128> = None;
 }
 
 impl pallet_stake_tracker::Config for Runtime {
@@ -109,8 +108,6 @@ impl pallet_stake_tracker::Config for Runtime {
 	type VoterList = VoterList;
 	type TargetList = pallet_staking::UseValidatorsMap<Self>;
 	type VoterUpdateMode = VoterUpdateMode;
-	type ScoreStrictUpdateThreshold = ScoreStrictUpdateThreshold;
-	type WeightInfo = ();
 }
 
 parameter_types! {

diff --git a/substrate/frame/staking/src/benchmarking.rs b/substrate/frame/staking/src/benchmarking.rs
@@ -22,7 +22,6 @@ use crate::{migrations::v13_stake_tracker as v13, ConfigOp, Pallet as Staking};
 use testing_utils::*;
 
 use codec::Decode;
-use frame_benchmarking::v2::*;
 use frame_election_provider_support::{bounds::DataProviderBounds, SortedListProvider};
 use frame_support::{
 	assert_ok,
@@ -32,13 +31,18 @@ use frame_support::{
 	traits::{Currency, Get, Imbalance, UnfilteredDispatchable},
 	weights::WeightMeter,
 };
-use frame_system::RawOrigin;
 use sp_runtime::{
 	traits::{Bounded, One, StaticLookup, TrailingZeroInput, Zero},
 	Perbill, Percent, Saturating,
 };
 use sp_staking::{currency_to_vote::CurrencyToVote, SessionIndex, StakingInterface};
 
+pub use frame_benchmarking::v1::{
+	account, impl_benchmark_test_suite, whitelist_account, whitelisted_caller, BenchmarkError,
+};
+use frame_benchmarking::v2::*;
+use frame_system::RawOrigin;
+
 const SEED: u32 = 0;
 const MAX_SPANS: u32 = 100;
 const MAX_SLASHES: u32 = 1000;

diff --git a/substrate/frame/staking/src/mock.rs b/substrate/frame/staking/src/mock.rs
@@ -356,8 +356,6 @@ impl OnStakingUpdate<AccountId, Balance> for EventTracker {
 
 parameter_types! {
 	pub static VoterUpdateMode: pallet_stake_tracker::VoterUpdateMode = pallet_stake_tracker::VoterUpdateMode::Lazy;
-	// disables the lazy approvals update.
-	pub static ScoreStrictUpdateThreshold: Option<u128> = None;
 }
 
 impl pallet_stake_tracker::Config for Test {
@@ -366,8 +364,6 @@ impl pallet_stake_tracker::Config for Test {
 	type VoterList = VoterBagsList;
 	type TargetList = TargetBagsList;
 	type VoterUpdateMode = VoterUpdateMode;
-	type ScoreStrictUpdateThreshold = ScoreStrictUpdateThreshold;
-	type WeightInfo = ();
 }
 
 // Disabling threshold for `UpToLimitDisablingStrategy`
@@ -390,8 +386,6 @@ impl crate::pallet::pallet::Config for Test {
 	type GenesisElectionProvider = Self::ElectionProvider;
 	type VoterList = VoterBagsList;
 	type TargetList = TargetBagsList;
-	#[cfg(any(feature = "try-runtime", test))]
-	type TargetUnsettledApprovals = pallet_stake_tracker::UnsettledTargetScores<Self>;
 	type NominationsQuota = WeightedNominationsQuota<16>;
 	type MaxUnlockingChunks = MaxUnlockingChunks;
 	type HistoryDepth = HistoryDepth;
@@ -565,11 +559,6 @@ impl ExtBuilder {
 		MaxWinners::set(max);
 		self
 	}
-	pub fn stake_tracker_update_threshold(self, threshold: Option<u128>) -> Self {
-		ScoreStrictUpdateThreshold::set(threshold);
-		self
-	}
-
 	fn build(self) -> sp_io::TestExternalities {
 		sp_tracing::try_init_simple();
 		let mut storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();

diff --git a/substrate/frame/staking/src/pallet/impls.rs b/substrate/frame/staking/src/pallet/impls.rs
@@ -1993,11 +1993,6 @@ impl<T: Config> StakingInterface for Pallet<T> {
 		Self::nominate(RawOrigin::Signed(ctrl).into(), targets)
 	}
 
-	fn validate(who: &Self::AccountId) -> DispatchResult {
-		let ctrl = Self::bonded(who).ok_or(Error::<T>::NotStash)?;
-		Self::validate(RawOrigin::Signed(ctrl).into(), Default::default())
-	}
-
 	fn desired_validator_count() -> u32 {
 		ValidatorCount::<T>::get()
 	}
@@ -2526,8 +2521,6 @@ impl<T: Config> Pallet<T> {
 	///   (active_validators + idle_validators + dangling_targets_score_with_score).
 	pub fn do_try_state_approvals() -> Result<(), sp_runtime::TryRuntimeError> {
 		use alloc::collections::{btree_map::BTreeMap, btree_set::BTreeSet};
-		use pallet_stake_tracker::StakeImbalance;
-
 		let mut approvals_map: BTreeMap<T::AccountId, T::CurrencyBalance> = BTreeMap::new();
 
 		// build map of approvals stakes from the `Nominators` storage map POV.
@@ -2592,19 +2585,6 @@ impl<T: Config> Pallet<T> {
 			}
 		}
 
-		// sync up current unsettled score to target's approvals.
-		for (target, imbalance) in T::TargetUnsettledApprovals::get().into_iter() {
-			if let Some(approvals) = approvals_map.get_mut(&target) {
-				match imbalance {
-					StakeImbalance::Positive(score) => *approvals -= score,
-					StakeImbalance::Negative(score) => *approvals += score,
-					StakeImbalance::Zero => (),
-				}
-			} else {
-				return Err("unsettled approval not in the target list".into());
-			}
-		}
-
 		let mut mismatch_approvals = 0;
 
 		// compare calculated approvals per target with target list state.

diff --git a/substrate/frame/staking/src/pallet/mod.rs b/substrate/frame/staking/src/pallet/mod.rs
@@ -268,19 +268,6 @@ pub mod pallet {
 		#[pallet::no_default]
 		type TargetList: SortedListProvider<Self::AccountId, Score = BalanceOf<Self>>;
 
-		/// Getter for unsettled approvals scores of targets in stake-tracker. Only used for
-		/// testing and try-state.
-		#[cfg(any(feature = "try-runtime", test))]
-		#[pallet::no_default]
-		type TargetUnsettledApprovals: TypedGet<
-			Type = Vec<(
-				Self::AccountId,
-				pallet_stake_tracker::StakeImbalance<
-					<Self::TargetList as SortedListProvider<Self::AccountId>>::Score,
-				>,
-			)>,
-		>;
-
 		/// The maximum number of `unlocking` chunks a [`StakingLedger`] can
 		/// have. Effectively determines how many unique eras a staker may be
 		/// unbonding in.

diff --git a/substrate/frame/staking/src/tests.rs b/substrate/frame/staking/src/tests.rs
@@ -7853,7 +7853,6 @@ mod stake_tracker {
 	use super::*;
 	use frame_election_provider_support::ScoreProvider;
 	use pallet_bags_list::Event as BagsEvent;
-	use pallet_stake_tracker::StakeImbalance;
 	use sp_staking::{StakingAccount::*, StakingInterface};
 
 	// keep tests clean;
@@ -8721,42 +8720,6 @@ mod stake_tracker {
 			);
 		})
 	}
-
-	#[test]
-	fn try_state_with_unsettled_score_works() {
-		ExtBuilder::default()
-			.stake_tracker_update_threshold(Some(50))
-			.try_state(true)
-			.build_and_execute(|| {
-				assert_eq!(Staking::status(&11), Ok(StakerStatus::Validator));
-				assert_eq!(TargetBagsList::score(&11), 1500);
-
-				assert_ok!(Staking::bond(
-					RuntimeOrigin::signed(90),
-					4000,
-					RewardDestination::Staked
-				));
-				assert_ok!(Staking::nominate(RuntimeOrigin::signed(90), vec![11]));
-
-				let vote_weight = Staking::weight_of(&90);
-
-				// confirm that vote weight of new nominator is lower than threshold.
-				assert!((vote_weight as u128) < ScoreStrictUpdateThreshold::get().unwrap());
-
-				// approvals of 42 did not updatee with nomination because new bond's vote weight
-				// was below the upadte threshold.
-				assert_eq!(TargetBagsList::score(&11), 1500);
-
-				// unsettled score map has been updated.
-				assert_eq!(
-					pallet_stake_tracker::UnsettledTargetScores::<Test>::get(),
-					vec![(11, StakeImbalance::Positive(vote_weight as u128))]
-				);
-
-				// he try-state checks takes into consideration the unsetttled score.
-				assert!(Staking::do_try_state(System::block_number()).is_ok());
-			})
-	}
 }
 
 mod ledger {
@@ -9355,8 +9318,7 @@ mod ledger_recovery {
 			assert_eq!(Balances::balance_locked(crate::STAKING_ID, &333), lock_333_before); // OK
 			assert_eq!(Bonded::<Test>::get(&333), Some(444)); // OK
 			assert!(Payee::<Test>::get(&333).is_some()); // OK
-
-			// however, ledger associated with its controller was killed.
+											 // however, ledger associated with its controller was killed.
 			assert!(Ledger::<Test>::get(&444).is_none()); // NOK
 
 			// side effects on 444 - ledger, bonded, payee, lock should be completely removed.

diff --git a/substrate/frame/staking/stake-tracker/Cargo.toml b/substrate/frame/staking/stake-tracker/Cargo.toml
@@ -19,7 +19,6 @@ codec = { features = [
 
 scale-info = { features = ["derive", "serde"], workspace = true }
 
-sp-std = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 sp-staking = { features = ["serde"], workspace = true }
 
@@ -57,7 +56,6 @@ std = [
 	"sp-runtime/std",
 	"sp-runtime/std",
 	"sp-staking/std",
-	"sp-std/std",
 	"sp-tracing/std",
 ]