From a43fbd3c67d6e26fdf17c4b322627d66ca2ee95d Mon Sep 17 00:00:00 2001 From: Valery Gantchev Date: Wed, 12 Jun 2024 15:12:07 +0200 Subject: [PATCH] Update TechComm origins --- Cargo.lock | 2 +- runtime/basilisk/Cargo.toml | 2 +- runtime/basilisk/src/governance/mod.rs | 5 ++++- runtime/basilisk/src/lib.rs | 2 +- runtime/basilisk/src/system.rs | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ae8f28351a..8ce60e0edc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -953,7 +953,7 @@ dependencies = [ [[package]] name = "basilisk-runtime" -version = "116.0.0" +version = "117.0.0" dependencies = [ "cumulus-pallet-aura-ext", "cumulus-pallet-parachain-system", diff --git a/runtime/basilisk/Cargo.toml b/runtime/basilisk/Cargo.toml index 1722388d92..e4c53792a9 100644 --- a/runtime/basilisk/Cargo.toml +++ b/runtime/basilisk/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "basilisk-runtime" -version = "116.0.0" +version = "117.0.0" authors = ["GalacticCouncil"] edition = "2021" homepage = "https://github.com/galacticcouncil/Basilisk-node" diff --git a/runtime/basilisk/src/governance/mod.rs b/runtime/basilisk/src/governance/mod.rs index 84679091d4..c890e06324 100644 --- a/runtime/basilisk/src/governance/mod.rs +++ b/runtime/basilisk/src/governance/mod.rs @@ -29,6 +29,7 @@ use frame_support::{ PalletId, }; use frame_system::{EnsureRoot, EnsureRootWithSuccess}; +use pallet_collective::EnsureProportionAtLeast; use primitives::constants::{currency::DOLLARS, time::DAYS}; use sp_arithmetic::Perbill; use sp_runtime::{traits::IdentityLookup, DispatchError}; @@ -38,6 +39,8 @@ mod tracks; // Old governance configurations. pub mod old; +pub type TechCommitteeMajority = EnsureProportionAtLeast; + parameter_types! { pub const TechnicalMotionDuration: BlockNumber = 5 * DAYS; pub const TechnicalMaxProposals: u32 = 20; @@ -84,7 +87,7 @@ impl pallet_whitelist::Config for Runtime { type WeightInfo = weights::pallet_whitelist::WeightInfo; type RuntimeCall = RuntimeCall; type RuntimeEvent = RuntimeEvent; - type WhitelistOrigin = EnsureRoot; + type WhitelistOrigin = EitherOf, TechCommitteeMajority>; type DispatchWhitelistedOrigin = EitherOf, WhitelistedCaller>; type Preimages = Preimage; } diff --git a/runtime/basilisk/src/lib.rs b/runtime/basilisk/src/lib.rs index 03e4c48c35..8614c7893a 100644 --- a/runtime/basilisk/src/lib.rs +++ b/runtime/basilisk/src/lib.rs @@ -102,7 +102,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { spec_name: create_runtime_str!("basilisk"), impl_name: create_runtime_str!("basilisk"), authoring_version: 1, - spec_version: 116, + spec_version: 117, impl_version: 0, apis: RUNTIME_API_VERSIONS, transaction_version: 1, diff --git a/runtime/basilisk/src/system.rs b/runtime/basilisk/src/system.rs index 0916f61c24..00be8436db 100644 --- a/runtime/basilisk/src/system.rs +++ b/runtime/basilisk/src/system.rs @@ -16,7 +16,7 @@ // limitations under the License. use super::*; -use crate::governance::{old::MajorityTechCommitteeOrRoot, origins::GeneralAdmin, TreasuryAccount}; +use crate::governance::{origins::GeneralAdmin, TechCommitteeMajority, TreasuryAccount}; use pallet_transaction_multi_payment::{DepositAll, TransferFees}; use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment}; @@ -488,7 +488,7 @@ impl pallet_relaychain_info::Config for Runtime { impl pallet_transaction_pause::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type UpdateOrigin = MajorityTechCommitteeOrRoot; + type UpdateOrigin = EitherOf, TechCommitteeMajority>; type WeightInfo = weights::pallet_transaction_pause::BasiliskWeight; }