limited_reserve_transfer_assets works from AssetHub (#487)

Author: bkontur

modules/pallets/testsuite/Cargo.toml

@@ -53,6 +53,7 @@ evm-state-machine = { workspace = true, default-features = true }
 subxt-utils = { workspace = true, default-features = true }
 ismp-grandpa = { workspace = true, default-features = true }
 rs_merkle = { version = "1.5.0"}
+log = { workspace = true }
 
 [dependencies.polkadot-sdk]
 workspace = true

modules/pallets/testsuite/src/tests/pallet_xcm_gateway.rs

@@ -27,7 +27,7 @@ use crate::runtime::BOB;
 
 
 const SEND_AMOUNT: u128 = 1000_000_000_0000;
-const PARA_ID: u32 = 100;
+const PARA_ID: u32 = crate::xcm::SIBLING_PARA_ID;
 pub type RelayChainPalletXcm = pallet_xcm::Pallet<relay_chain::Runtime>;
 
 #[test]
@@ -55,7 +55,7 @@ fn should_dispatch_ismp_request_when_assets_are_received_from_assethub() {
 
 
 			ParaB::execute_with(|| {
-				let dest = Location::new(1, [Parachain(100)]);
+				let dest = Location::new(1, [Parachain(PARA_ID)]);
 				let beneficiary: Location = Junctions::X3(Arc::new([
 					Junction::AccountId32 { network: None, id: ALICE.into() },
 					Junction::AccountKey20 {
@@ -79,38 +79,37 @@ fn should_dispatch_ismp_request_when_assets_are_received_from_assethub() {
 				let fee_asset = assets.clone().reanchored(&dest, &context).expect("should reanchor");
 				let fees = fee_asset.clone();
 
-
-				let xcm = Xcm(vec![
-					BuyExecution { fees, weight_limit:  WeightLimit::Unlimited },
-					DepositAsset {
-						assets: Wild(All),
-						beneficiary,
-					},
-				]);
-
-				let message = Xcm(vec![
-					SetFeesMode { jit_withdraw: true },
-					TransferReserveAsset {
-						assets: assets.into(),
-						dest,
-						xcm,
-					},
-				]);
-
-				assert_ok!(runtime::PalletXcm::execute(
-                    runtime::RuntimeOrigin::signed(ALICE.into()),
-                    Box::new(VersionedXcm::from(message)),
-                   Weight::MAX
-                ));
-
-				/*assert_ok!(runtime::PalletXcm::limited_reserve_transfer_assets(
+				// let xcm = Xcm(vec![
+				// 	BuyExecution { fees, weight_limit:  WeightLimit::Unlimited },
+				// 	DepositAsset {
+				// 		assets: Wild(All),
+				// 		beneficiary,
+				// 	},
+				// ]);
+
+				// let message = Xcm(vec![
+				// 	SetFeesMode { jit_withdraw: true },
+				// 	TransferReserveAsset {
+				// 		assets: assets.into(),
+				// 		dest,
+				// 		xcm,
+				// 	},
+				// ]);
+
+				// assert_ok!(runtime::PalletXcm::execute(
+                //     runtime::RuntimeOrigin::signed(ALICE.into()),
+                //     Box::new(VersionedXcm::from(message)),
+                //    Weight::MAX
+                // ));
+
+				assert_ok!(runtime::PalletXcm::limited_reserve_transfer_assets(
                     runtime::RuntimeOrigin::signed(ALICE.into()),
                     Box::new(dest.into()),
                     Box::new(beneficiary.into()),
                     Box::new(vec![(asset_location_on_assethub, SEND_AMOUNT).into()].into()),
                     0,
                     WeightLimit::Unlimited,
-                ));*/
+                ));
 			});
 
 
@@ -124,7 +123,7 @@ fn should_dispatch_ismp_request_when_assets_are_received_from_assethub() {
 				);
 				dbg!(bobs_balance);
 
-				let parachain_account: ParaId =   100u32.into();
+				let parachain_account: ParaId =   PARA_ID.into();
 				let parachain_account = parachain_account.into_account_truncating();
 
 				let alice_balance = <runtime::Assets as Inspect<

modules/pallets/testsuite/src/xcm.rs

@@ -80,13 +80,13 @@ parameter_types! {
 }
 
 parameter_types! {
-	pub const KsmLocation: Location = Location::parent();
+	pub const RelayLocation: Location = Location::parent();
 	pub const RelayNetwork: Option<NetworkId> = None;
 	pub UniversalLocation: Junctions = Parachain(ParachainInfo::parachain_id().into()).into();
 }
 
 parameter_types! {
-	pub ExternalConsensus: InteriorLocation = [Parachain(100), Parachain(1000)].into();
+	pub ExternalConsensus: InteriorLocation = [Parachain(SIBLING_PARA_ID), Parachain(1000)].into();
 }
 
 pub type LocationToAccountId = (
@@ -210,12 +210,15 @@ impl DmpMessageHandler for DmpMessageExecutor {
 	}
 }
 
+/// 1000-2000 are considered system parachains, so let's use higher para_id
+pub const SIBLING_PARA_ID: u32 = 2222;
+
 decl_test_parachain! {
 	pub struct ParaA {
 		Runtime = Test,
 		XcmpMessageHandler = crate::runtime::MsgQueue,
 		DmpMessageHandler = DmpMessageExecutor,
-		new_ext = para_ext(100),
+		new_ext = para_ext(SIBLING_PARA_ID),
 	}
 }
 
@@ -244,7 +247,7 @@ decl_test_network! {
 	pub struct MockNet {
 		relay_chain = Relay,
 		parachains = vec![
-			(100, ParaA),
+			(SIBLING_PARA_ID, ParaA),
 			(1000, ParaB),
 		],
 	}
@@ -272,7 +275,7 @@ parameter_types! {
 pub struct TestReserve;
 impl ContainsPair<Asset, Location> for TestReserve {
 	fn contains(asset: &Asset, origin: &Location) -> bool {
-		println!("TestReserve::contains asset: {asset:?}, origin:{origin:?}");
+		log::trace!(target: "xcm", "TestReserve::contains asset: {asset:?}, origin:{origin:?}");
 		let assethub_location = Location::new(1, Parachain(ASSET_HUB_PARA_ID));
 		&assethub_location == origin
 	}
@@ -285,7 +288,10 @@ impl staging_xcm_executor::Config for XcmConfig {
 	type AssetTransactor = LocalAssetTransactor;
 	type OriginConverter = XcmOriginToCallOrigin;
 	type IsReserve = TestReserve;
-	type IsTeleporter = ();
+	type IsTeleporter = (
+		// Important setting reflecting AssetHub
+		parachains_common::xcm_config::ConcreteAssetFromSystem<RelayLocation>,
+	);
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;