Refactors elections-phragmen pallet (companion for substrate#13453)

node/service/src/chain_spec.rs

@@ -364,7 +364,7 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		},
-		phragmen_election: Default::default(),
+		elections: Default::default(),
 		democracy: Default::default(),
 		council: polkadot::CouncilConfig { members: vec![], phantom: Default::default() },
 		technical_committee: polkadot::TechnicalCommitteeConfig {
@@ -745,7 +745,7 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		},
-		phragmen_election: Default::default(),
+		elections: Default::default(),
 		democracy: Default::default(),
 		council: kusama::CouncilConfig { members: vec![], phantom: Default::default() },
 		technical_committee: kusama::TechnicalCommitteeConfig {
@@ -1049,7 +1049,7 @@ fn rococo_staging_testnet_config_genesis(wasm_binary: &[u8]) -> rococo_runtime::
 				})
 				.collect::<Vec<_>>(),
 		},
-		phragmen_election: Default::default(),
+		elections: Default::default(),
 		babe: rococo_runtime::BabeConfig {
 			authorities: Default::default(),
 			epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
@@ -1357,7 +1357,7 @@ pub fn polkadot_testnet_genesis(
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		},
-		phragmen_election: Default::default(),
+		elections: Default::default(),
 		democracy: polkadot::DemocracyConfig::default(),
 		council: polkadot::CouncilConfig { members: vec![], phantom: Default::default() },
 		technical_committee: polkadot::TechnicalCommitteeConfig {
@@ -1444,7 +1444,7 @@ pub fn kusama_testnet_genesis(
 			slash_reward_fraction: Perbill::from_percent(10),
 			..Default::default()
 		},
-		phragmen_election: Default::default(),
+		elections: Default::default(),
 		democracy: kusama::DemocracyConfig::default(),
 		council: kusama::CouncilConfig { members: vec![], phantom: Default::default() },
 		technical_committee: kusama::TechnicalCommitteeConfig {
@@ -1609,7 +1609,7 @@ pub fn rococo_testnet_genesis(
 		},
 		grandpa: Default::default(),
 		im_online: Default::default(),
-		phragmen_election: Default::default(),
+		elections: Default::default(),
 		democracy: rococo::DemocracyConfig::default(),
 		council: rococo::CouncilConfig { members: vec![], phantom: Default::default() },
 		technical_committee: rococo::TechnicalCommitteeConfig {

runtime/kusama/Cargo.toml

@@ -49,7 +49,7 @@ pallet-nomination-pools-runtime-api = { git = "https://github.com/paritytech/sub
 pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-conviction-voting = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
+pallet-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-election-provider-multi-phase = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 pallet-fast-unstake = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-executive = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
@@ -146,7 +146,7 @@ std = [
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
-	"pallet-elections-phragmen/std",
+	"pallet-elections/std",
 	"pallet-election-provider-multi-phase/std",
 	"pallet-fast-unstake/std",
 	"pallet-democracy/std",
@@ -212,7 +212,7 @@ runtime-benchmarks = [
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
-	"pallet-elections-phragmen/runtime-benchmarks",
+	"pallet-elections/runtime-benchmarks",
 	"pallet-election-provider-multi-phase/runtime-benchmarks",
 	"pallet-election-provider-support-benchmarking/runtime-benchmarks",
 	"pallet-fast-unstake/runtime-benchmarks",
@@ -263,7 +263,7 @@ try-runtime = [
 	"pallet-transaction-payment/try-runtime",
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
-	"pallet-elections-phragmen/try-runtime",
+	"pallet-elections/try-runtime",
 	"pallet-election-provider-multi-phase/try-runtime",
 	"pallet-fast-unstake/try-runtime",
 	"pallet-democracy/try-runtime",

runtime/kusama/src/governance/old.rs

@@ -17,6 +17,7 @@
 //! Old governance configurations for the Kusama runtime.
 
 use crate::*;
+use frame_election_provider_support::{weights::SubstrateWeight, SequentialPhragmen};
 use frame_support::{parameter_types, traits::EitherOfDiverse};
 
 parameter_types! {
@@ -114,13 +115,16 @@ parameter_types! {
 	pub const DesiredRunnersUp: u32 = 19;
 	pub const MaxVoters: u32 = 10 * 1000;
 	pub const MaxCandidates: u32 = 1000;
-	pub const PhragmenElectionPalletId: LockIdentifier = *b"phrelect";
+	// The ElectionsPalletId parameter name was changed along with the renaming of the elections
+	// pallet, but we keep the same lock ID to prevent runtime migrations. Related to
+	// https://github.com/paritytech/substrate/issues/8250
+	pub const ElectionsPalletId: LockIdentifier = *b"phrelect";
 }
 
 // Make sure that there are no more than `MaxMembers` members elected via Phragmen.
 const_assert!(DesiredMembers::get() <= CouncilMaxMembers::get());
 
-impl pallet_elections_phragmen::Config for Runtime {
+impl pallet_elections::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type ChangeMembers = Council;
@@ -136,8 +140,10 @@ impl pallet_elections_phragmen::Config for Runtime {
 	type TermDuration = TermDuration;
 	type MaxVoters = MaxVoters;
 	type MaxCandidates = MaxCandidates;
-	type PalletId = PhragmenElectionPalletId;
-	type WeightInfo = weights::pallet_elections_phragmen::WeightInfo<Runtime>;
+	type PalletId = ElectionsPalletId;
+	type WeightInfo = weights::pallet_elections::WeightInfo<Runtime>;
+	type ElectionSolver = SequentialPhragmen<Self::AccountId, Perbill>;
+	type SolverWeightInfo = SubstrateWeight<Self>;
 }
 
 parameter_types! {

runtime/kusama/src/lib.rs

@@ -692,7 +692,7 @@ impl pallet_child_bounties::Config for Runtime {
 impl pallet_tips::Config for Runtime {
 	type MaximumReasonLength = MaximumReasonLength;
 	type DataDepositPerByte = DataDepositPerByte;
-	type Tippers = PhragmenElection;
+	type Tippers = Elections;
 	type TipCountdown = TipCountdown;
 	type TipFindersFee = TipFindersFee;
 	type TipReportDepositBase = TipReportDepositBase;
@@ -1001,7 +1001,7 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				RuntimeCall::Democracy(..) |
 				RuntimeCall::Council(..) |
 				RuntimeCall::TechnicalCommittee(..) |
-				RuntimeCall::PhragmenElection(..) |
+				RuntimeCall::Elections(..) |
 				RuntimeCall::TechnicalMembership(..) |
 				RuntimeCall::Treasury(..) |
 				RuntimeCall::Bounties(..) |
@@ -1045,7 +1045,7 @@ impl InstanceFilter<RuntimeCall> for ProxyType {
 				c,
 				RuntimeCall::Democracy(..) |
 					RuntimeCall::Council(..) | RuntimeCall::TechnicalCommittee(..) |
-					RuntimeCall::PhragmenElection(..) |
+					RuntimeCall::Elections(..) |
 					RuntimeCall::Treasury(..) |
 					RuntimeCall::Bounties(..) |
 					RuntimeCall::Tips(..) | RuntimeCall::Utility(..) |
@@ -1355,7 +1355,7 @@ construct_runtime! {
 		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>} = 13,
 		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 14,
 		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 15,
-		PhragmenElection: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>} = 16,
+		Elections: pallet_elections::{Pallet, Call, Storage, Event<T>, Config<T>} = 16,
 		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 17,
 		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 18,
 
@@ -1539,7 +1539,7 @@ mod benches {
 		[pallet_collective, TechnicalCommittee]
 		[pallet_conviction_voting, ConvictionVoting]
 		[pallet_democracy, Democracy]
-		[pallet_elections_phragmen, PhragmenElection]
+		[pallet_elections, Elections]
 		[pallet_election_provider_multi_phase, ElectionProviderMultiPhase]
 		[frame_election_provider_support, ElectionProviderBench::<Runtime>]
 		[pallet_fast_unstake, FastUnstake]

runtime/kusama/src/weights/mod.rs

@@ -27,7 +27,7 @@ pub mod pallet_collective_technical_committee;
 pub mod pallet_conviction_voting;
 pub mod pallet_democracy;
 pub mod pallet_election_provider_multi_phase;
-pub mod pallet_elections_phragmen;
+pub mod pallet_elections;
 pub mod pallet_fast_unstake;
 pub mod pallet_identity;
 pub mod pallet_im_online;

runtime/kusama/src/weights/pallet_elections_phragmen.rs → runtime/kusama/src/weights/pallet_elections.rs

@@ -13,7 +13,7 @@
 
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.
-//! Autogenerated weights for `pallet_elections_phragmen`
+//! Autogenerated weights for `pallet_elections`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
 //! DATE: 2022-11-16, STEPS: `50`, REPEAT: 20, LOW RANGE: `[]`, HIGH RANGE: `[]`
@@ -27,7 +27,7 @@
 // --chain=kusama-dev
 // --steps=50
 // --repeat=20
-// --pallet=pallet_elections_phragmen
+// --pallet=pallet_elections
 // --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
@@ -41,13 +41,13 @@
 use frame_support::{traits::Get, weights::Weight};
 use sp_std::marker::PhantomData;
 
-/// Weight functions for `pallet_elections_phragmen`.
+/// Weight functions for `pallet_elections`.
 pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightInfo<T> {
-	// Storage: PhragmenElection Candidates (r:1 w:0)
-	// Storage: PhragmenElection Members (r:1 w:0)
-	// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	// Storage: PhragmenElection Voting (r:1 w:1)
+impl<T: frame_system::Config> pallet_elections::WeightInfo for WeightInfo<T> {
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	/// The range of component `v` is `[1, 16]`.
 	fn vote_equal(v: u32, ) -> Weight {
@@ -58,10 +58,10 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
-	// Storage: PhragmenElection Candidates (r:1 w:0)
-	// Storage: PhragmenElection Members (r:1 w:0)
-	// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	// Storage: PhragmenElection Voting (r:1 w:1)
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	/// The range of component `v` is `[2, 16]`.
 	fn vote_more(v: u32, ) -> Weight {
@@ -72,10 +72,10 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
-	// Storage: PhragmenElection Candidates (r:1 w:0)
-	// Storage: PhragmenElection Members (r:1 w:0)
-	// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	// Storage: PhragmenElection Voting (r:1 w:1)
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	/// The range of component `v` is `[2, 16]`.
 	fn vote_less(v: u32, ) -> Weight {
@@ -86,17 +86,17 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
-	// Storage: PhragmenElection Voting (r:1 w:1)
+	// Storage: Elections Voting (r:1 w:1)
 	// Storage: Balances Locks (r:1 w:1)
 	fn remove_voter() -> Weight {
 		// Minimum execution time: 40_370 nanoseconds.
 		Weight::from_ref_time(41_142_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(2 as u64))
 			.saturating_add(T::DbWeight::get().writes(2 as u64))
 	}
-	// Storage: PhragmenElection Candidates (r:1 w:1)
-	// Storage: PhragmenElection Members (r:1 w:0)
-	// Storage: PhragmenElection RunnersUp (r:1 w:0)
+	// Storage: Elections Candidates (r:1 w:1)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
 	/// The range of component `c` is `[1, 1000]`.
 	fn submit_candidacy(c: u32, ) -> Weight {
 		// Minimum execution time: 37_086 nanoseconds.
@@ -106,7 +106,8 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(3 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
-	// Storage: PhragmenElection Candidates (r:1 w:1)
+	// Storage: Elections Candidates (r:1 w:1)
+
 	/// The range of component `c` is `[1, 1000]`.
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
 		// Minimum execution time: 32_127 nanoseconds.
@@ -116,8 +117,8 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
-	// Storage: PhragmenElection Members (r:1 w:1)
-	// Storage: PhragmenElection RunnersUp (r:1 w:1)
+	// Storage: Elections Members (r:1 w:1)
+	// Storage: Elections RunnersUp (r:1 w:1)
 	// Storage: Council Prime (r:1 w:1)
 	// Storage: Council Proposals (r:1 w:0)
 	// Storage: Council Members (r:0 w:1)
@@ -127,7 +128,7 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().writes(4 as u64))
 	}
-	// Storage: PhragmenElection RunnersUp (r:1 w:1)
+	// Storage: Elections RunnersUp (r:1 w:1)
 	fn renounce_candidacy_runners_up() -> Weight {
 		// Minimum execution time: 34_904 nanoseconds.
 		Weight::from_ref_time(36_139_000 as u64)
@@ -139,9 +140,9 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 		// Minimum execution time: 2_000_000_000 nanoseconds.
 		Weight::from_ref_time(2_000_000_000_000 as u64)
 	}
-	// Storage: PhragmenElection Members (r:1 w:1)
+	// Storage: Elections Members (r:1 w:1)
 	// Storage: System Account (r:1 w:1)
-	// Storage: PhragmenElection RunnersUp (r:1 w:1)
+	// Storage: Elections RunnersUp (r:1 w:1)
 	// Storage: Council Prime (r:1 w:1)
 	// Storage: Council Proposals (r:1 w:0)
 	// Storage: Council Members (r:0 w:1)
@@ -151,10 +152,10 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads(5 as u64))
 			.saturating_add(T::DbWeight::get().writes(5 as u64))
 	}
-	// Storage: PhragmenElection Voting (r:5001 w:5000)
-	// Storage: PhragmenElection Members (r:1 w:0)
-	// Storage: PhragmenElection RunnersUp (r:1 w:0)
-	// Storage: PhragmenElection Candidates (r:1 w:0)
+	// Storage: Elections Voting (r:5001 w:5000)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Candidates (r:1 w:0)
 	// Storage: Balances Locks (r:5000 w:5000)
 	// Storage: System Account (r:5000 w:5000)
 	/// The range of component `v` is `[5000, 10000]`.
@@ -168,28 +169,45 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads((3 as u64).saturating_mul(v as u64)))
 			.saturating_add(T::DbWeight::get().writes((3 as u64).saturating_mul(v as u64)))
 	}
-	// Storage: PhragmenElection Candidates (r:1 w:1)
-	// Storage: PhragmenElection Members (r:1 w:1)
-	// Storage: PhragmenElection RunnersUp (r:1 w:1)
-	// Storage: PhragmenElection Voting (r:10001 w:0)
+	// Storage: Elections Candidates (r:1 w:0)
+	// Storage: Elections Members (r:1 w:0)
+	// Storage: Elections RunnersUp (r:1 w:0)
+	// Storage: Elections Voting (r:10001 w:0)
+	/// The range of component `c` is `[1, 1000]`.
+	/// The range of component `v` is `[1, 10000]`.
+	/// The range of component `e` is `[10000, 160000]`.
+	fn pre_solve_election(_c: u32, v: u32, e: u32, ) -> Weight {
+		// Minimum execution time: 6_399_000 nanoseconds.
+		Weight::from_ref_time(1_581_352_360 as u64)
+			// Standard Error: 55_251
+			.saturating_add(Weight::from_ref_time(8_030_872 as u64).saturating_mul(v as u64))
+			// Standard Error: 3_683
+			.saturating_add(Weight::from_ref_time(13_203 as u64).saturating_mul(e as u64))
+			.saturating_add(T::DbWeight::get().reads(296 as u64))
+			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(v as u64)))
+	}
+	// Storage: Elections Members (r:1 w:1)
+	// Storage: Elections RunnersUp (r:1 w:1)
 	// Storage: Council Proposals (r:1 w:0)
-	// Storage: PhragmenElection ElectionRounds (r:1 w:1)
+	// Storage: Elections ElectionRounds (r:1 w:1)
+	// Storage: Elections Candidates (r:0 w:1)
 	// Storage: Council Members (r:0 w:1)
 	// Storage: Council Prime (r:0 w:1)
-	// Storage: System Account (r:3 w:3)
+	// Storage: System Account (r:1 w:1)
 	/// The range of component `c` is `[1, 1000]`.
 	/// The range of component `v` is `[1, 10000]`.
 	/// The range of component `e` is `[10000, 160000]`.
-	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
-		// Minimum execution time: 29_009_063 nanoseconds.
-		Weight::from_ref_time(29_156_039_000 as u64)
-			// Standard Error: 553_255
-			.saturating_add(Weight::from_ref_time(46_221_121 as u64).saturating_mul(v as u64))
-			// Standard Error: 35_504
-			.saturating_add(Weight::from_ref_time(2_367_682 as u64).saturating_mul(e as u64))
-			.saturating_add(T::DbWeight::get().reads(265 as u64))
+	fn post_solve_election(c: u32, v: u32, e: u32, ) -> Weight {
+		// Minimum execution time: 730_000 nanoseconds.
+		Weight::from_ref_time(747_000_000 as u64)
+			// Standard Error: 50_403
+			.saturating_add(Weight::from_ref_time(12_670_099 as u64).saturating_mul(c as u64))
+			// Standard Error: 5_039
+			.saturating_add(Weight::from_ref_time(342_861 as u64).saturating_mul(v as u64))
+			// Standard Error: 323
+			.saturating_add(Weight::from_ref_time(127 as u64).saturating_mul(e as u64))
+			.saturating_add(T::DbWeight::get().reads(4 as u64))
 			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(c as u64)))
-			.saturating_add(T::DbWeight::get().reads((1 as u64).saturating_mul(v as u64)))
 			.saturating_add(T::DbWeight::get().writes(6 as u64))
 			.saturating_add(T::DbWeight::get().writes((1 as u64).saturating_mul(c as u64)))
 	}