Make System Parachains trusted Teleporters

Cargo.toml

@@ -56,7 +56,9 @@ members = [
 	"parachains/integration-tests/emulated/assets/asset-hub-kusama",
 	"parachains/integration-tests/emulated/assets/asset-hub-polkadot",
 	"parachains/integration-tests/emulated/assets/asset-hub-westend",
+	"parachains/integration-tests/emulated/assets/asset-hub-rococo",
 	"parachains/integration-tests/emulated/collectives/collectives-polkadot",
+	"parachains/integration-tests/emulated/collectives/collectives-westend",
 	"parachains/integration-tests/emulated/bridges/bridge-hub-rococo",
 	"test/client",
 	"test/relay-sproof-builder",

parachains/common/src/xcm_config.rs

@@ -57,9 +57,61 @@ impl<Location: Get<MultiLocation>> ContainsPair<MultiAsset, MultiLocation>
 	for ConcreteNativeAssetFrom<Location>
 {
 	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
-		log::trace!(target: "xcm::filter_asset_location",
+		log::trace!(target: "xcm::contains",
 			"ConcreteNativeAsset asset: {:?}, origin: {:?}, location: {:?}",
 			asset, origin, Location::get());
 		matches!(asset.id, Concrete(ref id) if id == origin && origin == &Location::get())
 	}
 }
+
+/// Accepts an asset if it is a native asset from a System Parachain.
+pub struct NativeAssetFromSiblingSystemParachain;
+impl ContainsPair<MultiAsset, MultiLocation> for NativeAssetFromSiblingSystemParachain {
+	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
+		log::trace!(target: "xcm::contains", "NativeAssetFromSiblingSystemParachain asset: {:?}, origin: {:?}", asset, origin);
+		let is_system_para = match origin {
+			MultiLocation { parents: 1, interior: X1(Parachain(id)) } if *id < 2000 => true,
+			_ => false,
+		};
+		let parent = MultiLocation::parent();
+		matches!(asset.id, Concrete(id) if id == parent && is_system_para)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{
+		ContainsPair, Here, MultiAsset, MultiLocation, NativeAssetFromSiblingSystemParachain,
+		Parachain, Parent,
+	};
+
+	#[test]
+	fn native_asset_from_sibling_system_para_works() {
+		let expected_asset: MultiAsset = (Parent, 1000000).into();
+		let expected_origin: MultiLocation = (Parent, Parachain(1000)).into();
+
+		assert!(NativeAssetFromSiblingSystemParachain::contains(&expected_asset, &expected_origin));
+	}
+
+	#[test]
+	fn native_asset_from_sibling_system_para_fails_for_wrong_asset() {
+		let unexpected_asset: MultiAsset = (Here, 1000000).into();
+		let expected_origin: MultiLocation = (Parent, Parachain(1000)).into();
+
+		assert!(!NativeAssetFromSiblingSystemParachain::contains(
+			&unexpected_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!(!NativeAssetFromSiblingSystemParachain::contains(
+			&expected_asset,
+			&unexpected_origin
+		));
+	}
+}

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

@@ -13,22 +13,23 @@
 
 // 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 codec::Encode;
 pub use frame_support::{
 	assert_ok, instances::Instance1, pallet_prelude::Weight, traits::fungibles::Inspect,
 };
 pub use integration_tests_common::{
 	constants::{
 		accounts::{ALICE, BOB},
+		asset_hub_kusama::ED as ASSET_HUB_KUSAMA_ED,
+		bridge_hub_kusama::ED as BRIDGE_HUB_KUSAMA_ED,
 		kusama::ED as KUSAMA_ED,
 		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
-	AccountId, AssetHubKusama, AssetHubKusamaPallet, AssetHubKusamaReceiver, AssetHubKusamaSender,
-	BridgeHubKusama, BridgeHubKusamaPallet, BridgeHubKusamaReceiver, BridgeHubKusamaSender,
-	BridgeHubPolkadot, BridgeHubPolkadotPallet, BridgeHubPolkadotReceiver, BridgeHubPolkadotSender,
-	Collectives, CollectivesPallet, CollectivesReceiver, CollectivesSender, Kusama, KusamaMockNet,
-	KusamaPallet, KusamaReceiver, KusamaSender, PenpalKusama, PenpalKusamaReceiver,
+	test_parachain_is_trusted_teleporter, AccountId, AssetHubKusama, AssetHubKusamaPallet,
+	AssetHubKusamaReceiver, AssetHubKusamaSender, BridgeHubKusama, BridgeHubKusamaPallet,
+	BridgeHubKusamaReceiver, BridgeHubKusamaSender, BridgeHubPolkadot, BridgeHubPolkadotPallet,
+	BridgeHubPolkadotReceiver, BridgeHubPolkadotSender, Kusama, KusamaMockNet, KusamaPallet,
+	KusamaReceiver, KusamaSender, PenpalKusama, PenpalKusamaPallet, PenpalKusamaReceiver,
 	PenpalKusamaSender, PenpalPolkadot, PenpalPolkadotReceiver, PenpalPolkadotSender, Polkadot,
 	PolkadotMockNet, PolkadotPallet, PolkadotReceiver, PolkadotSender,
 };

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

@@ -78,3 +78,16 @@ fn teleport_native_assets_from_relay_to_assets_para() {
 	assert_eq!(relay_sender_balance_before - amount, relay_sender_balance_after);
 	assert!(para_sender_balance_after > para_receiver_balance_before);
 }
+
+#[test]
+fn teleport_to_other_system_parachains() {
+	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)
+	);
+}

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

@@ -21,15 +21,17 @@ pub use frame_support::{
 pub use integration_tests_common::{
 	constants::{
 		accounts::{ALICE, BOB},
+		asset_hub_polkadot::ED as ASSET_HUB_POLKADOT_ED,
 		polkadot::ED as POLKADOT_ED,
 		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
-	AccountId, AssetHubKusama, AssetHubKusamaPallet, AssetHubKusamaReceiver, AssetHubKusamaSender,
-	AssetHubPolkadot, AssetHubPolkadotPallet, AssetHubPolkadotReceiver, AssetHubPolkadotSender,
-	BridgeHubKusama, BridgeHubKusamaPallet, BridgeHubKusamaReceiver, BridgeHubKusamaSender,
-	BridgeHubPolkadot, BridgeHubPolkadotPallet, BridgeHubPolkadotReceiver, BridgeHubPolkadotSender,
-	Collectives, CollectivesPallet, CollectivesReceiver, CollectivesSender, Kusama, KusamaMockNet,
-	KusamaPallet, KusamaReceiver, KusamaSender, PenpalKusama, PenpalKusamaReceiver,
+	test_parachain_is_trusted_teleporter, AccountId, AssetHubKusama, AssetHubKusamaPallet,
+	AssetHubKusamaReceiver, AssetHubKusamaSender, AssetHubPolkadot, AssetHubPolkadotPallet,
+	AssetHubPolkadotReceiver, AssetHubPolkadotSender, BridgeHubKusama, BridgeHubKusamaPallet,
+	BridgeHubKusamaReceiver, BridgeHubKusamaSender, BridgeHubPolkadot, BridgeHubPolkadotPallet,
+	BridgeHubPolkadotReceiver, BridgeHubPolkadotSender, CollectivesPolkadot,
+	CollectivesPolkadotPallet, CollectivesPolkadotReceiver, CollectivesPolkadotSender, Kusama,
+	KusamaMockNet, KusamaPallet, KusamaReceiver, KusamaSender, PenpalKusama, PenpalKusamaReceiver,
 	PenpalKusamaSender, PenpalPolkadot, PenpalPolkadotReceiver, PenpalPolkadotSender, Polkadot,
 	PolkadotMockNet, PolkadotPallet, PolkadotReceiver, PolkadotSender,
 };

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

@@ -76,3 +76,15 @@ fn teleport_native_assets_from_relay_to_assets_para() {
 	assert_eq!(relay_sender_balance_before - amount, relay_sender_balance_after);
 	assert!(para_sender_balance_after > para_receiver_balance_before);
 }
+
+#[test]
+fn teleport_to_other_system_parachains() {
+	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)
+	);
+}

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

@@ -0,0 +1,38 @@
+[package]
+name = "asset-hub-rococo-integration-tests"
+version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+description = "Asset Hub Rococo parachain runtime integration tests based on xcm-emulator"
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
+
+# Substrate
+sp-runtime = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-support = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+frame-system = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-core = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+sp-weights = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+pallet-balances = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+pallet-assets = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+pallet-core-fellowship = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+pallet-salary = { default-features = false, git = "https://github.com/paritytech/substrate", branch = "master" }
+
+# Polkadot
+polkadot-core-primitives = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-parachain = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+polkadot-runtime = { git = "https://github.com/paritytech/polkadot", branch = "master" }
+xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "master" }
+xcm-executor = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "master" }
+pallet-xcm = { default-features = false, git = "https://github.com/paritytech/polkadot", branch = "master" }
+
+# Cumulus
+parachains-common = { path = "../../../../common" }
+cumulus-pallet-xcmp-queue = { default-features = false, path = "../../../../../pallets/xcmp-queue" }
+asset-hub-polkadot-runtime = { path = "../../../../runtimes/assets/asset-hub-polkadot" }
+
+# Local
+xcm-emulator = { default-features = false, path = "../../../../../xcm/xcm-emulator" }
+integration-tests-common = { default-features = false, path = "../../common" }

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

@@ -0,0 +1,29 @@
+// Copyright 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/>.
+
+//! Collectives Parachain integration tests based on xcm-emulator.
+
+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,
+	AccountId, AssetHubRococo, AssetHubRococoPallet, AssetHubRococoSender, BridgeHubRococo,
+	BridgeHubRococoReceiver,
+};
+pub use xcm::prelude::*;
+pub use xcm_emulator::{assert_expected_events, bx, Parachain, TestExt};
+
+#[cfg(test)]
+mod tests;

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

@@ -0,0 +1,17 @@
+// Copyright 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;

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

@@ -0,0 +1,29 @@
+// Copyright 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() {
+	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)
+	);
+}

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

@@ -21,13 +21,15 @@ pub use frame_support::{
 pub use integration_tests_common::{
 	constants::{
 		accounts::{ALICE, BOB},
+		asset_hub_westend::ED as ASSET_HUB_WESTEND_ED,
 		polkadot::ED as POLKADOT_ED,
 		PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
 	},
-	AccountId, AssetHubWestend, AssetHubWestendPallet, AssetHubWestendReceiver,
-	AssetHubWestendSender, Collectives, CollectivesPallet, CollectivesReceiver, CollectivesSender,
-	PenpalWestend, PenpalWestendPallet, PenpalWestendReceiver, PenpalWestendSender, Westend,
-	WestendPallet, WestendReceiver, WestendSender,
+	test_parachain_is_trusted_teleporter, AccountId, AssetHubWestend, AssetHubWestendPallet,
+	AssetHubWestendReceiver, AssetHubWestendSender, CollectivesWestend, CollectivesWestendPallet,
+	CollectivesWestendReceiver, CollectivesWestendSender, PenpalWestend, PenpalWestendPallet,
+	PenpalWestendReceiver, PenpalWestendSender, Westend, WestendPallet, WestendReceiver,
+	WestendSender,
 };
 pub use polkadot_core_primitives::InboundDownwardMessage;
 pub use xcm::{

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

@@ -76,3 +76,15 @@ fn teleport_native_assets_from_relay_to_assets_para() {
 	assert_eq!(relay_sender_balance_before - amount, relay_sender_balance_after);
 	assert!(para_sender_balance_after > para_receiver_balance_before);
 }
+
+#[test]
+fn teleport_to_other_system_parachains() {
+	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)
+	);
+}