feat(gov): normalize FastGeneralAdmin track origin for creating new f…

…oreign assets
moonbeam-foundation · Jan 28, 2025 · df55557 · df55557
1 parent aedf6b4
commit df55557
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 32 deletions.
diff --git a/runtime/moonbase/src/xcm_config.rs b/runtime/moonbase/src/xcm_config.rs
@@ -726,18 +726,31 @@ impl frame_support::traits::Contains<Location> for AssetFeesFilter {
 	}
 }
 
+pub type AddAndEditSupportedAssetOrigin = EitherOfDiverse<
+	EnsureRoot<AccountId>,
+	EitherOfDiverse<
+		pallet_collective::EnsureProportionMoreThan<AccountId, OpenTechCommitteeInstance, 5, 9>,
+		governance::custom_origins::FastGeneralAdmin,
+	>,
+>;
+
+pub type RemoveSupportedAssetOrigin = EitherOfDiverse<
+	EnsureRoot<AccountId>,
+	pallet_collective::EnsureProportionMoreThan<AccountId, OpenTechCommitteeInstance, 5, 9>,
+>;
+
 impl pallet_xcm_weight_trader::Config for Runtime {
 	type AccountIdToLocation = AccountIdToLocation<AccountId>;
-	type AddSupportedAssetOrigin = EnsureRoot<AccountId>;
+	type AddSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type AssetLocationFilter = AssetFeesFilter;
 	type AssetTransactor = AssetTransactors;
 	type Balance = Balance;
-	type EditSupportedAssetOrigin = EnsureRoot<AccountId>;
+	type EditSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type NativeLocation = SelfReserve;
-	type PauseSupportedAssetOrigin = EnsureRoot<AccountId>;
-	type RemoveSupportedAssetOrigin = EnsureRoot<AccountId>;
+	type PauseSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
+	type RemoveSupportedAssetOrigin = RemoveSupportedAssetOrigin;
 	type RuntimeEvent = RuntimeEvent;
-	type ResumeSupportedAssetOrigin = EnsureRoot<AccountId>;
+	type ResumeSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type WeightInfo = moonbase_weights::pallet_xcm_weight_trader::WeightInfo<Runtime>;
 	type WeightToFee = <Runtime as pallet_transaction_payment::Config>::WeightToFee;
 	type XcmFeesAccount = XcmFeesAccount;

diff --git a/runtime/moonbeam/src/xcm_config.rs b/runtime/moonbeam/src/xcm_config.rs
@@ -712,15 +712,7 @@ impl frame_support::traits::Contains<Location> for AssetFeesFilter {
 	}
 }
 
-pub type AddSupportedAssetOrigin = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	EitherOfDiverse<
-		pallet_collective::EnsureProportionMoreThan<AccountId, OpenTechCommitteeInstance, 5, 9>,
-		governance::custom_origins::GeneralAdmin,
-	>,
->;
-
-pub type EditSupportedAssetOrigin = EitherOfDiverse<
+pub type AddAndEditSupportedAssetOrigin = EitherOfDiverse<
 	EnsureRoot<AccountId>,
 	EitherOfDiverse<
 		pallet_collective::EnsureProportionMoreThan<AccountId, OpenTechCommitteeInstance, 5, 9>,
@@ -735,16 +727,16 @@ pub type RemoveSupportedAssetOrigin = EitherOfDiverse<
 
 impl pallet_xcm_weight_trader::Config for Runtime {
 	type AccountIdToLocation = AccountIdToLocation<AccountId>;
-	type AddSupportedAssetOrigin = AddSupportedAssetOrigin;
+	type AddSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type AssetLocationFilter = AssetFeesFilter;
 	type AssetTransactor = AssetTransactors;
 	type Balance = Balance;
-	type EditSupportedAssetOrigin = EditSupportedAssetOrigin;
+	type EditSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type NativeLocation = SelfReserve;
-	type PauseSupportedAssetOrigin = EditSupportedAssetOrigin;
+	type PauseSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
+	type ResumeSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type RemoveSupportedAssetOrigin = RemoveSupportedAssetOrigin;
 	type RuntimeEvent = RuntimeEvent;
-	type ResumeSupportedAssetOrigin = RemoveSupportedAssetOrigin;
 	type WeightInfo = moonbeam_weights::pallet_xcm_weight_trader::WeightInfo<Runtime>;
 	type WeightToFee = <Runtime as pallet_transaction_payment::Config>::WeightToFee;
 	type XcmFeesAccount = XcmFeesAccount;

diff --git a/runtime/moonriver/src/xcm_config.rs b/runtime/moonriver/src/xcm_config.rs
@@ -725,15 +725,7 @@ impl frame_support::traits::Contains<Location> for AssetFeesFilter {
 	}
 }
 
-pub type AddSupportedAssetOrigin = EitherOfDiverse<
-	EnsureRoot<AccountId>,
-	EitherOfDiverse<
-		pallet_collective::EnsureProportionMoreThan<AccountId, OpenTechCommitteeInstance, 5, 9>,
-		governance::custom_origins::GeneralAdmin,
-	>,
->;
-
-pub type EditSupportedAssetOrigin = EitherOfDiverse<
+pub type AddAndEditSupportedAssetOrigin = EitherOfDiverse<
 	EnsureRoot<AccountId>,
 	EitherOfDiverse<
 		pallet_collective::EnsureProportionMoreThan<AccountId, OpenTechCommitteeInstance, 5, 9>,
@@ -748,17 +740,16 @@ pub type RemoveSupportedAssetOrigin = EitherOfDiverse<
 
 impl pallet_xcm_weight_trader::Config for Runtime {
 	type AccountIdToLocation = AccountIdToLocation<AccountId>;
-	type AddSupportedAssetOrigin = AddSupportedAssetOrigin;
+	type AddSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type AssetLocationFilter = AssetFeesFilter;
 	type AssetTransactor = AssetTransactors;
 	type Balance = Balance;
-	type EditSupportedAssetOrigin = EditSupportedAssetOrigin;
+	type EditSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type NativeLocation = SelfReserve;
-	type PauseSupportedAssetOrigin = EditSupportedAssetOrigin;
+	type PauseSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
+	type ResumeSupportedAssetOrigin = AddAndEditSupportedAssetOrigin;
 	type RemoveSupportedAssetOrigin = RemoveSupportedAssetOrigin;
 	type RuntimeEvent = RuntimeEvent;
-	type ResumeSupportedAssetOrigin = RemoveSupportedAssetOrigin;
-
 	type WeightInfo = moonriver_weights::pallet_xcm_weight_trader::WeightInfo<Runtime>;
 	type WeightToFee = <Runtime as pallet_transaction_payment::Config>::WeightToFee;
 	type XcmFeesAccount = XcmFeesAccount;