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
20use frame_benchmarking::benchmarks;20use frame_benchmarking::benchmarks;
21use frame_system::{EventRecord, RawOrigin};21use frame_system::{EventRecord, RawOrigin};
22use frame_support::{assert_ok, BoundedVec, traits::Currency};22use frame_support::{assert_ok, BoundedVec, traits::Currency};
23use xcm::v1::MultiLocation;23use xcm::latest::MultiLocation;
2424
25fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {25fn assert_last_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
26 let events = frame_system::Pallet::<T>::events();26 let events = frame_system::Pallet::<T>::events();
modifiedpallets/configuration/src/lib.rsdiffbeforeafterboth
47 BoundedVec, log,47 BoundedVec, log,
48 };48 };
49 use frame_system::{pallet_prelude::OriginFor, ensure_root, Config as SystemConfig};49 use frame_system::{pallet_prelude::OriginFor, ensure_root, Config as SystemConfig};
50 use xcm::v1::MultiLocation;50 use xcm::latest::MultiLocation;
5151
52 pub use crate::weights::WeightInfo;52 pub use crate::weights::WeightInfo;
53 pub type BalanceOf<T> =53 pub type BalanceOf<T> =
modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
52use sp_std::{boxed::Box, vec::Vec};52use sp_std::{boxed::Box, vec::Vec};
53use up_data_structs::{CollectionId, TokenId, CreateCollectionData};53use up_data_structs::{CollectionId, TokenId, CreateCollectionData};
5454
55// NOTE:v1::MultiLocation is used in storages, we would need to do migration if upgrade the55// NOTE: MultiLocation is used in storages, we will need to do migration if upgrade the
56// MultiLocation in the future.56// MultiLocation to the XCM v3.
57use xcm::opaque::latest::{prelude::XcmError, Weight};57use xcm::opaque::latest::{prelude::XcmError, Weight};
58use xcm::{v1::MultiLocation, VersionedMultiLocation};58use xcm::{latest::MultiLocation, VersionedMultiLocation};
59use xcm_executor::{traits::WeightTrader, Assets};59use xcm_executor::{traits::WeightTrader, Assets};
6060
61use pallet_common::erc::CrossAccountId;61use pallet_common::erc::CrossAccountId;
modifiedruntime/common/config/orml.rsdiffbeforeafterboth
21use frame_system::EnsureSigned;21use frame_system::EnsureSigned;
22use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key};22use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key};
23use sp_runtime::traits::Convert;23use sp_runtime::traits::Convert;
24use xcm::v1::{Junction::*, Junctions::*, MultiLocation, NetworkId};24use xcm::latest::{Weight, Junction::*, Junctions::*, MultiLocation, NetworkId};
25use xcm::latest::Weight;
26use xcm_builder::LocationInverter;25use xcm_builder::LocationInverter;
27use xcm_executor::XcmExecutor;26use xcm_executor::XcmExecutor;
28use sp_std::{vec, vec::Vec};27use sp_std::{vec, vec::Vec};
modifiedruntime/common/config/xcm/foreignassets.rsdiffbeforeafterboth
19 parameter_types,19 parameter_types,
20};20};
21use sp_runtime::traits::Convert;21use sp_runtime::traits::Convert;
22use xcm::v1::{Junction::*, MultiLocation, Junctions::*};22use xcm::latest::{MultiAsset, Junction::*, MultiLocation, Junctions::*};
23use xcm::latest::MultiAsset;
24use xcm_builder::{FungiblesAdapter, ConvertedConcreteAssetId};23use xcm_builder::{FungiblesAdapter, ConvertedConcreteAssetId};
25use xcm_executor::traits::{Convert as ConvertXcm, JustTry, FilterAssetLocation};24use xcm_executor::traits::{Convert as ConvertXcm, JustTry, FilterAssetLocation};
26use pallet_foreign_assets::{25use pallet_foreign_assets::{
modifiedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
21use frame_system::EnsureRoot;21use frame_system::EnsureRoot;
22use pallet_xcm::XcmPassthrough;22use pallet_xcm::XcmPassthrough;
23use polkadot_parachain::primitives::Sibling;23use polkadot_parachain::primitives::Sibling;
24use xcm::v1::{Junction::*, MultiLocation, NetworkId};
25use xcm::latest::{prelude::*, Weight};24use xcm::latest::{prelude::*, Weight, MultiLocation, NetworkId};
26use xcm_builder::{25use xcm_builder::{
27 AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,26 AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, LocationInverter, ParentAsSuperuser,
28 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,27 RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,
modifiedruntime/common/config/xcm/nativeassets.rsdiffbeforeafterboth
19 weights::WeightToFeePolynomial,19 weights::WeightToFeePolynomial,
20};20};
21use sp_runtime::traits::{CheckedConversion, Zero, Convert};21use sp_runtime::traits::{CheckedConversion, Zero, Convert};
22use xcm::v1::{Junction::*, MultiLocation, Junctions::*};
23use xcm::latest::{22use xcm::latest::{
24 AssetId::{Concrete},23 AssetId::{Concrete},
25 Fungibility::Fungible as XcmFungible,24 Fungibility::Fungible as XcmFungible,
26 MultiAsset, Error as XcmError, Weight,25 MultiAsset, Error as XcmError, Weight,
26 Junction::*,
27 MultiLocation,
28 Junctions::*,
27};29};
28use xcm_builder::{CurrencyAdapter, NativeAsset};30use xcm_builder::{CurrencyAdapter, NativeAsset};
29use xcm_executor::{31use xcm_executor::{
modifiedruntime/common/xcm.rsdiffbeforeafterboth
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17use sp_std::{vec::Vec, marker::PhantomData};17use sp_std::{vec::Vec, marker::PhantomData};
18use xcm::v1::MultiLocation;18use xcm::latest::MultiLocation;
19use frame_support::traits::Get;19use frame_support::traits::Get;
2020
21pub struct OverridableAllowedLocations<T, L>(PhantomData<(T, L)>)21pub struct OverridableAllowedLocations<T, L>(PhantomData<(T, L)>)
modifiedruntime/opal/src/xcm_barrier.rsdiffbeforeafterboth
15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
1616
17use frame_support::traits::Everything;17use frame_support::traits::Everything;
18use xcm::{18use xcm::latest::{Xcm, Weight, MultiLocation};
19 latest::{Xcm, Weight},
20 v1::MultiLocation,
21};
22use xcm_builder::{AllowTopLevelPaidExecutionFrom, TakeWeightCredit};19use xcm_builder::{AllowTopLevelPaidExecutionFrom, TakeWeightCredit};
23use xcm_executor::traits::ShouldExecute;20use xcm_executor::traits::ShouldExecute;
2421
modifiedruntime/quartz/src/xcm_barrier.rsdiffbeforeafterboth
19 traits::{Get, Everything},19 traits::{Get, Everything},
20};20};
21use sp_std::{vec, vec::Vec};21use sp_std::{vec, vec::Vec};
22use xcm::v1::{Junction::*, Junctions::*, MultiLocation};22use xcm::latest::{Junction::*, Junctions::*, MultiLocation};
23use xcm_builder::{23use xcm_builder::{
24 AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,24 AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,
25 AllowTopLevelPaidExecutionFrom,25 AllowTopLevelPaidExecutionFrom,
modifiedruntime/unique/src/xcm_barrier.rsdiffbeforeafterboth
19 traits::{Get, Everything},19 traits::{Get, Everything},
20};20};
21use sp_std::{vec, vec::Vec};21use sp_std::{vec, vec::Vec};
22use xcm::v1::{Junction::*, Junctions::*, MultiLocation};22use xcm::latest::{Junction::*, Junctions::*, MultiLocation};
23use xcm_builder::{23use xcm_builder::{
24 AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,24 AllowKnownQueryResponses, AllowSubscriptionsFrom, TakeWeightCredit,
25 AllowTopLevelPaidExecutionFrom,25 AllowTopLevelPaidExecutionFrom,