git.delta.rocks / unique-network / refs/commits / c652c1eecc65

difftreelog

refactor draft foreign assets as proxy to collections

Daniel Shiposha2023-10-17parent: #bfab603.patch.diff
in: master

18 files changed

modifiednode/cli/src/chain_spec.rsdiffbeforeafterboth
--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -167,7 +167,6 @@
 					.map(|k| (k, 1 << 100))
 					.collect(),
 			},
-			tokens: TokensConfig { balances: vec![] },
 			sudo: SudoConfig {
 				key: Some($root_key),
 			},
modifiedpallets/balances-adapter/src/common.rsdiffbeforeafterboth
--- a/pallets/balances-adapter/src/common.rs
+++ b/pallets/balances-adapter/src/common.rs
@@ -332,10 +332,6 @@
 		0
 	}
 
-	fn refungible_extensions(&self) -> Option<&dyn pallet_common::RefungibleExtensions<T>> {
-		None
-	}
-
 	fn set_allowance_for_all(
 		&self,
 		_owner: <T>::CrossAccountId,
modifiedpallets/common/src/dispatch.rsdiffbeforeafterboth
--- a/pallets/common/src/dispatch.rs
+++ b/pallets/common/src/dispatch.rs
@@ -72,6 +72,7 @@
 	/// Create a collection. The collection will be created according to the value of [`data.mode`](CreateCollectionData::mode).
 	///
 	/// * `sender` - The user who will become the owner of the collection.
+	/// * `payer` - The user who pays the collection creation fee.
 	/// * `data` - Description of the created collection.
 	fn create(
 		sender: T::CrossAccountId,
@@ -79,6 +80,15 @@
 		data: CreateCollectionData<T::CrossAccountId>,
 	) -> Result<CollectionId, DispatchError>;
 
+	/// Create a foreign collection. The collection will be created according to the value of [`data.mode`](CreateCollectionData::mode).
+	///
+	/// * `sender` - The user who will become the owner of the collection.
+	/// * `data` - Description of the created collection.
+	fn create_foreign(
+		sender: T::CrossAccountId,
+		data: CreateCollectionData<T::CrossAccountId>,
+	) -> Result<CollectionId, DispatchError>;
+
 	/// Delete the collection.
 	///
 	/// * `sender` - The owner of the collection.
modifiedpallets/common/src/lib.rsdiffbeforeafterboth
--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1132,23 +1132,37 @@
 		data: CreateCollectionData<T::CrossAccountId>,
 	) -> Result<CollectionId, DispatchError> {
 		ensure!(data.flags.is_allowed_for_user(), <Error<T>>::NoPermission);
-		Self::init_collection_internal(owner, payer, data)
+
+		// Take a (non-refundable) deposit of collection creation
+		{
+			let mut imbalance = <Debt<T::AccountId, <T as Config>::Currency>>::zero();
+			imbalance.subsume(<T as Config>::Currency::deposit(
+				&T::TreasuryAccountId::get(),
+				T::CollectionCreationPrice::get(),
+				Precision::Exact,
+			)?);
+			let credit =
+				<T as Config>::Currency::settle(payer.as_sub(), imbalance, Preservation::Preserve)
+					.map_err(|_| Error::<T>::NotSufficientFounds)?;
+
+			debug_assert!(credit.peek().is_zero())
+		}
+
+		Self::init_collection_internal(owner, data)
 	}
 
 	/// Initializes the collection with ForeignCollection flag. Returns [CollectionId] on success, [DispatchError] otherwise.
 	pub fn init_foreign_collection(
 		owner: T::CrossAccountId,
-		payer: T::CrossAccountId,
 		mut data: CreateCollectionData<T::CrossAccountId>,
 	) -> Result<CollectionId, DispatchError> {
 		data.flags.foreign = true;
-		let id = Self::init_collection_internal(owner, payer, data)?;
+		let id = Self::init_collection_internal(owner, data)?;
 		Ok(id)
 	}
 
 	fn init_collection_internal(
 		owner: T::CrossAccountId,
-		payer: T::CrossAccountId,
 		data: CreateCollectionData<T::CrossAccountId>,
 	) -> Result<CollectionId, DispatchError> {
 		{
@@ -1224,21 +1238,6 @@
 			<Error<T>>::CollectionAdminCountExceeded,
 		);
 		<AdminAmount<T>>::insert(id, admin_amount);
-
-		// Take a (non-refundable) deposit of collection creation
-		{
-			let mut imbalance = <Debt<T::AccountId, <T as Config>::Currency>>::zero();
-			imbalance.subsume(<T as Config>::Currency::deposit(
-				&T::TreasuryAccountId::get(),
-				T::CollectionCreationPrice::get(),
-				Precision::Exact,
-			)?);
-			let credit =
-				<T as Config>::Currency::settle(payer.as_sub(), imbalance, Preservation::Preserve)
-					.map_err(|_| Error::<T>::NotSufficientFounds)?;
-
-			debug_assert!(credit.peek().is_zero())
-		}
 
 		<CreatedCollectionCount<T>>::put(created_count);
 		<Pallet<T>>::deposit_event(Event::CollectionCreated(
@@ -2293,7 +2292,14 @@
 	) -> u128;
 
 	/// Get extension for RFT collection.
-	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>>;
+	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
+		None
+	}
+
+	/// Get XCM extensions.
+	fn xcm_extensions(&self) -> Option<&dyn XcmExtensions<T>> {
+		None
+	}
 
 	/// The `operator` is allowed to transfer all tokens of the `owner` on their behalf.
 	/// * `owner` - Token owner
@@ -2333,6 +2339,34 @@
 	) -> DispatchResultWithPostInfo;
 }
 
+/// XCM extensions for fungible and NFT collections
+pub trait XcmExtensions<T>
+where
+	T: Config,
+{
+	/// Is the collection a foreign one?
+	fn is_foreign(&self) -> bool;
+
+	/// Create a collection's item.
+	fn create_item(
+		&self,
+		to: T::CrossAccountId,
+		data: CreateItemData,
+	) -> Result<TokenId, DispatchError>;
+
+	/// Transfer an item from the `from` account to the `to` account.
+	fn transfer(
+		&self,
+		from: T::CrossAccountId,
+		to: T::CrossAccountId,
+		token: TokenId,
+		amount: u128,
+	) -> DispatchResult;
+
+	/// Burn a collection's item.
+	fn burn(&self, from: T::CrossAccountId, token: TokenId, amount: u128) -> DispatchResult;
+}
+
 /// Merge [`DispatchResult`] with [`Weight`] into [`DispatchResultWithPostInfo`].
 ///
 /// Used for [`CommonCollectionOperations`] implementations and flexible enough to do so.
deletedpallets/foreign-assets/src/impl_fungibles.rsdiffbeforeafterboth
--- a/pallets/foreign-assets/src/impl_fungibles.rs
+++ /dev/null
@@ -1,499 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-//! Implementations for fungibles trait.
-
-use frame_support::traits::tokens::{
-	DepositConsequence, Fortitude, Precision, Preservation, Provenance, WithdrawConsequence,
-};
-use frame_system::Config as SystemConfig;
-use pallet_common::{CollectionHandle, CommonCollectionOperations};
-use pallet_fungible::FungibleHandle;
-use sp_runtime::traits::{CheckedAdd, CheckedSub};
-use up_data_structs::budget;
-
-use super::*;
-
-impl<T: Config> fungibles::Inspect<<T as SystemConfig>::AccountId> for Pallet<T>
-where
-	T: orml_tokens::Config<CurrencyId = AssetId>,
-	BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,
-	BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,
-	<T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,
-	<T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,
-{
-	type AssetId = AssetId;
-	type Balance = BalanceOf<T>;
-
-	fn total_issuance(asset: Self::AssetId) -> Self::Balance {
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible total_issuance");
-
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::total_issuance()
-					.into()
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::total_issuance(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-				)
-				.into()
-			}
-			AssetId::ForeignAssetId(fid) => {
-				let target_collection_id = match <AssetBinding<T>>::get(fid) {
-					Some(v) => v,
-					None => return Zero::zero(),
-				};
-				let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {
-					Ok(v) => v,
-					Err(_) => return Zero::zero(),
-				};
-				let collection = FungibleHandle::cast(collection_handle);
-				Self::Balance::try_from(collection.total_supply()).unwrap_or(Zero::zero())
-			}
-		}
-	}
-
-	fn minimum_balance(asset: Self::AssetId) -> Self::Balance {
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible minimum_balance");
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::minimum_balance()
-					.into()
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::minimum_balance(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-				)
-				.into()
-			}
-			AssetId::ForeignAssetId(fid) => AssetMetadatas::<T>::get(AssetId::ForeignAssetId(fid))
-				.map(|x| x.minimal_balance)
-				.unwrap_or_else(Zero::zero),
-		}
-	}
-
-	fn balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible balance");
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::balance(who).into()
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::balance(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-					who,
-				)
-				.into()
-			}
-			AssetId::ForeignAssetId(fid) => {
-				let target_collection_id = match <AssetBinding<T>>::get(fid) {
-					Some(v) => v,
-					None => return Zero::zero(),
-				};
-				let collection_handle = match <CollectionHandle<T>>::try_get(target_collection_id) {
-					Ok(v) => v,
-					Err(_) => return Zero::zero(),
-				};
-				let collection = FungibleHandle::cast(collection_handle);
-				Self::Balance::try_from(
-					collection.balance(T::CrossAccountId::from_sub(who.clone()), TokenId(0)),
-				)
-				.unwrap_or(Zero::zero())
-			}
-		}
-	}
-
-	fn total_balance(asset: Self::AssetId, who: &<T as SystemConfig>::AccountId) -> Self::Balance {
-		Self::balance(asset, who)
-	}
-
-	fn reducible_balance(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		preservation: Preservation,
-		fortitude: Fortitude,
-	) -> Self::Balance {
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible reducible_balance");
-
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::reducible_balance(
-					who,
-					preservation,
-					fortitude,
-				)
-				.into()
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::reducible_balance(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-					who,
-					preservation,
-					fortitude,
-				)
-				.into()
-			}
-			_ => Self::balance(asset, who),
-		}
-	}
-
-	fn can_deposit(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-		provenance: Provenance,
-	) -> DepositConsequence {
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_deposit");
-
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				<pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_deposit(
-					who,
-					amount.into(),
-					provenance,
-				)
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				<orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_deposit(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-					who,
-					amount.into(),
-					provenance,
-				)
-			}
-			_ => {
-				if amount.is_zero() {
-					return DepositConsequence::Success;
-				}
-
-				let extential_deposit_value = T::ExistentialDeposit::get();
-				let ed_value: u128 = match extential_deposit_value.try_into() {
-					Ok(val) => val,
-					Err(_) => return DepositConsequence::CannotCreate,
-				};
-				let extential_deposit: Self::Balance = match ed_value.try_into() {
-					Ok(val) => val,
-					Err(_) => return DepositConsequence::CannotCreate,
-				};
-
-				let new_total_balance = match Self::balance(asset, who).checked_add(&amount) {
-					Some(x) => x,
-					None => return DepositConsequence::Overflow,
-				};
-
-				if new_total_balance < extential_deposit {
-					return DepositConsequence::BelowMinimum;
-				}
-
-				DepositConsequence::Success
-			}
-		}
-	}
-
-	fn can_withdraw(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-	) -> WithdrawConsequence<Self::Balance> {
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible can_withdraw");
-		let value: u128 = match amount.try_into() {
-			Ok(val) => val,
-			Err(_) => return WithdrawConsequence::UnknownAsset,
-		};
-
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				let this_amount: <T as pallet_balances::Config>::Balance = match value.try_into() {
-					Ok(val) => val,
-					Err(_) => {
-						return WithdrawConsequence::UnknownAsset;
-					}
-				};
-				match <pallet_balances::Pallet<T> as fungible::Inspect<T::AccountId>>::can_withdraw(
-					who,
-					this_amount,
-				) {
-					WithdrawConsequence::BalanceLow => WithdrawConsequence::BalanceLow,
-					WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,
-					WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,
-					WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,
-					WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,
-					WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,
-					WithdrawConsequence::Success => WithdrawConsequence::Success,
-					_ => WithdrawConsequence::BalanceLow,
-				}
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				let parent_amount: <T as orml_tokens::Config>::Balance = match value.try_into() {
-					Ok(val) => val,
-					Err(_) => {
-						return WithdrawConsequence::UnknownAsset;
-					}
-				};
-				match <orml_tokens::Pallet<T> as fungibles::Inspect<T::AccountId>>::can_withdraw(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-					who,
-					parent_amount,
-				) {
-					WithdrawConsequence::BalanceLow => WithdrawConsequence::BalanceLow,
-					WithdrawConsequence::WouldDie => WithdrawConsequence::WouldDie,
-					WithdrawConsequence::UnknownAsset => WithdrawConsequence::UnknownAsset,
-					WithdrawConsequence::Underflow => WithdrawConsequence::Underflow,
-					WithdrawConsequence::Overflow => WithdrawConsequence::Overflow,
-					WithdrawConsequence::Frozen => WithdrawConsequence::Frozen,
-					WithdrawConsequence::Success => WithdrawConsequence::Success,
-					_ => WithdrawConsequence::BalanceLow,
-				}
-			}
-			_ => match Self::balance(asset, who).checked_sub(&amount) {
-				Some(_) => WithdrawConsequence::Success,
-				None => WithdrawConsequence::BalanceLow,
-			},
-		}
-	}
-
-	fn asset_exists(asset: AssetId) -> bool {
-		match asset {
-			AssetId::NativeAssetId(_) => true,
-			AssetId::ForeignAssetId(fid) => <AssetBinding<T>>::contains_key(fid),
-		}
-	}
-}
-
-impl<T: Config> fungibles::Mutate<<T as SystemConfig>::AccountId> for Pallet<T>
-where
-	T: orml_tokens::Config<CurrencyId = AssetId>,
-	BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,
-	BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,
-	<T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,
-	<T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,
-	u128: From<BalanceOf<T>>,
-{
-	fn mint_into(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-	) -> Result<BalanceOf<T>, DispatchError> {
-		//Self::do_mint(asset, who, amount, None)
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible mint_into {:?}", asset);
-
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				<pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::mint_into(
-					who,
-					amount.into(),
-				)
-				.map(Into::into)
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				<orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::mint_into(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-					who,
-					amount.into(),
-				)
-				.map(Into::into)
-			}
-			AssetId::ForeignAssetId(fid) => {
-				let target_collection_id = match <AssetBinding<T>>::get(fid) {
-					Some(v) => v,
-					None => {
-						return Err(DispatchError::Other(
-							"Associated collection not found for asset",
-						))
-					}
-				};
-				let collection =
-					FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);
-				let account = T::CrossAccountId::from_sub(who.clone());
-
-				let amount_data: pallet_fungible::CreateItemData<T> =
-					(account.clone(), amount.into());
-
-				pallet_fungible::Pallet::<T>::create_item_foreign(
-					&collection,
-					&account,
-					amount_data,
-					&budget::Value::new(0),
-				)?;
-
-				Ok(amount)
-			}
-		}
-	}
-
-	fn burn_from(
-		asset: Self::AssetId,
-		who: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-		precision: Precision,
-		fortitude: Fortitude,
-	) -> Result<Self::Balance, DispatchError> {
-		// let f = DebitFlags { keep_alive: false, best_effort: false };
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible burn_from");
-
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				<pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::burn_from(
-					who,
-					amount.into(),
-					precision,
-					fortitude,
-				)
-				.map(Into::into)
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				<orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::burn_from(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-					who,
-					amount.into(),
-					precision,
-					fortitude,
-				)
-				.map(Into::into)
-			}
-			AssetId::ForeignAssetId(fid) => {
-				let target_collection_id = match <AssetBinding<T>>::get(fid) {
-					Some(v) => v,
-					None => {
-						return Err(DispatchError::Other(
-							"Associated collection not found for asset",
-						))
-					}
-				};
-				let collection =
-					FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);
-				pallet_fungible::Pallet::<T>::burn_foreign(
-					&collection,
-					&T::CrossAccountId::from_sub(who.clone()),
-					amount.into(),
-				)?;
-
-				Ok(amount)
-			}
-		}
-	}
-
-	fn transfer(
-		asset: Self::AssetId,
-		source: &<T as SystemConfig>::AccountId,
-		dest: &<T as SystemConfig>::AccountId,
-		amount: Self::Balance,
-		preservation: Preservation,
-	) -> Result<Self::Balance, DispatchError> {
-		// let f = TransferFlags { keep_alive, best_effort: false, burn_dust: false };
-		log::trace!(target: "fassets::impl_foreign_assets", "impl_fungible transfer");
-
-		match asset {
-			AssetId::NativeAssetId(NativeCurrency::Here) => {
-				match <pallet_balances::Pallet<T> as fungible::Mutate<T::AccountId>>::transfer(
-					source,
-					dest,
-					amount.into(),
-					preservation,
-				) {
-					Ok(_) => Ok(amount),
-					Err(_) => Err(DispatchError::Other(
-						"Bad amount to relay chain value conversion",
-					)),
-				}
-			}
-			AssetId::NativeAssetId(NativeCurrency::Parent) => {
-				match <orml_tokens::Pallet<T> as fungibles::Mutate<T::AccountId>>::transfer(
-					AssetId::NativeAssetId(NativeCurrency::Parent),
-					source,
-					dest,
-					amount.into(),
-					preservation,
-				) {
-					Ok(_) => Ok(amount),
-					Err(e) => Err(e),
-				}
-			}
-			AssetId::ForeignAssetId(fid) => {
-				let target_collection_id = match <AssetBinding<T>>::get(fid) {
-					Some(v) => v,
-					None => {
-						return Err(DispatchError::Other(
-							"Associated collection not found for asset",
-						))
-					}
-				};
-				let collection =
-					FungibleHandle::cast(<CollectionHandle<T>>::try_get(target_collection_id)?);
-
-				pallet_fungible::Pallet::<T>::transfer(
-					&collection,
-					&T::CrossAccountId::from_sub(source.clone()),
-					&T::CrossAccountId::from_sub(dest.clone()),
-					amount.into(),
-					&budget::Value::new(0),
-				)
-				.map_err(|e| e.error)?;
-
-				Ok(amount)
-			}
-		}
-	}
-}
-
-#[cfg(not(debug_assertions))]
-extern "C" {
-	// This function does not exists, thus compilation will fail, if its call is
-	// not optimized away, which is only possible if it's not called at all.
-	//
-	// not(debug_assertions) is used to ensure compiler is dropping unused functions, as
-	// this option is enabled in release by defailt
-	//
-	// FIXME: maybe use build.rs, to ensure it will fail even in release with debug_assertions
-	// enabled?
-	fn unbalanced_fungible_is_called();
-}
-macro_rules! ensure_balanced {
-	() => {{
-		#[cfg(debug_assertions)]
-		panic!("unbalanced fungible methods should not be used");
-		#[cfg(not(debug_assertions))]
-		{
-			unsafe { unbalanced_fungible_is_called() };
-			unreachable!();
-		}
-	}};
-}
-
-impl<T: Config> fungibles::Unbalanced<<T as SystemConfig>::AccountId> for Pallet<T>
-where
-	T: orml_tokens::Config<CurrencyId = AssetId>,
-	BalanceOf<T>: From<<T as pallet_balances::Config>::Balance>,
-	BalanceOf<T>: From<<T as orml_tokens::Config>::Balance>,
-	<T as pallet_balances::Config>::Balance: From<BalanceOf<T>>,
-	<T as orml_tokens::Config>::Balance: From<BalanceOf<T>>,
-	u128: From<BalanceOf<T>>,
-{
-	fn handle_dust(_dust: fungibles::Dust<<T as SystemConfig>::AccountId, Self>) {
-		ensure_balanced!();
-	}
-	fn write_balance(
-		_asset: Self::AssetId,
-		_who: &<T as SystemConfig>::AccountId,
-		_amount: Self::Balance,
-	) -> Result<Option<Self::Balance>, DispatchError> {
-		ensure_balanced!();
-	}
-	fn set_total_issuance(_asset: Self::AssetId, _amount: Self::Balance) {
-		ensure_balanced!();
-	}
-}
modifiedpallets/foreign-assets/src/lib.rsdiffbeforeafterboth
34#![cfg_attr(not(feature = "std"), no_std)]34#![cfg_attr(not(feature = "std"), no_std)]
35#![allow(clippy::unused_unit)]35#![allow(clippy::unused_unit)]
3636
37use frame_support::{37use frame_support::{dispatch::DispatchResult, pallet_prelude::*, traits::EnsureOrigin, PalletId};
38 dispatch::DispatchResult,
39 ensure,
40 pallet_prelude::*,
41 traits::{fungible, fungibles, Currency, EnsureOrigin},
42};
43use frame_system::pallet_prelude::*;38use frame_system::pallet_prelude::*;
44use pallet_common::erc::CrossAccountId;39use pallet_common::{
45use pallet_fungible::Pallet as PalletFungible;40 dispatch::CollectionDispatch, erc::CrossAccountId, NATIVE_FUNGIBLE_COLLECTION_ID,
46use scale_info::TypeInfo;
47use serde::{Deserialize, Serialize};
48use sp_runtime::{
49 traits::{One, Zero},
50 ArithmeticError,
51};41};
52use sp_std::{boxed::Box, vec::Vec};42use sp_runtime::traits::AccountIdConversion;
53use staging_xcm::{latest::MultiLocation, VersionedMultiLocation};43use sp_std::{vec, vec::Vec};
54// NOTE: MultiLocation is used in storages, we will need to do migration if upgrade the44// NOTE: MultiLocation is used in storages, we will need to do migration if upgrade the
55// MultiLocation to the XCM v3.45// MultiLocation to the XCM v3.
56use staging_xcm::{46use staging_xcm::{
57 opaque::latest::{prelude::XcmError, Weight},47 opaque::latest::{prelude::XcmError, Weight},
58 v3::XcmContext,48 v3::{prelude::*, MultiAsset, XcmContext},
59};49};
60use staging_xcm_executor::{traits::WeightTrader, Assets};50use staging_xcm_executor::{
51 traits::{TransactAsset, WeightTrader},
52 Assets,
53};
61use up_data_structs::{CollectionId, CollectionMode, CreateCollectionData, TokenId};54use up_data_structs::{
55 CollectionId, CollectionMode, CollectionName, CreateCollectionData, PropertyKey, TokenId,
56};
6257
63// TODO: Move to primitives
64// Id of native currency.
65// 0 - QTZ\UNQ
66// 1 - KSM\DOT
67#[derive(
68 Clone,
69 Copy,
70 Eq,
71 PartialEq,
72 PartialOrd,
73 Ord,
74 MaxEncodedLen,
75 RuntimeDebug,
76 Encode,
77 Decode,
78 TypeInfo,
79 Serialize,
80 Deserialize,
81)]
82pub enum NativeCurrency {
83 Here = 0,
84 Parent = 1,
85}
86
87#[derive(
88 Clone,
89 Copy,
90 Eq,
91 PartialEq,
92 PartialOrd,
93 Ord,
94 MaxEncodedLen,
95 RuntimeDebug,
96 Encode,
97 Decode,
98 TypeInfo,
99 Serialize,
100 Deserialize,
101)]
102pub enum AssetId {
103 ForeignAssetId(ForeignAssetId),
104 NativeAssetId(NativeCurrency),
105}
106
107pub trait TryAsForeign<T, F> {
108 fn try_as_foreign(asset: T) -> Option<F>;
109}
110
111impl TryAsForeign<AssetId, ForeignAssetId> for AssetId {
112 fn try_as_foreign(asset: AssetId) -> Option<ForeignAssetId> {
113 match asset {
114 Self::ForeignAssetId(id) => Some(id),
115 _ => None,
116 }
117 }
118}
119
120pub type ForeignAssetId = u32;
121pub type CurrencyId = AssetId;
122
123mod impl_fungibles;
124pub mod weights;58pub mod weights;
12559
126#[cfg(feature = "runtime-benchmarks")]60#[cfg(feature = "runtime-benchmarks")]
129pub use module::*;63pub use module::*;
130pub use weights::WeightInfo;64pub use weights::WeightInfo;
13165
132/// Type alias for currency balance.
133pub type BalanceOf<T> =
134 <<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
135
136/// A mapping between ForeignAssetId and AssetMetadata.
137pub trait AssetIdMapping<ForeignAssetId, MultiLocation, AssetMetadata> {
138 /// Returns the AssetMetadata associated with a given ForeignAssetId.
139 fn get_asset_metadata(foreign_asset_id: ForeignAssetId) -> Option<AssetMetadata>;
140 /// Returns the MultiLocation associated with a given ForeignAssetId.
141 fn get_multi_location(foreign_asset_id: ForeignAssetId) -> Option<MultiLocation>;
142 /// Returns the CurrencyId associated with a given MultiLocation.
143 fn get_currency_id(multi_location: MultiLocation) -> Option<CurrencyId>;
144}
145
146pub struct XcmForeignAssetIdMapping<T>(sp_std::marker::PhantomData<T>);
147
148impl<T: Config> AssetIdMapping<ForeignAssetId, MultiLocation, AssetMetadata<BalanceOf<T>>>
149 for XcmForeignAssetIdMapping<T>
150{
151 fn get_asset_metadata(foreign_asset_id: ForeignAssetId) -> Option<AssetMetadata<BalanceOf<T>>> {
152 log::trace!(target: "fassets::asset_metadatas", "call");
153 Pallet::<T>::asset_metadatas(AssetId::ForeignAssetId(foreign_asset_id))
154 }
155
156 fn get_multi_location(foreign_asset_id: ForeignAssetId) -> Option<MultiLocation> {
157 log::trace!(target: "fassets::get_multi_location", "call");
158 Pallet::<T>::foreign_asset_locations(foreign_asset_id)
159 }
160
161 fn get_currency_id(multi_location: MultiLocation) -> Option<CurrencyId> {
162 log::trace!(target: "fassets::get_currency_id", "call");
163 Pallet::<T>::location_to_currency_ids(multi_location).map(AssetId::ForeignAssetId)
164 }
165}
166
167#[frame_support::pallet]66#[frame_support::pallet]
168pub mod module {67pub mod module {
68 use up_data_structs::{
69 CollectionDescription, Property, PropertyKeyPermission, PropertyPermission,
70 };
71
169 use super::*;72 use super::*;
17073
171 #[pallet::config]74 #[pallet::config]
172 pub trait Config:75 pub trait Config:
173 frame_system::Config76 frame_system::Config
174 + pallet_common::Config77 + pallet_common::Config
175 + pallet_fungible::Config78 + pallet_fungible::Config
176 + orml_tokens::Config
177 + pallet_balances::Config79 + pallet_balances::Config
178 {80 {
179 /// The overarching event type.81 /// The overarching event type.
180 type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;82 type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
18183
182 /// Currency type for withdraw and balance storage.84 /// Origin for force registering of a foreign asset.
183 type Currency: Currency<Self::AccountId>;85 type ForceRegisterOrigin: EnsureOrigin<Self::RuntimeOrigin>;
18486
185 /// Required origin for registering asset.87 /// The ID of the foreign assets pallet.
186 type RegisterOrigin: EnsureOrigin<Self::RuntimeOrigin>;88 type PalletId: Get<PalletId>;
18789
188 /// Weight information for the extrinsics in this module.90 /// Weight information for the extrinsics in this module.
189 type WeightInfo: WeightInfo;91 type WeightInfo: WeightInfo;
190 }92 }
19193
192 pub type AssetName = BoundedVec<u8, ConstU32<32>>;
193 pub type AssetSymbol = BoundedVec<u8, ConstU32<7>>;
194
195 #[derive(Clone, Eq, PartialEq, RuntimeDebug, Encode, Decode, TypeInfo, MaxEncodedLen)]
196 pub struct AssetMetadata<Balance> {
197 pub name: AssetName,
198 pub symbol: AssetSymbol,
199 pub decimals: u8,
200 pub minimal_balance: Balance,
201 }
202
203 #[pallet::error]94 #[pallet::error]
204 pub enum Error<T> {95 pub enum Error<T> {
205 /// The given location could not be used (e.g. because it cannot be expressed in the96 /// The foreign asset is already registered
206 /// desired version of XCM).
207 BadLocation,
208 /// MultiLocation existed
209 MultiLocationExisted,
210 /// AssetId not exists
211 AssetIdNotExists,
212 /// AssetId exists
213 AssetIdExisted,97 ForeignAssetAlreadyRegistered,
214 }98 }
21599
216 #[pallet::event]100 #[pallet::event]
217 #[pallet::generate_deposit(fn deposit_event)]101 #[pallet::generate_deposit(fn deposit_event)]
218 pub enum Event<T: Config> {102 pub enum Event<T: Config> {
219 /// The foreign asset registered.103 /// The foreign asset registered.
220 ForeignAssetRegistered {104 ForeignAssetRegistered {
221 asset_id: ForeignAssetId,105 asset_id: CollectionId,
222 asset_address: MultiLocation,106 reserve_location: MultiLocation,
223 metadata: AssetMetadata<BalanceOf<T>>,
224 },107 },
225 /// The foreign asset updated.
226 ForeignAssetUpdated {
227 asset_id: ForeignAssetId,
228 asset_address: MultiLocation,
229 metadata: AssetMetadata<BalanceOf<T>>,
230 },
231 /// The asset registered.
232 AssetRegistered {
233 asset_id: AssetId,
234 metadata: AssetMetadata<BalanceOf<T>>,
235 },
236 /// The asset updated.
237 AssetUpdated {
238 asset_id: AssetId,
239 metadata: AssetMetadata<BalanceOf<T>>,
240 },
241 }108 }
242109
243 /// Next available Foreign AssetId ID.110 /// The corresponding collections of reserve locations.
244 ///
245 /// NextForeignAssetId: ForeignAssetId
246 #[pallet::storage]111 #[pallet::storage]
247 #[pallet::getter(fn next_foreign_asset_id)]112 #[pallet::getter(fn foreign_reserve_location_to_collection)]
248 pub type NextForeignAssetId<T: Config> = StorageValue<_, ForeignAssetId, ValueQuery>;113 pub type ForeignReserveLocationToCollection<T: Config> =
249 /// The storages for MultiLocations.114 StorageMap<_, Twox64Concat, staging_xcm::v3::MultiLocation, CollectionId, OptionQuery>;
250 ///
251 /// ForeignAssetLocations: map ForeignAssetId => Option<MultiLocation>
252 #[pallet::storage]
253 #[pallet::getter(fn foreign_asset_locations)]
254 pub type ForeignAssetLocations<T: Config> =
255 StorageMap<_, Twox64Concat, ForeignAssetId, staging_xcm::v3::MultiLocation, OptionQuery>;
256115
257 /// The storages for CurrencyIds.116 /// The correponding NFT token id of reserve NFTs
258 ///
259 /// LocationToCurrencyIds: map MultiLocation => Option<ForeignAssetId>
260 #[pallet::storage]117 #[pallet::storage]
261 #[pallet::getter(fn location_to_currency_ids)]118 #[pallet::getter(fn foreign_reserve_asset_instance_to_token_id)]
262 pub type LocationToCurrencyIds<T: Config> =119 pub type ForeignReserveAssetInstanceToTokenId<T: Config> = StorageDoubleMap<
263 StorageMap<_, Twox64Concat, staging_xcm::v3::MultiLocation, ForeignAssetId, OptionQuery>;120 Hasher1 = Twox64Concat,
121 Key1 = CollectionId,
122 Hasher2 = Twox64Concat,
123 Key2 = staging_xcm::v3::AssetInstance,
124 Value = TokenId,
125 QueryKind = OptionQuery,
126 >;
264127
265 /// The storages for AssetMetadatas.
266 ///
267 /// AssetMetadatas: map AssetIds => Option<AssetMetadata>
268 #[pallet::storage]
269 #[pallet::getter(fn asset_metadatas)]
270 pub type AssetMetadatas<T: Config> =
271 StorageMap<_, Twox64Concat, AssetId, AssetMetadata<BalanceOf<T>>, OptionQuery>;
272
273 /// The storages for assets to fungible collection binding
274 ///
275 #[pallet::storage]
276 #[pallet::getter(fn asset_binding)]
277 pub type AssetBinding<T: Config> =
278 StorageMap<_, Twox64Concat, ForeignAssetId, CollectionId, OptionQuery>;
279
280 #[pallet::pallet]128 #[pallet::pallet]
281 pub struct Pallet<T>(_);129 pub struct Pallet<T>(_);
282130
283 #[pallet::call]131 #[pallet::call]
284 impl<T: Config> Pallet<T> {132 impl<T: Config> Pallet<T> {
285 #[pallet::call_index(0)]133 #[pallet::call_index(0)]
286 #[pallet::weight(<T as Config>::WeightInfo::register_foreign_asset())]134 #[pallet::weight(<T as Config>::WeightInfo::register_foreign_asset())]
287 pub fn register_foreign_asset(135 pub fn force_register_foreign_asset(
288 origin: OriginFor<T>,136 origin: OriginFor<T>,
289 owner: T::AccountId,137 reserve_location: MultiLocation,
290 location: Box<VersionedMultiLocation>,138 name: CollectionName,
291 metadata: Box<AssetMetadata<BalanceOf<T>>>,139 mode: CollectionMode,
292 ) -> DispatchResult {140 ) -> DispatchResult {
293 T::RegisterOrigin::ensure_origin(origin.clone())?;141 T::ForceRegisterOrigin::ensure_origin(origin.clone())?;
294142
295 let location: MultiLocation = (*location)143 let foreign_collection_owner = Self::pallet_account();
296 .try_into()
297 .map_err(|()| Error::<T>::BadLocation)?;
298144
299 let md = metadata.clone();145 let description: CollectionDescription = "Foreign Assets Collection"
300 let name: Vec<u16> = md.name.into_iter().map(|x| x as u16).collect::<Vec<u16>>();
301 let mut description: Vec<u16> = "Foreign assets collection for "
302 .encode_utf16()146 .encode_utf16()
303 .collect::<Vec<u16>>();147 .collect::<Vec<_>>()
304 description.append(&mut name.clone());148 .try_into()
149 .expect("description length < max description length; qed");
305150
306 let data: CreateCollectionData<T::CrossAccountId> = CreateCollectionData {151 let collection_id = T::CollectionDispatch::create_foreign(
307 name: name.try_into().unwrap(),
308 description: description.try_into().unwrap(),152 foreign_collection_owner,
309 mode: CollectionMode::Fungible(md.decimals),153 CreateCollectionData {
310 ..Default::default()154 name,
311 };
312 let owner = T::CrossAccountId::from_sub(owner);155 description,
313 let bounded_collection_id =
314 <PalletFungible<T>>::init_foreign_collection(owner.clone(), owner, data)?;
315 let foreign_asset_id =156 mode,
316 Self::do_register_foreign_asset(&location, &metadata, bounded_collection_id)?;
317157
318 Self::deposit_event(Event::<T>::ForeignAssetRegistered {158 properties: vec![Property {
319 asset_id: foreign_asset_id,159 key: Self::reserve_location_property_key(),
320 asset_address: location,160 value: reserve_location
321 metadata: *metadata,161 .encode()
162 .try_into()
163 .expect("multilocation is less than 32k; qed"),
322 });164 }]
323 Ok(())165 .try_into()
324 }166 .expect("just one property can always be stored; qed"),
325167
326 #[pallet::call_index(1)]168 token_property_permissions: vec![PropertyKeyPermission {
327 #[pallet::weight(<T as Config>::WeightInfo::update_foreign_asset())]169 key: Self::reserve_asset_instance_property_key(),
328 pub fn update_foreign_asset(170 permission: PropertyPermission {
329 origin: OriginFor<T>,171 mutable: false,
330 foreign_asset_id: ForeignAssetId,172 collection_admin: true,
331 location: Box<VersionedMultiLocation>,173 token_owner: false,
332 metadata: Box<AssetMetadata<BalanceOf<T>>>,174 },
333 ) -> DispatchResult {175 }]
176 .try_into()
177 .expect("just one property permission can always be stored; qed"),
334 T::RegisterOrigin::ensure_origin(origin)?;178 ..Default::default()
179 },
180 )?;
335181
336 let location: MultiLocation = (*location)182 <ForeignReserveLocationToCollection<T>>::insert(reserve_location, collection_id);
337 .try_into()
338 .map_err(|()| Error::<T>::BadLocation)?;
339 Self::do_update_foreign_asset(foreign_asset_id, &location, &metadata)?;
340183
341 Self::deposit_event(Event::<T>::ForeignAssetUpdated {184 Self::deposit_event(Event::<T>::ForeignAssetRegistered {
342 asset_id: foreign_asset_id,185 asset_id: collection_id,
343 asset_address: location,186 reserve_location,
344 metadata: *metadata,
345 });187 });
188
346 Ok(())189 Ok(())
347 }190 }
348 }191 }
349}192}
350193
351impl<T: Config> Pallet<T> {194impl<T: Config> Pallet<T> {
352 fn get_next_foreign_asset_id() -> Result<ForeignAssetId, DispatchError> {195 fn pallet_account() -> T::CrossAccountId {
353 NextForeignAssetId::<T>::try_mutate(|current| -> Result<ForeignAssetId, DispatchError> {
354 let id = *current;196 let owner: T::AccountId = T::PalletId::get().into_account_truncating();
355 *current = current
356 .checked_add(One::one())
357 .ok_or(ArithmeticError::Overflow)?;
358 Ok(id)197 T::CrossAccountId::from_sub(owner)
359 })
360 }198 }
361199
362 fn do_register_foreign_asset(200 fn reserve_location_property_key() -> PropertyKey {
363 location: &MultiLocation,
364 metadata: &AssetMetadata<BalanceOf<T>>,
365 bounded_collection_id: CollectionId,
366 ) -> Result<ForeignAssetId, DispatchError> {
367 let foreign_asset_id = Self::get_next_foreign_asset_id()?;201 b"reserve-location"
368 LocationToCurrencyIds::<T>::try_mutate(location, |maybe_currency_ids| -> DispatchResult {
369 ensure!(202 .to_vec()
370 maybe_currency_ids.is_none(),203 .try_into()
371 Error::<T>::MultiLocationExisted204 .expect("key length < max property key length; qed")
372 );205 }
373 *maybe_currency_ids = Some(foreign_asset_id);
374 // *maybe_currency_ids = Some(CurrencyId::ForeignAsset(foreign_asset_id));
375206
376 ForeignAssetLocations::<T>::try_mutate(207 fn reserve_asset_instance_property_key() -> PropertyKey {
377 foreign_asset_id,
378 |maybe_location| -> DispatchResult {
379 ensure!(maybe_location.is_none(), Error::<T>::MultiLocationExisted);208 b"reserve-asset-instance"
209 .to_vec()
380 *maybe_location = Some(*location);210 .try_into()
211 .expect("key length < max property key length; qed")
212 }
213}
381214
382 AssetMetadatas::<T>::try_mutate(215impl<T: Config> TransactAsset for Pallet<T> {
383 AssetId::ForeignAssetId(foreign_asset_id),
384 |maybe_asset_metadatas| -> DispatchResult {
385 ensure!(maybe_asset_metadatas.is_none(), Error::<T>::AssetIdExisted);
386 *maybe_asset_metadatas = Some(metadata.clone());216 fn can_check_in(
387 Ok(())217 _origin: &MultiLocation,
218 _what: &MultiAsset,
388 },219 _context: &XcmContext,
389 )220 ) -> XcmResult {
390 },221 Err(XcmError::Unimplemented)
391 )?;222 }
392223
393 AssetBinding::<T>::try_mutate(foreign_asset_id, |collection_id| -> DispatchResult {224 fn check_in(_origin: &MultiLocation, _what: &MultiAsset, _context: &XcmContext) {}
394 *collection_id = Some(bounded_collection_id);
395 Ok(())
396 })
397 })?;
398225
399 Ok(foreign_asset_id)226 fn can_check_out(
227 _dest: &MultiLocation,
228 _what: &MultiAsset,
229 _context: &XcmContext,
230 ) -> XcmResult {
231 Err(XcmError::Unimplemented)
400 }232 }
401233
402 fn do_update_foreign_asset(234 fn check_out(_dest: &MultiLocation, _what: &MultiAsset, _context: &XcmContext) {}
403 foreign_asset_id: ForeignAssetId,
404 location: &MultiLocation,
405 metadata: &AssetMetadata<BalanceOf<T>>,
406 ) -> DispatchResult {
407 ForeignAssetLocations::<T>::try_mutate(
408 foreign_asset_id,
409 |maybe_multi_locations| -> DispatchResult {
410 let old_multi_locations = maybe_multi_locations
411 .as_mut()
412 .ok_or(Error::<T>::AssetIdNotExists)?;
413235
414 AssetMetadatas::<T>::try_mutate(236 fn deposit_asset(what: &MultiAsset, to: &MultiLocation, context: &XcmContext) -> XcmResult {
415 AssetId::ForeignAssetId(foreign_asset_id),
416 |maybe_asset_metadatas| -> DispatchResult {
417 ensure!(237 Err(XcmError::Unimplemented)
418 maybe_asset_metadatas.is_some(),
419 Error::<T>::AssetIdNotExists
420 );238 }
421239
422 // modify location240 fn withdraw_asset(
423 if location != old_multi_locations {241 what: &MultiAsset,
424 LocationToCurrencyIds::<T>::remove(*old_multi_locations);242 from: &MultiLocation,
425 LocationToCurrencyIds::<T>::try_mutate(243 _maybe_context: Option<&XcmContext>,
426 location,
427 |maybe_currency_ids| -> DispatchResult {244 ) -> Result<staging_xcm_executor::Assets, XcmError> {
428 ensure!(
429 maybe_currency_ids.is_none(),
430 Error::<T>::MultiLocationExisted
431 );
432 // *maybe_currency_ids = Some(CurrencyId::ForeignAsset(foreign_asset_id));
433 *maybe_currency_ids = Some(foreign_asset_id);
434 Ok(())
435 },
436 )?;
437 }
438 *maybe_asset_metadatas = Some(metadata.clone());
439 *old_multi_locations = *location;245 Err(XcmError::Unimplemented)
440 Ok(())
441 },
442 )
443 },
444 )
445 }246 }
247
248 fn internal_transfer_asset(
249 what: &MultiAsset,
250 from: &MultiLocation,
251 to: &MultiLocation,
252 _context: &XcmContext,
253 ) -> Result<staging_xcm_executor::Assets, XcmError> {
254 Err(XcmError::Unimplemented)
255 }
446}256}
447257
258pub struct CurrencyIdConvert<T: Config>(PhantomData<T>);
259impl<T: Config> sp_runtime::traits::Convert<CollectionId, Option<MultiLocation>>
260 for CurrencyIdConvert<T>
261{
262 fn convert(collection_id: CollectionId) -> Option<MultiLocation> {
263 if collection_id == NATIVE_FUNGIBLE_COLLECTION_ID {
264 Some(Here.into())
265 } else {
266 // let dispatch = T::CollectionDispatch::dispatch(collection_id).ok()?;
267 // let collection = dispatch.as_dyn();
268 // let xcm_ext = collection.xcm_extensions()?;
269
270 // if xcm_ext.is_foreign() {
271 // let encoded_location =
272 // collection.property(&<Pallet<T>>::reserve_location_property_key())?;
273 // MultiLocation::decode(&mut &encoded_location[..]).ok()
274 // } else {
275 // T::SelfLocation::get()
276 // .pushed_with_interior(GeneralIndex(collection_id.0.into()))
277 // .ok()
278 // }
279 todo!()
280 }
281 }
282}
283
448pub use frame_support::{284pub use frame_support::{
449 traits::{285 traits::{
450 fungibles::Balanced, tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT,286 fungibles::Balanced, tokens::currency::Currency as CurrencyT, OnUnbalanced as OnUnbalancedT,
451 },287 },
452 weights::{WeightToFee, WeightToFeePolynomial},288 weights::{WeightToFee, WeightToFeePolynomial},
453};289};
454290
455pub struct FreeForAll<291pub struct FreeForAll;
456 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,
457 AssetId: Get<MultiLocation>,
458 AccountId,
459 Currency: CurrencyT<AccountId>,
460 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
461>(
462 Weight,
463 Currency::Balance,
464 PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced)>,
465);
466292
467impl<293impl WeightTrader for FreeForAll {
468 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,
469 AssetId: Get<MultiLocation>,
470 AccountId,
471 Currency: CurrencyT<AccountId>,
472 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
473 > WeightTrader for FreeForAll<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>
474{
475 fn new() -> Self {294 fn new() -> Self {
476 Self(Weight::default(), Zero::zero(), PhantomData)295 Self
477 }296 }
478297
479 fn buy_weight(298 fn buy_weight(
484 ) -> Result<Assets, XcmError> {303 ) -> Result<Assets, XcmError> {
485 log::trace!(target: "fassets::weight", "buy_weight weight: {:?}, payment: {:?}", weight, payment);304 log::trace!(target: "fassets::weight", "buy_weight weight: {:?}, payment: {:?}", weight, payment);
486 Ok(payment)305 Ok(payment)
487 }
488}
489impl<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced> Drop
490 for FreeForAll<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>
491where
492 WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,
493 AssetId: Get<MultiLocation>,
494 Currency: CurrencyT<AccountId>,
495 OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
496{
497 fn drop(&mut self) {
498 OnUnbalanced::on_unbalanced(Currency::issue(self.1));
499 }306 }
500}307}
501308
modifiedpallets/fungible/src/common.rsdiffbeforeafterboth
--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -428,10 +428,6 @@
 		<Allowance<T>>::get((self.id, sender, spender))
 	}
 
-	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
-		None
-	}
-
 	fn total_pieces(&self, token: TokenId) -> Option<u128> {
 		if token != TokenId::default() {
 			return None;
modifiedpallets/fungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -212,24 +212,6 @@
 
 /// Pallet implementation for fungible assets
 impl<T: Config> Pallet<T> {
-	/// Initializes the collection. Returns [CollectionId] on success, [DispatchError] otherwise.
-	pub fn init_collection(
-		owner: T::CrossAccountId,
-		payer: T::CrossAccountId,
-		data: CreateCollectionData<T::CrossAccountId>,
-	) -> Result<CollectionId, DispatchError> {
-		<PalletCommon<T>>::init_collection(owner, payer, data)
-	}
-
-	/// Initializes the collection with ForeignCollection flag. Returns [CollectionId] on success, [DispatchError] otherwise.
-	pub fn init_foreign_collection(
-		owner: T::CrossAccountId,
-		payer: T::CrossAccountId,
-		data: CreateCollectionData<T::CrossAccountId>,
-	) -> Result<CollectionId, DispatchError> {
-		<PalletCommon<T>>::init_foreign_collection(owner, payer, data)
-	}
-
 	/// Destroys a collection.
 	pub fn destroy_collection(
 		collection: FungibleHandle<T>,
modifiedpallets/nonfungible/src/common.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -535,10 +535,6 @@
 		}
 	}
 
-	fn refungible_extensions(&self) -> Option<&dyn RefungibleExtensions<T>> {
-		None
-	}
-
 	fn total_pieces(&self, token: TokenId) -> Option<u128> {
 		if <TokenData<T>>::contains_key((self.id, token)) {
 			Some(1)
modifiedpallets/nonfungible/src/lib.rsdiffbeforeafterboth
--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -383,19 +383,6 @@
 
 // unchecked calls skips any permission checks
 impl<T: Config> Pallet<T> {
-	/// Create NFT collection
-	///
-	/// `init_collection` will take non-refundable deposit for collection creation.
-	///
-	/// - `data`: Contains settings for collection limits and permissions.
-	pub fn init_collection(
-		owner: T::CrossAccountId,
-		payer: T::CrossAccountId,
-		data: CreateCollectionData<T::CrossAccountId>,
-	) -> Result<CollectionId, DispatchError> {
-		<PalletCommon<T>>::init_collection(owner, payer, data)
-	}
-
 	/// Destroy NFT collection
 	///
 	/// `destroy_collection` will throw error if collection contains any tokens.
modifiedruntime/common/config/orml.rsdiffbeforeafterboth
--- a/runtime/common/config/orml.rs
+++ b/runtime/common/config/orml.rs
@@ -14,31 +14,21 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-use frame_support::{
-	parameter_types,
-	traits::{Contains, Everything},
-};
+use frame_support::{parameter_types, traits::Everything};
 use frame_system::EnsureSigned;
 use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key};
-use pallet_foreign_assets::{CurrencyId, NativeCurrency};
+use pallet_foreign_assets::CurrencyIdConvert;
 use sp_runtime::traits::Convert;
-use sp_std::{vec, vec::Vec};
 use staging_xcm::latest::{Junction::*, Junctions::*, MultiLocation, Weight};
 use staging_xcm_executor::XcmExecutor;
 use up_common::{
 	constants::*,
 	types::{AccountId, Balance},
 };
+use up_data_structs::CollectionId;
 
 use crate::{
-	runtime_common::config::{
-		pallets::TreasuryAccountId,
-		substrate::{MaxLocks, MaxReserves},
-		xcm::{
-			xcm_assets::CurrencyIdConvert, SelfLocation, UniversalLocation, Weigher,
-			XcmExecutorConfig,
-		},
-	},
+	runtime_common::config::xcm::{SelfLocation, UniversalLocation, Weigher, XcmExecutorConfig},
 	RelayChainBlockNumberProvider, Runtime, RuntimeEvent,
 };
 
@@ -59,29 +49,6 @@
 	};
 }
 
-parameter_type_with_key! {
-	pub ExistentialDeposits: |currency_id: CurrencyId| -> Balance {
-		match currency_id {
-			CurrencyId::NativeAssetId(symbol) => match symbol {
-				NativeCurrency::Here => 0,
-				NativeCurrency::Parent=> 0,
-			},
-			_ => 100_000
-		}
-	};
-}
-
-pub fn get_all_module_accounts() -> Vec<AccountId> {
-	vec![TreasuryAccountId::get()]
-}
-
-pub struct DustRemovalWhitelist;
-impl Contains<AccountId> for DustRemovalWhitelist {
-	fn contains(a: &AccountId) -> bool {
-		get_all_module_accounts().contains(a)
-	}
-}
-
 pub struct AccountIdToMultiLocation;
 impl Convert<AccountId, MultiLocation> for AccountIdToMultiLocation {
 	fn convert(account: AccountId) -> MultiLocation {
@@ -91,18 +58,6 @@
 		})
 		.into()
 	}
-}
-
-pub struct CurrencyHooks;
-impl orml_traits::currency::MutationHooks<AccountId, CurrencyId, Balance> for CurrencyHooks {
-	type OnDust = orml_tokens::TransferDust<Runtime, TreasuryAccountId>;
-	type OnSlash = ();
-	type PreTransfer = ();
-	type PostTransfer = ();
-	type PreDeposit = ();
-	type PostDeposit = ();
-	type OnNewTokenAccount = ();
-	type OnKilledTokenAccount = ();
 }
 
 impl orml_vesting::Config for Runtime {
@@ -113,29 +68,13 @@
 	type WeightInfo = ();
 	type MaxVestingSchedules = MaxVestingSchedules;
 	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;
-}
-
-impl orml_tokens::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type Balance = Balance;
-	type Amount = Amount;
-	type CurrencyId = CurrencyId;
-	type WeightInfo = ();
-	type ExistentialDeposits = ExistentialDeposits;
-	type CurrencyHooks = CurrencyHooks;
-	type MaxLocks = MaxLocks;
-	type MaxReserves = MaxReserves;
-	// TODO: Add all module accounts
-	type DustRemovalWhitelist = DustRemovalWhitelist;
-	/// The id type for named reserves.
-	type ReserveIdentifier = ();
 }
 
 impl orml_xtokens::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
-	type CurrencyId = CurrencyId;
-	type CurrencyIdConvert = CurrencyIdConvert;
+	type CurrencyId = CollectionId;
+	type CurrencyIdConvert = CurrencyIdConvert<Self>;
 	type AccountIdToMultiLocation = AccountIdToMultiLocation;
 	type SelfLocation = SelfLocation;
 	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
modifiedruntime/common/config/pallets/foreign_asset.rsdiffbeforeafterboth
--- a/runtime/common/config/pallets/foreign_asset.rs
+++ b/runtime/common/config/pallets/foreign_asset.rs
@@ -1,10 +1,14 @@
-use up_common::types::AccountId;
+use frame_support::{parameter_types, PalletId};
+
+use crate::{runtime_common::config::governance, Runtime, RuntimeEvent};
 
-use crate::{Balances, Runtime, RuntimeEvent};
+parameter_types! {
+	pub ForeignAssetPalletId: PalletId = PalletId(*b"frgnasts");
+}
 
 impl pallet_foreign_assets::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type Currency = Balances;
-	type RegisterOrigin = frame_system::EnsureRoot<AccountId>;
+	type ForceRegisterOrigin = governance::RootOrTechnicalCommitteeMember;
+	type PalletId = ForeignAssetPalletId;
 	type WeightInfo = pallet_foreign_assets::weights::SubstrateWeight<Self>;
 }
addedruntime/common/config/xcm.rsdiffbeforeafterboth
--- /dev/null
+++ b/runtime/common/config/xcm.rs
@@ -0,0 +1,254 @@
+// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
+// This file is part of Unique Network.
+
+// Unique Network is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Unique Network is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
+
+use cumulus_primitives_core::ParaId;
+use frame_support::{
+	parameter_types,
+	traits::{ConstU32, Everything, Get, Nothing, ProcessMessageError},
+};
+use frame_system::EnsureRoot;
+use orml_traits::location::AbsoluteReserveProvider;
+use orml_xcm_support::MultiNativeAsset;
+use pallet_foreign_assets::FreeForAll;
+use pallet_xcm::XcmPassthrough;
+use polkadot_parachain_primitives::primitives::Sibling;
+use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
+use sp_std::marker::PhantomData;
+use staging_xcm::{
+	latest::{prelude::*, MultiLocation, Weight},
+	v3::Instruction,
+};
+use staging_xcm_builder::{
+	AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, ParentIsPreset, RelayChainAsNative,
+	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
+	SignedToAccountId32, SovereignSignedViaLocation,
+};
+use staging_xcm_executor::{
+	traits::{Properties, ShouldExecute},
+	XcmExecutor,
+};
+use up_common::types::AccountId;
+
+#[cfg(feature = "governance")]
+use crate::runtime_common::config::governance;
+use crate::{
+	xcm_barrier::Barrier, AllPalletsWithSystem, Balances, ForeignAssets, ParachainInfo,
+	ParachainSystem, PolkadotXcm, RelayNetwork, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
+	XcmpQueue,
+};
+
+parameter_types! {
+	pub const RelayLocation: MultiLocation = MultiLocation::parent();
+	pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub UniversalLocation: InteriorMultiLocation = (
+		GlobalConsensus(crate::RelayNetwork::get()),
+		Parachain(ParachainInfo::get().into()),
+	).into();
+	pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));
+
+	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.
+	pub UnitWeightCost: Weight = Weight::from_parts(1_000_000, 1000); // ?
+	pub const MaxInstructions: u32 = 100;
+}
+
+/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
+/// when determining ownership of accounts for asset transacting and when attempting to use XCM
+/// `Transact` in order to determine the dispatch Origin.
+pub type LocationToAccountId = (
+	// The parent (Relay-chain) origin converts to the default `AccountId`.
+	ParentIsPreset<AccountId>,
+	// Sibling parachain origins convert to AccountId via the `ParaId::into`.
+	SiblingParachainConvertsVia<Sibling, AccountId>,
+	// Straight up local `AccountId32` origins just alias directly to `AccountId`.
+	AccountId32Aliases<RelayNetwork, AccountId>,
+);
+
+/// No local origins on this chain are allowed to dispatch XCM sends/executions.
+pub type LocalOriginToLocation = (SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>,);
+
+/// The means for routing XCM messages which are not for local execution into the right message
+/// queues.
+pub type XcmRouter = (
+	// Two routers - use UMP to communicate with the relay chain:
+	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
+	// ..and XCMP to communicate with the sibling chains.
+	XcmpQueue,
+);
+
+/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
+/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
+/// biases the kind of local `Origin` it will become.
+pub type XcmOriginToTransactDispatchOrigin = (
+	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
+	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
+	// foreign chains who want to have a local sovereign account on this chain which they control.
+	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
+	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when
+	// recognised.
+	RelayChainAsNative<RelayOrigin, RuntimeOrigin>,
+	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
+	// recognised.
+	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
+	// Native signed account converter; this just converts an `AccountId32` origin into a normal
+	// `Origin::Signed` origin of the same 32-byte value.
+	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
+	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
+	XcmPassthrough<RuntimeOrigin>,
+);
+
+pub trait TryPass {
+	fn try_pass<Call>(
+		origin: &MultiLocation,
+		message: &mut [Instruction<Call>],
+	) -> Result<(), ProcessMessageError>;
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+impl TryPass for Tuple {
+	fn try_pass<Call>(
+		origin: &MultiLocation,
+		message: &mut [Instruction<Call>],
+	) -> Result<(), ProcessMessageError> {
+		for_tuples!( #(
+			Tuple::try_pass(origin, message)?;
+		)* );
+
+		Ok(())
+	}
+}
+
+/// Deny executing the XCM if it matches any of the Deny filter regardless of anything else.
+/// If it passes the Deny, and matches one of the Allow cases then it is let through.
+pub struct DenyThenTry<Deny, Allow>(PhantomData<Deny>, PhantomData<Allow>)
+where
+	Deny: TryPass,
+	Allow: ShouldExecute;
+
+impl<Deny, Allow> ShouldExecute for DenyThenTry<Deny, Allow>
+where
+	Deny: TryPass,
+	Allow: ShouldExecute,
+{
+	fn should_execute<Call>(
+		origin: &MultiLocation,
+		message: &mut [Instruction<Call>],
+		max_weight: Weight,
+		properties: &mut Properties,
+	) -> Result<(), ProcessMessageError> {
+		Deny::try_pass(origin, message)?;
+		Allow::should_execute(origin, message, max_weight, properties)
+	}
+}
+
+pub type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
+
+pub type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
+
+pub type Trader = FreeForAll;
+
+pub struct XcmExecutorConfig<T>(PhantomData<T>);
+impl<T> staging_xcm_executor::Config for XcmExecutorConfig<T>
+where
+	T: pallet_configuration::Config,
+{
+	type RuntimeCall = RuntimeCall;
+	type XcmSender = XcmRouter;
+	// How to withdraw and deposit an asset.
+	type AssetTransactor = ForeignAssets;
+	type OriginConverter = XcmOriginToTransactDispatchOrigin;
+	type IsReserve = IsReserve;
+	type IsTeleporter = (); // Teleportation is disabled
+	type UniversalLocation = UniversalLocation;
+	type Barrier = Barrier;
+	type Weigher = Weigher;
+	type Trader = Trader;
+	type ResponseHandler = PolkadotXcm;
+	type SubscriptionService = PolkadotXcm;
+	type PalletInstancesInfo = AllPalletsWithSystem;
+	type MaxAssetsIntoHolding = ConstU32<8>;
+
+	type AssetTrap = PolkadotXcm;
+	type AssetClaims = PolkadotXcm;
+	type AssetLocker = ();
+	type AssetExchanger = ();
+	type FeeManager = ();
+	type MessageExporter = ();
+	type UniversalAliases = Nothing;
+	type CallDispatcher = RuntimeCall;
+	type SafeCallFilter = Nothing;
+	type Aliasers = Nothing;
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+parameter_types! {
+	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
+}
+
+impl pallet_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
+	type XcmRouter = XcmRouter;
+	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
+	type XcmExecuteFilter = Everything;
+	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
+	type XcmTeleportFilter = Everything;
+	type XcmReserveTransferFilter = Everything;
+	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
+	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeCall = RuntimeCall;
+	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
+	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
+	type UniversalLocation = UniversalLocation;
+	type Currency = Balances;
+	type CurrencyMatcher = ();
+	type TrustedLockers = ();
+	type SovereignAccountOf = LocationToAccountId;
+	type MaxLockers = ConstU32<8>;
+	type WeightInfo = crate::weights::xcm::SubstrateWeight<Runtime>;
+	type AdminOrigin = EnsureRoot<AccountId>;
+	type MaxRemoteLockConsumers = ConstU32<0>;
+	type RemoteLockConsumerIdentifier = ();
+	#[cfg(feature = "runtime-benchmarks")]
+	type ReachableDest = ReachableDest;
+}
+
+impl cumulus_pallet_xcm::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
+}
+impl cumulus_pallet_xcmp_queue::Config for Runtime {
+	type WeightInfo = ();
+	type RuntimeEvent = RuntimeEvent;
+	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
+	type ChannelInfo = ParachainSystem;
+	type VersionWrapper = PolkadotXcm;
+	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
+
+	#[cfg(feature = "governance")]
+	type ControllerOrigin = governance::RootOrTechnicalCommitteeMember;
+
+	#[cfg(not(feature = "governance"))]
+	type ControllerOrigin = frame_system::EnsureRoot<AccountId>;
+
+	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
+	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
+}
+
+impl cumulus_pallet_dmp_queue::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
+	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
+}
deletedruntime/common/config/xcm/foreignassets.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm/foreignassets.rs
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use frame_support::{parameter_types, traits::Get};
-use orml_traits::location::AbsoluteReserveProvider;
-use orml_xcm_support::MultiNativeAsset;
-use pallet_foreign_assets::{
-	AssetId, AssetIdMapping, CurrencyId, ForeignAssetId, FreeForAll, NativeCurrency, TryAsForeign,
-	XcmForeignAssetIdMapping,
-};
-use sp_runtime::traits::{Convert, MaybeEquivalence};
-use sp_std::marker::PhantomData;
-use staging_xcm::latest::{prelude::*, MultiAsset, MultiLocation};
-use staging_xcm_builder::{ConvertedConcreteId, FungiblesAdapter, NoChecking};
-use staging_xcm_executor::traits::{JustTry, TransactAsset};
-use up_common::types::{AccountId, Balance};
-
-use super::{LocationToAccountId, RelayLocation};
-use crate::{Balances, ForeignAssets, ParachainInfo, PolkadotXcm, Runtime};
-
-parameter_types! {
-	pub CheckingAccount: AccountId = PolkadotXcm::check_account();
-}
-
-pub struct AsInnerId<ConvertAssetId>(PhantomData<(AssetId, ConvertAssetId)>);
-impl<ConvertAssetId: MaybeEquivalence<AssetId, AssetId>> MaybeEquivalence<MultiLocation, AssetId>
-	for AsInnerId<ConvertAssetId>
-{
-	fn convert(id: &MultiLocation) -> Option<AssetId> {
-		log::trace!(
-			target: "xcm::AsInnerId::Convert",
-			"AsInnerId {:?}",
-			id
-		);
-
-		let parent = MultiLocation::parent();
-		let here = MultiLocation::here();
-		let self_location = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));
-
-		if *id == parent {
-			return ConvertAssetId::convert(&AssetId::NativeAssetId(NativeCurrency::Parent));
-		}
-
-		if *id == here || *id == self_location {
-			return ConvertAssetId::convert(&AssetId::NativeAssetId(NativeCurrency::Here));
-		}
-
-		match XcmForeignAssetIdMapping::<Runtime>::get_currency_id(*id) {
-			Some(AssetId::ForeignAssetId(foreign_asset_id)) => {
-				ConvertAssetId::convert(&AssetId::ForeignAssetId(foreign_asset_id))
-			}
-			_ => None,
-		}
-	}
-
-	fn convert_back(asset_id: &AssetId) -> Option<MultiLocation> {
-		log::trace!(
-			target: "xcm::AsInnerId::Reverse",
-			"AsInnerId",
-		);
-
-		let parent_id =
-			ConvertAssetId::convert(&AssetId::NativeAssetId(NativeCurrency::Parent)).unwrap();
-		let here_id =
-			ConvertAssetId::convert(&AssetId::NativeAssetId(NativeCurrency::Here)).unwrap();
-
-		if *asset_id == parent_id {
-			return Some(MultiLocation::parent());
-		}
-
-		if *asset_id == here_id {
-			return Some(MultiLocation::new(
-				1,
-				X1(Parachain(ParachainInfo::get().into())),
-			));
-		}
-
-		let fid = <AssetId as TryAsForeign<AssetId, ForeignAssetId>>::try_as_foreign(*asset_id)?;
-		XcmForeignAssetIdMapping::<Runtime>::get_multi_location(fid)
-	}
-}
-
-/// Means for transacting assets besides the native currency on this chain.
-pub type FungiblesTransactor = FungiblesAdapter<
-	// Use this fungibles implementation:
-	ForeignAssets,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	ConvertedConcreteId<AssetId, Balance, AsInnerId<JustTry>, JustTry>,
-	// Convert an XCM MultiLocation into a local account id:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// No Checking for teleported assets since we disallow teleports at all.
-	NoChecking,
-	// The account to use for tracking teleports.
-	CheckingAccount,
->;
-
-/// Means for transacting assets on this chain.
-pub struct AssetTransactor;
-impl TransactAsset for AssetTransactor {
-	fn can_check_in(
-		_origin: &MultiLocation,
-		_what: &MultiAsset,
-		_context: &XcmContext,
-	) -> XcmResult {
-		Err(XcmError::Unimplemented)
-	}
-
-	fn check_in(_origin: &MultiLocation, _what: &MultiAsset, _context: &XcmContext) {}
-
-	fn can_check_out(
-		_dest: &MultiLocation,
-		_what: &MultiAsset,
-		_context: &XcmContext,
-	) -> XcmResult {
-		Err(XcmError::Unimplemented)
-	}
-
-	fn check_out(_dest: &MultiLocation, _what: &MultiAsset, _context: &XcmContext) {}
-
-	fn deposit_asset(
-		what: &MultiAsset,
-		who: &MultiLocation,
-		context: Option<&XcmContext>,
-	) -> XcmResult {
-		FungiblesTransactor::deposit_asset(what, who, context)
-	}
-
-	fn withdraw_asset(
-		what: &MultiAsset,
-		who: &MultiLocation,
-		maybe_context: Option<&XcmContext>,
-	) -> Result<staging_xcm_executor::Assets, XcmError> {
-		FungiblesTransactor::withdraw_asset(what, who, maybe_context)
-	}
-
-	fn internal_transfer_asset(
-		what: &MultiAsset,
-		from: &MultiLocation,
-		to: &MultiLocation,
-		context: &XcmContext,
-	) -> Result<staging_xcm_executor::Assets, XcmError> {
-		FungiblesTransactor::internal_transfer_asset(what, from, to, context)
-	}
-}
-
-pub type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
-
-pub type Trader<T> = FreeForAll<
-	pallet_configuration::WeightToFee<T, Balance>,
-	RelayLocation,
-	AccountId,
-	Balances,
-	(),
->;
-
-pub struct CurrencyIdConvert;
-impl Convert<AssetId, Option<MultiLocation>> for CurrencyIdConvert {
-	fn convert(id: AssetId) -> Option<MultiLocation> {
-		match id {
-			AssetId::NativeAssetId(NativeCurrency::Here) => Some(MultiLocation::new(
-				1,
-				X1(Parachain(ParachainInfo::get().into())),
-			)),
-			AssetId::NativeAssetId(NativeCurrency::Parent) => Some(MultiLocation::parent()),
-			AssetId::ForeignAssetId(foreign_asset_id) => {
-				XcmForeignAssetIdMapping::<Runtime>::get_multi_location(foreign_asset_id)
-			}
-		}
-	}
-}
-
-impl Convert<MultiLocation, Option<CurrencyId>> for CurrencyIdConvert {
-	fn convert(location: MultiLocation) -> Option<CurrencyId> {
-		if location == MultiLocation::here()
-			|| location == MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())))
-		{
-			return Some(AssetId::NativeAssetId(NativeCurrency::Here));
-		}
-
-		if location == MultiLocation::parent() {
-			return Some(AssetId::NativeAssetId(NativeCurrency::Parent));
-		}
-
-		if let Some(currency_id) = XcmForeignAssetIdMapping::<Runtime>::get_currency_id(location) {
-			return Some(currency_id);
-		}
-
-		None
-	}
-}
deletedruntime/common/config/xcm/mod.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm/mod.rs
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use cumulus_primitives_core::ParaId;
-use frame_support::{
-	parameter_types,
-	traits::{ConstU32, Everything, Get, Nothing, ProcessMessageError},
-};
-use frame_system::EnsureRoot;
-use pallet_xcm::XcmPassthrough;
-use polkadot_parachain_primitives::primitives::Sibling;
-use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
-use sp_std::marker::PhantomData;
-use staging_xcm::{
-	latest::{prelude::*, MultiLocation, Weight},
-	v3::Instruction,
-};
-use staging_xcm_builder::{
-	AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, ParentIsPreset, RelayChainAsNative,
-	SiblingParachainAsNative, SiblingParachainConvertsVia, SignedAccountId32AsNative,
-	SignedToAccountId32, SovereignSignedViaLocation,
-};
-use staging_xcm_executor::{
-	traits::{Properties, ShouldExecute},
-	XcmExecutor,
-};
-use up_common::types::AccountId;
-
-use crate::{
-	xcm_barrier::Barrier, AllPalletsWithSystem, Balances, ParachainInfo, ParachainSystem,
-	PolkadotXcm, RelayNetwork, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, XcmpQueue,
-};
-
-#[cfg(feature = "foreign-assets")]
-pub mod foreignassets;
-
-#[cfg(not(feature = "foreign-assets"))]
-pub mod nativeassets;
-
-#[cfg(feature = "foreign-assets")]
-pub use foreignassets as xcm_assets;
-#[cfg(not(feature = "foreign-assets"))]
-pub use nativeassets as xcm_assets;
-use xcm_assets::{AssetTransactor, IsReserve, Trader};
-
-#[cfg(feature = "governance")]
-use crate::runtime_common::config::governance;
-
-parameter_types! {
-	pub const RelayLocation: MultiLocation = MultiLocation::parent();
-	pub RelayOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub UniversalLocation: InteriorMultiLocation = (
-		GlobalConsensus(crate::RelayNetwork::get()),
-		Parachain(ParachainInfo::get().into()),
-	).into();
-	pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));
-
-	// One XCM operation is 1_000_000 weight - almost certainly a conservative estimate.
-	pub UnitWeightCost: Weight = Weight::from_parts(1_000_000, 1000); // ?
-	pub const MaxInstructions: u32 = 100;
-}
-
-/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
-/// when determining ownership of accounts for asset transacting and when attempting to use XCM
-/// `Transact` in order to determine the dispatch Origin.
-pub type LocationToAccountId = (
-	// The parent (Relay-chain) origin converts to the default `AccountId`.
-	ParentIsPreset<AccountId>,
-	// Sibling parachain origins convert to AccountId via the `ParaId::into`.
-	SiblingParachainConvertsVia<Sibling, AccountId>,
-	// Straight up local `AccountId32` origins just alias directly to `AccountId`.
-	AccountId32Aliases<RelayNetwork, AccountId>,
-);
-
-/// No local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation = (SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>,);
-
-/// The means for routing XCM messages which are not for local execution into the right message
-/// queues.
-pub type XcmRouter = (
-	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
-	// ..and XCMP to communicate with the sibling chains.
-	XcmpQueue,
-);
-
-/// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
-/// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
-/// biases the kind of local `Origin` it will become.
-pub type XcmOriginToTransactDispatchOrigin = (
-	// Sovereign account converter; this attempts to derive an `AccountId` from the origin location
-	// using `LocationToAccountId` and then turn that into the usual `Signed` origin. Useful for
-	// foreign chains who want to have a local sovereign account on this chain which they control.
-	SovereignSignedViaLocation<LocationToAccountId, RuntimeOrigin>,
-	// Native converter for Relay-chain (Parent) location; will converts to a `Relay` origin when
-	// recognised.
-	RelayChainAsNative<RelayOrigin, RuntimeOrigin>,
-	// Native converter for sibling Parachains; will convert to a `SiblingPara` origin when
-	// recognised.
-	SiblingParachainAsNative<cumulus_pallet_xcm::Origin, RuntimeOrigin>,
-	// Native signed account converter; this just converts an `AccountId32` origin into a normal
-	// `Origin::Signed` origin of the same 32-byte value.
-	SignedAccountId32AsNative<RelayNetwork, RuntimeOrigin>,
-	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
-	XcmPassthrough<RuntimeOrigin>,
-);
-
-pub trait TryPass {
-	fn try_pass<Call>(
-		origin: &MultiLocation,
-		message: &mut [Instruction<Call>],
-	) -> Result<(), ProcessMessageError>;
-}
-
-#[impl_trait_for_tuples::impl_for_tuples(30)]
-impl TryPass for Tuple {
-	fn try_pass<Call>(
-		origin: &MultiLocation,
-		message: &mut [Instruction<Call>],
-	) -> Result<(), ProcessMessageError> {
-		for_tuples!( #(
-			Tuple::try_pass(origin, message)?;
-		)* );
-
-		Ok(())
-	}
-}
-
-/// Deny executing the XCM if it matches any of the Deny filter regardless of anything else.
-/// If it passes the Deny, and matches one of the Allow cases then it is let through.
-pub struct DenyThenTry<Deny, Allow>(PhantomData<Deny>, PhantomData<Allow>)
-where
-	Deny: TryPass,
-	Allow: ShouldExecute;
-
-impl<Deny, Allow> ShouldExecute for DenyThenTry<Deny, Allow>
-where
-	Deny: TryPass,
-	Allow: ShouldExecute,
-{
-	fn should_execute<Call>(
-		origin: &MultiLocation,
-		message: &mut [Instruction<Call>],
-		max_weight: Weight,
-		properties: &mut Properties,
-	) -> Result<(), ProcessMessageError> {
-		Deny::try_pass(origin, message)?;
-		Allow::should_execute(origin, message, max_weight, properties)
-	}
-}
-
-pub type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
-
-pub struct XcmExecutorConfig<T>(PhantomData<T>);
-impl<T> staging_xcm_executor::Config for XcmExecutorConfig<T>
-where
-	T: pallet_configuration::Config,
-{
-	type RuntimeCall = RuntimeCall;
-	type XcmSender = XcmRouter;
-	// How to withdraw and deposit an asset.
-	type AssetTransactor = AssetTransactor;
-	type OriginConverter = XcmOriginToTransactDispatchOrigin;
-	type IsReserve = IsReserve;
-	type IsTeleporter = (); // Teleportation is disabled
-	type UniversalLocation = UniversalLocation;
-	type Barrier = Barrier;
-	type Weigher = Weigher;
-	type Trader = Trader<T>;
-	type ResponseHandler = PolkadotXcm;
-	type SubscriptionService = PolkadotXcm;
-	type PalletInstancesInfo = AllPalletsWithSystem;
-	type MaxAssetsIntoHolding = ConstU32<8>;
-
-	type AssetTrap = PolkadotXcm;
-	type AssetClaims = PolkadotXcm;
-	type AssetLocker = ();
-	type AssetExchanger = ();
-	type FeeManager = ();
-	type MessageExporter = ();
-	type UniversalAliases = Nothing;
-	type CallDispatcher = RuntimeCall;
-	type SafeCallFilter = Nothing;
-	type Aliasers = Nothing;
-}
-
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
-impl pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type SendXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, ()>;
-	type XcmRouter = XcmRouter;
-	type ExecuteXcmOrigin = EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
-	type XcmExecuteFilter = Everything;
-	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
-	type XcmTeleportFilter = Everything;
-	type XcmReserveTransferFilter = Everything;
-	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
-	type RuntimeOrigin = RuntimeOrigin;
-	type RuntimeCall = RuntimeCall;
-	const VERSION_DISCOVERY_QUEUE_SIZE: u32 = 100;
-	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
-	type UniversalLocation = UniversalLocation;
-	type Currency = Balances;
-	type CurrencyMatcher = ();
-	type TrustedLockers = ();
-	type SovereignAccountOf = LocationToAccountId;
-	type MaxLockers = ConstU32<8>;
-	type WeightInfo = crate::weights::xcm::SubstrateWeight<Runtime>;
-	type AdminOrigin = EnsureRoot<AccountId>;
-	type MaxRemoteLockConsumers = ConstU32<0>;
-	type RemoteLockConsumerIdentifier = ();
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
-}
-
-impl cumulus_pallet_xcm::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
-}
-impl cumulus_pallet_xcmp_queue::Config for Runtime {
-	type WeightInfo = ();
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
-	type ChannelInfo = ParachainSystem;
-	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
-
-	#[cfg(feature = "governance")]
-	type ControllerOrigin = governance::RootOrTechnicalCommitteeMember;
-
-	#[cfg(not(feature = "governance"))]
-	type ControllerOrigin = frame_system::EnsureRoot<AccountId>;
-
-	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
-	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
-}
-
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmExecutorConfig<Self>>;
-	type ExecuteOverweightOrigin = frame_system::EnsureRoot<AccountId>;
-}
deletedruntime/common/config/xcm/nativeassets.rsdiffbeforeafterboth
--- a/runtime/common/config/xcm/nativeassets.rs
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.
-// This file is part of Unique Network.
-
-// Unique Network is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// Unique Network is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-
-use cumulus_primitives_core::XcmContext;
-use frame_support::{
-	traits::{tokens::currency::Currency as CurrencyT, Get, OnUnbalanced as OnUnbalancedT},
-	weights::WeightToFeePolynomial,
-};
-use pallet_foreign_assets::{AssetIds, NativeCurrency};
-use sp_runtime::traits::{CheckedConversion, Convert, Zero};
-use sp_std::marker::PhantomData;
-use staging_xcm::latest::{
-	AssetId::Concrete, Error as XcmError, Fungibility::Fungible as XcmFungible, Junction::*,
-	Junctions::*, MultiAsset, MultiLocation, Weight,
-};
-use staging_xcm_builder::{CurrencyAdapter, NativeAsset};
-use staging_xcm_executor::{
-	traits::{MatchesFungible, WeightTrader},
-	Assets,
-};
-use up_common::types::{AccountId, Balance};
-
-use super::{LocationToAccountId, RelayLocation};
-use crate::{Balances, ParachainInfo};
-
-pub struct OnlySelfCurrency;
-impl<B: TryFrom<u128>> MatchesFungible<B> for OnlySelfCurrency {
-	fn matches_fungible(a: &MultiAsset) -> Option<B> {
-		let paraid = Parachain(ParachainInfo::parachain_id().into());
-		match (&a.id, &a.fun) {
-			(
-				Concrete(MultiLocation {
-					parents: 1,
-					interior: X1(loc),
-				}),
-				XcmFungible(ref amount),
-			) if paraid == *loc => CheckedConversion::checked_from(*amount),
-			(
-				Concrete(MultiLocation {
-					parents: 0,
-					interior: Here,
-				}),
-				XcmFungible(ref amount),
-			) => CheckedConversion::checked_from(*amount),
-			_ => None,
-		}
-	}
-}
-
-/// Means for transacting assets on this chain.
-pub type LocalAssetTransactor = CurrencyAdapter<
-	// Use this currency:
-	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	OnlySelfCurrency,
-	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:
-	LocationToAccountId,
-	// Our chain's account ID type (we can't get away without mentioning it explicitly):
-	AccountId,
-	// We don't track any teleports.
-	(),
->;
-
-pub type AssetTransactor = LocalAssetTransactor;
-
-pub type IsReserve = NativeAsset;
-
-pub struct UsingOnlySelfCurrencyComponents<
-	WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,
-	AssetId: Get<MultiLocation>,
-	AccountId,
-	Currency: CurrencyT<AccountId>,
-	OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
->(
-	Weight,
-	Currency::Balance,
-	PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced)>,
-);
-impl<
-		WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,
-		AssetId: Get<MultiLocation>,
-		AccountId,
-		Currency: CurrencyT<AccountId>,
-		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
-	> WeightTrader
-	for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>
-{
-	fn new() -> Self {
-		// FIXME: benchmark
-		Self(Weight::from_parts(0, 0), Zero::zero(), PhantomData)
-	}
-
-	fn buy_weight(
-		&mut self,
-		_weight: Weight,
-		payment: Assets,
-		_xcm: &XcmContext,
-	) -> Result<Assets, XcmError> {
-		Ok(payment)
-	}
-}
-impl<
-		WeightToFee: WeightToFeePolynomial<Balance = Currency::Balance>,
-		AssetId: Get<MultiLocation>,
-		AccountId,
-		Currency: CurrencyT<AccountId>,
-		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
-	> Drop
-	for UsingOnlySelfCurrencyComponents<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced>
-{
-	fn drop(&mut self) {
-		OnUnbalanced::on_unbalanced(Currency::issue(self.1));
-	}
-}
-
-pub type Trader<T> = UsingOnlySelfCurrencyComponents<
-	pallet_configuration::WeightToFee<T, Balance>,
-	RelayLocation,
-	AccountId,
-	Balances,
-	(),
->;
-
-pub struct CurrencyIdConvert;
-impl Convert<AssetIds, Option<MultiLocation>> for CurrencyIdConvert {
-	fn convert(id: AssetIds) -> Option<MultiLocation> {
-		match id {
-			AssetIds::NativeAssetId(NativeCurrency::Here) => Some(MultiLocation::new(
-				1,
-				X1(Parachain(ParachainInfo::get().into())),
-			)),
-			_ => None,
-		}
-	}
-}
modifiedruntime/common/construct_runtime.rsdiffbeforeafterboth
--- a/runtime/common/construct_runtime.rs
+++ b/runtime/common/construct_runtime.rs
@@ -47,7 +47,7 @@
 				Vesting: orml_vesting = 37,
 
 				XTokens: orml_xtokens = 38,
-				Tokens: orml_tokens = 39,
+				// [REMOVED] Tokens: orml_tokens = 39,
 				// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,
 
 				#[cfg(feature = "governance")]
modifiedruntime/common/dispatch.rsdiffbeforeafterboth
--- a/runtime/common/dispatch.rs
+++ b/runtime/common/dispatch.rs
@@ -17,11 +17,9 @@
 use frame_support::{dispatch::DispatchResult, ensure, fail};
 use pallet_balances_adapter::NativeFungibleHandle;
 pub use pallet_common::dispatch::CollectionDispatch;
-#[cfg(not(feature = "refungible"))]
-use pallet_common::unsupported;
 use pallet_common::{
-	erc::CommonEvmHandler, eth::map_eth_to_id, CollectionById, CollectionHandle,
-	CommonCollectionOperations,
+	erc::CommonEvmHandler, eth::map_eth_to_id, unsupported, CollectionById, CollectionHandle,
+	CommonCollectionOperations, Pallet as PalletCommon,
 };
 use pallet_evm::{PrecompileHandle, PrecompileResult};
 use pallet_fungible::{FungibleHandle, Pallet as PalletFungible};
@@ -73,24 +71,42 @@
 		payer: T::CrossAccountId,
 		data: CreateCollectionData<T::CrossAccountId>,
 	) -> Result<CollectionId, DispatchError> {
-		let id = match data.mode {
-			CollectionMode::NFT => <PalletNonfungible<T>>::init_collection(sender, payer, data)?,
+		match data.mode {
 			CollectionMode::Fungible(decimal_points) => {
 				// check params
 				ensure!(
 					decimal_points <= MAX_DECIMAL_POINTS,
 					pallet_unique::Error::<T>::CollectionDecimalPointLimitExceeded
 				);
-				<PalletFungible<T>>::init_collection(sender, payer, data)?
 			}
 
-			#[cfg(feature = "refungible")]
-			CollectionMode::ReFungible => <PalletRefungible<T>>::init_collection(sender, payer, data)?,
+			#[cfg(not(feature = "refungible"))]
+			CollectionMode::ReFungible => return unsupported!(T),
+
+			_ => {}
+		};
+
+		<PalletCommon<T>>::init_collection(sender, payer, data)
+	}
+
+	fn create_foreign(
+		sender: <T>::CrossAccountId,
+		data: CreateCollectionData<<T>::CrossAccountId>,
+	) -> Result<CollectionId, DispatchError> {
+		match data.mode {
+			CollectionMode::Fungible(decimal_points) => {
+				// check params
+				ensure!(
+					decimal_points <= MAX_DECIMAL_POINTS,
+					pallet_unique::Error::<T>::CollectionDecimalPointLimitExceeded
+				);
+			}
 
-			#[cfg(not(feature = "refungible"))]
 			CollectionMode::ReFungible => return unsupported!(T),
+			_ => {}
 		};
-		Ok(id)
+
+		<PalletCommon<T>>::init_foreign_collection(sender, data)
 	}
 
 	fn destroy(sender: T::CrossAccountId, collection_id: CollectionId) -> DispatchResult {