refactor: Drop tranche multiLocation

pallets/pool-registry/src/mock.rs

@@ -152,7 +152,6 @@ impl pallet_pool_system::Config for Test {
 	type NAV = FakeNav;
 	type PalletId = PoolPalletId;
 	type PalletIndex = PoolPalletIndex;
-	type ParachainId = ParachainInfo;
 	type Permission = PermissionsMock;
 	type PoolCreateOrigin = EnsureSigned<u64>;
 	type PoolCurrency = PoolCurrency;

pallets/pool-system/src/impls.rs

@@ -149,15 +149,8 @@ impl<T: Config> PoolMutate<T::AccountId, T::PoolId> for Pallet<T> {
 				None => return Err(Error::<T>::MetadataForCurrencyNotFound.into()),
 			};
 
-			let parachain_id = T::ParachainId::get();
-
-			let metadata = tranche.create_asset_metadata(
-				decimals,
-				parachain_id,
-				T::PalletIndex::get(),
-				token_name.to_vec(),
-				token_symbol.to_vec(),
-			);
+			let metadata =
+				tranche.create_asset_metadata(decimals, token_name.to_vec(), token_symbol.to_vec());
 
 			T::AssetRegistry::register_asset(Some(tranche.currency.into()), metadata)
 				.map_err(|_| Error::<T>::FailedToRegisterTrancheMetadata)?;

pallets/pool-system/src/lib.rs

@@ -40,7 +40,6 @@ use orml_traits::{
 	Change,
 };
 pub use pallet::*;
-use polkadot_parachain::primitives::Id as ParachainId;
 use pool_types::{
 	PoolChanges, PoolDepositInfo, PoolDetails, PoolEssence, PoolLocator, ScheduledUpdateDetails,
 };
@@ -275,9 +274,6 @@ pub mod pallet {
 			CustomMetadata = CustomMetadata,
 		>;
 
-		#[pallet::constant]
-		type ParachainId: Get<ParachainId>;
-
 		type Currency: ReservableCurrency<Self::AccountId, Balance = Self::Balance>;
 
 		type Tokens: Mutate<Self::AccountId>

pallets/pool-system/src/mock.rs

@@ -322,7 +322,6 @@ impl Config for Runtime {
 	type NAV = FakeNav;
 	type PalletId = PoolPalletId;
 	type PalletIndex = PoolPalletIndex;
-	type ParachainId = ParachainInfo;
 	type Permission = Permissions;
 	type PoolCreateOrigin = EnsureSigned<u64>;
 	type PoolCurrency = PoolCurrency;

pallets/pool-system/src/tests/mod.rs

@@ -20,15 +20,10 @@ use cfg_types::{
 use frame_support::{assert_err, assert_noop, assert_ok};
 use orml_traits::asset_registry::{AssetMetadata, Inspect};
 use rand::Rng;
-use sp_core::{storage::StateVersion, Encode};
+use sp_core::storage::StateVersion;
 use sp_runtime::{
-	traits::{ConstU32, One, Zero},
-	FixedPointNumber, Perquintill, TokenError, WeakBoundedVec,
-};
-use xcm::{
-	latest::MultiLocation,
-	prelude::{GeneralKey, PalletInstance, Parachain, X3},
-	VersionedMultiLocation,
+	traits::{One, Zero},
+	FixedPointNumber, Perquintill, TokenError,
 };
 
 use crate::{
@@ -2311,8 +2306,6 @@ fn create_tranche_token_metadata() {
 
 		let pool = Pool::<Runtime>::get(3).unwrap();
 		let tranche_currency = pool.tranches.tranches[0].currency;
-		let tranche_id =
-			WeakBoundedVec::<u8, ConstU32<32>>::force_from(tranche_currency.encode(), None);
 
 		assert_eq!(
 			<Runtime as Config>::AssetRegistry::metadata(&tranche_currency.into()).unwrap(),
@@ -2321,14 +2314,7 @@ fn create_tranche_token_metadata() {
 				name: "SuperToken".into(),
 				symbol: "ST".into(),
 				existential_deposit: 0,
-				location: Some(VersionedMultiLocation::V1(MultiLocation {
-					parents: 1,
-					interior: X3(
-						Parachain(MockParachainId::get()),
-						PalletInstance(PoolPalletIndex::get()),
-						GeneralKey(tranche_id)
-					),
-				})),
+				location: None,
 				additional: CustomMetadata {
 					mintable: false,
 					permissioned: true,

pallets/pool-system/src/tranches.rs

@@ -25,26 +25,20 @@ use frame_support::{
 	dispatch::DispatchResult,
 	ensure,
 	sp_runtime::ArithmeticError,
-	traits::{fungibles::Inspect, Get},
+	traits::{fungibles::Inspect, Get, Len},
 	Blake2_128, BoundedVec, Parameter, RuntimeDebug, StorageHasher,
 };
 use orml_traits::asset_registry::AssetMetadata;
-use polkadot_parachain::primitives::Id as ParachainId;
 use rev_slice::{RevSlice, SliceExt};
 use scale_info::TypeInfo;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 use sp_arithmetic::traits::{checked_pow, BaseArithmetic, Unsigned};
 use sp_runtime::{
-	traits::{ConstU32, Member, One, Zero},
-	DispatchError, FixedPointNumber, FixedPointOperand, Perquintill, WeakBoundedVec,
+	traits::{Member, One, Zero},
+	DispatchError, FixedPointNumber, FixedPointOperand, Perquintill,
 };
 use sp_std::{marker::PhantomData, ops::Deref, vec::Vec};
-use xcm::{
-	latest::MultiLocation,
-	prelude::{GeneralKey, PalletInstance, Parachain, X3},
-	VersionedMultiLocation,
-};
 
 /// Type that indicates the seniority of a tranche
 pub type Seniority = u32;
@@ -236,8 +230,6 @@ where
 	pub fn create_asset_metadata(
 		&self,
 		decimals: u32,
-		parachain_id: ParachainId,
-		pallet_index: u8,
 		token_name: Vec<u8>,
 		token_symbol: Vec<u8>,
 	) -> AssetMetadata<Balance, CustomMetadata>
@@ -246,22 +238,12 @@ where
 		Currency: Encode,
 		CustomMetadata: Parameter + Member + TypeInfo,
 	{
-		let tranche_id =
-			WeakBoundedVec::<u8, ConstU32<32>>::force_from(self.currency.encode(), None);
-
 		AssetMetadata {
 			decimals,
 			name: token_name,
 			symbol: token_symbol,
 			existential_deposit: Zero::zero(),
-			location: Some(VersionedMultiLocation::V1(MultiLocation {
-				parents: 1,
-				interior: X3(
-					Parachain(parachain_id.into()),
-					PalletInstance(pallet_index),
-					GeneralKey(tranche_id),
-				),
-			})),
+			location: None,
 			additional: CustomMetadata {
 				mintable: false,
 				permissioned: true,
@@ -1854,27 +1836,13 @@ pub mod test {
 			let decimals: u32 = 10;
 			let name: Vec<u8> = "Glimmer".into();
 			let symbol: Vec<u8> = "GLMR".into();
-			let asset_metadata = tranche.create_asset_metadata(
-				decimals,
-				// fake parachain id
-				ParachainId::from(42),
-				// fake pallet index
-				42u8,
-				name,
-				symbol,
-			);
+			let asset_metadata = tranche.create_asset_metadata(decimals, name, symbol);
 
 			assert_eq!(asset_metadata.existential_deposit, 0);
 			assert_eq!(asset_metadata.name[..], [71, 108, 105, 109, 109, 101, 114]);
 			assert_eq!(asset_metadata.symbol[..], [71, 76, 77, 82]);
 			assert_eq!(asset_metadata.decimals, decimals);
-			assert!(match asset_metadata.location {
-				Some(VersionedMultiLocation::V1(xcm::v1::MultiLocation {
-					parents: 1,
-					interior: X3(Parachain(42), PalletInstance(42), GeneralKey(_)),
-				})) => true,
-				_ => false,
-			})
+			assert_eq!(asset_metadata.location, None);
 		}
 	}
 

runtime/altair/src/lib.rs

@@ -93,6 +93,7 @@ use xcm_executor::XcmExecutor;
 use crate::xcm::{XcmConfig, XcmOriginToTransactDispatchOrigin};
 
 pub mod constants;
+mod migrations;
 mod weights;
 pub mod xcm;
 
@@ -1198,7 +1199,6 @@ impl pallet_pool_system::Config for Runtime {
 	type NAV = Loans;
 	type PalletId = PoolPalletId;
 	type PalletIndex = PoolPalletIndex;
-	type ParachainId = ParachainInfo;
 	type Permission = Permissions;
 	type PoolCreateOrigin = EnsureRoot<AccountId>;
 	type PoolCurrency = PoolCurrency;
@@ -1489,16 +1489,14 @@ pub type UncheckedExtrinsic =
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 
-type UpgradeAltair1027 = pallet_loans_ref::migrations::v1::Migration<Runtime>;
-
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,
 	Block,
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	UpgradeAltair1027,
+	migrations::Migrations,
 >;
 
 #[cfg(not(feature = "disable-runtime-api"))]

runtime/altair/src/migrations.rs

@@ -0,0 +1,74 @@
+// Copyright 2021 Centrifuge Foundation (centrifuge.io).
+//
+// This file is part of the Centrifuge chain project.
+// Centrifuge 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 (see http://www.gnu.org/licenses).
+// Centrifuge 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.
+
+use cfg_types::tokens::CurrencyId;
+use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};
+
+use crate::{OrmlAssetRegistry, Runtime};
+
+// Migrations to Altair 1027
+pub type Migrations = (
+	pallet_loans_ref::migrations::v1::Migration<Runtime>,
+	TrancheLocationMigration,
+);
+
+/// This migration sets the AssetMetadata.location of all the Tranche tokens
+/// registered in the AssetRegistry to `None`.
+pub struct TrancheLocationMigration;
+
+impl OnRuntimeUpgrade for TrancheLocationMigration {
+	fn on_runtime_upgrade() -> Weight {
+		for (asset_id, metadata) in orml_asset_registry::Metadata::<Runtime>::iter() {
+			if matches!(asset_id, CurrencyId::Tranche(_, _)) && metadata.location.is_some() {
+				OrmlAssetRegistry::do_update_asset(
+					asset_id,
+					// decimals
+					None,
+					// name
+					None,
+					// symbol
+					None,
+					// existential_deposit
+					None,
+					// location: we do set it to `None`
+					Some(None),
+					// additional
+					None,
+				)
+				.expect("TrancheLocationMigration: Failed to update tranche token");
+			}
+		}
+
+		// todo(nuno): not sure how to build this properly,
+		// setting it to a conservative value for now.
+		Weight::from_ref_time(200_000_000)
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<sp_std::vec::Vec<u8>, &'static str> {
+		Ok(Default::default())
+	}
+
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(_: sp_std::vec::Vec<u8>) -> Result<(), &'static str> {
+		for (asset_id, metadata) in orml_asset_registry::Metadata::<Runtime>::iter() {
+			if matches!(asset_id, CurrencyId::Tranche(_, _)) {
+				frame_support::ensure!(
+					metadata.location.is_none(),
+					"A tranche token's location is not None"
+				)
+			}
+		}
+
+		Ok(())
+	}
+}

runtime/centrifuge/src/lib.rs

@@ -93,6 +93,7 @@ use xcm_executor::XcmExecutor;
 
 use crate::xcm::{XcmConfig, XcmOriginToTransactDispatchOrigin};
 
+mod migrations;
 mod weights;
 pub mod xcm;
 
@@ -1320,7 +1321,6 @@ impl pallet_pool_system::Config for Runtime {
 	type NAV = Loans;
 	type PalletId = PoolPalletId;
 	type PalletIndex = PoolPalletIndex;
-	type ParachainId = ParachainInfo;
 	type Permission = Permissions;
 	type PoolCreateOrigin = EnsureRoot<AccountId>;
 	type PoolCurrency = PoolCurrency;
@@ -1666,16 +1666,14 @@ pub type UncheckedExtrinsic =
 /// Extrinsic type that has already been checked.
 pub type CheckedExtrinsic = generic::CheckedExtrinsic<AccountId, RuntimeCall, SignedExtra>;
 
-type UpgradeCentrifuge1019 = pallet_loans_ref::migrations::v1::Migration<Runtime>;
-
 /// Executive: handles dispatch to the various modules.
 pub type Executive = frame_executive::Executive<
 	Runtime,
 	Block,
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	UpgradeCentrifuge1019,
+	migrations::Migrations,
 >;
 
 #[cfg(not(feature = "disable-runtime-api"))]