Integrate Treasury and Council Pallets with Enhanced Configuration and Benchmarking

Cargo.toml

@@ -113,6 +113,9 @@ pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch =
 pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }
 pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }

e2e-tests/package.json

@@ -25,7 +25,7 @@
 		"mocha-steps": "^1.3.0",
 		"rimraf": "^5.0.0",
 		"solc": "^0.8.3",
-		"truffle": "^5.10.2",
+		"truffle": "^5.11.5",
 		"ts-node": "^10.9.1",
 		"typescript": "^4.9.5",
 		"wait-on": "^7.0.1",

primitives/Cargo.toml

@@ -14,6 +14,7 @@ sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-consensus-aura = { workspace = true }
 cumulus-primitives-core = { workspace = true }
+parachains-common = { workspace = true }
 
 # EVM
 fp-account = { workspace = true, features = ["serde"] }

primitives/src/lib.rs

@@ -19,30 +19,15 @@
 #![warn(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-use frame_support::weights::{constants::WEIGHT_REF_TIME_PER_SECOND, IdentityFee, Weight};
+use frame_support::weights::IdentityFee;
 use frame_system::limits;
+pub use parachains_common::{MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO};
 use sp_core::Hasher as HasherT;
-use sp_runtime::{
-	traits::{BlakeTwo256, IdentifyAccount, Verify},
-	Perbill,
-};
+use sp_runtime::traits::{BlakeTwo256, IdentifyAccount, Verify};
 
 /// Authority ID used in parachain.
 pub type AuraId = sp_consensus_aura::sr25519::AuthorityId;
 
-/// Maximal weight of single LaosParachain block.
-///
-/// This represents 0.5 seconds of compute assuming a target block time of 12 seconds.
-///
-/// Max PoV size is set to `5Mb` as all Cumulus-based parachains do.
-pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
-	WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
-	cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
-);
-
-/// Represents the portion of a block that will be used by Normal extrinsics.
-pub const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
-
 /// Block number type used in Laos chain.
 pub type BlockNumber = u32;
 
@@ -76,21 +61,21 @@ pub type WeightToFee = IdentityFee<Balance>;
 
 frame_support::parameter_types! {
 	/// Size limit of the Laos parachain blocks.
-	pub BlockLength: limits::BlockLength =
+	pub RuntimeBlockLength: limits::BlockLength =
 		limits::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
 	/// Weight limit of the Laos parachain blocks.
-	pub BlockWeights: limits::BlockWeights =
+	pub RuntimeBlockWeights: limits::BlockWeights =
 		limits::BlockWeights::with_sensible_defaults(MAXIMUM_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO);
 }
 
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use frame_support::dispatch::DispatchClass;
+	use frame_support::{dispatch::DispatchClass, weights::Weight};
 
 	#[test]
 	fn test_block_weights() {
-		let weights = BlockWeights::get();
+		let weights = RuntimeBlockWeights::get();
 
 		assert_eq!(weights.base_block, Weight::from_parts(453383000, 0));
 		assert_eq!(weights.max_block, Weight::from_parts(500000000000, 5242880));

runtime/laos/Cargo.toml

@@ -36,8 +36,11 @@ pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-session = { workspace = true }
 pallet-sudo = { workspace = true }
+pallet-treasury = { workspace = true }
 pallet-preimage = { workspace = true }
 pallet-timestamp = { workspace = true }
+pallet-collective = { workspace = true }
+pallet-elections-phragmen = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-vesting = { workspace = true }
@@ -119,6 +122,7 @@ test-utils = { workspace = true }
 ethereum = { workspace = true }
 
 [features]
+fast-mode=[]
 default = [
 	"std",
 ]
@@ -141,8 +145,11 @@ std = [
 	"pallet-aura/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
+	"pallet-elections-phragmen/std",
 	"pallet-session/std",
 	"pallet-sudo/std",
+	"pallet-treasury/std",
+	"pallet-collective/std",
 	"pallet-preimage/std",
 	"pallet-laos-evolution/std",
 	"pallet-asset-metadata-extender/std",
@@ -210,10 +217,13 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-collective/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-laos-evolution/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
+	"pallet-elections-phragmen/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"staging-xcm-builder/runtime-benchmarks",
@@ -250,10 +260,13 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
+	"pallet-collective/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-laos-evolution/try-runtime",
 	"pallet-multisig/try-runtime",
+	"pallet-elections-phragmen/try-runtime",
 	"pallet-timestamp/try-runtime",
+	"pallet-treasury/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-xcm/try-runtime",
 	"staging-parachain-info/try-runtime",

runtime/laos/src/apis.rs

@@ -360,7 +360,7 @@ impl_runtime_apis! {
 	impl frame_try_runtime::TryRuntime<Block> for Runtime {
 		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
 			let weight = Executive::try_runtime_upgrade(checks).unwrap();
-			(weight, laos_primitives::BlockWeights::get().max_block)
+			(weight, laos_primitives::RuntimeBlockWeights::get().max_block)
 		}
 
 		fn execute_block(

runtime/laos/src/benchmarks.rs

@@ -27,9 +27,12 @@ frame_benchmarking::define_benchmarks!(
 	[pallet_laos_evolution, LaosEvolution]
 	[pallet_asset_metadata_extender, AssetMetadataExtender]
 	[pallet_precompiles_benchmark, PrecompilesBenchmark]
+	[pallet_collective, Council]
+	[pallet_elections_phragmen, Elections]
 	[pallet_preimage, Preimage]
 	[pallet_vesting, Vesting]
 	[pallet_message_queue, MessageQueue]
 	[cumulus_pallet_parachain_system, ParachainSystem]
+	[pallet_treasury, Treasury]
 	// TODO pallet_xcm?
 );

runtime/laos/src/configs/collective_council.rs

@@ -0,0 +1,36 @@
+use crate::{weights, AccountId, BlockNumber, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin};
+use frame_support::{pallet_prelude::Weight, parameter_types};
+use frame_system::EnsureRoot;
+use laos_primitives::RuntimeBlockWeights;
+#[cfg(not(feature = "fast-mode"))]
+use parachains_common::DAYS;
+#[cfg(feature = "fast-mode")]
+use parachains_common::MINUTES;
+use sp_runtime::Perbill;
+
+#[cfg(feature = "fast-mode")]
+pub const COUNCIL_MOTION_DURATION: BlockNumber = 5 * MINUTES;
+#[cfg(not(feature = "fast-mode"))]
+pub const COUNCIL_MOTION_DURATION: BlockNumber = 7 * DAYS;
+
+parameter_types! {
+	pub const CouncilMotionDuration: BlockNumber = COUNCIL_MOTION_DURATION;
+	pub const CouncilMaxProposals: u32 = 7;
+	pub const CouncilMaxMembers: u32 = 20;
+	pub MaxProposalWeight: Weight = Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block;
+	pub MaxCollectivesProposalWeight: Weight = Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block;
+}
+
+pub type CouncilCollective = pallet_collective::Instance1;
+impl pallet_collective::Config<CouncilCollective> for Runtime {
+	type DefaultVote = pallet_collective::MoreThanMajorityThenPrimeDefaultVote;
+	type MaxMembers = CouncilMaxMembers;
+	type MaxProposalWeight = MaxCollectivesProposalWeight;
+	type MaxProposals = CouncilMaxProposals;
+	type MotionDuration = CouncilMotionDuration;
+	type Proposal = RuntimeCall;
+	type RuntimeEvent = RuntimeEvent;
+	type RuntimeOrigin = RuntimeOrigin;
+	type SetMembersOrigin = EnsureRoot<AccountId>;
+	type WeightInfo = weights::pallet_collective::WeightInfo<Runtime>;
+}

runtime/laos/src/configs/election_phragmen.rs

@@ -0,0 +1,61 @@
+use crate::{
+	currency::UNIT, weights, Balance, Balances, BlockNumber, Council, Runtime, RuntimeEvent,
+	Treasury,
+};
+use frame_support::{parameter_types, traits::LockIdentifier};
+#[cfg(not(feature = "fast-mode"))]
+use parachains_common::DAYS;
+#[cfg(feature = "fast-mode")]
+use parachains_common::MINUTES;
+use polkadot_runtime_common::CurrencyToVote;
+
+#[cfg(feature = "fast-mode")]
+pub const TERM_DURATION: BlockNumber = 10 * MINUTES;
+#[cfg(not(feature = "fast-mode"))]
+pub const TERM_DURATION: BlockNumber = 28 * DAYS;
+
+#[cfg(feature = "fast-mode")]
+pub const ELECTION_VOTING_LOCK_DURATION: BlockNumber = 10 * MINUTES;
+#[cfg(not(feature = "fast-mode"))]
+pub const ELECTION_VOTING_LOCK_DURATION: BlockNumber = 28 * DAYS;
+
+parameter_types! {
+	pub const CandidacyBond: Balance = 1000 * UNIT;
+	pub TermDuration: BlockNumber = TERM_DURATION;
+	pub VotingLockPeriod: BlockNumber = ELECTION_VOTING_LOCK_DURATION;
+	pub const DesiredMembers: u32 = 7;
+	pub const DesiredRunnersUp: u32 = 20;
+	pub const MaxCandidates: u32 = 30;
+	pub const MaxVoters: u32 = 200;
+	pub const MaxVotesPerVoter: u32 = 8;
+	pub const VotingBondBase: Balance = 1000 * UNIT;
+	pub const VotingBondFactor: Balance = 100 * UNIT;
+	pub const ElectionsPhragmenPalletId: LockIdentifier = *b"phrelect";
+}
+
+impl pallet_elections_phragmen::Config for Runtime {
+	/// How much should be locked up in order to submit one's candidacy.
+	type CandidacyBond = CandidacyBond;
+	type ChangeMembers = Council;
+	type Currency = Balances;
+	type CurrencyToVote = CurrencyToVote;
+	/// Number of members to elect.
+	type DesiredMembers = DesiredMembers;
+	/// Number of runners_up to keep.
+	type DesiredRunnersUp = DesiredRunnersUp;
+	type InitializeMembers = Council;
+	type LoserCandidate = Treasury;
+	type MaxCandidates = MaxCandidates;
+	type MaxVoters = MaxVoters;
+	type MaxVotesPerVoter = MaxVotesPerVoter;
+	type PalletId = ElectionsPhragmenPalletId;
+	type RuntimeEvent = RuntimeEvent;
+	/// How long each seat is kept. This defines the next block number at which
+	/// an election round will happen. If set to zero, no elections are ever
+	/// triggered and the module will be in passive mode.
+	type TermDuration = TermDuration;
+	type VotingBondBase = VotingBondBase;
+	type VotingBondFactor = VotingBondFactor;
+	type KickedMember = ();
+	type WeightInfo = weights::pallet_elections_phragmen::WeightInfo<Runtime>;
+}

runtime/laos/src/configs/mod.rs

@@ -20,8 +20,10 @@ mod authorship;
 mod balances;
 mod base_fee;
 mod benchmark;
+mod collective_council;
 mod cumulus_parachain_system;
 mod cumulus_xcmp_queue;
+mod election_phragmen;
 mod ethereum;
 pub(crate) mod evm;
 pub(crate) mod laos_evolution;
@@ -34,6 +36,7 @@ mod sudo;
 pub mod system;
 mod timestamp;
 mod transaction_payment;
+mod treasury;
 mod utility;
 mod vesting;
 pub(crate) mod xcm_config;

runtime/laos/src/configs/system.rs

@@ -67,9 +67,9 @@ impl frame_system::Config for Runtime {
 	/// Weight information for the extrinsics of this pallet.
 	type SystemWeightInfo = ();
 	/// Block & extrinsics weights: base values and limits.
-	type BlockWeights = laos_primitives::BlockWeights;
+	type BlockWeights = laos_primitives::RuntimeBlockWeights;
 	/// The maximum length of a block (in bytes).
-	type BlockLength = laos_primitives::BlockLength;
+	type BlockLength = laos_primitives::RuntimeBlockLength;
 	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
 	type SS58Prefix = SS58Prefix;
 	/// The action to take on a Runtime Upgrade