mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-05-30 18:41:03 +00:00
[Companion] Bound Election and Staking by MaxActiveValidators (#6157)
* add maximum winners to multi phase election provider
* fallback to noelection
* fmt
* missing values
* convert boundedvec to inner before sort
* dont clone
* pr feedback
* update lockfile for {"substrate"}
* run onchain election on westend benchmark
Co-authored-by: parity-processbot <>
This commit is contained in:
@@ -411,6 +411,9 @@ parameter_types! {
|
||||
pub const MaxElectableTargets: u16 = u16::MAX;
|
||||
pub NposSolutionPriority: TransactionPriority =
|
||||
Perbill::from_percent(90) * TransactionPriority::max_value();
|
||||
/// Setup election pallet to support maximum winners upto 2000. This will mean Staking Pallet
|
||||
/// cannot have active validators higher than this count.
|
||||
pub const MaxActiveValidators: u32 = 2000;
|
||||
}
|
||||
|
||||
generate_solution_type!(
|
||||
@@ -429,6 +432,9 @@ impl onchain::Config for OnChainSeqPhragmen {
|
||||
type Solver = SequentialPhragmen<AccountId, runtime_common::elections::OnChainAccuracy>;
|
||||
type DataProvider = Staking;
|
||||
type WeightInfo = weights::frame_election_provider_support::WeightInfo<Runtime>;
|
||||
type MaxWinners = MaxActiveValidators;
|
||||
type VotersBound = MaxElectingVoters;
|
||||
type TargetsBound = MaxElectableTargets;
|
||||
}
|
||||
|
||||
impl pallet_election_provider_multi_phase::MinerConfig for Runtime {
|
||||
@@ -476,10 +482,15 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
|
||||
type MinerTxPriority = NposSolutionPriority;
|
||||
type DataProvider = Staking;
|
||||
#[cfg(feature = "fast-runtime")]
|
||||
type Fallback = onchain::UnboundedExecution<OnChainSeqPhragmen>;
|
||||
type Fallback = onchain::OnChainExecution<OnChainSeqPhragmen>;
|
||||
#[cfg(not(feature = "fast-runtime"))]
|
||||
type Fallback = pallet_election_provider_multi_phase::NoFallback<Self>;
|
||||
type GovernanceFallback = onchain::UnboundedExecution<OnChainSeqPhragmen>;
|
||||
type Fallback = frame_election_provider_support::NoElection<(
|
||||
AccountId,
|
||||
BlockNumber,
|
||||
Staking,
|
||||
MaxActiveValidators,
|
||||
)>;
|
||||
type GovernanceFallback = onchain::OnChainExecution<OnChainSeqPhragmen>;
|
||||
type Solver = SequentialPhragmen<
|
||||
AccountId,
|
||||
pallet_election_provider_multi_phase::SolutionAccuracyOf<Self>,
|
||||
@@ -490,6 +501,7 @@ impl pallet_election_provider_multi_phase::Config for Runtime {
|
||||
type WeightInfo = weights::pallet_election_provider_multi_phase::WeightInfo<Self>;
|
||||
type MaxElectingVoters = MaxElectingVoters;
|
||||
type MaxElectableTargets = MaxElectableTargets;
|
||||
type MaxWinners = MaxActiveValidators;
|
||||
}
|
||||
|
||||
parameter_types! {
|
||||
@@ -553,7 +565,7 @@ impl pallet_staking::Config for Runtime {
|
||||
type UnixTime = Timestamp;
|
||||
type CurrencyToVote = CurrencyToVote;
|
||||
type ElectionProvider = ElectionProviderMultiPhase;
|
||||
type GenesisElectionProvider = onchain::UnboundedExecution<OnChainSeqPhragmen>;
|
||||
type GenesisElectionProvider = onchain::OnChainExecution<OnChainSeqPhragmen>;
|
||||
type RewardRemainder = Treasury;
|
||||
type RuntimeEvent = RuntimeEvent;
|
||||
type Slash = Treasury;
|
||||
|
||||
Reference in New Issue
Block a user