Integrate Treasury and Council Pallets with Enhanced Configuration and Benchmarking

Cargo.toml

@@ -113,6 +113,8 @@ 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-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-vesting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.11.0", default-features = false }

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,7 +36,9 @@ pallet-message-queue = { workspace = true }
 pallet-multisig = { workspace = true }
 pallet-session = { workspace = true }
 pallet-sudo = { workspace = true }
+pallet-treasury = { workspace = true }
 pallet-timestamp = { workspace = true }
+pallet-collective = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-vesting = { workspace = true }
@@ -118,6 +120,7 @@ test-utils = { workspace = true }
 ethereum = { workspace = true }
 
 [features]
+fast-mode=[]
 default = [
 	"std",
 ]
@@ -142,6 +145,8 @@ std = [
 	"pallet-balances/std",
 	"pallet-session/std",
 	"pallet-sudo/std",
+	"pallet-treasury/std",
+	"pallet-collective/std",
 	"pallet-laos-evolution/std",
 	"pallet-asset-metadata-extender/std",
 	"pallet-multisig/std",
@@ -208,8 +213,10 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
+	"pallet-collective/runtime-benchmarks",
 	"pallet-laos-evolution/runtime-benchmarks",
 	"pallet-multisig/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-xcm/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
@@ -247,9 +254,11 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-session/try-runtime",
 	"pallet-sudo/try-runtime",
+	"pallet-collective/try-runtime",
 	"pallet-laos-evolution/try-runtime",
 	"pallet-multisig/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

@@ -30,5 +30,7 @@ frame_benchmarking::define_benchmarks!(
 	[pallet_vesting, Vesting]
 	[pallet_message_queue, MessageQueue]
 	[cumulus_pallet_parachain_system, ParachainSystem]
+	[pallet_treasury, Treasury]
+	[pallet_collective, Council]
 	// 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/mod.rs

@@ -20,6 +20,7 @@ mod authorship;
 mod balances;
 mod base_fee;
 mod benchmark;
+mod collective_council;
 mod cumulus_parachain_system;
 mod cumulus_xcmp_queue;
 mod ethereum;
@@ -33,6 +34,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

runtime/laos/src/configs/treasury.rs

@@ -0,0 +1,95 @@
+use super::collective_council::CouncilCollective;
+use crate::{
+	currency::UNIT, weights, AccountId, Balance, Balances, BlockNumber, Permill, Runtime,
+	RuntimeEvent, Treasury,
+};
+use frame_support::{
+	parameter_types,
+	traits::{
+		tokens::{PayFromAccount, UnityAssetBalanceConversion},
+		EitherOfDiverse,
+	},
+	PalletId,
+};
+use frame_system::EnsureRoot;
+#[cfg(feature = "fast-mode")]
+use parachains_common::MINUTES;
+#[cfg(not(feature = "fast-mode"))]
+use parachains_common::DAYS;
+use sp_runtime::traits::IdentityLookup;
+
+#[cfg(feature = "fast-mode")]
+const TREASURY_SPENDING_PERIOD: BlockNumber = 5 * MINUTES;
+#[cfg(not(feature = "fast-mode"))]
+const TREASURY_SPENDING_PERIOD: BlockNumber = 7 * DAYS;
+
+parameter_types! {
+	pub const ProposalBond: Permill = Permill::from_percent(5);
+	pub const ProposalBondMinimum: Balance = 100 * UNIT;
+	pub const SpendPeriod: BlockNumber = TREASURY_SPENDING_PERIOD;
+	pub const MaxApprovals: u32 = 100;
+	pub const TreasuryId: PalletId = PalletId(*b"py/trsry");
+	pub const PayoutPeriod: BlockNumber = 5;
+	pub TreasuryAccount: AccountId = Treasury::account_id();
+}
+
+type ApproveOrigin = EitherOfDiverse<
+	EnsureRoot<AccountId>,
+	pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 1>,
+>;
+type RejectOrigin = EitherOfDiverse<
+	EnsureRoot<AccountId>,
+	pallet_collective::EnsureProportionAtLeast<AccountId, CouncilCollective, 1, 2>,
+>;
+
+impl pallet_treasury::Config for Runtime {
+	type AssetKind = ();
+	type ApproveOrigin = ApproveOrigin;
+	type BalanceConverter = UnityAssetBalanceConversion;
+	type Beneficiary = AccountId;
+	type BeneficiaryLookup = IdentityLookup<Self::Beneficiary>;
+	type Burn = ();
+	type BurnDestination = ();
+	type Currency = Balances;
+	type MaxApprovals = MaxApprovals;
+	type OnSlash = Treasury;
+	type PalletId = TreasuryId;
+	type Paymaster = PayFromAccount<Balances, TreasuryAccount>;
+	type PayoutPeriod = PayoutPeriod;
+	type ProposalBond = ProposalBond;
+	type ProposalBondMaximum = ();
+	type ProposalBondMinimum = ProposalBondMinimum;
+	type RejectOrigin = RejectOrigin;
+	type RuntimeEvent = RuntimeEvent;
+	type SpendFunds = ();
+	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
+	type SpendPeriod = SpendPeriod;
+	type WeightInfo = weights::pallet_treasury::WeightInfo<Runtime>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = TreasuryBenchmarkHelper;
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+pub struct TreasuryBenchmarkHelper;
+
+#[cfg(feature = "runtime-benchmarks")]
+impl pallet_treasury::ArgumentsFactory<(), AccountId> for TreasuryBenchmarkHelper {
+	fn create_asset_kind(_seed: u32) {}
+
+	fn create_beneficiary(seed: [u8; 32]) -> AccountId {
+		AccountId::from(seed)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::*;
+
+	#[test]
+	fn check_trasury_address() {
+		assert_eq!(
+			pallet_treasury::Pallet::<Runtime>::account_id().to_string(),
+			"0x6d6f646C70792f74727372790000000000000000"
+		);
+	}
+}

runtime/laos/src/configs/xcm_message_queue.rs

@@ -1,7 +1,7 @@
 use crate::{weights, Runtime, RuntimeEvent, XcmpQueue};
 use cumulus_primitives_core::AggregateMessageOrigin;
 use frame_support::parameter_types;
-use laos_primitives::BlockWeights;
+use laos_primitives::RuntimeBlockWeights;
 use parachains_common::message_queue::NarrowOriginToSibling;
 use sp_core::ConstU32;
 use sp_runtime::Perbill;
@@ -14,7 +14,7 @@ parameter_types! {
 	/// This may be legitimately `None` in the case that you will call
 	/// `ServiceQueues::service_queues` manually.
 	pub MessageQueueServiceWeight: Weight =
-	Perbill::from_percent(25) * BlockWeights::get().max_block;
+	Perbill::from_percent(25) * RuntimeBlockWeights::get().max_block;
 }
 
 impl pallet_message_queue::Config for Runtime {

runtime/laos/src/lib.rs

@@ -23,6 +23,7 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 pub mod apis;
 pub mod configs;
 pub mod currency;
+mod migrations;
 mod precompiles;
 mod self_contained_call;
 pub mod types;
@@ -127,6 +128,10 @@ construct_runtime!(
 		CumulusXcm: cumulus_pallet_xcm = 32,
 		MessageQueue: pallet_message_queue = 34,
 
+		// Governance
+		Council: pallet_collective::<Instance1> = 40,
+		Treasury: pallet_treasury = 41,
+
 		// Frontier
 		Ethereum: pallet_ethereum = 50,
 		EVM: pallet_evm = 51,
@@ -163,7 +168,7 @@ type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	migrations::Migrations,
 >;
 
 #[cfg(test)]

runtime/laos/src/migrations.rs

@@ -0,0 +1,19 @@
+// Copyright 2023-2024 Freeverse.io
+// This file is part of LAOS.
+
+// LAOS is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// LAOS is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with LAOS.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::Runtime;
+
+pub type Migrations = (cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,);