Fast General Admin Track for opening HRMP channels (#2736)

* Add new origin for opening a Hrmp channel * update Moonbase to support the HrmpOpen origin * add new track fast_general_admin to open hrmp channels on Moonriver * add new track fast_general_admin to open new hrmp channels on Moonbeam * allow HRMPOpenOrigin to accept HRMP channels * separate permission checks from action processing * Update pallets/xcm-transactor/src/lib.rs Co-authored-by: Andrea Giacobino <no.andrea@gmail.com> --------- Co-authored-by: Rodrigo Quelhas <22591718+RomarQ@users.noreply.github.com>
moonbeam-foundation · Apr 10, 2024 · 0430625 · 0430625
1 parent 56cccd0
commit 0430625
Show file tree

Hide file tree

Showing 17 changed files with 79 additions and 13 deletions.
diff --git a/pallets/xcm-transactor/src/lib.rs b/pallets/xcm-transactor/src/lib.rs
@@ -95,7 +95,10 @@ pub mod pallet {
 	use crate::weights::WeightInfo;
 	use crate::CurrencyIdOf;
 	use cumulus_primitives_core::{relay_chain::HrmpChannelId, ParaId};
-	use frame_support::{pallet_prelude::*, weights::constants::WEIGHT_REF_TIME_PER_SECOND};
+	use frame_support::traits::EitherOfDiverse;
+	use frame_support::{
+		dispatch::DispatchResult, pallet_prelude::*, weights::constants::WEIGHT_REF_TIME_PER_SECOND,
+	};
 	use frame_system::{ensure_signed, pallet_prelude::*};
 	use orml_traits::location::{Parse, Reserve};
 	use sp_runtime::traits::{AtLeast32BitUnsigned, Bounded, Convert};
@@ -143,9 +146,12 @@ pub mod pallet {
 		// The origin that is allowed to register derivative address indices
 		type DerivativeAddressRegistrationOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
-		// The origin that is allowed to register derivative address indices
+		// The origin that is allowed to manipulate (open, close, accept, cancel) an Hrmp channel
 		type HrmpManipulatorOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
+		// The origin that is allowed to open and accept an Hrmp channel
+		type HrmpOpenOrigin: EnsureOrigin<Self::RuntimeOrigin>;
+
 		/// Convert `T::AccountId` to `Location`.
 		type AccountIdToLocation: Convert<Self::AccountId, Location>;
 
@@ -862,7 +868,20 @@ pub mod pallet {
 			// BuyExecution
 			// SetAppendix(RefundSurplus, DepositAsset(sov account))
 			// Transact
-			T::HrmpManipulatorOrigin::ensure_origin(origin)?;
+
+			// check permissions
+			match &action {
+				HrmpOperation::InitOpen(_) | HrmpOperation::Accept { .. } => {
+					<EitherOfDiverse<T::HrmpManipulatorOrigin, T::HrmpOpenOrigin>>::ensure_origin(
+						origin,
+					)?;
+				}
+				HrmpOperation::Close(_) | HrmpOperation::Cancel { .. } => {
+					T::HrmpManipulatorOrigin::ensure_origin(origin)?;
+				}
+			}
+
+			// process action
 			let call_bytes = match action.clone() {
 				HrmpOperation::InitOpen(params) => {
 					Self::hrmp_encode_call(HrmpAvailableCalls::InitOpenChannel(

diff --git a/pallets/xcm-transactor/src/mock.rs b/pallets/xcm-transactor/src/mock.rs
@@ -396,6 +396,7 @@ impl Config for Test {
 	type ReserveProvider = orml_traits::location::RelativeReserveProvider;
 	type WeightInfo = ();
 	type HrmpManipulatorOrigin = EnsureRoot<u64>;
+	type HrmpOpenOrigin = EnsureRoot<u64>;
 	type MaxHrmpFee = MaxHrmpRelayFee;
 }
 

diff --git a/precompiles/relay-encoder/src/mock.rs b/precompiles/relay-encoder/src/mock.rs
@@ -309,6 +309,7 @@ impl pallet_xcm_transactor::Config for Runtime {
 	type ReserveProvider = orml_traits::location::RelativeReserveProvider;
 	type WeightInfo = ();
 	type HrmpManipulatorOrigin = frame_system::EnsureRoot<AccountId>;
+	type HrmpOpenOrigin = frame_system::EnsureRoot<AccountId>;
 	type MaxHrmpFee = ();
 }
 

diff --git a/precompiles/xcm-transactor/src/mock.rs b/precompiles/xcm-transactor/src/mock.rs
@@ -334,6 +334,7 @@ impl pallet_xcm_transactor::Config for Runtime {
 	type ReserveProvider = orml_traits::location::RelativeReserveProvider;
 	type WeightInfo = ();
 	type HrmpManipulatorOrigin = frame_system::EnsureRoot<AccountId>;
+	type HrmpOpenOrigin = frame_system::EnsureRoot<AccountId>;
 	type MaxHrmpFee = ();
 }
 

diff --git a/runtime/moonbase/src/governance/referenda.rs b/runtime/moonbase/src/governance/referenda.rs
@@ -51,8 +51,8 @@ parameter_types! {
 
 pub type GeneralAdminOrRoot = EitherOf<EnsureRoot<AccountId>, origins::GeneralAdmin>;
 
-/// The policy allows for Root, GeneralAdmin, or FastGeneralAdmin.
-pub type FastGeneralAdminOrRoot = EitherOf<GeneralAdminOrRoot, origins::FastGeneralAdmin>;
+/// The policy allows for Root or FastGeneralAdmin.
+pub type FastGeneralAdminOrRoot = EitherOf<EnsureRoot<AccountId>, origins::FastGeneralAdmin>;
 
 impl custom_origins::Config for Runtime {}
 

diff --git a/runtime/moonbase/src/xcm_config.rs b/runtime/moonbase/src/xcm_config.rs
@@ -72,7 +72,7 @@ use sp_std::{
 
 use orml_traits::parameter_type_with_key;
 
-use crate::governance::referenda::FastGeneralAdminOrRoot;
+use crate::governance::referenda::{FastGeneralAdminOrRoot, GeneralAdminOrRoot};
 
 parameter_types! {
 	// The network Id of the relay
@@ -658,7 +658,8 @@ impl pallet_xcm_transactor::Config for Runtime {
 	type AssetTransactor = AssetTransactors;
 	type ReserveProvider = AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
 	type WeightInfo = moonbeam_weights::pallet_xcm_transactor::WeightInfo<Runtime>;
-	type HrmpManipulatorOrigin = FastGeneralAdminOrRoot;
+	type HrmpManipulatorOrigin = GeneralAdminOrRoot;
+	type HrmpOpenOrigin = FastGeneralAdminOrRoot;
 	type MaxHrmpFee = xcm_builder::Case<MaxHrmpRelayFee>;
 }
 

diff --git a/runtime/moonbase/tests/xcm_mock/parachain.rs b/runtime/moonbase/tests/xcm_mock/parachain.rs
@@ -840,6 +840,7 @@ impl pallet_xcm_transactor::Config for Runtime {
 	type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
 	type WeightInfo = ();
 	type HrmpManipulatorOrigin = EnsureRoot<AccountId>;
+	type HrmpOpenOrigin = EnsureRoot<AccountId>;
 	type MaxHrmpFee = xcm_builder::Case<MaxHrmpRelayFee>;
 }
 

diff --git a/runtime/moonbeam/src/governance/origins.rs b/runtime/moonbeam/src/governance/origins.rs
@@ -41,6 +41,8 @@ pub mod custom_origins {
 		ReferendumCanceller,
 		/// Origin able to kill referenda.
 		ReferendumKiller,
+		/// Fast General Admin
+		FastGeneralAdmin,
 	}
 
 	macro_rules! decl_unit_ensures {
@@ -77,6 +79,7 @@ pub mod custom_origins {
 		ReferendumCanceller,
 		ReferendumKiller,
 		WhitelistedCaller,
-		GeneralAdmin
+		GeneralAdmin,
+		FastGeneralAdmin,
 	);
 }
diff --git a/runtime/moonbeam/src/governance/referenda.rs b/runtime/moonbeam/src/governance/referenda.rs
@@ -50,6 +50,8 @@ parameter_types! {
 
 // Origin for general admin or root
 pub type GeneralAdminOrRoot = EitherOf<EnsureRoot<AccountId>, origins::GeneralAdmin>;
+// The policy allows for Root or FastGeneralAdmin.
+pub type FastGeneralAdminOrRoot = EitherOf<EnsureRoot<AccountId>, origins::FastGeneralAdmin>;
 
 impl custom_origins::Config for Runtime {}
 

diff --git a/runtime/moonbeam/src/governance/tracks.rs b/runtime/moonbeam/src/governance/tracks.rs
@@ -28,7 +28,7 @@ const fn permill(x: i32) -> sp_runtime::FixedI64 {
 }
 
 use pallet_referenda::Curve;
-const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 5] = [
+const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6] = [
 	(
 		0,
 		pallet_referenda::TrackInfo {
@@ -111,6 +111,20 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 5]
 			min_support: Curve::make_reciprocal(1, 14, percent(1), percent(0), percent(10)),
 		},
 	),
+	(
+		5,
+		pallet_referenda::TrackInfo {
+			name: "fast_general_admin",
+			max_deciding: 10,
+			decision_deposit: 100 * GLMR * SUPPLY_FACTOR,
+			prepare_period: 1 * HOURS,
+			decision_period: 14 * DAYS,
+			confirm_period: 3 * HOURS,
+			min_enactment_period: 10 * MINUTES,
+			min_approval: Curve::make_reciprocal(4, 14, percent(80), percent(50), percent(100)),
+			min_support: Curve::make_reciprocal(5, 14, percent(1), percent(0), percent(50)),
+		},
+	),
 ];
 
 pub struct TracksInfo;

diff --git a/runtime/moonbeam/src/xcm_config.rs b/runtime/moonbeam/src/xcm_config.rs
@@ -72,7 +72,7 @@ use sp_std::{
 
 use orml_traits::parameter_type_with_key;
 
-use crate::governance::referenda::GeneralAdminOrRoot;
+use crate::governance::referenda::{FastGeneralAdminOrRoot, GeneralAdminOrRoot};
 
 parameter_types! {
 	// The network Id of the relay
@@ -651,6 +651,7 @@ impl pallet_xcm_transactor::Config for Runtime {
 	type ReserveProvider = AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
 	type WeightInfo = moonbeam_weights::pallet_xcm_transactor::WeightInfo<Runtime>;
 	type HrmpManipulatorOrigin = GeneralAdminOrRoot;
+	type HrmpOpenOrigin = FastGeneralAdminOrRoot;
 	type MaxHrmpFee = xcm_builder::Case<MaxHrmpRelayFee>;
 }
 

diff --git a/runtime/moonbeam/tests/xcm_mock/parachain.rs b/runtime/moonbeam/tests/xcm_mock/parachain.rs
@@ -800,6 +800,7 @@ impl pallet_xcm_transactor::Config for Runtime {
 	type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
 	type WeightInfo = ();
 	type HrmpManipulatorOrigin = EnsureRoot<AccountId>;
+	type HrmpOpenOrigin = EnsureRoot<AccountId>;
 	type MaxHrmpFee = xcm_builder::Case<MaxHrmpRelayFee>;
 }
 

diff --git a/runtime/moonriver/src/governance/origins.rs b/runtime/moonriver/src/governance/origins.rs
@@ -40,6 +40,8 @@ pub mod custom_origins {
 		ReferendumCanceller,
 		/// Origin able to kill referenda.
 		ReferendumKiller,
+		/// Fast General Admin
+		FastGeneralAdmin,
 	}
 
 	macro_rules! decl_unit_ensures {
@@ -76,6 +78,7 @@ pub mod custom_origins {
 		ReferendumCanceller,
 		ReferendumKiller,
 		WhitelistedCaller,
-		GeneralAdmin
+		GeneralAdmin,
+		FastGeneralAdmin,
 	);
 }
diff --git a/runtime/moonriver/src/governance/referenda.rs b/runtime/moonriver/src/governance/referenda.rs
@@ -50,6 +50,8 @@ parameter_types! {
 
 // Origin for general admin or root
 pub type GeneralAdminOrRoot = EitherOf<EnsureRoot<AccountId>, origins::GeneralAdmin>;
+// The policy allows for Root or FastGeneralAdmin.
+pub type FastGeneralAdminOrRoot = EitherOf<EnsureRoot<AccountId>, origins::FastGeneralAdmin>;
 
 impl custom_origins::Config for Runtime {}
 

diff --git a/runtime/moonriver/src/governance/tracks.rs b/runtime/moonriver/src/governance/tracks.rs
@@ -28,7 +28,7 @@ const fn permill(x: i32) -> sp_runtime::FixedI64 {
 }
 
 use pallet_referenda::Curve;
-const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 5] = [
+const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6] = [
 	(
 		0,
 		pallet_referenda::TrackInfo {
@@ -111,6 +111,20 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 5]
 			min_support: Curve::make_reciprocal(1, 14, percent(1), percent(0), percent(10)),
 		},
 	),
+	(
+		5,
+		pallet_referenda::TrackInfo {
+			name: "fast_general_admin",
+			max_deciding: 10,
+			decision_deposit: 500 * MOVR * SUPPLY_FACTOR,
+			prepare_period: 1 * HOURS,
+			decision_period: 14 * DAYS,
+			confirm_period: 3 * HOURS,
+			min_enactment_period: 10 * MINUTES,
+			min_approval: Curve::make_reciprocal(4, 14, percent(80), percent(50), percent(100)),
+			min_support: Curve::make_reciprocal(5, 14, percent(1), percent(0), percent(50)),
+		},
+	),
 ];
 
 pub struct TracksInfo;

diff --git a/runtime/moonriver/src/xcm_config.rs b/runtime/moonriver/src/xcm_config.rs
@@ -72,7 +72,7 @@ use sp_std::{
 
 use orml_traits::parameter_type_with_key;
 
-use crate::governance::referenda::GeneralAdminOrRoot;
+use crate::governance::referenda::{FastGeneralAdminOrRoot, GeneralAdminOrRoot};
 
 parameter_types! {
 	// The network Id of the relay
@@ -664,6 +664,7 @@ impl pallet_xcm_transactor::Config for Runtime {
 	type ReserveProvider = AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
 	type WeightInfo = moonbeam_weights::pallet_xcm_transactor::WeightInfo<Runtime>;
 	type HrmpManipulatorOrigin = GeneralAdminOrRoot;
+	type HrmpOpenOrigin = FastGeneralAdminOrRoot;
 	type MaxHrmpFee = xcm_builder::Case<MaxHrmpRelayFee>;
 }
 

diff --git a/runtime/moonriver/tests/xcm_mock/parachain.rs b/runtime/moonriver/tests/xcm_mock/parachain.rs
@@ -805,6 +805,7 @@ impl pallet_xcm_transactor::Config for Runtime {
 	type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
 	type WeightInfo = ();
 	type HrmpManipulatorOrigin = EnsureRoot<AccountId>;
+	type HrmpOpenOrigin = EnsureRoot<AccountId>;
 	type MaxHrmpFee = xcm_builder::Case<MaxHrmpRelayFee>;
 }