mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-16 20:11:03 +00:00
[NPoS] Implements dynamic number of nominators (#12970)
* Implements dynamic nominations per nominator * Adds SnapshotBounds and ElectionSizeTracker * Changes the ElectionDataProvider interface to receive ElectionBounds as input * Implements get_npos_voters with ElectionBounds * Implements get_npos_targets with ElectionBounds * Adds comments * tests * Truncates nomninations that exceed nominations quota; Old tests passing * Uses DataProviderBounds and ElectionBounds (to continue) * Finishes conversions - tests passing * Refactor staking in babe mocks * Replaces MaxElectableTargets and MaxElectingVoters with ElectionBounds; Adds more tests * Fixes nits; node compiling * bechmarks * removes nomination_quota extrinsic to request the nomination quota * Lazy quota check, ie. at nominate time only * remove non-working test (for now) * tests lazy nominations quota when quota is lower than current number of nominated targets * Adds runtime API and custom RPC call for clients to query the nominations quota for a given balance * removes old rpc * Cosmetic touches * All mocks working * Fixes benchmarking mocks * nits * more tests * renames trait methods * nit * ".git/.scripts/commands/fmt/fmt.sh" * Fix V2 PoV benchmarking (#13485) * Bump default 'additional_trie_layers' to two The default here only works for extremely small runtimes, which have no more than 16 storage prefices. This is changed to a "sane" default of 2, which is save for runtimes with up to 4096 storage prefices (eg StorageValue). Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Update tests and test weights Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * Fix PoV weights Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_balances * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_message_queue * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_glutton * ".git/.scripts/commands/bench/bench.sh" pallet dev pallet_glutton * Fix sanity check >0 would also do as a check, but let's try this. Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: command-bot <> * Move BEEFY code to consensus (#13484) * Move beefy primitives to consensus dir * Move beefy gadget to client consensus folder * Rename beefy crates * chore: move genesis block builder to chain-spec crate. (#13427) * chore: move genesis block builder to block builder crate. * add missing file * chore: move genesis block builder to sc-chain-spec * Update client/chain-spec/src/genesis.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Update test-utils/runtime/src/genesismap.rs Co-authored-by: Bastian Köcher <git@kchr.de> * Update test-utils/runtime/client/src/lib.rs * fix warnings * fix warnings --------- Co-authored-by: Bastian Köcher <git@kchr.de> * Speed up storage iteration from within the runtime (#13479) * Speed up storage iteration from within the runtime * Move the cached iterator into an `Option` * Use `RefCell` in no_std * Simplify the code slightly * Use `Option::replace` * Update doc comment for `next_storage_key_slow` * Make unbounded channels size warning exact (part 1) (#13490) * Replace `futures-channel` with `async-channel` in `out_events` * Apply suggestions from code review Co-authored-by: Koute <koute@users.noreply.github.com> * Also print the backtrace of `send()` call * Switch from `backtrace` crate to `std::backtrace` * Remove outdated `backtrace` dependency * Remove `backtrace` from `Cargo.lock` --------- Co-authored-by: Koute <koute@users.noreply.github.com> * Removal of Prometheus alerting rules deployment in cloud-infra (#13499) * sp-consensus: remove unused error variants (#13495) * Expose `ChargedAmount` (#13488) * Expose `ChargedAmount` * Fix imports * sc-consensus-beefy: fix metrics: use correct names (#13494) Signed-off-by: acatangiu <adrian@parity.io> * clippy fix * removes NominationsQuotaExceeded event * Update frame/staking/src/lib.rs Co-authored-by: Ross Bulat <ross@parity.io> * adds back the npos_max_iter * remove duplicate imports added after merge * fmt * Adds comment in public struct; Refactors CountBound and SizeCount to struct * addresses various pr comments * PR comment reviews * Fixes on-chain election bounds and related code * EPM checks the size of the voter list returned by the data provider * cosmetic changes * updates e2e tests mock * Adds more tests for size tracker and refactors code * Adds back only_iterates_max_2_times_max_allowed_len test * Refactor * removes unecessary dependency * empty commit -- restart all stuck CI jobs * restarts ci jobs * Renames ElectionBounds -> Bounds in benchmarking mocks et al * updates mocks * Update frame/election-provider-support/src/lib.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * Update frame/staking/src/pallet/impls.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * Update frame/election-provider-support/src/lib.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * Update frame/staking/src/tests.rs Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com> * more checks in api_nominations_quota in tests * Improves docs * fixes e2e tests * Uses size_hint rather than mem::size_of in size tracker; Refactor size tracker to own module * nits from reviews * Refactors bounds to own module; improves docs * More tests and docs * fixes docs * Fixes benchmarks * Fixes rust docs * fixes bags-list remote-ext-tests * Simplify bound checks in create_snapshot_external * Adds target size check in get_npos_targets * ".git/.scripts/commands/fmt/fmt.sh" * restart ci * rust doc fixes and cosmetic nits * rollback upgrade on parity-scale-codec version (unecessary) * reset cargo lock, no need to update it --------- Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Signed-off-by: acatangiu <adrian@parity.io> Co-authored-by: command-bot <> Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io> Co-authored-by: Davide Galassi <davxy@datawok.net> Co-authored-by: yjh <yjh465402634@gmail.com> Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: Koute <koute@users.noreply.github.com> Co-authored-by: Dmitry Markin <dmitry@markin.tech> Co-authored-by: Anthony Lazam <lazam@users.noreply.github.com> Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com> Co-authored-by: Piotr Mikołajczyk <piomiko41@gmail.com> Co-authored-by: Adrian Catangiu <adrian@parity.io> Co-authored-by: Ross Bulat <ross@parity.io> Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
This commit is contained in:
@@ -18,8 +18,9 @@
|
||||
//! Implementations for the Staking FRAME Pallet.
|
||||
|
||||
use frame_election_provider_support::{
|
||||
data_provider, BoundedSupportsOf, ElectionDataProvider, ElectionProvider, ScoreProvider,
|
||||
SortedListProvider, VoteWeight, VoterOf,
|
||||
bounds::{CountBound, SizeBound},
|
||||
data_provider, BoundedSupportsOf, DataProviderBounds, ElectionDataProvider, ElectionProvider,
|
||||
ScoreProvider, SortedListProvider, VoteWeight, VoterOf,
|
||||
};
|
||||
use frame_support::{
|
||||
defensive,
|
||||
@@ -45,8 +46,9 @@ use sp_staking::{
|
||||
use sp_std::prelude::*;
|
||||
|
||||
use crate::{
|
||||
log, slashing, weights::WeightInfo, ActiveEraInfo, BalanceOf, EraPayout, Exposure, ExposureOf,
|
||||
Forcing, IndividualExposure, MaxWinnersOf, Nominations, PositiveImbalanceOf, RewardDestination,
|
||||
election_size_tracker::StaticTracker, log, slashing, weights::WeightInfo, ActiveEraInfo,
|
||||
BalanceOf, EraPayout, Exposure, ExposureOf, Forcing, IndividualExposure, MaxNominationsOf,
|
||||
MaxWinnersOf, Nominations, NominationsQuota, PositiveImbalanceOf, RewardDestination,
|
||||
SessionInterface, StakingLedger, ValidatorPrefs,
|
||||
};
|
||||
|
||||
@@ -761,13 +763,15 @@ impl<T: Config> Pallet<T> {
|
||||
/// nominators.
|
||||
///
|
||||
/// This function is self-weighing as [`DispatchClass::Mandatory`].
|
||||
pub fn get_npos_voters(maybe_max_len: Option<usize>) -> Vec<VoterOf<Self>> {
|
||||
let max_allowed_len = {
|
||||
let all_voter_count = T::VoterList::count() as usize;
|
||||
maybe_max_len.unwrap_or(all_voter_count).min(all_voter_count)
|
||||
pub fn get_npos_voters(bounds: DataProviderBounds) -> Vec<VoterOf<Self>> {
|
||||
let mut voters_size_tracker: StaticTracker<Self> = StaticTracker::default();
|
||||
|
||||
let final_predicted_len = {
|
||||
let all_voter_count = T::VoterList::count();
|
||||
bounds.count.unwrap_or(all_voter_count.into()).min(all_voter_count.into()).0
|
||||
};
|
||||
|
||||
let mut all_voters = Vec::<_>::with_capacity(max_allowed_len);
|
||||
let mut all_voters = Vec::<_>::with_capacity(final_predicted_len as usize);
|
||||
|
||||
// cache a few things.
|
||||
let weight_of = Self::weight_of_fn();
|
||||
@@ -778,8 +782,8 @@ impl<T: Config> Pallet<T> {
|
||||
let mut min_active_stake = u64::MAX;
|
||||
|
||||
let mut sorted_voters = T::VoterList::iter();
|
||||
while all_voters.len() < max_allowed_len &&
|
||||
voters_seen < (NPOS_MAX_ITERATIONS_COEFFICIENT * max_allowed_len as u32)
|
||||
while all_voters.len() < final_predicted_len as usize &&
|
||||
voters_seen < (NPOS_MAX_ITERATIONS_COEFFICIENT * final_predicted_len as u32)
|
||||
{
|
||||
let voter = match sorted_voters.next() {
|
||||
Some(voter) => {
|
||||
@@ -798,10 +802,23 @@ impl<T: Config> Pallet<T> {
|
||||
|
||||
if let Some(Nominations { targets, .. }) = <Nominators<T>>::get(&voter) {
|
||||
if !targets.is_empty() {
|
||||
all_voters.push((voter.clone(), voter_weight, targets));
|
||||
// Note on lazy nomination quota: we do not check the nomination quota of the
|
||||
// voter at this point and accept all the current nominations. The nomination
|
||||
// quota is only enforced at `nominate` time.
|
||||
|
||||
let voter = (voter, voter_weight, targets);
|
||||
if voters_size_tracker.try_register_voter(&voter, &bounds).is_err() {
|
||||
// no more space left for the election result, stop iterating.
|
||||
Self::deposit_event(Event::<T>::SnapshotVotersSizeExceeded {
|
||||
size: voters_size_tracker.size as u32,
|
||||
});
|
||||
break
|
||||
}
|
||||
|
||||
all_voters.push(voter);
|
||||
nominators_taken.saturating_inc();
|
||||
} else {
|
||||
// Technically should never happen, but not much we can do about it.
|
||||
// technically should never happen, but not much we can do about it.
|
||||
}
|
||||
min_active_stake =
|
||||
if voter_weight < min_active_stake { voter_weight } else { min_active_stake };
|
||||
@@ -814,24 +831,31 @@ impl<T: Config> Pallet<T> {
|
||||
.try_into()
|
||||
.expect("`MaxVotesPerVoter` must be greater than or equal to 1"),
|
||||
);
|
||||
|
||||
if voters_size_tracker.try_register_voter(&self_vote, &bounds).is_err() {
|
||||
// no more space left for the election snapshot, stop iterating.
|
||||
Self::deposit_event(Event::<T>::SnapshotVotersSizeExceeded {
|
||||
size: voters_size_tracker.size as u32,
|
||||
});
|
||||
break
|
||||
}
|
||||
all_voters.push(self_vote);
|
||||
validators_taken.saturating_inc();
|
||||
} else {
|
||||
// this can only happen if: 1. there a bug in the bags-list (or whatever is the
|
||||
// sorted list) logic and the state of the two pallets is no longer compatible, or
|
||||
// because the nominators is not decodable since they have more nomination than
|
||||
// `T::MaxNominations`. The latter can rarely happen, and is not really an emergency
|
||||
// or bug if it does.
|
||||
log!(
|
||||
warn,
|
||||
"DEFENSIVE: invalid item in `VoterList`: {:?}, this nominator probably has too many nominations now",
|
||||
voter
|
||||
);
|
||||
// `T::NominationsQuota::get_quota`. The latter can rarely happen, and is not
|
||||
// really an emergency or bug if it does.
|
||||
defensive!(
|
||||
"DEFENSIVE: invalid item in `VoterList`: {:?}, this nominator probably has too many nominations now",
|
||||
voter,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// all_voters should have not re-allocated.
|
||||
debug_assert!(all_voters.capacity() == max_allowed_len);
|
||||
debug_assert!(all_voters.capacity() == final_predicted_len as usize);
|
||||
|
||||
Self::register_weight(T::WeightInfo::get_npos_voters(validators_taken, nominators_taken));
|
||||
|
||||
@@ -854,14 +878,20 @@ impl<T: Config> Pallet<T> {
|
||||
/// Get the targets for an upcoming npos election.
|
||||
///
|
||||
/// This function is self-weighing as [`DispatchClass::Mandatory`].
|
||||
pub fn get_npos_targets(maybe_max_len: Option<usize>) -> Vec<T::AccountId> {
|
||||
let max_allowed_len = maybe_max_len.unwrap_or_else(|| T::TargetList::count() as usize);
|
||||
let mut all_targets = Vec::<T::AccountId>::with_capacity(max_allowed_len);
|
||||
pub fn get_npos_targets(bounds: DataProviderBounds) -> Vec<T::AccountId> {
|
||||
let mut targets_size_tracker: StaticTracker<Self> = StaticTracker::default();
|
||||
|
||||
let final_predicted_len = {
|
||||
let all_target_count = T::TargetList::count();
|
||||
bounds.count.unwrap_or(all_target_count.into()).min(all_target_count.into()).0
|
||||
};
|
||||
|
||||
let mut all_targets = Vec::<T::AccountId>::with_capacity(final_predicted_len as usize);
|
||||
let mut targets_seen = 0;
|
||||
|
||||
let mut targets_iter = T::TargetList::iter();
|
||||
while all_targets.len() < max_allowed_len &&
|
||||
targets_seen < (NPOS_MAX_ITERATIONS_COEFFICIENT * max_allowed_len as u32)
|
||||
while all_targets.len() < final_predicted_len as usize &&
|
||||
targets_seen < (NPOS_MAX_ITERATIONS_COEFFICIENT * final_predicted_len as u32)
|
||||
{
|
||||
let target = match targets_iter.next() {
|
||||
Some(target) => {
|
||||
@@ -871,6 +901,14 @@ impl<T: Config> Pallet<T> {
|
||||
None => break,
|
||||
};
|
||||
|
||||
if targets_size_tracker.try_register_target(target.clone(), &bounds).is_err() {
|
||||
// no more space left for the election snapshot, stop iterating.
|
||||
Self::deposit_event(Event::<T>::SnapshotTargetsSizeExceeded {
|
||||
size: targets_size_tracker.size as u32,
|
||||
});
|
||||
break
|
||||
}
|
||||
|
||||
if Validators::<T>::contains_key(&target) {
|
||||
all_targets.push(target);
|
||||
}
|
||||
@@ -989,43 +1027,48 @@ impl<T: Config> Pallet<T> {
|
||||
/// Returns the current nominations quota for nominators.
|
||||
///
|
||||
/// Used by the runtime API.
|
||||
/// Note: for now, this api runtime will always return value of `T::MaxNominations` and thus it
|
||||
/// is redundant. However, with the upcoming changes in
|
||||
/// <https://github.com/paritytech/substrate/pull/12970>, the nominations quota will change
|
||||
/// depending on the nominators balance. We're introducing this runtime API now to prepare the
|
||||
/// community to use it before rolling out PR#12970.
|
||||
pub fn api_nominations_quota(_balance: BalanceOf<T>) -> u32 {
|
||||
T::MaxNominations::get()
|
||||
pub fn api_nominations_quota(balance: BalanceOf<T>) -> u32 {
|
||||
T::NominationsQuota::get_quota(balance)
|
||||
}
|
||||
}
|
||||
|
||||
impl<T: Config> ElectionDataProvider for Pallet<T> {
|
||||
type AccountId = T::AccountId;
|
||||
type BlockNumber = BlockNumberFor<T>;
|
||||
type MaxVotesPerVoter = T::MaxNominations;
|
||||
type MaxVotesPerVoter = MaxNominationsOf<T>;
|
||||
|
||||
fn desired_targets() -> data_provider::Result<u32> {
|
||||
Self::register_weight(T::DbWeight::get().reads(1));
|
||||
Ok(Self::validator_count())
|
||||
}
|
||||
|
||||
fn electing_voters(maybe_max_len: Option<usize>) -> data_provider::Result<Vec<VoterOf<Self>>> {
|
||||
fn electing_voters(bounds: DataProviderBounds) -> data_provider::Result<Vec<VoterOf<Self>>> {
|
||||
// This can never fail -- if `maybe_max_len` is `Some(_)` we handle it.
|
||||
let voters = Self::get_npos_voters(maybe_max_len);
|
||||
debug_assert!(maybe_max_len.map_or(true, |max| voters.len() <= max));
|
||||
let voters = Self::get_npos_voters(bounds);
|
||||
|
||||
debug_assert!(!bounds.exhausted(
|
||||
SizeBound(voters.encoded_size() as u32).into(),
|
||||
CountBound(voters.len() as u32).into()
|
||||
));
|
||||
|
||||
Ok(voters)
|
||||
}
|
||||
|
||||
fn electable_targets(maybe_max_len: Option<usize>) -> data_provider::Result<Vec<T::AccountId>> {
|
||||
let target_count = T::TargetList::count();
|
||||
fn electable_targets(bounds: DataProviderBounds) -> data_provider::Result<Vec<T::AccountId>> {
|
||||
let targets = Self::get_npos_targets(bounds);
|
||||
|
||||
// We can't handle this case yet -- return an error.
|
||||
if maybe_max_len.map_or(false, |max_len| target_count > max_len as u32) {
|
||||
// We can't handle this case yet -- return an error. WIP to improve handling this case in
|
||||
// <https://github.com/paritytech/substrate/pull/13195>.
|
||||
if bounds.exhausted(None, CountBound(T::TargetList::count() as u32).into()) {
|
||||
return Err("Target snapshot too big")
|
||||
}
|
||||
|
||||
Ok(Self::get_npos_targets(None))
|
||||
debug_assert!(!bounds.exhausted(
|
||||
SizeBound(targets.encoded_size() as u32).into(),
|
||||
CountBound(targets.len() as u32).into()
|
||||
));
|
||||
|
||||
Ok(targets)
|
||||
}
|
||||
|
||||
fn next_election_prediction(now: BlockNumberFor<T>) -> BlockNumberFor<T> {
|
||||
|
||||
Reference in New Issue
Block a user