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
before · runtime/opal/src/xcm_barrier.rs
1// 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, AllowTopLevelPaidExecutionFrom, TakeWeightCredit,21};2223match_types! {24	pub type ParentOnly: impl Contains<MultiLocation> = {25		MultiLocation { parents: 1, interior: Here }26	};27}2829pub type Barrier = (30	TakeWeightCredit,31	AllowExplicitUnpaidExecutionFrom<ParentOnly>,32	AllowTopLevelPaidExecutionFrom<Everything>,33);
after · runtime/opal/src/xcm_barrier.rs
1// 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, AllowTopLevelPaidExecutionFrom, TakeWeightCredit,21	TrailingSetTopicAsId,22};2324match_types! {25	pub type ParentOnly: impl Contains<MultiLocation> = {26		MultiLocation { parents: 1, interior: Here }27	};28}2930pub type Barrier = TrailingSetTopicAsId<(31	TakeWeightCredit,32	AllowExplicitUnpaidExecutionFrom<ParentOnly>,33	AllowTopLevelPaidExecutionFrom<Everything>,34)>;
modifiedruntime/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>,
-);
+)>;
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>,
-);
+)>;