diff --git a/pallets/liquid-staking/src/mock.rs b/pallets/liquid-staking/src/mock.rs index 1666ef546e..233e4c6e86 100644 --- a/pallets/liquid-staking/src/mock.rs +++ b/pallets/liquid-staking/src/mock.rs @@ -25,9 +25,9 @@ pub use xcm::latest::prelude::*; pub use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, AllowUnpaidExecutionFrom, ChildParachainAsNative, ChildParachainConvertsVia, ChildSystemParachainAsSuperuser, - CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfConcreteFungible, - FixedWeightBounds, IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, + CurrencyAdapter as XcmCurrencyAdapter, EnsureXcmOrigin, FixedRateOfFungible, FixedWeightBounds, + IsConcrete, LocationInverter, NativeAsset, ParentAsSuperuser, ParentIsDefault, + RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeWeightCredit, }; use xcm_executor::{Config, XcmExecutor}; @@ -78,7 +78,7 @@ pub type XcmOriginToCallOrigin = ( parameter_types! { pub const UnitWeightCost: Weight = 1; - pub DotPerSecond: (MultiLocation, u128) = (MultiLocation::parent(), 1); + pub DotPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), 1); } pub type LocalAssetTransactor = MultiCurrencyAdapter< @@ -103,7 +103,7 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; + type Trader = FixedRateOfFungible; type ResponseHandler = (); type SubscriptionService = PolkadotXcm; } diff --git a/runtime/heiko/src/lib.rs b/runtime/heiko/src/lib.rs index 041b2c6ffd..0bf6ecd1c3 100644 --- a/runtime/heiko/src/lib.rs +++ b/runtime/heiko/src/lib.rs @@ -66,11 +66,10 @@ use primitives::{ }; use xcm::latest::prelude::*; use xcm_builder::{ - AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, - FixedRateOfConcreteFungible, FixedWeightBounds, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, - TakeWeightCredit, + AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedRateOfFungible, + FixedWeightBounds, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, + SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; use xcm_executor::{Config, XcmExecutor}; @@ -812,7 +811,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { pub UnitWeightCost: Weight = 20_000_000; - pub KsmPerSecond: (MultiLocation, u128) = (MultiLocation::parent(), ksm_per_second()); + pub KsmPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), ksm_per_second()); } parameter_types! { @@ -852,7 +851,7 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; + type Trader = FixedRateOfFungible; type ResponseHandler = (); type SubscriptionService = PolkadotXcm; } diff --git a/runtime/parallel/src/lib.rs b/runtime/parallel/src/lib.rs index 626d3836ec..dd1270344d 100644 --- a/runtime/parallel/src/lib.rs +++ b/runtime/parallel/src/lib.rs @@ -75,11 +75,10 @@ use primitives::{ use hex_literal::hex; use xcm::latest::prelude::*; use xcm_builder::{ - AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, - FixedRateOfConcreteFungible, FixedWeightBounds, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, - TakeWeightCredit, + AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedRateOfFungible, + FixedWeightBounds, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, + SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; use xcm_executor::{Config, XcmExecutor}; pub mod constants; @@ -812,7 +811,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { pub UnitWeightCost: Weight = 20_000_000; - pub DotPerSecond: (MultiLocation, u128) = (MultiLocation::parent(), dot_per_second()); + pub DotPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), dot_per_second()); } parameter_types! { @@ -852,7 +851,7 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; + type Trader = FixedRateOfFungible; type ResponseHandler = (); // Don't handle responses for now. type SubscriptionService = PolkadotXcm; } diff --git a/runtime/vanilla/src/lib.rs b/runtime/vanilla/src/lib.rs index c763c5c9db..4ccc68b892 100644 --- a/runtime/vanilla/src/lib.rs +++ b/runtime/vanilla/src/lib.rs @@ -72,11 +72,10 @@ use sp_version::NativeVersion; use sp_version::RuntimeVersion; use xcm::latest::prelude::*; use xcm_builder::{ - AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, - FixedRateOfConcreteFungible, FixedWeightBounds, LocationInverter, ParentAsSuperuser, - ParentIsDefault, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, - SignedAccountId32AsNative, SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, - TakeWeightCredit, + AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedRateOfFungible, + FixedWeightBounds, LocationInverter, ParentAsSuperuser, ParentIsDefault, RelayChainAsNative, + SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative, + SignedToAccountId32, SovereignSignedViaLocation, TakeRevenue, TakeWeightCredit, }; use xcm_executor::{Config, XcmExecutor}; @@ -790,7 +789,7 @@ pub type XcmOriginToTransactDispatchOrigin = ( parameter_types! { pub UnitWeightCost: Weight = 20_000_000; - pub KsmPerSecond: (MultiLocation, u128) = (MultiLocation::parent(), ksm_per_second()); + pub KsmPerSecond: (AssetId, u128) = (AssetId::Concrete(MultiLocation::parent()), ksm_per_second()); } parameter_types! { @@ -830,7 +829,7 @@ impl Config for XcmConfig { type LocationInverter = LocationInverter; type Barrier = Barrier; type Weigher = FixedWeightBounds; - type Trader = FixedRateOfConcreteFungible; + type Trader = FixedRateOfFungible; type ResponseHandler = (); // Don't handle responses for now. type SubscriptionService = PolkadotXcm; }