--- a/runtime/common/config/orml.rs +++ b/runtime/common/config/orml.rs @@ -29,7 +29,7 @@ Runtime, RuntimeEvent, RelayChainBlockNumberProvider, runtime_common::config::{ xcm::{ - SelfLocation, Weigher, XcmConfig, UniversalLocation, + SelfLocation, Weigher, XcmExecutorConfig, UniversalLocation, xcm_assets::{CurrencyIdConvert}, }, pallets::TreasuryAccountId, @@ -138,7 +138,7 @@ type CurrencyIdConvert = CurrencyIdConvert; type AccountIdToMultiLocation = AccountIdToMultiLocation; type SelfLocation = SelfLocation; - type XcmExecutor = XcmExecutor>; + type XcmExecutor = XcmExecutor>; type Weigher = Weigher; type BaseXcmWeight = BaseXcmWeight; type MaxAssetsForTransfer = MaxAssetsForTransfer; --- a/runtime/common/config/xcm/mod.rs +++ b/runtime/common/config/xcm/mod.rs @@ -28,7 +28,7 @@ SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, ParentIsPreset, }; -use xcm_executor::{Config, XcmExecutor, traits::ShouldExecute}; +use xcm_executor::{XcmExecutor, traits::ShouldExecute}; use sp_std::{marker::PhantomData, vec::Vec}; use crate::{ Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm, @@ -182,8 +182,8 @@ pub type Weigher = FixedWeightBounds; -pub struct XcmConfig(PhantomData); -impl Config for XcmConfig +pub struct XcmExecutorConfig(PhantomData); +impl xcm_executor::Config for XcmExecutorConfig where T: pallet_configuration::Config, { @@ -227,7 +227,7 @@ type XcmRouter = XcmRouter; type ExecuteXcmOrigin = EnsureXcmOrigin; type XcmExecuteFilter = Everything; - type XcmExecutor = XcmExecutor>; + type XcmExecutor = XcmExecutor>; type XcmTeleportFilter = Everything; type XcmReserveTransferFilter = Everything; type Weigher = FixedWeightBounds; @@ -248,13 +248,13 @@ impl cumulus_pallet_xcm::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type XcmExecutor = XcmExecutor>; + type XcmExecutor = XcmExecutor>; } impl cumulus_pallet_xcmp_queue::Config for Runtime { type WeightInfo = (); type RuntimeEvent = RuntimeEvent; - type XcmExecutor = XcmExecutor>; + type XcmExecutor = XcmExecutor>; type ChannelInfo = ParachainSystem; type VersionWrapper = (); type ExecuteOverweightOrigin = frame_system::EnsureRoot; @@ -265,6 +265,6 @@ impl cumulus_pallet_dmp_queue::Config for Runtime { type RuntimeEvent = RuntimeEvent; - type XcmExecutor = XcmExecutor>; + type XcmExecutor = XcmExecutor>; type ExecuteOverweightOrigin = frame_system::EnsureRoot; }