open-web3-stack · zjb0807 · Mar 2, 2023 · Mar 1, 2023
diff --git a/asset-registry/src/impls.rs b/asset-registry/src/impls.rs
@@ -12,7 +12,7 @@ use sp_runtime::{
 	ArithmeticError, FixedU128,
 };
 use sp_std::prelude::*;
-use xcm::latest::{prelude::*, Weight as XcmWeight};
+use xcm::v3::{prelude::*, Weight as XcmWeight};
 use xcm::VersionedMultiLocation;
 use xcm_builder::TakeRevenue;
 use xcm_executor::{traits::WeightTrader, Assets};

diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs
@@ -26,7 +26,7 @@ use sp_runtime::{
 	traits::{AccountIdConversion, Convert, IdentityLookup},
 	AccountId32,
 };
-use xcm::latest::{prelude::*, Weight};
+use xcm::v3::{prelude::*, Weight};
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, ParentIsPreset,
 	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,

diff --git a/asset-registry/src/mock/relay.rs b/asset-registry/src/mock/relay.rs
@@ -9,7 +9,7 @@ use frame_system::EnsureRoot;
 use polkadot_runtime_parachains::{configuration, origin, shared, ump};
 use sp_core::H256;
 use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
-use xcm::latest::prelude::*;
+use xcm::v3::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative, ChildParachainConvertsVia,
 	CurrencyAdapter as XcmCurrencyAdapter, FixedWeightBounds, IsConcrete, SignedAccountId32AsNative,

diff --git a/traits/src/asset_registry.rs b/traits/src/asset_registry.rs
@@ -1,7 +1,7 @@
 use frame_support::pallet_prelude::*;
 use sp_runtime::DispatchResult;
 use sp_std::vec::Vec;
-use xcm::latest::prelude::*;
+use xcm::v3::prelude::*;
 use xcm::VersionedMultiLocation;
 
 pub trait WeightToFeeConverter {

diff --git a/traits/src/location.rs b/traits/src/location.rs
@@ -1,5 +1,5 @@
 use sp_core::{bounded::BoundedVec, ConstU32};
-use xcm::latest::prelude::*;
+use xcm::v3::prelude::*;
 
 pub trait Parse {
 	/// Returns the "chain" location part. It could be parent, sibling

diff --git a/traits/src/multi_asset.rs b/traits/src/multi_asset.rs
@@ -1,5 +1,5 @@
 use sp_core::{bounded::BoundedVec, ConstU32};
-use xcm::latest::prelude::*;
+use xcm::v3::prelude::*;
 
 use crate::location::RelativeLocations;
 

diff --git a/traits/src/xcm_transfer.rs b/traits/src/xcm_transfer.rs
@@ -1,5 +1,5 @@
 use frame_support::dispatch::DispatchResult;
-use xcm::latest::prelude::*;
+use xcm::v3::prelude::*;
 
 /// Abstraction over cross-chain token transfers.
 pub trait XcmTransfer<AccountId, Balance, CurrencyId> {

diff --git a/unknown-tokens/src/lib.rs b/unknown-tokens/src/lib.rs
@@ -3,7 +3,7 @@
 
 use frame_support::pallet_prelude::*;
 use sp_std::vec::Vec;
-use xcm::latest::prelude::*;
+use xcm::v3::prelude::*;
 
 use orml_xcm_support::UnknownAsset;
 

diff --git a/xcm-support/src/currency_adapter.rs b/xcm-support/src/currency_adapter.rs
@@ -12,7 +12,7 @@ use sp_std::{
 	result,
 };
 
-use xcm::latest::{prelude::*, Error as XcmError, MultiAsset, MultiLocation, Result};
+use xcm::v3::{prelude::*, Error as XcmError, MultiAsset, MultiLocation, Result};
 use xcm_executor::{
 	traits::{Convert as MoreConvert, MatchesFungible, TransactAsset},
 	Assets,

diff --git a/xcm-support/src/lib.rs b/xcm-support/src/lib.rs
@@ -16,7 +16,7 @@ use frame_support::{
 use sp_runtime::traits::{CheckedConversion, Convert};
 use sp_std::marker::PhantomData;
 
-use xcm::latest::prelude::*;
+use xcm::v3::prelude::*;
 use xcm_executor::traits::MatchesFungible;
 
 use orml_traits::{location::Reserve, GetByKey};

diff --git a/xcm/src/lib.rs b/xcm/src/lib.rs
@@ -6,7 +6,7 @@
 use frame_support::{pallet_prelude::*, traits::EnsureOrigin};
 use frame_system::pallet_prelude::*;
 use sp_std::boxed::Box;
-use xcm::{latest::prelude::*, VersionedMultiLocation, VersionedXcm};
+use xcm::{v3::prelude::*, VersionedMultiLocation, VersionedXcm};
 
 pub use module::*;
 

diff --git a/xtokens/src/lib.rs b/xtokens/src/lib.rs
@@ -46,7 +46,10 @@ use sp_runtime::{
 };
 use sp_std::{prelude::*, result::Result};
 
-use xcm::{latest::Weight, prelude::*};
+use xcm::{
+	v3::{prelude::*, Weight},
+	VersionedMultiAsset, VersionedMultiAssets, VersionedMultiLocation,
+};
 use xcm_executor::traits::WeightBounds;
 
 pub use module::*;

diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs
@@ -17,7 +17,7 @@ use sp_runtime::{
 use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId};
 use pallet_xcm::XcmPassthrough;
 use polkadot_parachain::primitives::Sibling;
-use xcm::latest::{prelude::*, Weight};
+use xcm::v3::{prelude::*, Weight};
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, NativeAsset,
 	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,

diff --git a/xtokens/src/mock/para_relative_view.rs b/xtokens/src/mock/para_relative_view.rs
@@ -17,7 +17,7 @@ use sp_runtime::{
 use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId};
 use pallet_xcm::XcmPassthrough;
 use polkadot_parachain::primitives::Sibling;
-use xcm::latest::{prelude::*, Weight};
+use xcm::v3::{prelude::*, Weight};
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, ParentIsPreset,
 	RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,

diff --git a/xtokens/src/mock/para_teleport.rs b/xtokens/src/mock/para_teleport.rs
@@ -17,7 +17,7 @@ use sp_runtime::{
 use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId};
 use pallet_xcm::XcmPassthrough;
 use polkadot_parachain::primitives::Sibling;
-use xcm::latest::{prelude::*, Weight};
+use xcm::v3::{prelude::*, Weight};
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, NativeAsset,
 	ParentIsPreset, RelayChainAsNative, SiblingParachainAsNative, SiblingParachainConvertsVia,

diff --git a/xtokens/src/mock/relay.rs b/xtokens/src/mock/relay.rs
@@ -10,7 +10,7 @@ use sp_runtime::{testing::Header, traits::IdentityLookup, AccountId32};
 use crate::Weight;
 use cumulus_primitives_core::ParaId;
 use polkadot_runtime_parachains::{configuration, origin, shared, ump};
-use xcm::latest::prelude::*;
+use xcm::v3::prelude::*;
 use xcm_builder::{
 	AccountId32Aliases, AllowTopLevelPaidExecutionFrom, ChildParachainAsNative, ChildParachainConvertsVia,
 	CurrencyAdapter as XcmCurrencyAdapter, FixedWeightBounds, IsConcrete, SignedAccountId32AsNative,

diff --git a/xtokens/src/mock/teleport_currency_adapter.rs b/xtokens/src/mock/teleport_currency_adapter.rs
@@ -9,7 +9,7 @@ use sp_std::{
 };
 
 use orml_xcm_support::{OnDepositFail, UnknownAsset as UnknownAssetT};
-use xcm::latest::{prelude::*, Error as XcmError, MultiAsset, MultiLocation, Result};
+use xcm::v3::{prelude::*, Error as XcmError, MultiAsset, MultiLocation, Result};
 use xcm_executor::{
 	traits::{Convert as MoreConvert, MatchesFungible, TransactAsset},
 	Assets,

diff --git a/xtokens/src/tests.rs b/xtokens/src/tests.rs
@@ -8,6 +8,7 @@ use mock::*;
 use orml_traits::{ConcreteFungibleAsset, MultiCurrency};
 use polkadot_parachain::primitives::Sibling;
 use sp_runtime::{traits::AccountIdConversion, AccountId32};
+use xcm::{v3::OriginKind::SovereignAccount, VersionedXcm};
 use xcm_simulator::TestExt;
 
 fn para_a_account() -> AccountId32 {
@@ -1028,8 +1029,6 @@ fn send_as_sovereign() {
 	});
 
 	ParaA::execute_with(|| {
-		use xcm::latest::OriginKind::SovereignAccount;
-
 		let call = relay::RuntimeCall::System(frame_system::Call::<relay::Runtime>::remark_with_event {
 			remark: vec![1, 1, 1],
 		});
@@ -1071,8 +1070,6 @@ fn send_as_sovereign_fails_if_bad_origin() {
 	});
 
 	ParaA::execute_with(|| {
-		use xcm::latest::OriginKind::SovereignAccount;
-
 		let call = relay::RuntimeCall::System(frame_system::Call::<relay::Runtime>::remark_with_event {
 			remark: vec![1, 1, 1],
 		});