integration test passes now

Author: dharjeezy

Cargo.lock

@@ -8,11 +8,12 @@ use futures::StreamExt;
 use polkadot_sdk::{
 	sp_core::{bytes::from_hex, sr25519, Pair, H256},
 	sp_runtime::Weight,
-	staging_xcm::v4::{Asset, AssetId, Fungibility},
+	staging_xcm::v5::{Asset, AssetId, Fungibility},
 	*,
 };
+use polkadot_sdk::staging_xcm::v5::Parent;
 use staging_xcm::{
-	v4::{Junction, Junctions, Location, NetworkId, WeightLimit},
+	v5::{Junction, Junctions, Location, NetworkId, WeightLimit},
 	VersionedLocation,
 };
 use subxt::{
@@ -45,17 +46,27 @@ async fn should_dispatch_ismp_request_when_xcm_is_received() -> anyhow::Result<(
 	let url = std::env::var("ROCOCO_LOCAL_URL")
 		.ok()
 		.unwrap_or("ws://127.0.0.1:9922".to_string());
-	let client = OnlineClient::<BlakeSubstrateChain>::from_url(&url).await?;
+	let relay_client = OnlineClient::<BlakeSubstrateChain>::from_url(&url).await?;
 	let rpc_client = RpcClient::from_url(&url).await?;
 	let _rpc = LegacyRpcMethods::<BlakeSubstrateChain>::new(rpc_client.clone());
 
+	let assethub_url = std::env::var("ASSET_HUB_LOCAL_URL")
+		.ok()
+		.unwrap_or("ws://127.0.0.1:9910".to_string());
+	let assethub_client = OnlineClient::<BlakeSubstrateChain>::from_url(&assethub_url).await?;
+	let _assethub_rpc_client = RpcClient::from_url(&assethub_url).await?;
+	let _assethub_rpc = LegacyRpcMethods::<BlakeSubstrateChain>::new(rpc_client.clone());
+
 	let para_url = std::env::var("PARA_LOCAL_URL")
 		.ok()
 		.unwrap_or("ws://127.0.0.1:9990".to_string());
 	let _para_client = OnlineClient::<Hyperbridge>::from_url(&para_url).await?;
 	let para_rpc_client = RpcClient::from_url(&para_url).await?;
 	let para_rpc = LegacyRpcMethods::<BlakeSubstrateChain>::new(para_rpc_client.clone());
 
+	force_open_hrmp_channel(&relay_client, &signer, 1000, 2000).await?;
+	force_open_hrmp_channel(&relay_client, &signer, 2000, 1000).await?;
+
 	// Wait for parachain block production
 
 	let sub = para_rpc.chain_subscribe_finalized_heads().await?;
@@ -76,37 +87,23 @@ async fn should_dispatch_ismp_request_when_xcm_is_received() -> anyhow::Result<(
 	.into_location();
 	let weight_limit = WeightLimit::Unlimited;
 
-	let dest: VersionedLocation = VersionedLocation::V4(Junction::Parachain(2000).into());
+	let dest: VersionedLocation = VersionedLocation::V5( Location::new(1, [Junction::Parachain(2000)]));
 
-	let beneficiary_as_versioned = VersionedLocation::V4(beneficiary);
-	let assets_vec = vec![(Junctions::Here, SEND_AMOUNT).into()];
+	let beneficiary_as_versioned = VersionedLocation::V5(beneficiary);
+	let dot_location: Location = Parent.into();
+	let assets_vec = vec![Asset {
+		id: dot_location.into(),
+		fun: Fungibility::Fungible(SEND_AMOUNT),
+	}];
 
 	let dest_value = versioned_location_to_value(&dest);
 	let beneficiary_value = versioned_location_to_value(&beneficiary_as_versioned);
 	let assets_value = versioned_assets_to_value(&assets_vec);
 	let fee_asset_index_value = Value::u128(0);
 	let weight_limit_value = weight_limit_to_value(&weight_limit);
 
-	{
-		let signer = InMemorySigner::<BlakeSubstrateChain>::new(pair.clone());
-		let para_absolute_location: Location = Junction::Parachain(2000).into();
-		let version = 4u32;
-
-		let location_as_value = location_to_value(&para_absolute_location);
-		let version_as_value = Value::u128(version.into());
-
-		// Force set the xcm version to our supported version
-		let call = subxt::dynamic::tx(
-			"XcmPallet",
-			"force_xcm_version",
-			vec![location_as_value, version_as_value],
-		);
-		let tx = subxt::dynamic::tx("Sudo", "sudo", vec![call.into_value()]);
-		send_extrinsic(&client, &signer, &tx, None).await?;
-	}
-
 	let ext = subxt::dynamic::tx(
-		"XcmPallet",
+		"PolkadotXcm",
 		"limited_reserve_transfer_assets",
 		vec![
 			dest_value,
@@ -123,8 +120,10 @@ async fn should_dispatch_ismp_request_when_xcm_is_received() -> anyhow::Result<(
 		.ok_or_else(|| anyhow!("Failed to fetch latest header"))?
 		.number();
 
-	send_extrinsic(&client, &signer, &ext, None).await?;
+	send_extrinsic(&assethub_client, &signer, &ext, None).await?;
+
 
+	println!("done performing limited reserve asset transfer");
 	let mut sub = para_rpc.chain_subscribe_finalized_heads().await?;
 
 	while let Some(res) = sub.next().await {
@@ -171,6 +170,28 @@ async fn should_dispatch_ismp_request_when_xcm_is_received() -> anyhow::Result<(
 	Err(anyhow!("XCM Integration test failed"))
 }
 
+async fn force_open_hrmp_channel(
+	relay_client: &OnlineClient<BlakeSubstrateChain>,
+	signer: &InMemorySigner<BlakeSubstrateChain>,
+	sender: u128,
+	recipient: u128,
+) -> anyhow::Result<()> {
+	let force_call = subxt::dynamic::tx(
+		"Hrmp",
+		"force_open_hrmp_channel",
+		vec![
+			Value::u128(sender),
+			Value::u128(recipient),
+			Value::u128(8),
+			Value::u128(1024 * 1024),
+		],
+	);
+	let sudo_call = subxt::dynamic::tx("Sudo", "sudo", vec![force_call.into_value()]);
+	send_extrinsic(relay_client, signer, &sudo_call, None).await?;
+
+	Ok(())
+}
+
 fn junction_to_value(junction: &Junction) -> Value<()> {
 	match junction {
 		Junction::Parachain(id) =>
@@ -253,11 +274,11 @@ pub fn force_xcm_version_value() -> Value<()> {
 
 fn versioned_location_to_value(loc: &VersionedLocation) -> Value<()> {
 	match loc {
-		VersionedLocation::V4(location) => {
+		VersionedLocation::V5(location) => {
 			let location_value = location_to_value(location);
-			Value::variant("V4", Composite::unnamed(vec![location_value]))
+			Value::variant("V5", Composite::unnamed(vec![location_value]))
 		},
-		_ => unimplemented!("This helper only supports V4 VersionedLocation"),
+		_ => unimplemented!("This helper only supports V5 VersionedLocation"),
 	}
 }
 
@@ -285,7 +306,7 @@ fn versioned_assets_to_value(assets_vec: &Vec<Asset>) -> Value<()> {
 	let inner_assets_value = Value::unnamed_composite(asset_values);
 
 	let assets_struct_value = Value::unnamed_composite(vec![inner_assets_value]);
-	Value::variant("V4", Composite::unnamed(vec![assets_struct_value]))
+	Value::variant("V5", Composite::unnamed(vec![assets_struct_value]))
 }
 
 fn weight_to_value(weight: &Weight) -> Value<()> {

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

@@ -81,7 +81,6 @@ parameter_types! {
 
 parameter_types! {
 	pub const RelayLocation: Location = Location::parent();
-	pub ParaALocation: Location = Location::new(1, Parachain(SIBLING_PARA_ID));
 	pub const RelayNetwork: Option<NetworkId> = None;
 	pub UniversalLocation: Junctions = Parachain(ParachainInfo::parachain_id().into()).into();
 }
@@ -254,19 +253,22 @@ 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:?}");
-		let assethub_location = Location::new(1, Parachain(ASSET_HUB_PARA_ID));
-		&assethub_location == origin
+		let self_para = Location::new(1, [Parachain(ParachainInfo::parachain_id().into())]);
+		if origin == &self_para {
+			return false;
+		}
+
+		let asset_hub = Location::new(1, [Parachain(ASSET_HUB_PARA_ID)]);
+		if origin == &asset_hub {
+			let AssetId(asset_id) = &asset.id;
+			return DotOnAssetHub::get() == *asset_id;
+		}
+
+		false
 	}
 }
 
@@ -402,7 +404,7 @@ impl pallet_xcm::Config for Test {
 	type XcmExecuteFilter = Everything;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type XcmTeleportFilter = Everything;
-	type XcmReserveTransferFilter = Everything;
+	type XcmReserveTransferFilter = ReserveTransferFilter;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;
 	type UniversalLocation = UniversalLocation;
 	type RuntimeOrigin = RuntimeOrigin;

modules/pallets/testsuite/src/xcm.rs

@@ -33,9 +33,8 @@ use frame_support::{
 		Get,
 	},
 };
-use polkadot_sdk::cumulus_primitives_core::{All, BuyExecution, DepositAsset, Parachain, SetFeesMode, TransferReserveAsset, Weight, Wild, Xcm};
+use polkadot_sdk::cumulus_primitives_core::{All, AllCounted, BuyExecution, DepositAsset, Parachain, SetFeesMode, TransferReserveAsset, Weight, Wild, Xcm};
 use polkadot_sdk::staging_xcm_executor::traits::TransferType;
-use polkadot_sdk::xcm_simulator::AllCounted;
 
 use ismp::{
 	dispatcher::{DispatchPost, DispatchRequest, FeeMetadata, IsmpDispatcher},
@@ -327,7 +326,6 @@ where
 	T::AccountId: Into<[u8; 32]> + From<[u8; 32]>,
 {
 	fn on_accept(&self, post: ismp::router::PostRequest) -> Result<(), anyhow::Error> {
-		println!("accepting module");
 		let request = Request::Post(post.clone());
 		// Check that source module is equal to the known token gateway deployment address
 		ensure!(
@@ -341,7 +339,6 @@ where
 				},
 			}
 		);
-		println!("ensuring module");
 		// parachains/solochains shouldn't be sending us a request.
 		ensure!(
 			!matches!(
@@ -358,7 +355,6 @@ where
 			}
 		);
 
-		println!("decoding post request");
 		let body = Body::abi_decode(&mut &post.body[1..], true).map_err(|_| {
 			ismp::error::Error::ModuleDispatchError {
 				msg: "Token Gateway: Failed to decode request body".to_string(),
@@ -370,7 +366,6 @@ where
 			}
 		})?;
 
-		println!(" asset id {:?} {:?}", body.asset_id.0, Pallet::<T>::dot_asset_id().0);
 		// Check that the asset id is equal to the known asset id
 		ensure!(
 			body.asset_id.0 == Pallet::<T>::dot_asset_id().0,
@@ -414,7 +409,6 @@ where
 			beneficiary: xcm_beneficiary.clone(),
 		}]);
 
-		println!("sending xcm {:?}, xcm_beneficiary {:?}", xcm_dest, xcm_beneficiary);
 
 		// Send xcm back to assethub
 		pallet_xcm::Pallet::<T>::transfer_assets_using_type_and_then(
@@ -435,8 +429,6 @@ where
 			},
 		})?;
 
-		println!("done sending xcm");
-
 		Pallet::<T>::deposit_event(Event::<T>::AssetReceived {
 			beneficiary: body.to.0.into(),
 			amount: amount.into(),
@@ -519,15 +511,14 @@ where
 					Box::new(TransferType::DestinationReserve),
 					Box::new(VersionedXcm::from(custom_xcm_on_dest)),
 					weight_limit,
-				)
-				.unwrap();/*map_err(|_| ismp::error::Error::ModuleDispatchError {
+				).map_err(|_| ismp::error::Error::ModuleDispatchError {
 					msg: "Token Gateway: Failed to execute xcm to relay chain".to_string(),
 					meta: Meta {
 						source: request.source_chain(),
 						dest: request.dest_chain(),
 						nonce: request.nonce(),
 					},
-				})?;*/
+				})?;
 
 				Pallet::<T>::deposit_event(Event::<T>::AssetRefunded {
 					beneficiary,

modules/pallets/xcm-gateway/src/lib.rs

@@ -23,8 +23,7 @@ use frame_support::traits::{
 };
 use ismp::host::StateMachine;
 use polkadot_sdk::*;
-use polkadot_sdk::cumulus_primitives_core::Parachain;
-use polkadot_sdk::xcm_emulator::Here;
+use polkadot_sdk::cumulus_primitives_core::Here;
 use sp_core::{Get, H160};
 use sp_runtime::traits::MaybeEquivalence;
 use staging_xcm::v5::{
@@ -77,7 +76,7 @@ where
 {
 	fn convert_location(location: &Location) -> Option<MultiAccount<A>> {
 		match location {
-			Location { interior: Junctions::X3(arc_junctions), .. } => {
+			Location { parents: 0, interior: Junctions::X3(arc_junctions) } => {
 				// Dereference the Arc to access the underlying array
 				match arc_junctions.as_ref() {
 					[Junction::AccountId32 { id, .. }, Junction::AccountKey20 { network: Some(network), key }, Junction::GeneralIndex(timeout)] =>
@@ -129,7 +128,6 @@ pub struct ReserveTransferFilter;
 
 impl Contains<(Location, Vec<Asset>)> for ReserveTransferFilter {
 	fn contains(t: &(Location, Vec<Asset>)) -> bool {
-		println!("filter for {:?}", t);
 		let native = Location::new(1, Here);
 		t.1.iter().all(|asset| {
 			if let Asset { id: asset_id, fun: Fungible(_) } = asset {
@@ -162,7 +160,6 @@ where
 	T::AccountId: Eq + Clone + From<[u8; 32]> + Into<[u8; 32]>,
 {
 	fn can_check_in(origin: &Location, what: &Asset, context: &XcmContext) -> XcmResult {
-		println!("can check in {:?}", origin);
 		FungiblesMutateAdapter::<
 			T::Assets,
 			Matcher,
@@ -174,7 +171,6 @@ where
 	}
 
 	fn check_in(origin: &Location, what: &Asset, context: &XcmContext) {
-		println!("check in {:?}", origin);
 		FungiblesMutateAdapter::<
 			T::Assets,
 			Matcher,
@@ -208,13 +204,11 @@ where
 	}
 
 	fn deposit_asset(what: &Asset, who: &Location, context: Option<&XcmContext>) -> XcmResult {
-		println!("depositing asset: what: {what:?}, who: {who:?}, context: {:?}", context.unwrap().origin);
 		// Check we handle this asset.
 		let (asset_id, amount) = Matcher::matches_fungibles(what)?;
 
 		// Ismp xcm transaction
 		if let Some(who) = MultilocationToMultiAccount::<T::AccountId>::convert_location(who) {
-			println!("some account gotten {:?}", what);
 			// We would remove the protocol fee at this point
 
 			let protocol_account = Pallet::<T>::protocol_account_id();
@@ -241,9 +235,7 @@ where
 			// We dispatch an ismp request to the destination chain
 			Pallet::<T>::dispatch_request(who, remainder)
 				.map_err(|e| XcmError::FailedToTransactAsset(e.into()))?;
-			println!("done minting");
 		} else {
-
 			#[cfg(feature = "std")]
 			FungiblesMutateAdapter::<
 				T::Assets,
@@ -266,7 +258,6 @@ where
 		who: &Location,
 		maybe_context: Option<&XcmContext>,
 	) -> Result<AssetsInHolding, XcmError> {
-		println!("withdrawing asset {:?}, {:?}", &what, &who);
 		FungiblesMutateAdapter::<
 			T::Assets,
 			Matcher,
@@ -283,7 +274,6 @@ where
 		to: &Location,
 		context: &XcmContext,
 	) -> Result<AssetsInHolding, XcmError> {
-		println!("internal transfer asset from {:?}, to {:?}", &from, &to);
 		FungiblesMutateAdapter::<
 			T::Assets,
 			Matcher,
@@ -300,7 +290,6 @@ where
 		to: &Location,
 		context: &XcmContext,
 	) -> Result<AssetsInHolding, XcmError> {
-		println!("transfer asset {:?}, {:?}", &from, &to);
 		FungiblesMutateAdapter::<
 			T::Assets,
 			Matcher,