git.delta.rocks / unique-network / refs/commits / 2477690c31b6

difftreelog

fix use latest xcm version in imports

Daniel Shiposha2023-01-25parent: #40455c4.patch.diff
in: master

11 files changed

modifiedpallets/configuration/src/benchmarking.rsdiffbeforeafterboth
--- 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<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 	let events = frame_system::Pallet::<T>::events();
modifiedpallets/configuration/src/lib.rsdiffbeforeafterboth
--- 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<T> =
modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
--- 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;
modifiedruntime/common/config/orml.rsdiffbeforeafterboth
--- 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};
modifiedruntime/common/config/xcm/foreignassets.rsdiffbeforeafterboth
--- 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::{
modifiedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
--- 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, NetworkId};
 use xcm_builder::{
 	AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,
 	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
modifiedruntime/common/config/xcm/nativeassets.rsdiffbeforeafterboth
--- 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::{
modifiedruntime/common/xcm.rsdiffbeforeafterboth
--- a/runtime/common/xcm.rs
+++ b/runtime/common/xcm.rs
@@ -15,7 +15,7 @@
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
 use sp_std::{vec::Vec, marker::PhantomData};
-use xcm::v1::MultiLocation;
+use xcm::latest::MultiLocation;
 use frame_support::traits::Get;
 
 pub struct OverridableAllowedLocations<T, L>(PhantomData<(T, L)>)
modifiedruntime/opal/src/xcm_barrier.rsdiffbeforeafterboth
--- 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 <http://www.gnu.org/licenses/>.
 
 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;
modifiedruntime/quartz/src/xcm_barrier.rsdiffbeforeafterboth
before · runtime/quartz/src/xcm_barrier.rs
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	match_types, parameter_types,19	traits::{Get, Everything},20};21use sp_std::{vec, vec::Vec};22use xcm::v1::{Junction::*, Junctions::*, MultiLocation};23use xcm_builder::{24	AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,25	AllowTopLevelPaidExecutionFrom,26};2728use crate::{29	Runtime, ParachainInfo, PolkadotXcm,30	runtime_common::{31		config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},32		xcm::OverridableAllowedLocations,33	},34};3536match_types! {37	pub type ParentOrSiblings: impl Contains<MultiLocation> = {38		MultiLocation { parents: 1, interior: Here } |39		MultiLocation { parents: 1, interior: X1(_) }40	};41}4243parameter_types! {44	pub QuartzDefaultAllowedLocations: Vec<MultiLocation> = vec![45		// Self location46		MultiLocation {47			parents: 0,48			interior: Here,49		},50		// Parent location51		MultiLocation {52			parents: 1,53			interior: Here,54		},55		// Statemint/Statemint location56		MultiLocation {57			parents: 1,58			interior: X1(Parachain(1000)),59		},60		// Karura/Acala location61		MultiLocation {62			parents: 1,63			interior: X1(Parachain(2000)),64		},65		// Moonriver location66		MultiLocation {67			parents: 1,68			interior: X1(Parachain(2023)),69		},70		// Self parachain address71		MultiLocation {72			parents: 1,73			interior: X1(Parachain(ParachainInfo::get().into())),74		},75	];76}7778pub type Barrier = DenyThenTry<79	(80		DenyTransact,81		DenyExchangeWithUnknownLocation<82			OverridableAllowedLocations<Runtime, QuartzDefaultAllowedLocations>,83		>,84	),85	(86		TakeWeightCredit,87		AllowTopLevelPaidExecutionFrom<Everything>,88		// Expected responses are OK.89		AllowKnownQueryResponses<PolkadotXcm>,90		// Subscriptions for version tracking are OK.91		AllowSubscriptionsFrom<ParentOrSiblings>,92	),93>;
after · runtime/quartz/src/xcm_barrier.rs
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	match_types, parameter_types,19	traits::{Get, Everything},20};21use sp_std::{vec, vec::Vec};22use xcm::latest::{Junction::*, Junctions::*, MultiLocation};23use xcm_builder::{24	AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,25	AllowTopLevelPaidExecutionFrom,26};2728use crate::{29	Runtime, ParachainInfo, PolkadotXcm,30	runtime_common::{31		config::xcm::{DenyThenTry, DenyTransact, DenyExchangeWithUnknownLocation},32		xcm::OverridableAllowedLocations,33	},34};3536match_types! {37	pub type ParentOrSiblings: impl Contains<MultiLocation> = {38		MultiLocation { parents: 1, interior: Here } |39		MultiLocation { parents: 1, interior: X1(_) }40	};41}4243parameter_types! {44	pub QuartzDefaultAllowedLocations: Vec<MultiLocation> = vec![45		// Self location46		MultiLocation {47			parents: 0,48			interior: Here,49		},50		// Parent location51		MultiLocation {52			parents: 1,53			interior: Here,54		},55		// Statemint/Statemint location56		MultiLocation {57			parents: 1,58			interior: X1(Parachain(1000)),59		},60		// Karura/Acala location61		MultiLocation {62			parents: 1,63			interior: X1(Parachain(2000)),64		},65		// Moonriver location66		MultiLocation {67			parents: 1,68			interior: X1(Parachain(2023)),69		},70		// Self parachain address71		MultiLocation {72			parents: 1,73			interior: X1(Parachain(ParachainInfo::get().into())),74		},75	];76}7778pub type Barrier = DenyThenTry<79	(80		DenyTransact,81		DenyExchangeWithUnknownLocation<82			OverridableAllowedLocations<Runtime, QuartzDefaultAllowedLocations>,83		>,84	),85	(86		TakeWeightCredit,87		AllowTopLevelPaidExecutionFrom<Everything>,88		// Expected responses are OK.89		AllowKnownQueryResponses<PolkadotXcm>,90		// Subscriptions for version tracking are OK.91		AllowSubscriptionsFrom<ParentOrSiblings>,92	),93>;
modifiedruntime/unique/src/xcm_barrier.rsdiffbeforeafterboth
--- 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,