difftreelog
fix use XCM barriers - pass SetTopic(ID)
in: master
3 files changed
runtime/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>,
-);
+)>;
runtime/quartz/src/xcm_barrier.rsdiffbeforeafterboth--- 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>,
-);
+)>;
runtime/unique/src/xcm_barrier.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use frame_support::{match_types, traits::Everything};18use staging_xcm::latest::{Junctions::*, MultiLocation};19use staging_xcm_builder::{20 AllowExplicitUnpaidExecutionFrom, AllowKnownQueryResponses, AllowSubscriptionsFrom,21 AllowTopLevelPaidExecutionFrom, TakeWeightCredit, TrailingSetTopicAsId,22};2324use crate::PolkadotXcm;2526match_types! {27 pub type ParentOnly: impl Contains<MultiLocation> = {28 MultiLocation { parents: 1, interior: Here }29 };3031 pub type ParentOrSiblings: impl Contains<MultiLocation> = {32 MultiLocation { parents: 1, interior: Here } |33 MultiLocation { parents: 1, interior: X1(_) }34 };35}3637pub type Barrier = TrailingSetTopicAsId<(38 TakeWeightCredit,39 AllowExplicitUnpaidExecutionFrom<ParentOnly>,40 AllowTopLevelPaidExecutionFrom<Everything>,41 // Expected responses are OK.42 AllowKnownQueryResponses<PolkadotXcm>,43 // Subscriptions for version tracking are OK.44 AllowSubscriptionsFrom<ParentOrSiblings>,45)>;