git.delta.rocks / unique-network / refs/commits / 1d2d3c81f701

difftreelog

fix use XCM barriers - pass SetTopic(ID)

Daniel Shiposha2023-11-13parent: #a3f68ee.patch.diff
in: master

3 files changed

modifiedruntime/opal/src/xcm_barrier.rsdiffbeforeafterboth
--- 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>,
-);
+)>;
modifiedruntime/quartz/src/xcm_barrier.rsdiffbeforeafterboth
18use staging_xcm::latest::{Junctions::*, MultiLocation};18use staging_xcm::latest::{Junctions::*, MultiLocation};
19use staging_xcm_builder::{19use staging_xcm_builder::{
20 AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,20 AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,
21 AllowTopLevelPaidExecutionFrom, TakeWeightCredit,21 AllowTopLevelPaidExecutionFrom, TakeWeightCredit, TrailingSetTopicAsId,
22};22};
2323
24use crate::PolkadotXcm;24use crate::PolkadotXcm;
34 };34 };
35}35}
3636
37pub type Barrier = (37pub type Barrier = TrailingSetTopicAsId<(
38 TakeWeightCredit,38 TakeWeightCredit,
39 AllowExplicitUnpaidExecutionFrom<ParentOnly>,39 AllowExplicitUnpaidExecutionFrom<ParentOnly>,
40 AllowTopLevelPaidExecutionFrom<Everything>,40 AllowTopLevelPaidExecutionFrom<Everything>,
41 // Expected responses are OK.41 // Expected responses are OK.
42 AllowKnownQueryResponses<PolkadotXcm>,42 AllowKnownQueryResponses<PolkadotXcm>,
43 // Subscriptions for version tracking are OK.43 // Subscriptions for version tracking are OK.
44 AllowSubscriptionsFrom<ParentOrSiblings>,44 AllowSubscriptionsFrom<ParentOrSiblings>,
45);45)>;
4646
modifiedruntime/unique/src/xcm_barrier.rsdiffbeforeafterboth
--- 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>,
-);
+)>;