Polkadot-1.7.2: restricted transfer location changes

libs/types/src/locations.rs

@@ -14,21 +14,19 @@ use cfg_primitives::AccountId;
 use frame_support::RuntimeDebugNoBound;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
-use sp_core::{crypto::AccountId32, H256};
-use sp_runtime::traits::{BlakeTwo256, Hash};
+use sp_core::crypto::AccountId32;
+use sp_std::boxed::Box;
 use staging_xcm::VersionedLocation;
 
 use crate::domain_address::DomainAddress;
+
 /// Location types for destinations that can receive restricted transfers
 #[derive(Clone, RuntimeDebugNoBound, Encode, Decode, Eq, PartialEq, MaxEncodedLen, TypeInfo)]
 pub enum RestrictedTransferLocation {
 	/// Local chain account sending destination.
 	Local(AccountId),
-	/// XCM MultiLocation sending destinations.
-	/// Using hash value here as Multilocation is large -- v1 is 512 bytes, but
-	/// next largest is only 40 bytes other values aren't hashed as we have
-	/// blake2 hashing on storage map keys, and we don't want the extra overhead
-	XCM(H256),
+	/// XCM Location sending destinations.
+	Xcm(Box<VersionedLocation>),
 	/// DomainAddress sending location from a liquidity pools' instance
 	Address(DomainAddress),
 }
@@ -38,21 +36,3 @@ impl From<AccountId32> for RestrictedTransferLocation {
 		Self::Local(value)
 	}
 }
-
-impl From<VersionedLocation> for RestrictedTransferLocation {
-	fn from(vml: VersionedLocation) -> Self {
-		// using hash here as multilocation is significantly larger than any other enum
-		// type here -- 592 bytes, vs 40 bytes for domain address (next largest)
-		Self::XCM(BlakeTwo256::hash(&vml.encode()))
-
-		// TODO-1.7: I'm afraid of locations translated from v3 to v4 will
-		// generate a different hash here. How this affect our current chain
-		// state?
-	}
-}
-
-impl From<DomainAddress> for RestrictedTransferLocation {
-	fn from(da: DomainAddress) -> Self {
-		Self::Address(da)
-	}
-}

pallets/restricted-xtokens/src/lib.rs

@@ -51,37 +51,37 @@ use staging_xcm::{v4::prelude::*, VersionedAsset, VersionedAssets, VersionedLoca
 pub enum TransferEffects<AccountId, CurrencyId, Balance> {
 	Transfer {
 		sender: AccountId,
-		destination: Location,
+		destination: VersionedLocation,
 		currency_id: CurrencyId,
 		amount: Balance,
 	},
 	TransferMultiAsset {
 		sender: AccountId,
-		destination: Location,
+		destination: VersionedLocation,
 		asset: Asset,
 	},
 	TransferWithFee {
 		sender: AccountId,
-		destination: Location,
+		destination: VersionedLocation,
 		currency_id: CurrencyId,
 		amount: Balance,
 		fee: Balance,
 	},
 	TransferMultiAssetWithFee {
 		sender: AccountId,
-		destination: Location,
+		destination: VersionedLocation,
 		asset: Asset,
 		fee_asset: Asset,
 	},
 	TransferMultiCurrencies {
 		sender: AccountId,
-		destination: Location,
+		destination: VersionedLocation,
 		currencies: Vec<(CurrencyId, Balance)>,
 		fee: (CurrencyId, Balance),
 	},
 	TransferMultiAssets {
 		sender: AccountId,
-		destination: Location,
+		destination: VersionedLocation,
 		assets: Assets,
 		fee_asset: Asset,
 	},
@@ -130,14 +130,11 @@ pub mod pallet {
 			dest: Box<VersionedLocation>,
 			dest_weight_limit: WeightLimit,
 		) -> DispatchResult {
-			let destination: Location = (*dest.clone())
-				.try_into()
-				.map_err(|()| Error::<T>::BadVersion)?;
 			let sender = ensure_signed(origin.clone())?;
 
 			T::PreTransfer::check(TransferEffects::Transfer {
 				sender,
-				destination,
+				destination: (*dest.clone()),
 				currency_id: currency_id.clone(),
 				amount,
 			})?;
@@ -175,13 +172,10 @@ pub mod pallet {
 			let multi_asset: Asset = (*asset.clone())
 				.try_into()
 				.map_err(|()| Error::<T>::BadVersion)?;
-			let destination: Location = (*dest.clone())
-				.try_into()
-				.map_err(|()| Error::<T>::BadVersion)?;
 
 			T::PreTransfer::check(TransferEffects::TransferMultiAsset {
 				sender,
-				destination,
+				destination: (*dest.clone()),
 				asset: multi_asset,
 			})?;
 
@@ -220,13 +214,10 @@ pub mod pallet {
 			dest_weight_limit: WeightLimit,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin.clone())?;
-			let destination: Location = (*dest.clone())
-				.try_into()
-				.map_err(|()| Error::<T>::BadVersion)?;
 
 			T::PreTransfer::check(TransferEffects::TransferWithFee {
 				sender,
-				destination,
+				destination: (*dest.clone()),
 				currency_id: currency_id.clone(),
 				amount,
 				fee,
@@ -279,13 +270,10 @@ pub mod pallet {
 			let fee_asset: Asset = (*fee.clone())
 				.try_into()
 				.map_err(|()| Error::<T>::BadVersion)?;
-			let destination: Location = (*dest.clone())
-				.try_into()
-				.map_err(|()| Error::<T>::BadVersion)?;
 
 			T::PreTransfer::check(TransferEffects::TransferMultiAssetWithFee {
 				sender,
-				destination,
+				destination: (*dest.clone()),
 				asset: multi_asset,
 				fee_asset,
 			})?;
@@ -324,16 +312,13 @@ pub mod pallet {
 			dest_weight_limit: WeightLimit,
 		) -> DispatchResult {
 			let sender = ensure_signed(origin.clone())?;
-			let destination: Location = (*dest.clone())
-				.try_into()
-				.map_err(|()| Error::<T>::BadVersion)?;
 			let fee = currencies
 				.get(fee_item as usize)
 				.ok_or(orml_xtokens::Error::<T>::AssetIndexNonExistent)?;
 
 			T::PreTransfer::check(TransferEffects::TransferMultiCurrencies {
 				sender,
-				destination,
+				destination: (*dest.clone()),
 				currencies: currencies.clone(),
 				fee: fee.clone(),
 			})?;
@@ -375,16 +360,13 @@ pub mod pallet {
 			let multi_assets: Assets = (*assets.clone())
 				.try_into()
 				.map_err(|()| Error::<T>::BadVersion)?;
-			let destination: Location = (*dest.clone())
-				.try_into()
-				.map_err(|()| Error::<T>::BadVersion)?;
 			let fee_asset: &Asset = multi_assets
 				.get(fee_item as usize)
 				.ok_or(orml_xtokens::Error::<T>::AssetIndexNonExistent)?;
 
 			T::PreTransfer::check(TransferEffects::TransferMultiAssets {
 				sender,
-				destination,
+				destination: (*dest.clone()),
 				assets: multi_assets.clone(),
 				fee_asset: fee_asset.clone(),
 			})?;