git.delta.rocks / unique-network / refs/commits / 64ecfc595eff

difftreelog

refactor rename local xcm_config to xcm_barrier

Daniel Shiposha2022-09-06parent: #e0c98a4.patch.diff
in: master

11 files changed

modifiedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
before · runtime/common/config/xcm/mod.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::{18	traits::{Everything, Get},19	weights::Weight,20	parameter_types,21};22use frame_system::EnsureRoot;23use pallet_xcm::XcmPassthrough;24use polkadot_parachain::primitives::Sibling;25use xcm::v1::{Junction::*, MultiLocation, NetworkId};26use xcm::latest::prelude::*;27use xcm_builder::{28	AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,29	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,30	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, ParentIsPreset,31};32use xcm_executor::{Config, XcmExecutor, traits::ShouldExecute};33use sp_std::{marker::PhantomData, vec::Vec};34use crate::{35	Runtime, Call, Event, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, XcmpQueue,36	xcm_config::Barrier,37};3839use up_common::types::AccountId;4041#[cfg(feature = "foreign-assets")]42pub mod foreignassets;4344#[cfg(not(feature = "foreign-assets"))]45pub mod nativeassets;4647#[cfg(feature = "foreign-assets")]48pub use foreignassets as xcm_assets;4950#[cfg(not(feature = "foreign-assets"))]51pub use nativeassets as xcm_assets;5253use xcm_assets::{AssetTransactors, IsReserve, Trader};5455parameter_types! {56	pub const RelayLocation: MultiLocation = MultiLocation::parent();57	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;58	pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();59	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();60	pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));6162	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.63	pub UnitWeightCost: Weight = 1_000_000;64	pub const MaxInstructions: u32 = 100;65}6667/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used68/// when determining ownership of accounts for asset transacting and when attempting to use XCM69/// `Transact` in order to determine the dispatch Origin.70pub type LocationToAccountId = (71	// The parent (Relay-chain) origin converts to the default `AccountId`.72	ParentIsPreset<AccountId>,73	// Sibling parachain origins convert to AccountId via the `ParaId::into`.74	SiblingParachainConvertsVia<Sibling, AccountId>,75	// Straight up local `AccountId32` origins just alias directly to `AccountId`.76	AccountId32Aliases<RelayNetwork, AccountId>,77);7879/// No local origins on this chain are allowed to dispatch XCM sends/executions.80pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);8182/// The means for routing XCM messages which are not for local execution into the right message83/// queues.84pub type XcmRouter = (85	// Two routers - use UMP to communicate with the relay chain:86	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,87	// ..and XCMP to communicate with the sibling chains.88	XcmpQueue,89);9091/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,92/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can93/// biases the kind of local `Origin` it will become.94pub type XcmOriginToTransactDispatchOrigin = (95	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location96	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for97	// foreign chains who want to have a local sovereign account on this chain which they control.98	SovereignSignedViaLocation<LocationToAccountId, Origin>,99	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when100	// recognised.101	RelayChainAsNative<RelayOrigin, Origin>,102	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when103	// recognised.104	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,105	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a106	// transaction from the Root origin.107	ParentAsSuperuser<Origin>,108	// Native signed account converter; this just converts an `AccountId32` origin into a normal109	// `Origin::Signed` origin of the same 32-byte value.110	SignedAccountId32AsNative<RelayNetwork, Origin>,111	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.112	XcmPassthrough<Origin>,113);114115pub trait TryPass {116	fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()>;117}118119#[impl_trait_for_tuples::impl_for_tuples(30)]120impl TryPass for Tuple {121	fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {122		for_tuples!( #(123			Tuple::try_pass(origin, message)?;124		)* );125126		Ok(())127	}128}129130pub struct DenyTransact;131impl TryPass for DenyTransact {132	fn try_pass<Call>(_origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {133		let transact_inst = message134			.0135			.iter()136			.find(|inst| matches![inst, Instruction::Transact { .. }]);137138		match transact_inst {139			Some(_) => {140				log::warn!(141					target: "xcm::barrier",142					"transact XCM rejected"143				);144145				Err(())146			}147			None => Ok(()),148		}149	}150}151152/// Deny executing the XCM if it matches any of the Deny filter regardless of anything else.153/// If it passes the Deny, and matches one of the Allow cases then it is let through.154pub struct DenyThenTry<Deny, Allow>(PhantomData<Deny>, PhantomData<Allow>)155where156	Deny: TryPass,157	Allow: ShouldExecute;158159impl<Deny, Allow> ShouldExecute for DenyThenTry<Deny, Allow>160where161	Deny: TryPass,162	Allow: ShouldExecute,163{164	fn should_execute<Call>(165		origin: &MultiLocation,166		message: &mut Xcm<Call>,167		max_weight: Weight,168		weight_credit: &mut Weight,169	) -> Result<(), ()> {170		Deny::try_pass(origin, message)?;171		Allow::should_execute(origin, message, max_weight, weight_credit)172	}173}174175// Allow xcm exchange only with locations in list176pub struct DenyExchangeWithUnknownLocation<T>(PhantomData<T>);177impl<T: Get<Vec<MultiLocation>>> TryPass for DenyExchangeWithUnknownLocation<T> {178	fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {179		let allowed_locations = T::get();180181		// Check if deposit or transfer belongs to allowed parachains182		let mut allowed = allowed_locations.contains(origin);183184		message.0.iter().for_each(|inst| match inst {185			DepositReserveAsset { dest: dst, .. } => {186				allowed |= allowed_locations.contains(dst);187			}188			TransferReserveAsset { dest: dst, .. } => {189				allowed |= allowed_locations.contains(dst);190			}191			_ => {}192		});193194		if allowed {195			return Ok(());196		}197198		log::warn!(199			target: "xcm::barrier",200			"Unexpected deposit or transfer location"201		);202		// Deny203		Err(())204	}205}206207pub type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;208209pub struct XcmConfig<T>(PhantomData<T>);210impl<T> Config for XcmConfig<T>211where212	T: pallet_configuration::Config,213{214	type Call = Call;215	type XcmSender = XcmRouter;216	// How to withdraw and deposit an asset.217	type AssetTransactor = AssetTransactors;218	type OriginConverter = XcmOriginToTransactDispatchOrigin;219	type IsReserve = IsReserve;220	type IsTeleporter = (); // Teleportation is disabled221	type LocationInverter = LocationInverter<Ancestry>;222	type Barrier = Barrier;223	type Weigher = Weigher;224	type Trader = Trader<T>;225	type ResponseHandler = (); // Don't handle responses for now.226	type SubscriptionService = PolkadotXcm;227228	type AssetTrap = PolkadotXcm;229	type AssetClaims = PolkadotXcm;230}231232impl pallet_xcm::Config for Runtime {233	type Event = Event;234	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;235	type XcmRouter = XcmRouter;236	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;237	type XcmExecuteFilter = Everything;238	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;239	type XcmTeleportFilter = Everything;240	type XcmReserveTransferFilter = Everything;241	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;242	type LocationInverter = LocationInverter<Ancestry>;243	type Origin = Origin;244	type Call = Call;245	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;246	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;247}248249impl cumulus_pallet_xcm::Config for Runtime {250	type Event = Event;251	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;252}253254impl cumulus_pallet_xcmp_queue::Config for Runtime {255	type WeightInfo = ();256	type Event = Event;257	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;258	type ChannelInfo = ParachainSystem;259	type VersionWrapper = ();260	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;261	type ControllerOrigin = EnsureRoot<AccountId>;262	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;263}264265impl cumulus_pallet_dmp_queue::Config for Runtime {266	type Event = Event;267	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;268	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;269}
after · runtime/common/config/xcm/mod.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::{18	traits::{Everything, Get},19	weights::Weight,20	parameter_types,21};22use frame_system::EnsureRoot;23use pallet_xcm::XcmPassthrough;24use polkadot_parachain::primitives::Sibling;25use xcm::v1::{Junction::*, MultiLocation, NetworkId};26use xcm::latest::prelude::*;27use xcm_builder::{28	AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,29	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,30	SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, ParentIsPreset,31};32use xcm_executor::{Config, XcmExecutor, traits::ShouldExecute};33use sp_std::{marker::PhantomData, vec::Vec};34use crate::{35	Runtime, Call, Event, Origin, ParachainInfo, ParachainSystem, PolkadotXcm, XcmpQueue,36	xcm_barrier::Barrier,37};3839use up_common::types::AccountId;4041#[cfg(feature = "foreign-assets")]42pub mod foreignassets;4344#[cfg(not(feature = "foreign-assets"))]45pub mod nativeassets;4647#[cfg(feature = "foreign-assets")]48pub use foreignassets as xcm_assets;4950#[cfg(not(feature = "foreign-assets"))]51pub use nativeassets as xcm_assets;5253use xcm_assets::{AssetTransactors, IsReserve, Trader};5455parameter_types! {56	pub const RelayLocation: MultiLocation = MultiLocation::parent();57	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;58	pub RelayOrigin: Origin = cumulus_pallet_xcm::Origin::Relay.into();59	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();60	pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));6162	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.63	pub UnitWeightCost: Weight = 1_000_000;64	pub const MaxInstructions: u32 = 100;65}6667/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used68/// when determining ownership of accounts for asset transacting and when attempting to use XCM69/// `Transact` in order to determine the dispatch Origin.70pub type LocationToAccountId = (71	// The parent (Relay-chain) origin converts to the default `AccountId`.72	ParentIsPreset<AccountId>,73	// Sibling parachain origins convert to AccountId via the `ParaId::into`.74	SiblingParachainConvertsVia<Sibling, AccountId>,75	// Straight up local `AccountId32` origins just alias directly to `AccountId`.76	AccountId32Aliases<RelayNetwork, AccountId>,77);7879/// No local origins on this chain are allowed to dispatch XCM sends/executions.80pub type LocalOriginToLocation = (SignedToAccountId32<Origin, AccountId, RelayNetwork>,);8182/// The means for routing XCM messages which are not for local execution into the right message83/// queues.84pub type XcmRouter = (85	// Two routers - use UMP to communicate with the relay chain:86	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,87	// ..and XCMP to communicate with the sibling chains.88	XcmpQueue,89);9091/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,92/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can93/// biases the kind of local `Origin` it will become.94pub type XcmOriginToTransactDispatchOrigin = (95	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location96	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for97	// foreign chains who want to have a local sovereign account on this chain which they control.98	SovereignSignedViaLocation<LocationToAccountId, Origin>,99	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when100	// recognised.101	RelayChainAsNative<RelayOrigin, Origin>,102	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when103	// recognised.104	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, Origin>,105	// Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a106	// transaction from the Root origin.107	ParentAsSuperuser<Origin>,108	// Native signed account converter; this just converts an `AccountId32` origin into a normal109	// `Origin::Signed` origin of the same 32-byte value.110	SignedAccountId32AsNative<RelayNetwork, Origin>,111	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.112	XcmPassthrough<Origin>,113);114115pub trait TryPass {116	fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()>;117}118119#[impl_trait_for_tuples::impl_for_tuples(30)]120impl TryPass for Tuple {121	fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {122		for_tuples!( #(123			Tuple::try_pass(origin, message)?;124		)* );125126		Ok(())127	}128}129130pub struct DenyTransact;131impl TryPass for DenyTransact {132	fn try_pass<Call>(_origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {133		let transact_inst = message134			.0135			.iter()136			.find(|inst| matches![inst, Instruction::Transact { .. }]);137138		match transact_inst {139			Some(_) => {140				log::warn!(141					target: "xcm::barrier",142					"transact XCM rejected"143				);144145				Err(())146			}147			None => Ok(()),148		}149	}150}151152/// Deny executing the XCM if it matches any of the Deny filter regardless of anything else.153/// If it passes the Deny, and matches one of the Allow cases then it is let through.154pub struct DenyThenTry<Deny, Allow>(PhantomData<Deny>, PhantomData<Allow>)155where156	Deny: TryPass,157	Allow: ShouldExecute;158159impl<Deny, Allow> ShouldExecute for DenyThenTry<Deny, Allow>160where161	Deny: TryPass,162	Allow: ShouldExecute,163{164	fn should_execute<Call>(165		origin: &MultiLocation,166		message: &mut Xcm<Call>,167		max_weight: Weight,168		weight_credit: &mut Weight,169	) -> Result<(), ()> {170		Deny::try_pass(origin, message)?;171		Allow::should_execute(origin, message, max_weight, weight_credit)172	}173}174175// Allow xcm exchange only with locations in list176pub struct DenyExchangeWithUnknownLocation<T>(PhantomData<T>);177impl<T: Get<Vec<MultiLocation>>> TryPass for DenyExchangeWithUnknownLocation<T> {178	fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {179		let allowed_locations = T::get();180181		// Check if deposit or transfer belongs to allowed parachains182		let mut allowed = allowed_locations.contains(origin);183184		message.0.iter().for_each(|inst| match inst {185			DepositReserveAsset { dest: dst, .. } => {186				allowed |= allowed_locations.contains(dst);187			}188			TransferReserveAsset { dest: dst, .. } => {189				allowed |= allowed_locations.contains(dst);190			}191			_ => {}192		});193194		if allowed {195			return Ok(());196		}197198		log::warn!(199			target: "xcm::barrier",200			"Unexpected deposit or transfer location"201		);202		// Deny203		Err(())204	}205}206207pub type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;208209pub struct XcmConfig<T>(PhantomData<T>);210impl<T> Config for XcmConfig<T>211where212	T: pallet_configuration::Config,213{214	type Call = Call;215	type XcmSender = XcmRouter;216	// How to withdraw and deposit an asset.217	type AssetTransactor = AssetTransactors;218	type OriginConverter = XcmOriginToTransactDispatchOrigin;219	type IsReserve = IsReserve;220	type IsTeleporter = (); // Teleportation is disabled221	type LocationInverter = LocationInverter<Ancestry>;222	type Barrier = Barrier;223	type Weigher = Weigher;224	type Trader = Trader<T>;225	type ResponseHandler = (); // Don't handle responses for now.226	type SubscriptionService = PolkadotXcm;227228	type AssetTrap = PolkadotXcm;229	type AssetClaims = PolkadotXcm;230}231232impl pallet_xcm::Config for Runtime {233	type Event = Event;234	type SendXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;235	type XcmRouter = XcmRouter;236	type ExecuteXcmOrigin = EnsureXcmOrigin<Origin, LocalOriginToLocation>;237	type XcmExecuteFilter = Everything;238	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;239	type XcmTeleportFilter = Everything;240	type XcmReserveTransferFilter = Everything;241	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;242	type LocationInverter = LocationInverter<Ancestry>;243	type Origin = Origin;244	type Call = Call;245	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;246	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;247}248249impl cumulus_pallet_xcm::Config for Runtime {250	type Event = Event;251	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;252}253254impl cumulus_pallet_xcmp_queue::Config for Runtime {255	type WeightInfo = ();256	type Event = Event;257	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;258	type ChannelInfo = ParachainSystem;259	type VersionWrapper = ();260	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;261	type ControllerOrigin = EnsureRoot<AccountId>;262	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;263}264265impl cumulus_pallet_dmp_queue::Config for Runtime {266	type Event = Event;267	type XcmExecutor = XcmExecutor<XcmConfig<Self>>;268	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;269}
modifiedruntime/opal/src/lib.rsdiffbeforeafterboth
--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -35,7 +35,7 @@
 #[path = "../../common/mod.rs"]
 mod runtime_common;
 
-pub mod xcm_config;
+pub mod xcm_barrier;
 
 #[cfg(test)]
 mod tests;
modifiedruntime/opal/src/tests/xcm.rsdiffbeforeafterboth
--- a/runtime/opal/src/tests/xcm.rs
+++ b/runtime/opal/src/tests/xcm.rs
@@ -15,7 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use logtest::Logger;
-use crate::{runtime_common::tests::xcm::*, xcm_config::Barrier};
+use crate::{runtime_common::tests::xcm::*, xcm_barrier::Barrier};
 
 const OPAL_PARA_ID: u32 = 2095; // Same as Quartz
 
addedruntime/opal/src/xcm_barrier.rsdiffbeforeafterboth
--- /dev/null
+++ b/runtime/opal/src/xcm_barrier.rs
@@ -0,0 +1,63 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+use frame_support::{
+	{match_types, weights::Weight},
+	traits::Everything,
+};
+use xcm::{
+	latest::Xcm,
+	v1::{BodyId, Junction::*, Junctions::*, MultiLocation},
+};
+use xcm_builder::{AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, TakeWeightCredit};
+use xcm_executor::traits::ShouldExecute;
+
+use crate::runtime_common::config::xcm::{DenyThenTry, DenyTransact};
+
+match_types! {
+	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here } |
+		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }
+	};
+}
+
+/// Execution barrier that just takes `max_weight` from `weight_credit`.
+///
+/// Useful to allow XCM execution by local chain users via extrinsics.
+/// E.g. `pallet_xcm::reserve_asset_transfer` to transfer a reserve asset
+/// out of the local chain to another one.
+pub struct AllowAllDebug;
+impl ShouldExecute for AllowAllDebug {
+	fn should_execute<Call>(
+		_origin: &MultiLocation,
+		_message: &mut Xcm<Call>,
+		_max_weight: Weight,
+		_weight_credit: &mut Weight,
+	) -> Result<(), ()> {
+		Ok(())
+	}
+}
+
+pub type Barrier = DenyThenTry<
+	DenyTransact,
+	(
+		TakeWeightCredit,
+		AllowTopLevelPaidExecutionFrom<Everything>,
+		AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,
+		// ^^^ Parent & its unit plurality gets free execution
+		AllowAllDebug,
+	),
+>;
deletedruntime/opal/src/xcm_config.rsdiffbeforeafterboth
--- a/runtime/opal/src/xcm_config.rs
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use frame_support::{
-	{match_types, weights::Weight},
-	traits::Everything,
-};
-use xcm::{
-	latest::Xcm,
-	v1::{BodyId, Junction::*, Junctions::*, MultiLocation},
-};
-use xcm_builder::{AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, TakeWeightCredit};
-use xcm_executor::traits::ShouldExecute;
-
-use crate::runtime_common::config::xcm::{DenyThenTry, DenyTransact};
-
-match_types! {
-	pub type ParentOrParentsUnitPlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Unit, .. }) }
-	};
-}
-
-/// Execution barrier that just takes `max_weight` from `weight_credit`.
-///
-/// Useful to allow XCM execution by local chain users via extrinsics.
-/// E.g. `pallet_xcm::reserve_asset_transfer` to transfer a reserve asset
-/// out of the local chain to another one.
-pub struct AllowAllDebug;
-impl ShouldExecute for AllowAllDebug {
-	fn should_execute<Call>(
-		_origin: &MultiLocation,
-		_message: &mut Xcm<Call>,
-		_max_weight: Weight,
-		_weight_credit: &mut Weight,
-	) -> Result<(), ()> {
-		Ok(())
-	}
-}
-
-pub type Barrier = DenyThenTry<
-	DenyTransact,
-	(
-		TakeWeightCredit,
-		AllowTopLevelPaidExecutionFrom<Everything>,
-		AllowUnpaidExecutionFrom<ParentOrParentsUnitPlurality>,
-		// ^^^ Parent & its unit plurality gets free execution
-		AllowAllDebug,
-	),
->;
modifiedruntime/quartz/src/lib.rsdiffbeforeafterboth
--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -35,7 +35,7 @@
 #[path = "../../common/mod.rs"]
 mod runtime_common;
 
-pub mod xcm_config;
+pub mod xcm_barrier;
 
 #[cfg(test)]
 mod tests;
addedruntime/quartz/src/xcm_barrier.rsdiffbeforeafterboth
--- /dev/null
+++ b/runtime/quartz/src/xcm_barrier.rs
@@ -0,0 +1,84 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+use frame_support::{match_types, parameter_types, traits::Get};
+use sp_std::{vec, vec::Vec};
+use xcm::v1::{BodyId, Junction::*, Junctions::*, MultiLocation};
+use xcm_builder::{
+	AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowUnpaidExecutionFrom, TakeWeightCredit,
+};
+
+use crate::{
+	ParachainInfo, PolkadotXcm,
+	runtime_common::config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},
+};
+
+match_types! {
+	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here } |
+		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
+	};
+	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here } |
+		MultiLocation { parents: 1, interior: X1(_) }
+	};
+}
+
+parameter_types! {
+	pub QuartzAllowedLocations: Vec<MultiLocation> = vec![
+		// Self location
+		MultiLocation {
+			parents: 0,
+			interior: Here,
+		},
+		// Parent location
+		MultiLocation {
+			parents: 1,
+			interior: Here,
+		},
+		// Karura/Acala location
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(2000)),
+		},
+		// Moonriver location
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(2023)),
+		},
+		// Self parachain address
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(ParachainInfo::get().into())),
+		},
+	];
+}
+
+pub type Barrier = DenyThenTry<
+	(
+		DenyTransact,
+		DenyExchangeWithUnknownLocation<QuartzAllowedLocations>,
+	),
+	(
+		TakeWeightCredit,
+		// Parent and its exec plurality get free execution
+		AllowUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
+		// Expected responses are OK.
+		AllowKnownQueryResponses<PolkadotXcm>,
+		// Subscriptions for version tracking are OK.
+		AllowSubscriptionsFrom<ParentOrSiblings>,
+	),
+>;
deletedruntime/quartz/src/xcm_config.rsdiffbeforeafterboth
--- a/runtime/quartz/src/xcm_config.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use frame_support::{match_types, parameter_types, traits::Get};
-use sp_std::{vec, vec::Vec};
-use xcm::v1::{BodyId, Junction::*, Junctions::*, MultiLocation};
-use xcm_builder::{
-	AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowUnpaidExecutionFrom, TakeWeightCredit,
-};
-
-use crate::{
-	ParachainInfo, PolkadotXcm,
-	runtime_common::config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},
-};
-
-match_types! {
-	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
-	};
-	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(_) }
-	};
-}
-
-parameter_types! {
-	pub QuartzAllowedLocations: Vec<MultiLocation> = vec![
-		// Self location
-		MultiLocation {
-			parents: 0,
-			interior: Here,
-		},
-		// Parent location
-		MultiLocation {
-			parents: 1,
-			interior: Here,
-		},
-		// Karura/Acala location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(2000)),
-		},
-		// Moonriver location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(2023)),
-		},
-		// Self parachain address
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(ParachainInfo::get().into())),
-		},
-	];
-}
-
-pub type Barrier = DenyThenTry<
-	(
-		DenyTransact,
-		DenyExchangeWithUnknownLocation<QuartzAllowedLocations>,
-	),
-	(
-		TakeWeightCredit,
-		// Parent and its exec plurality get free execution
-		AllowUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
-		// Expected responses are OK.
-		AllowKnownQueryResponses<PolkadotXcm>,
-		// Subscriptions for version tracking are OK.
-		AllowSubscriptionsFrom<ParentOrSiblings>,
-	),
->;
modifiedruntime/unique/src/lib.rsdiffbeforeafterboth
--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -35,7 +35,7 @@
 #[path = "../../common/mod.rs"]
 mod runtime_common;
 
-pub mod xcm_config;
+pub mod xcm_barrier;
 
 #[cfg(test)]
 mod tests;
addedruntime/unique/src/xcm_barrier.rsdiffbeforeafterboth
--- /dev/null
+++ b/runtime/unique/src/xcm_barrier.rs
@@ -0,0 +1,84 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+use frame_support::{match_types, parameter_types, traits::Get};
+use sp_std::{vec, vec::Vec};
+use xcm::v1::{BodyId, Junction::*, Junctions::*, MultiLocation};
+use xcm_builder::{
+	AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowUnpaidExecutionFrom, TakeWeightCredit,
+};
+
+use crate::{
+	ParachainInfo, PolkadotXcm,
+	runtime_common::config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},
+};
+
+match_types! {
+	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here } |
+		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
+	};
+	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
+		MultiLocation { parents: 1, interior: Here } |
+		MultiLocation { parents: 1, interior: X1(_) }
+	};
+}
+
+parameter_types! {
+	pub UniqueAllowedLocations: Vec<MultiLocation> = vec![
+		// Self location
+		MultiLocation {
+			parents: 0,
+			interior: Here,
+		},
+		// Parent location
+		MultiLocation {
+			parents: 1,
+			interior: Here,
+		},
+		// Karura/Acala location
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(2000)),
+		},
+		// Moonbeam location
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(2004)),
+		},
+		// Self parachain address
+		MultiLocation {
+			parents: 1,
+			interior: X1(Parachain(ParachainInfo::get().into())),
+		},
+	];
+}
+
+pub type Barrier = DenyThenTry<
+	(
+		DenyTransact,
+		DenyExchangeWithUnknownLocation<UniqueAllowedLocations>,
+	),
+	(
+		TakeWeightCredit,
+		// Parent and its exec plurality get free execution
+		AllowUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
+		// Expected responses are OK.
+		AllowKnownQueryResponses<PolkadotXcm>,
+		// Subscriptions for version tracking are OK.
+		AllowSubscriptionsFrom<ParentOrSiblings>,
+	),
+>;
deletedruntime/unique/src/xcm_config.rsdiffbeforeafterboth
--- a/runtime/unique/src/xcm_config.rs
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use frame_support::{match_types, parameter_types, traits::Get};
-use sp_std::{vec, vec::Vec};
-use xcm::v1::{BodyId, Junction::*, Junctions::*, MultiLocation};
-use xcm_builder::{
-	AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowUnpaidExecutionFrom, TakeWeightCredit,
-};
-
-use crate::{
-	ParachainInfo, PolkadotXcm,
-	runtime_common::config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},
-};
-
-match_types! {
-	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
-	};
-	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(_) }
-	};
-}
-
-parameter_types! {
-	pub UniqueAllowedLocations: Vec<MultiLocation> = vec![
-		// Self location
-		MultiLocation {
-			parents: 0,
-			interior: Here,
-		},
-		// Parent location
-		MultiLocation {
-			parents: 1,
-			interior: Here,
-		},
-		// Karura/Acala location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(2000)),
-		},
-		// Moonbeam location
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(2004)),
-		},
-		// Self parachain address
-		MultiLocation {
-			parents: 1,
-			interior: X1(Parachain(ParachainInfo::get().into())),
-		},
-	];
-}
-
-pub type Barrier = DenyThenTry<
-	(
-		DenyTransact,
-		DenyExchangeWithUnknownLocation<UniqueAllowedLocations>,
-	),
-	(
-		TakeWeightCredit,
-		// Parent and its exec plurality get free execution
-		AllowUnpaidExecutionFrom<ParentOrParentsExecutivePlurality>,
-		// Expected responses are OK.
-		AllowKnownQueryResponses<PolkadotXcm>,
-		// Subscriptions for version tracking are OK.
-		AllowSubscriptionsFrom<ParentOrSiblings>,
-	),
->;