Make System Parachains trusted Teleporters

Cargo.toml

@@ -61,9 +61,11 @@ members = [
 	"cumulus/parachains/common",
 	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama",
 	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot",
+	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo",
 	"cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend",
 	"cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo",
 	"cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot",
+	"cumulus/parachains/integration-tests/emulated/collectives/collectives-westend",
 	"cumulus/parachains/integration-tests/emulated/common",
 	"cumulus/parachains/pallets/parachain-info",
 	"cumulus/parachains/pallets/ping",

cumulus/parachains/common/src/xcm_config.rs

@@ -78,3 +78,59 @@ impl<Location: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation>
 		matches!(asset.id, Concrete(ref id) if id == origin && origin == &Location::get())
 	}
 }
+
+/// Accepts an asset if it is a native asset from the system (Relay Chain or system parachain).
+pub struct ConcreteNativeAssetFromSystem;
+impl ContainsPair<MultiAsset, MultiLocation> for ConcreteNativeAssetFromSystem {
+	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
+		log::trace!(target: "xcm::contains", "ConcreteNativeAssetFromSystem asset: {:?}, origin: {:?}", asset, origin);
+		let parent = MultiLocation::parent();
+		let is_system = match origin {
+			// The Relay Chain
+			MultiLocation { parents: 1, interior: Here } => true,
+			// System parachain
+			MultiLocation { parents: 1, interior: X1(Parachain(id)) } if *id < 2000 => true,
+			// Others
+			_ => false,
+		};
+		matches!(asset.id, Concrete(id) if id == parent && is_system)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{
+		ConcreteNativeAssetFromSystem, ContainsPair, GeneralIndex, Here, MultiAsset, MultiLocation,
+		PalletInstance, Parachain, Parent,
+	};
+
+	#[test]
+	fn native_asset_from_sibling_system_para_works() {
+		let expected_asset: MultiAsset = (Parent, 1000000).into();
+		let expected_origin: MultiLocation = (Parent, Parachain(1999)).into();
+
+		assert!(ConcreteNativeAssetFromSystem::contains(&expected_asset, &expected_origin));
+	}
+
+	#[test]
+	fn native_asset_from_sibling_system_para_fails_for_wrong_asset() {
+		let unexpected_assets: Vec<MultiAsset> = vec![
+			(Here, 1000000).into(),
+			((PalletInstance(50), GeneralIndex(1)), 1000000).into(),
+			((Parent, Parachain(1000), PalletInstance(50), GeneralIndex(1)), 1000000).into(),
+		];
+		let expected_origin: MultiLocation = (Parent, Parachain(1000)).into();
+
+		unexpected_assets.iter().for_each(|asset| {
+			assert!(!ConcreteNativeAssetFromSystem::contains(asset, &expected_origin));
+		});
+	}
+
+	#[test]
+	fn native_asset_from_sibling_system_para_fails_for_wrong_origin() {
+		let expected_asset: MultiAsset = (Parent, 1000000).into();
+		let unexpected_origin: MultiLocation = (Parent, Parachain(2000)).into();
+
+		assert!(!ConcreteNativeAssetFromSystem::contains(&expected_asset, &unexpected_origin));
+	}
+}

cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs

@@ -26,10 +26,12 @@ pub use integration_tests_common::{
 		asset_hub_kusama::ED as ASSET_HUB_KUSAMA_ED, kusama::ED as KUSAMA_ED, PROOF_SIZE_THRESHOLD,
 		REF_TIME_THRESHOLD, XCM_V3,
 	},
+	test_parachain_is_trusted_teleporter,
 	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
-	AssetHubKusama, AssetHubKusamaPallet, AssetHubKusamaReceiver, AssetHubKusamaSender, Kusama,
-	KusamaPallet, KusamaReceiver, KusamaSender, PenpalKusamaA, PenpalKusamaAPallet,
-	PenpalKusamaAReceiver, PenpalKusamaASender, PenpalKusamaB, PenpalKusamaBPallet,
+	AssetHubKusama, AssetHubKusamaPallet, AssetHubKusamaReceiver, AssetHubKusamaSender,
+	BridgeHubKusama, BridgeHubKusamaReceiver, Kusama, KusamaPallet, KusamaReceiver, KusamaSender,
+	PenpalKusamaA, PenpalKusamaAPallet, PenpalKusamaAReceiver, PenpalKusamaASender, PenpalKusamaB,
+	PenpalKusamaBPallet,
 };
 pub use parachains_common::{AccountId, Balance};
 pub use xcm::{

cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/teleport.rs

@@ -362,3 +362,16 @@ fn teleport_native_assets_from_relay_to_system_para_works() {
 // 	// Receiver's balance does not change
 // 	assert_eq!(receiver_balance_after, receiver_balance_before);
 // }
+
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = ASSET_HUB_KUSAMA_ED * 100;
+	let expected_asset: VersionedMultiAssets = (Parent, amount).into();
+
+	// Works for the right origin and asset
+	test_parachain_is_trusted_teleporter!(
+		AssetHubKusama,        // Origin
+		vec![BridgeHubKusama], // Destinations
+		(expected_asset, amount)
+	);
+}

cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs

@@ -26,8 +26,10 @@ pub use integration_tests_common::{
 		asset_hub_polkadot::ED as ASSET_HUB_POLKADOT_ED, polkadot::ED as POLKADOT_ED,
 		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
+	test_parachain_is_trusted_teleporter,
 	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
 	AssetHubPolkadot, AssetHubPolkadotPallet, AssetHubPolkadotReceiver, AssetHubPolkadotSender,
+	BridgeHubPolkadot, BridgeHubPolkadotReceiver, CollectivesPolkadot, CollectivesPolkadotReceiver,
 	PenpalPolkadotA, PenpalPolkadotAPallet, PenpalPolkadotAReceiver, PenpalPolkadotB,
 	PenpalPolkadotBPallet, Polkadot, PolkadotPallet, PolkadotReceiver, PolkadotSender,
 };

cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/tests/teleport.rs

@@ -362,3 +362,15 @@ fn teleport_native_assets_from_relay_to_system_para_works() {
 // 	// Receiver's balance does not change
 // 	assert_eq!(receiver_balance_after, receiver_balance_before);
 // }
+
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = ASSET_HUB_POLKADOT_ED * 100;
+	let native_asset: VersionedMultiAssets = (Parent, amount).into();
+
+	test_parachain_is_trusted_teleporter!(
+		AssetHubPolkadot,                             // Origin
+		vec![CollectivesPolkadot, BridgeHubPolkadot], // Destinations
+		(native_asset, amount)
+	);
+}

cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "asset-hub-rococo-integration-tests"
+version = "1.0.0"
+authors.workspace = true
+edition.workspace = true
+description = "Asset Hub Rococo runtime integration tests with xcm-emulator"
+publish = false
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
+
+# Substrate
+frame-support = { path = "../../../../../../substrate/frame/support", default-features = false}
+xcm = { package = "staging-xcm", path = "../../../../../../polkadot/xcm", default-features = false}
+
+# Local
+xcm-emulator = { path = "../../../../../xcm/xcm-emulator", default-features = false}
+integration-tests-common = { path = "../../common", default-features = false}
+
+[features]
+runtime-benchmarks = [
+	"frame-support/runtime-benchmarks",
+	"integration-tests-common/runtime-benchmarks",
+]

cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/lib.rs

@@ -0,0 +1,28 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+pub use frame_support::assert_ok;
+pub use integration_tests_common::{
+	constants::asset_hub_polkadot::ED as ASSET_HUB_ROCOCO_ED, test_parachain_is_trusted_teleporter,
+	AssetHubRococo, AssetHubRococoPallet, AssetHubRococoSender, BridgeHubRococo,
+	BridgeHubRococoReceiver,
+};
+pub use xcm::prelude::*;
+pub use xcm_emulator::{assert_expected_events, bx, Chain, Parachain, TestExt};
+
+#[cfg(test)]
+#[cfg(not(feature = "runtime-benchmarks"))]
+mod tests;

cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/mod.rs

@@ -0,0 +1,17 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+mod teleport;

cumulus/parachains/integration-tests/emulated/assets/asset-hub-rococo/src/tests/teleport.rs

@@ -0,0 +1,29 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::*;
+
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = ASSET_HUB_ROCOCO_ED * 100;
+	let native_asset: VersionedMultiAssets = (Parent, amount).into();
+
+	test_parachain_is_trusted_teleporter!(
+		AssetHubRococo,        // Origin
+		vec![BridgeHubRococo], // Destinations
+		(native_asset, amount)
+	);
+}

cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs

@@ -28,10 +28,12 @@ pub use integration_tests_common::{
 		asset_hub_westend::ED as ASSET_HUB_WESTEND_ED, westend::ED as WESTEND_ED,
 		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
+	test_parachain_is_trusted_teleporter,
 	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
 	AssetHubWestend, AssetHubWestendPallet, AssetHubWestendReceiver, AssetHubWestendSender,
-	PenpalWestendA, PenpalWestendAPallet, PenpalWestendAReceiver, PenpalWestendASender, Westend,
-	WestendPallet, WestendReceiver, WestendSender,
+	CollectivesWestend, CollectivesWestendReceiver, PenpalWestendA, PenpalWestendAPallet,
+	PenpalWestendAReceiver, PenpalWestendASender, Westend, WestendPallet, WestendReceiver,
+	WestendSender,
 };
 pub use parachains_common::{AccountId, Balance};
 pub use xcm::{

cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/tests/teleport.rs

@@ -362,3 +362,15 @@ fn teleport_native_assets_from_relay_to_system_para_works() {
 // 	// Receiver's balance does not change
 // 	assert_eq!(receiver_balance_after, receiver_balance_before);
 // }
+
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = ASSET_HUB_WESTEND_ED * 100;
+	let native_asset: VersionedMultiAssets = (Parent, amount).into();
+
+	test_parachain_is_trusted_teleporter!(
+		AssetHubWestend,          // Origin
+		vec![CollectivesWestend], // Destinations
+		(native_asset, amount)
+	);
+}

cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs

@@ -18,12 +18,15 @@ pub use bp_messages::LaneId;
 pub use frame_support::assert_ok;
 pub use integration_tests_common::{
 	constants::{
-		asset_hub_kusama::ED as ASSET_HUB_ROCOCO_ED, kusama::ED as ROCOCO_ED, PROOF_SIZE_THRESHOLD,
-		REF_TIME_THRESHOLD, XCM_V3,
+		asset_hub_kusama::ED as ASSET_HUB_ROCOCO_ED, bridge_hub_rococo::ED as BRIDGE_HUB_ROCOCO_ED,
+		kusama::ED as ROCOCO_ED, PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
+	test_parachain_is_trusted_teleporter,
 	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
-	AssetHubRococo, AssetHubRococoReceiver, AssetHubWococo, BridgeHubRococo, BridgeHubWococo,
-	PenpalRococoA, Rococo, RococoPallet,
+	AssetHubRococo, AssetHubRococoReceiver, AssetHubWococo, BridgeHubPolkadot,
+	BridgeHubPolkadotReceiver, BridgeHubRococo, BridgeHubRococoPallet, BridgeHubRococoSender,
+	BridgeHubWococo, CollectivesPolkadot, CollectivesPolkadotReceiver, PenpalRococoA, Rococo,
+	RococoPallet,
 };
 pub use parachains_common::{AccountId, Balance};
 pub use xcm::{

cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/mod.rs

@@ -15,3 +15,4 @@
 // along with Cumulus.  If not, see <http://www.gnu.org/licenses/>.
 
 mod example;
+mod teleport;

cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/tests/teleport.rs

@@ -0,0 +1,29 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// This file is part of Cumulus.
+
+// Cumulus 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.
+
+// Cumulus 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 Cumulus.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::*;
+
+#[test]
+fn teleport_to_other_system_parachains_works() {
+	let amount = BRIDGE_HUB_ROCOCO_ED * 100;
+	let native_asset: VersionedMultiAssets = (Parent, amount).into();
+
+	test_parachain_is_trusted_teleporter!(
+		BridgeHubRococo,      // Origin
+		vec![AssetHubRococo], // Destinations
+		(native_asset, amount)
+	);
+}

cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs

@@ -19,11 +19,14 @@ pub use frame_support::{assert_ok, sp_runtime::AccountId32};
 pub use integration_tests_common::{
 	constants::{
 		accounts::ALICE, asset_hub_polkadot::ED as ASSET_HUB_POLKADOT_ED,
-		polkadot::ED as POLKADOT_ED, PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
+		collectives::ED as COLLECTIVES_POLKADOT_ED, polkadot::ED as POLKADOT_ED,
+		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
+	test_parachain_is_trusted_teleporter,
 	xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
-	AssetHubPolkadot, AssetHubPolkadotPallet, AssetHubPolkadotReceiver, Collectives,
-	PenpalPolkadotA, Polkadot,
+	AssetHubPolkadot, AssetHubPolkadotPallet, AssetHubPolkadotReceiver, BridgeHubPolkadot,
+	BridgeHubPolkadotReceiver, CollectivesPolkadot, CollectivesPolkadotPallet,
+	CollectivesPolkadotSender, PenpalPolkadotA, Polkadot,
 };
 pub use parachains_common::{AccountId, Balance};
 pub use xcm::{

cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/tests/fellowship.rs

@@ -46,12 +46,12 @@ fn pay_salary() {
 		assert_ok!(<AssetHubAssets as Mutate<_>>::mint_into(asset_id, &pay_from, pay_amount * 2));
 	});
 
-	Collectives::execute_with(|| {
-		type RuntimeEvent = <Collectives as Chain>::RuntimeEvent;
+	CollectivesPolkadot::execute_with(|| {
+		type RuntimeEvent = <CollectivesPolkadot as Chain>::RuntimeEvent;
 
 		assert_ok!(FellowshipSalaryPaymaster::pay(&pay_to, (), pay_amount));
 		assert_expected_events!(
-			Collectives,
+			CollectivesPolkadot,
 			vec![
 				RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }) => {},
 			]