Remove DenyReserveTransferToRelayChain

darwinia-network · May 21, 2024 · 1baf268 · 1baf268
1 parent a4465e1
commit 1baf268
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 48 deletions.
diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -109,34 +109,29 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	pallet_xcm::XcmPassthrough<RuntimeOrigin>,
 );
 
-pub type Barrier = xcm_builder::TrailingSetTopicAsId<
-	xcm_builder::DenyThenTry<
-		xcm_builder::DenyReserveTransferToRelayChain,
+pub type Barrier = xcm_builder::TrailingSetTopicAsId<(
+	xcm_builder::TakeWeightCredit,
+	xcm_builder::WithComputedOrigin<
 		(
-			xcm_builder::TakeWeightCredit,
-			xcm_builder::WithComputedOrigin<
-				(
-					// If the message is one that immediately attemps to pay for execution, then
-					// allow it.
-					xcm_builder::AllowTopLevelPaidExecutionFrom<frame_support::traits::Everything>,
-					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
-					// get free execution.
-					xcm_builder::AllowUnpaidExecutionFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality,
-					>,
-					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrSiblings,
-					>,
-				),
-				UniversalLocation,
-				ConstU32<8>,
+			// If the message is one that immediately attemps to pay for execution, then
+			// allow it.
+			xcm_builder::AllowTopLevelPaidExecutionFrom<frame_support::traits::Everything>,
+			// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
+			// get free execution.
+			xcm_builder::AllowUnpaidExecutionFrom<
+				darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality,
+			>,
+			// Subscriptions for version tracking are OK.
+			xcm_builder::AllowSubscriptionsFrom<
+				darwinia_common_runtime::xcm_configs::ParentOrSiblings,
 			>,
-			// Expected responses are OK.
-			xcm_builder::AllowKnownQueryResponses<PolkadotXcm>,
 		),
+		UniversalLocation,
+		ConstU32<8>,
 	>,
->;
+	// Expected responses are OK.
+	xcm_builder::AllowKnownQueryResponses<PolkadotXcm>,
+)>;
 
 frame_support::parameter_types! {
 	pub const MaxAssetsIntoHolding: u32 = 64;

diff --git a/runtime/pangolin/src/pallets/polkadot_xcm.rs b/runtime/pangolin/src/pallets/polkadot_xcm.rs
@@ -109,34 +109,29 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	pallet_xcm::XcmPassthrough<RuntimeOrigin>,
 );
 
-pub type Barrier = xcm_builder::TrailingSetTopicAsId<
-	xcm_builder::DenyThenTry<
-		xcm_builder::DenyReserveTransferToRelayChain,
+pub type Barrier = xcm_builder::TrailingSetTopicAsId<(
+	xcm_builder::TakeWeightCredit,
+	xcm_builder::WithComputedOrigin<
 		(
-			xcm_builder::TakeWeightCredit,
-			xcm_builder::WithComputedOrigin<
-				(
-					// If the message is one that immediately attemps to pay for execution, then
-					// allow it.
-					xcm_builder::AllowTopLevelPaidExecutionFrom<frame_support::traits::Everything>,
-					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
-					// get free execution.
-					xcm_builder::AllowExplicitUnpaidExecutionFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality,
-					>,
-					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrSiblings,
-					>,
-				),
-				UniversalLocation,
-				ConstU32<8>,
+			// If the message is one that immediately attemps to pay for execution, then
+			// allow it.
+			xcm_builder::AllowTopLevelPaidExecutionFrom<frame_support::traits::Everything>,
+			// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
+			// get free execution.
+			xcm_builder::AllowExplicitUnpaidExecutionFrom<
+				darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality,
+			>,
+			// Subscriptions for version tracking are OK.
+			xcm_builder::AllowSubscriptionsFrom<
+				darwinia_common_runtime::xcm_configs::ParentOrSiblings,
 			>,
-			// Expected responses are OK.
-			xcm_builder::AllowKnownQueryResponses<PolkadotXcm>,
 		),
+		UniversalLocation,
+		ConstU32<8>,
 	>,
->;
+	// Expected responses are OK.
+	xcm_builder::AllowKnownQueryResponses<PolkadotXcm>,
+)>;
 
 frame_support::parameter_types! {
 	pub const MaxAssetsIntoHolding: u32 = 64;