From 2ff692ccd6a34851de60613389660d5c3689e15c Mon Sep 17 00:00:00 2001
From: Yaroslav Bolyukin <iam@lach.pw>
Date: Tue, 14 Nov 2023 09:16:57 +0000
Subject: [PATCH] Merge pull request #1038 from UniqueNetwork/fix/xcmv3-settopic-barrier


---
--- a/runtime/opal/src/xcm_barrier.rs
+++ b/runtime/opal/src/xcm_barrier.rs
@@ -18,6 +18,7 @@
 use staging_xcm::latest::{Junctions::*, MultiLocation};
 use staging_xcm_builder::{
 	AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
+	TrailingSetTopicAsId,
 };
 
 match_types! {
@@ -26,8 +27,8 @@
 	};
 }
 
-pub type Barrier = (
+pub type Barrier = TrailingSetTopicAsId<(
 	TakeWeightCredit,
 	AllowExplicitUnpaidExecutionFrom<ParentOnly>,
 	AllowTopLevelPaidExecutionFrom<Everything>,
-);
+)>;
--- a/runtime/quartz/src/xcm_barrier.rs
+++ b/runtime/quartz/src/xcm_barrier.rs
@@ -18,7 +18,7 @@
 use staging_xcm::latest::{Junctions::*, MultiLocation};
 use staging_xcm_builder::{
 	AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
-	AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
+	AllowTopLevelPaidExecutionFrom, TakeWeightCredit, TrailingSetTopicAsId,
 };
 
 use crate::PolkadotXcm;
@@ -34,7 +34,7 @@
 	};
 }
 
-pub type Barrier = (
+pub type Barrier = TrailingSetTopicAsId<(
 	TakeWeightCredit,
 	AllowExplicitUnpaidExecutionFrom<ParentOnly>,
 	AllowTopLevelPaidExecutionFrom<Everything>,
@@ -42,4 +42,4 @@
 	AllowKnownQueryResponses<PolkadotXcm>,
 	// Subscriptions for version tracking are OK.
 	AllowSubscriptionsFrom<ParentOrSiblings>,
-);
+)>;
--- a/runtime/unique/src/xcm_barrier.rs
+++ b/runtime/unique/src/xcm_barrier.rs
@@ -18,7 +18,7 @@
 use staging_xcm::latest::{Junctions::*, MultiLocation};
 use staging_xcm_builder::{
 	AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
-	AllowTopLevelPaidExecutionFrom, TakeWeightCredit,
+	AllowTopLevelPaidExecutionFrom, TakeWeightCredit, TrailingSetTopicAsId,
 };
 
 use crate::PolkadotXcm;
@@ -34,7 +34,7 @@
 	};
 }
 
-pub type Barrier = (
+pub type Barrier = TrailingSetTopicAsId<(
 	TakeWeightCredit,
 	AllowExplicitUnpaidExecutionFrom<ParentOnly>,
 	AllowTopLevelPaidExecutionFrom<Everything>,
@@ -42,4 +42,4 @@
 	AllowKnownQueryResponses<PolkadotXcm>,
 	// Subscriptions for version tracking are OK.
 	AllowSubscriptionsFrom<ParentOrSiblings>,
-);
+)>;

-- 
gitstuff