Merge pull request #1038 from UniqueNetwork/fix/xcmv3-settopic-barrier

fix: use XCM barriers - pass SetTopic(ID)
UniqueNetwork · Nov 14, 2023 · 2ff692c · 2ff692c
2 parents a3f68ee + 1d2d3c8
commit 2ff692c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 8 deletions.
diff --git a/runtime/opal/src/xcm_barrier.rs b/runtime/opal/src/xcm_barrier.rs
@@ -18,6 +18,7 @@ use frame_support::{match_types, traits::Everything};
 use staging_xcm::latest::{Junctions::*, MultiLocation};
 use staging_xcm_builder::{
 	AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
+	TrailingSetTopicAsId,
 };
 
 match_types! {
@@ -26,8 +27,8 @@ match_types! {
 	};
 }
 
-pub type Barrier = (
+pub type Barrier = TrailingSetTopicAsId<(
 	TakeWeightCredit,
 	AllowExplicitUnpaidExecutionFrom<ParentOnly>,
 	AllowTopLevelPaidExecutionFrom<Everything>,
-);
+)>;
diff --git a/runtime/quartz/src/xcm_barrier.rs b/runtime/quartz/src/xcm_barrier.rs
@@ -18,7 +18,7 @@ use frame_support::{match_types, traits::Everything};
 use staging_xcm::latest::{Junctions::*, MultiLocation};
 use staging_xcm_builder::{
 	AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
-	AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
+	AllowTopLevelPaidExecutionFrom, TakeWeightCredit, TrailingSetTopicAsId,
 };
 
 use crate::PolkadotXcm;
@@ -34,12 +34,12 @@ match_types! {
 	};
 }
 
-pub type Barrier = (
+pub type Barrier = TrailingSetTopicAsId<(
 	TakeWeightCredit,
 	AllowExplicitUnpaidExecutionFrom<ParentOnly>,
 	AllowTopLevelPaidExecutionFrom<Everything>,
 	// Expected responses are OK.
 	AllowKnownQueryResponses<PolkadotXcm>,
 	// Subscriptions for version tracking are OK.
 	AllowSubscriptionsFrom<ParentOrSiblings>,
-);
+)>;
diff --git a/runtime/unique/src/xcm_barrier.rs b/runtime/unique/src/xcm_barrier.rs
@@ -18,7 +18,7 @@ use frame_support::{match_types, traits::Everything};
 use staging_xcm::latest::{Junctions::*, MultiLocation};
 use staging_xcm_builder::{
 	AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
-	AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
+	AllowTopLevelPaidExecutionFrom, TakeWeightCredit, TrailingSetTopicAsId,
 };
 
 use crate::PolkadotXcm;
@@ -34,12 +34,12 @@ match_types! {
 	};
 }
 
-pub type Barrier = (
+pub type Barrier = TrailingSetTopicAsId<(
 	TakeWeightCredit,
 	AllowExplicitUnpaidExecutionFrom<ParentOnly>,
 	AllowTopLevelPaidExecutionFrom<Everything>,
 	// Expected responses are OK.
 	AllowKnownQueryResponses<PolkadotXcm>,
 	// Subscriptions for version tracking are OK.
 	AllowSubscriptionsFrom<ParentOrSiblings>,
-);
+)>;