--- a/pallets/configuration/src/benchmarking.rs +++ b/pallets/configuration/src/benchmarking.rs @@ -20,7 +20,7 @@ use frame_benchmarking::benchmarks; use frame_system::{EventRecord, RawOrigin}; use frame_support::{assert_ok, BoundedVec, traits::Currency}; -use xcm::v1::MultiLocation; +use xcm::latest::MultiLocation; fn assert_last_event(generic_event: ::RuntimeEvent) { let events = frame_system::Pallet::::events(); --- a/pallets/configuration/src/lib.rs +++ b/pallets/configuration/src/lib.rs @@ -47,7 +47,7 @@ BoundedVec, log, }; use frame_system::{pallet_prelude::OriginFor, ensure_root, Config as SystemConfig}; - use xcm::v1::MultiLocation; + use xcm::latest::MultiLocation; pub use crate::weights::WeightInfo; pub type BalanceOf = @@ -116,7 +116,7 @@ #[pallet::storage] pub type XcmAllowedLocationsOverride = StorageValue< - Value = BoundedVec, + Value = BoundedVec, QueryKind = OptionQuery, >; --- a/pallets/foreign-assets/src/lib.rs +++ b/pallets/foreign-assets/src/lib.rs @@ -52,10 +52,10 @@ use sp_std::{boxed::Box, vec::Vec}; use up_data_structs::{CollectionId, TokenId, CreateCollectionData}; -// NOTE:v1::MultiLocation is used in storages, we would need to do migration if upgrade the -// MultiLocation in the future. +// NOTE: MultiLocation is used in storages, we will need to do migration if upgrade the +// MultiLocation to the XCM v3. use xcm::opaque::latest::{prelude::XcmError, Weight}; -use xcm::{v1::MultiLocation, VersionedMultiLocation}; +use xcm::{latest::MultiLocation, VersionedMultiLocation}; use xcm_executor::{traits::WeightTrader, Assets}; use pallet_common::erc::CrossAccountId; @@ -250,7 +250,7 @@ #[pallet::storage] #[pallet::getter(fn foreign_asset_locations)] pub type ForeignAssetLocations = - StorageMap<_, Twox64Concat, ForeignAssetId, MultiLocation, OptionQuery>; + StorageMap<_, Twox64Concat, ForeignAssetId, xcm::v2::MultiLocation, OptionQuery>; /// The storages for CurrencyIds. /// @@ -258,7 +258,7 @@ #[pallet::storage] #[pallet::getter(fn location_to_currency_ids)] pub type LocationToCurrencyIds = - StorageMap<_, Twox64Concat, MultiLocation, ForeignAssetId, OptionQuery>; + StorageMap<_, Twox64Concat, xcm::v2::MultiLocation, ForeignAssetId, OptionQuery>; /// The storages for AssetMetadatas. /// --- a/runtime/common/config/orml.rs +++ b/runtime/common/config/orml.rs @@ -21,8 +21,7 @@ use frame_system::EnsureSigned; use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key}; use sp_runtime::traits::Convert; -use xcm::v1::{Junction::*, Junctions::*, MultiLocation, NetworkId}; -use xcm::latest::Weight; +use xcm::latest::{Weight, Junction::*, Junctions::*, MultiLocation, NetworkId}; use xcm_builder::LocationInverter; use xcm_executor::XcmExecutor; use sp_std::{vec, vec::Vec}; --- a/runtime/common/config/xcm/foreignassets.rs +++ b/runtime/common/config/xcm/foreignassets.rs @@ -19,8 +19,7 @@ parameter_types, }; use sp_runtime::traits::Convert; -use xcm::v1::{Junction::*, MultiLocation, Junctions::*}; -use xcm::latest::MultiAsset; +use xcm::latest::{MultiAsset, Junction::*, MultiLocation, Junctions::*}; use xcm_builder::{FungiblesAdapter, ConvertedConcreteAssetId}; use xcm_executor::traits::{Convert as ConvertXcm, JustTry, FilterAssetLocation}; use pallet_foreign_assets::{ --- a/runtime/common/config/xcm/mod.rs +++ b/runtime/common/config/xcm/mod.rs @@ -21,8 +21,7 @@ use frame_system::EnsureRoot; use pallet_xcm::XcmPassthrough; use polkadot_parachain::primitives::Sibling; -use xcm::v1::{Junction::*, MultiLocation, NetworkId}; -use xcm::latest::{prelude::*, Weight}; +use xcm::latest::{prelude::*, Weight, MultiLocation}; use xcm_builder::{ AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, @@ -32,7 +31,7 @@ use sp_std::{marker::PhantomData, vec::Vec}; use crate::{ Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, ParachainInfo, ParachainSystem, PolkadotXcm, - XcmpQueue, xcm_barrier::Barrier, + XcmpQueue, xcm_barrier::Barrier, RelayNetwork, }; use up_common::types::AccountId; @@ -53,7 +52,6 @@ parameter_types! { pub const RelayLocation: MultiLocation = MultiLocation::parent(); - pub const RelayNetwork: NetworkId = NetworkId::Polkadot; pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into(); pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into(); pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into()))); --- a/runtime/common/config/xcm/nativeassets.rs +++ b/runtime/common/config/xcm/nativeassets.rs @@ -19,11 +19,13 @@ weights::WeightToFeePolynomial, }; use sp_runtime::traits::{CheckedConversion, Zero, Convert}; -use xcm::v1::{Junction::*, MultiLocation, Junctions::*}; use xcm::latest::{ AssetId::{Concrete}, Fungibility::Fungible as XcmFungible, MultiAsset, Error as XcmError, Weight, + Junction::*, + MultiLocation, + Junctions::*, }; use xcm_builder::{CurrencyAdapter, NativeAsset}; use xcm_executor::{ --- a/runtime/common/xcm.rs +++ b/runtime/common/xcm.rs @@ -15,7 +15,7 @@ // along with Unique Network. If not, see . use sp_std::{vec::Vec, marker::PhantomData}; -use xcm::v1::MultiLocation; +use xcm::latest::MultiLocation; use frame_support::traits::Get; pub struct OverridableAllowedLocations(PhantomData<(T, L)>) --- 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!(); --- a/runtime/opal/src/xcm_barrier.rs +++ b/runtime/opal/src/xcm_barrier.rs @@ -15,10 +15,7 @@ // along with Unique Network. If not, see . use frame_support::traits::Everything; -use xcm::{ - latest::{Xcm, Weight}, - v1::MultiLocation, -}; +use xcm::latest::{Xcm, Weight, MultiLocation}; use xcm_builder::{AllowTopLevelPaidExecutionFrom, TakeWeightCredit}; use xcm_executor::traits::ShouldExecute; --- 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! { --- a/runtime/quartz/src/xcm_barrier.rs +++ b/runtime/quartz/src/xcm_barrier.rs @@ -19,7 +19,7 @@ traits::{Get, Everything}, }; use sp_std::{vec, vec::Vec}; -use xcm::v1::{Junction::*, Junctions::*, MultiLocation}; +use xcm::latest::{Junction::*, Junctions::*, MultiLocation}; use xcm_builder::{ AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit, AllowTopLevelPaidExecutionFrom, --- 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!(); --- a/runtime/unique/src/xcm_barrier.rs +++ b/runtime/unique/src/xcm_barrier.rs @@ -19,7 +19,7 @@ traits::{Get, Everything}, }; use sp_std::{vec, vec::Vec}; -use xcm::v1::{Junction::*, Junctions::*, MultiLocation}; +use xcm::latest::{Junction::*, Junctions::*, MultiLocation}; use xcm_builder::{ AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit, AllowTopLevelPaidExecutionFrom,