difftreelog
fix RelayNetwork for Quartz
in: master
4 files changed
runtime/common/config/xcm/mod.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::{18 traits::{Everything, Get},19 parameter_types,20};21use frame_system::EnsureRoot;22use pallet_xcm::XcmPassthrough;23use polkadot_parachain::primitives::Sibling;24use xcm::latest::{prelude::*, Weight, MultiLocation, NetworkId};25use xcm_builder::{26 AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,27 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,28 SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, ParentIsPreset,29};30use xcm_executor::{Config, XcmExecutor, traits::ShouldExecute};31use sp_std::{marker::PhantomData, vec::Vec};32use crate::{33 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm,34 XcmpQueue, xcm_barrier::Barrier,35};3637use up_common::types::AccountId;3839#[cfg(feature = "foreign-assets")]40pub mod foreignassets;4142#[cfg(not(feature = "foreign-assets"))]43pub mod nativeassets;4445#[cfg(feature = "foreign-assets")]46pub use foreignassets as xcm_assets;4748#[cfg(not(feature = "foreign-assets"))]49pub use nativeassets as xcm_assets;5051use xcm_assets::{AssetTransactors, IsReserve, Trader};5253parameter_types! {54 pub const RelayLocation: MultiLocation = MultiLocation::parent();55 pub const RelayNetwork: NetworkId = NetworkId::Polkadot;56 pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();57 pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();58 pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));5960 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.61 pub UnitWeightCost: Weight = 1_000_000;62 pub const MaxInstructions: u32 = 100;63}6465/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used66/// when determining ownership of accounts for asset transacting and when attempting to use XCM67/// `Transact` in order to determine the dispatch Origin.68pub type LocationToAccountId = (69 // The parent (Relay-chain) origin converts to the default `AccountId`.70 ParentIsPreset<AccountId>,71 // Sibling parachain origins convert to AccountId via the `ParaId::into`.72 SiblingParachainConvertsVia<Sibling, AccountId>,73 // Straight up local `AccountId32` origins just alias directly to `AccountId`.74 AccountId32Aliases<RelayNetwork, AccountId>,75);7677/// No local origins on this chain are allowed to dispatch XCM sends/executions.78pub type LocalOriginToLocation = (SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>,);7980/// The means for routing XCM messages which are not for local execution into the right message81/// queues.82pub type XcmRouter = (83 // Two routers - use UMP to communicate with the relay chain:84 cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,85 // ..and XCMP to communicate with the sibling chains.86 XcmpQueue,87);8889/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,90/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can91/// biases the kind of local `Origin` it will become.92pub type XcmOriginToTransactDispatchOrigin = (93 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location94 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for95 // foreign chains who want to have a local sovereign account on this chain which they control.96 SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,97 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when98 // recognised.99 RelayChainAsNative<RelayOrigin, RuntimeOrigin>,100 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when101 // recognised.102 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,103 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a104 // transaction from the Root origin.105 ParentAsSuperuser<RuntimeOrigin>,106 // Native signed account converter; this just converts an `AccountId32` origin into a normal107 // `Origin::Signed` origin of the same 32-byte value.108 SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,109 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.110 XcmPassthrough<RuntimeOrigin>,111);112113pub trait TryPass {114 fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()>;115}116117#[impl_trait_for_tuples::impl_for_tuples(30)]118impl TryPass for Tuple {119 fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {120 for_tuples!( #(121 Tuple::try_pass(origin, message)?;122 )* );123124 Ok(())125 }126}127128pub struct DenyTransact;129impl TryPass for DenyTransact {130 fn try_pass<Call>(_origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {131 let transact_inst = message132 .0133 .iter()134 .find(|inst| matches![inst, Instruction::Transact { .. }]);135136 if transact_inst.is_some() {137 log::warn!(138 target: "xcm::barrier",139 "transact XCM rejected"140 );141142 Err(())143 } else {144 Ok(())145 }146 }147}148149/// Deny executing the XCM if it matches any of the Deny filter regardless of anything else.150/// If it passes the Deny, and matches one of the Allow cases then it is let through.151pub struct DenyThenTry<Deny, Allow>(PhantomData<Deny>, PhantomData<Allow>)152where153 Deny: TryPass,154 Allow: ShouldExecute;155156impl<Deny, Allow> ShouldExecute for DenyThenTry<Deny, Allow>157where158 Deny: TryPass,159 Allow: ShouldExecute,160{161 fn should_execute<Call>(162 origin: &MultiLocation,163 message: &mut Xcm<Call>,164 max_weight: Weight,165 weight_credit: &mut Weight,166 ) -> Result<(), ()> {167 Deny::try_pass(origin, message)?;168 Allow::should_execute(origin, message, max_weight, weight_credit)169 }170}171172// Allow xcm exchange only with locations in list173pub struct DenyExchangeWithUnknownLocation<T>(PhantomData<T>);174impl<T: Get<Vec<MultiLocation>>> TryPass for DenyExchangeWithUnknownLocation<T> {175 fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {176 let allowed_locations = T::get();177178 // Check if deposit or transfer belongs to allowed parachains179 let mut allowed = allowed_locations.contains(origin);180181 message.0.iter().for_each(|inst| match inst {182 DepositReserveAsset { dest: dst, .. } => {183 allowed |= allowed_locations.contains(dst);184 }185 TransferReserveAsset { dest: dst, .. } => {186 allowed |= allowed_locations.contains(dst);187 }188 InitiateReserveWithdraw { reserve: 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, RuntimeCall, MaxInstructions>;208209pub struct XcmConfig<T>(PhantomData<T>);210impl<T> Config for XcmConfig<T>211where212 T: pallet_configuration::Config,213{214 type RuntimeCall = RuntimeCall;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 RuntimeEvent = RuntimeEvent;234 type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;235 type XcmRouter = XcmRouter;236 type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;237 type XcmExecuteFilter = Everything;238 type XcmExecutor = XcmExecutor<XcmConfig<Self>>;239 type XcmTeleportFilter = Everything;240 type XcmReserveTransferFilter = Everything;241 type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;242 type LocationInverter = LocationInverter<Ancestry>;243 type RuntimeOrigin = RuntimeOrigin;244 type RuntimeCall = RuntimeCall;245 const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;246 type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;247}248249impl cumulus_pallet_xcm::Config for Runtime {250 type RuntimeEvent = RuntimeEvent;251 type XcmExecutor = XcmExecutor<XcmConfig<Self>>;252}253254impl cumulus_pallet_xcmp_queue::Config for Runtime {255 type WeightInfo = ();256 type RuntimeEvent = RuntimeEvent;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 RuntimeEvent = RuntimeEvent;267 type XcmExecutor = XcmExecutor<XcmConfig<Self>>;268 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;269}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 parameter_types,20};21use frame_system::EnsureRoot;22use pallet_xcm::XcmPassthrough;23use polkadot_parachain::primitives::Sibling;24use xcm::latest::{prelude::*, Weight, MultiLocation};25use xcm_builder::{26 AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,27 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,28 SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, ParentIsPreset,29};30use xcm_executor::{Config, XcmExecutor, traits::ShouldExecute};31use sp_std::{marker::PhantomData, vec::Vec};32use crate::{33 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm,34 XcmpQueue, xcm_barrier::Barrier, RelayNetwork,35};3637use up_common::types::AccountId;3839#[cfg(feature = "foreign-assets")]40pub mod foreignassets;4142#[cfg(not(feature = "foreign-assets"))]43pub mod nativeassets;4445#[cfg(feature = "foreign-assets")]46pub use foreignassets as xcm_assets;4748#[cfg(not(feature = "foreign-assets"))]49pub use nativeassets as xcm_assets;5051use xcm_assets::{AssetTransactors, IsReserve, Trader};5253parameter_types! {54 pub const RelayLocation: MultiLocation = MultiLocation::parent();55 pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();56 pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();57 pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));5859 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.60 pub UnitWeightCost: Weight = 1_000_000;61 pub const MaxInstructions: u32 = 100;62}6364/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used65/// when determining ownership of accounts for asset transacting and when attempting to use XCM66/// `Transact` in order to determine the dispatch Origin.67pub type LocationToAccountId = (68 // The parent (Relay-chain) origin converts to the default `AccountId`.69 ParentIsPreset<AccountId>,70 // Sibling parachain origins convert to AccountId via the `ParaId::into`.71 SiblingParachainConvertsVia<Sibling, AccountId>,72 // Straight up local `AccountId32` origins just alias directly to `AccountId`.73 AccountId32Aliases<RelayNetwork, AccountId>,74);7576/// No local origins on this chain are allowed to dispatch XCM sends/executions.77pub type LocalOriginToLocation = (SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>,);7879/// The means for routing XCM messages which are not for local execution into the right message80/// queues.81pub type XcmRouter = (82 // Two routers - use UMP to communicate with the relay chain:83 cumulus_primitives_utility::ParentAsUmp<ParachainSystem, ()>,84 // ..and XCMP to communicate with the sibling chains.85 XcmpQueue,86);8788/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,89/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can90/// biases the kind of local `Origin` it will become.91pub type XcmOriginToTransactDispatchOrigin = (92 // Sovereign account converter; this attempts to derive an `AccountId` from the origin location93 // using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for94 // foreign chains who want to have a local sovereign account on this chain which they control.95 SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,96 // Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when97 // recognised.98 RelayChainAsNative<RelayOrigin, RuntimeOrigin>,99 // Native converter for sibling Parachains; will convert to a `SiblingPara` origin when100 // recognised.101 SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,102 // Superuser converter for the Relay-chain (Parent) location. This will allow it to issue a103 // transaction from the Root origin.104 ParentAsSuperuser<RuntimeOrigin>,105 // Native signed account converter; this just converts an `AccountId32` origin into a normal106 // `Origin::Signed` origin of the same 32-byte value.107 SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,108 // Xcm origins can be represented natively under the Xcm pallet's Xcm origin.109 XcmPassthrough<RuntimeOrigin>,110);111112pub trait TryPass {113 fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()>;114}115116#[impl_trait_for_tuples::impl_for_tuples(30)]117impl TryPass for Tuple {118 fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {119 for_tuples!( #(120 Tuple::try_pass(origin, message)?;121 )* );122123 Ok(())124 }125}126127pub struct DenyTransact;128impl TryPass for DenyTransact {129 fn try_pass<Call>(_origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {130 let transact_inst = message131 .0132 .iter()133 .find(|inst| matches![inst, Instruction::Transact { .. }]);134135 if transact_inst.is_some() {136 log::warn!(137 target: "xcm::barrier",138 "transact XCM rejected"139 );140141 Err(())142 } else {143 Ok(())144 }145 }146}147148/// Deny executing the XCM if it matches any of the Deny filter regardless of anything else.149/// If it passes the Deny, and matches one of the Allow cases then it is let through.150pub struct DenyThenTry<Deny, Allow>(PhantomData<Deny>, PhantomData<Allow>)151where152 Deny: TryPass,153 Allow: ShouldExecute;154155impl<Deny, Allow> ShouldExecute for DenyThenTry<Deny, Allow>156where157 Deny: TryPass,158 Allow: ShouldExecute,159{160 fn should_execute<Call>(161 origin: &MultiLocation,162 message: &mut Xcm<Call>,163 max_weight: Weight,164 weight_credit: &mut Weight,165 ) -> Result<(), ()> {166 Deny::try_pass(origin, message)?;167 Allow::should_execute(origin, message, max_weight, weight_credit)168 }169}170171// Allow xcm exchange only with locations in list172pub struct DenyExchangeWithUnknownLocation<T>(PhantomData<T>);173impl<T: Get<Vec<MultiLocation>>> TryPass for DenyExchangeWithUnknownLocation<T> {174 fn try_pass<Call>(origin: &MultiLocation, message: &mut Xcm<Call>) -> Result<(), ()> {175 let allowed_locations = T::get();176177 // Check if deposit or transfer belongs to allowed parachains178 let mut allowed = allowed_locations.contains(origin);179180 message.0.iter().for_each(|inst| match inst {181 DepositReserveAsset { dest: dst, .. } => {182 allowed |= allowed_locations.contains(dst);183 }184 TransferReserveAsset { dest: dst, .. } => {185 allowed |= allowed_locations.contains(dst);186 }187 InitiateReserveWithdraw { reserve: dst, .. } => {188 allowed |= allowed_locations.contains(dst);189 }190 _ => {}191 });192193 if allowed {194 return Ok(());195 }196197 log::warn!(198 target: "xcm::barrier",199 "Unexpected deposit or transfer location"200 );201 // Deny202 Err(())203 }204}205206pub type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;207208pub struct XcmConfig<T>(PhantomData<T>);209impl<T> Config for XcmConfig<T>210where211 T: pallet_configuration::Config,212{213 type RuntimeCall = RuntimeCall;214 type XcmSender = XcmRouter;215 // How to withdraw and deposit an asset.216 type AssetTransactor = AssetTransactors;217 type OriginConverter = XcmOriginToTransactDispatchOrigin;218 type IsReserve = IsReserve;219 type IsTeleporter = (); // Teleportation is disabled220 type LocationInverter = LocationInverter<Ancestry>;221 type Barrier = Barrier;222 type Weigher = Weigher;223 type Trader = Trader<T>;224 type ResponseHandler = (); // Don't handle responses for now.225 type SubscriptionService = PolkadotXcm;226227 type AssetTrap = PolkadotXcm;228 type AssetClaims = PolkadotXcm;229}230231impl pallet_xcm::Config for Runtime {232 type RuntimeEvent = RuntimeEvent;233 type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;234 type XcmRouter = XcmRouter;235 type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;236 type XcmExecuteFilter = Everything;237 type XcmExecutor = XcmExecutor<XcmConfig<Self>>;238 type XcmTeleportFilter = Everything;239 type XcmReserveTransferFilter = Everything;240 type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;241 type LocationInverter = LocationInverter<Ancestry>;242 type RuntimeOrigin = RuntimeOrigin;243 type RuntimeCall = RuntimeCall;244 const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;245 type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;246}247248impl cumulus_pallet_xcm::Config for Runtime {249 type RuntimeEvent = RuntimeEvent;250 type XcmExecutor = XcmExecutor<XcmConfig<Self>>;251}252253impl cumulus_pallet_xcmp_queue::Config for Runtime {254 type WeightInfo = ();255 type RuntimeEvent = RuntimeEvent;256 type XcmExecutor = XcmExecutor<XcmConfig<Self>>;257 type ChannelInfo = ParachainSystem;258 type VersionWrapper = ();259 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;260 type ControllerOrigin = EnsureRoot<AccountId>;261 type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;262}263264impl cumulus_pallet_dmp_queue::Config for Runtime {265 type RuntimeEvent = RuntimeEvent;266 type XcmExecutor = XcmExecutor<XcmConfig<Self>>;267 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;268}runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -34,6 +34,8 @@
use up_common::types::*;
+use ::xcm::latest::NetworkId;
+
#[path = "../../common/mod.rs"]
mod runtime_common;
@@ -63,6 +65,7 @@
pub const Version: RuntimeVersion = VERSION;
pub const SS58Prefix: u16 = 42;
pub const ChainId: u64 = 8882;
+ pub const RelayNetwork: NetworkId = NetworkId::Kusama;
}
construct_runtime!();
runtime/quartz/src/lib.rsdiffbeforeafterboth--- a/runtime/quartz/src/lib.rs
+++ b/runtime/quartz/src/lib.rs
@@ -34,6 +34,8 @@
use up_common::types::*;
+use ::xcm::latest::NetworkId;
+
#[path = "../../common/mod.rs"]
mod runtime_common;
@@ -64,6 +66,7 @@
parameter_types! {
pub const Version: RuntimeVersion = VERSION;
+ pub const RelayNetwork: NetworkId = NetworkId::Kusama;
}
#[cfg(feature = "become-sapphire")]
parameter_types! {
runtime/unique/src/lib.rsdiffbeforeafterboth--- a/runtime/unique/src/lib.rs
+++ b/runtime/unique/src/lib.rs
@@ -34,6 +34,8 @@
use up_common::types::*;
+use ::xcm::latest::NetworkId;
+
#[path = "../../common/mod.rs"]
mod runtime_common;
@@ -63,6 +65,7 @@
pub const Version: RuntimeVersion = VERSION;
pub const SS58Prefix: u16 = 7391;
pub const ChainId: u64 = 8880;
+ pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
}
construct_runtime!();