difftreelog
fix xcm v3 related fixes
in: master
1 file changed
runtime/common/config/xcm/mod.rsdiffbeforeafterboth29 SignedToAccountId32, SovereignSignedViaLocation, ParentIsPreset,29 SignedToAccountId32, SovereignSignedViaLocation, ParentIsPreset,30};30};31use xcm_executor::{XcmExecutor, traits::ShouldExecute};31use xcm_executor::{XcmExecutor, traits::ShouldExecute};32use sp_std::{marker::PhantomData, vec::Vec};32use sp_std::marker::PhantomData;33use crate::{33use crate::{34 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm,34 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm,35 XcmpQueue, xcm_barrier::Barrier, RelayNetwork, AllPalletsWithSystem, Balances,35 XcmpQueue, xcm_barrier::Barrier, RelayNetwork, AllPalletsWithSystem, Balances,54parameter_types! {54parameter_types! {55 pub const RelayLocation: MultiLocation = MultiLocation::parent();55 pub const RelayLocation: MultiLocation = MultiLocation::parent();56 pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();56 pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();57 pub UniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::get().into()));57 pub UniversalLocation: InteriorMultiLocation = (58 GlobalConsensus(crate::RelayNetwork::get()),59 Parachain(ParachainInfo::get().into()),60 ).into();58 pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));61 pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));596260 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.63 // One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.224 type RuntimeEvent = RuntimeEvent;227 type RuntimeEvent = RuntimeEvent;225 type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;228 type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;226 type ChannelInfo = ParachainSystem;229 type ChannelInfo = ParachainSystem;227 type VersionWrapper = ();230 type VersionWrapper = PolkadotXcm;228 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;231 type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;229 type ControllerOrigin = EnsureRoot<AccountId>;232 type ControllerOrigin = EnsureRoot<AccountId>;230 type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;233 type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;