From 1d2d3c81f70195690b1836138ac13e8d2cde7231 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Mon, 13 Nov 2023 19:49:33 +0100 Subject: [PATCH] fix: use XCM barriers - pass SetTopic(ID) --- runtime/opal/src/xcm_barrier.rs | 5 +++-- runtime/quartz/src/xcm_barrier.rs | 6 +++--- runtime/unique/src/xcm_barrier.rs | 6 +++--- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/runtime/opal/src/xcm_barrier.rs b/runtime/opal/src/xcm_barrier.rs index d16b4a2825..4febe9adda 100644 --- 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, AllowTopLevelPaidExecutionFrom, -); +)>; diff --git a/runtime/quartz/src/xcm_barrier.rs b/runtime/quartz/src/xcm_barrier.rs index 15fa44dec6..905a66e016 100644 --- 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,7 +34,7 @@ match_types! { }; } -pub type Barrier = ( +pub type Barrier = TrailingSetTopicAsId<( TakeWeightCredit, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, @@ -42,4 +42,4 @@ pub type Barrier = ( AllowKnownQueryResponses, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, -); +)>; diff --git a/runtime/unique/src/xcm_barrier.rs b/runtime/unique/src/xcm_barrier.rs index 15fa44dec6..905a66e016 100644 --- 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,7 +34,7 @@ match_types! { }; } -pub type Barrier = ( +pub type Barrier = TrailingSetTopicAsId<( TakeWeightCredit, AllowExplicitUnpaidExecutionFrom, AllowTopLevelPaidExecutionFrom, @@ -42,4 +42,4 @@ pub type Barrier = ( AllowKnownQueryResponses, // Subscriptions for version tracking are OK. AllowSubscriptionsFrom, -); +)>;