Adapt moonbeam to migrations and statemint

runtime/moonbeam/src/lib.rs

@@ -1068,7 +1068,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type Weigher = XcmWeigher;
 	// When we receive a non-reserve asset, we use AssetManager to fetch how many
 	// units per second we should charge
-	type Trader = FirstAssetTrader<AssetId, AssetType, AssetManager, XcmFeesToAccount>;
+	type Trader = FirstAssetTrader<AssetType, AssetManager, XcmFeesToAccount>;
 	type ResponseHandler = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
 	type AssetTrap = PolkadotXcm;
@@ -1163,13 +1163,10 @@ impl pallet_assets::Config for Runtime {
 }
 
 parameter_types! {
-	// Statemine ParaId in Alphanet
+	// Statemint ParaId in Polkadot
 	pub StatemineParaId: u32 = 1000;
-	// Assets Pallet instance in Statemine alphanet
+	// Assets Pallet instance in Statemint
 	pub StatemineAssetPalletInstance: u8 = 50;
-	// AssetIds from Statemine already registered, these will retain
-	// the previous prefix assetId and we will map new one to previous ones
-	pub StatemineAssetIdExceptions: Vec<u128> = [8].to_vec();
 }
 
 // Our AssetType. For now we only handle Xcm Assets
@@ -1188,21 +1185,18 @@ impl From<MultiLocation> for AssetType {
 		match location {
 			// Change https://github.com/paritytech/cumulus/pull/831
 			// This avoids interrumption once they upgrade
-			// We map to the previous location so that the assetId is well calculated
-			// TODO: we might want to do a migration after statemine has upgraded
-			// as this is quite hacky, but the change itself is quite painful to cover
+			// We map the previous location to the new one so that the assetId is well retrieved
 			MultiLocation {
 				parents: 1,
-				interior: X3(Parachain(id), PalletInstance(instance), GeneralIndex(index)),
-			} if id == StatemineParaId::get()
-				&& instance == StatemineAssetPalletInstance::get()
-				&& StatemineAssetIdExceptions::get().contains(&index) =>
-			{
-				Self::Xcm(MultiLocation {
-					parents: 1,
-					interior: X2(Parachain(id), GeneralIndex(index)),
-				})
-			}
+				interior: X2(Parachain(id), GeneralIndex(index)),
+			} if id == StatemineParaId::get() => Self::Xcm(MultiLocation {
+				parents: 1,
+				interior: X3(
+					Parachain(id),
+					PalletInstance(StatemineAssetPalletInstance::get()),
+					GeneralIndex(index),
+				),
+			}),
 			_ => Self::Xcm(location),
 		}
 	}

runtime/moonbeam/tests/xcm_mock/mod.rs

@@ -16,6 +16,7 @@
 
 pub mod parachain;
 pub mod relay_chain;
+pub mod statemint_like;
 
 use cumulus_primitives_core::ParaId;
 use polkadot_parachain::primitives::AccountIdConversion;
@@ -63,6 +64,15 @@ decl_test_parachain! {
 	}
 }
 
+decl_test_parachain! {
+	pub struct Statemint {
+		Runtime = statemint_like::Runtime,
+		XcmpMessageHandler = statemint_like::MsgQueue,
+		DmpMessageHandler = statemint_like::MsgQueue,
+		new_ext = statemint_ext(4),
+	}
+}
+
 decl_test_relay_chain! {
 	pub struct Relay {
 		Runtime = relay_chain::Runtime,
@@ -78,6 +88,7 @@ decl_test_network! {
 			(1, ParaA),
 			(2, ParaB),
 			(3, ParaC),
+			(4, Statemint),
 		],
 	}
 }
@@ -130,6 +141,27 @@ pub fn para_ext(para_id: u32) -> sp_io::TestExternalities {
 	ext
 }
 
+pub fn statemint_ext(para_id: u32) -> sp_io::TestExternalities {
+	use statemint_like::{MsgQueue, Runtime, System};
+
+	let mut t = frame_system::GenesisConfig::default()
+		.build_storage::<Runtime>()
+		.unwrap();
+
+	pallet_balances::GenesisConfig::<Runtime> {
+		balances: vec![(RELAYALICE.into(), INITIAL_BALANCE)],
+	}
+	.assimilate_storage(&mut t)
+	.unwrap();
+
+	let mut ext = sp_io::TestExternalities::new(t);
+	ext.execute_with(|| {
+		System::set_block_number(1);
+		MsgQueue::set_para_id(para_id.into());
+	});
+	ext
+}
+
 pub fn relay_ext() -> sp_io::TestExternalities {
 	use relay_chain::{Runtime, System};
 
@@ -149,6 +181,11 @@ pub fn relay_ext() -> sp_io::TestExternalities {
 }
 
 pub type RelayChainPalletXcm = pallet_xcm::Pallet<relay_chain::Runtime>;
+
+pub type StatemintBalances = pallet_balances::Pallet<statemint_like::Runtime>;
+pub type StatemintChainPalletXcm = pallet_xcm::Pallet<statemint_like::Runtime>;
+pub type StatemintAssets = pallet_assets::Pallet<statemint_like::Runtime>;
+
 pub type Assets = pallet_assets::Pallet<parachain::Runtime>;
 pub type Treasury = pallet_treasury::Pallet<parachain::Runtime>;
 pub type AssetManager = pallet_asset_manager::Pallet<parachain::Runtime>;

runtime/moonbeam/tests/xcm_mock/parachain.rs

@@ -256,8 +256,7 @@ impl Config for XcmConfig {
 	type LocationInverter = LocationInverter<Ancestry>;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<UnitWeightCost, Call, MaxInstructions>;
-	type Trader =
-		(xcm_primitives::FirstAssetTrader<AssetId, AssetType, AssetManager, XcmFeesToAccount_>,);
+	type Trader = (xcm_primitives::FirstAssetTrader<AssetType, AssetManager, XcmFeesToAccount_>,);
 
 	type ResponseHandler = PolkadotXcm;
 	type SubscriptionService = PolkadotXcm;
@@ -556,6 +555,11 @@ impl pallet_xcm::Config for Runtime {
 	type AdvertisedXcmVersion = XcmVersioner;
 }
 
+parameter_types! {
+	pub StatemintParaId: u32 = 4;
+	pub StatemintAssetPalletInstance: u8 = 5;
+}
+
 // Our AssetType. For now we only handle Xcm Assets
 #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
 pub enum AssetType {
@@ -569,7 +573,23 @@ impl Default for AssetType {
 
 impl From<MultiLocation> for AssetType {
 	fn from(location: MultiLocation) -> Self {
-		Self::Xcm(location)
+		match location {
+			// Change https://github.com/paritytech/cumulus/pull/831
+			// This avoids interrumption once they upgrade
+			// We map the previous location to the new one so that the assetId is well retrieved
+			MultiLocation {
+				parents: 1,
+				interior: X2(Parachain(id), GeneralIndex(index)),
+			} if id == StatemintParaId::get() => Self::Xcm(MultiLocation {
+				parents: 1,
+				interior: X3(
+					Parachain(id),
+					PalletInstance(StatemintAssetPalletInstance::get()),
+					GeneralIndex(index),
+				),
+			}),
+			_ => Self::Xcm(location),
+		}
 	}
 }