update IsTeleporter

AcalaNetwork · Mar 28, 2024 · 7c1dcca · 7c1dcca
1 parent 19054ee
commit 7c1dcca
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/runtime/acala/src/xcm_config.rs b/runtime/acala/src/xcm_config.rs
@@ -116,8 +116,7 @@ impl xcm_executor::Config for XcmConfig {
 	type AssetTransactor = LocalAssetTransactor;
 	type OriginConverter = XcmOriginToCallOrigin;
 	type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
-	// Teleporting is disabled.
-	type IsTeleporter = ();
+	type IsTeleporter = runtime_common::xcm_config::TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;

diff --git a/runtime/common/src/xcm_config.rs b/runtime/common/src/xcm_config.rs
@@ -18,11 +18,12 @@
 
 use crate::{xcm_impl::AccountKey20Aliases, AccountId, Balance, Convert, CurrencyId};
 use frame_support::{
-	match_types,
+	match_types, parameter_types,
 	traits::{ConstU32, Everything, Get},
 };
 use orml_traits::MultiCurrency;
 use pallet_xcm::XcmPassthrough;
+use parachains_common::xcm_config::{ConcreteAssetFromSystem, ParentRelayOrSiblingParachains};
 use polkadot_parachain_primitives::primitives::Sibling;
 use xcm::latest::prelude::*;
 use xcm_builder::{
@@ -69,13 +70,6 @@ pub type XcmOriginToCallOrigin<LocationToAccountId, RuntimeOrigin, RelayChainOri
 	XcmPassthrough<RuntimeOrigin>,
 );
 
-match_types! {
-	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(_) }
-	};
-}
-
 pub type Barrier<PolkadotXcm, UniversalLocation> = TrailingSetTopicAsId<(
 	TakeWeightCredit,
 	// Expected responses are OK.
@@ -87,7 +81,7 @@ pub type Barrier<PolkadotXcm, UniversalLocation> = TrailingSetTopicAsId<(
 			// allow it.
 			AllowTopLevelPaidExecutionFrom<Everything>,
 			// Subscriptions for version tracking are OK.
-			AllowSubscriptionsFrom<ParentOrSiblings>,
+			AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
 		),
 		UniversalLocation,
 		ConstU32<8>,
@@ -130,3 +124,13 @@ impl Convert<AccountId, MultiLocation> for AccountIdToMultiLocation {
 		.into()
 	}
 }
+
+parameter_types! {
+	pub const RelayLocation: MultiLocation = MultiLocation::parent();
+}
+
+// define assets that can be trusted to teleport by remotes
+pub type TrustedTeleporters = (
+	// relay token from relaychain or system parachain
+	ConcreteAssetFromSystem<RelayLocation>,
+);
diff --git a/runtime/karura/src/xcm_config.rs b/runtime/karura/src/xcm_config.rs
@@ -163,8 +163,7 @@ impl xcm_executor::Config for XcmConfig {
 	type AssetTransactor = LocalAssetTransactor;
 	type OriginConverter = XcmOriginToCallOrigin;
 	type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
-	// Teleporting is disabled.
-	type IsTeleporter = ();
+	type IsTeleporter = runtime_common::xcm_config::TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;

diff --git a/runtime/mandala/src/xcm_config.rs b/runtime/mandala/src/xcm_config.rs
@@ -104,8 +104,7 @@ impl xcm_executor::Config for XcmConfig {
 	type AssetTransactor = LocalAssetTransactor;
 	type OriginConverter = XcmOriginToCallOrigin;
 	type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
-	// Teleporting is disabled.
-	type IsTeleporter = ();
+	type IsTeleporter = runtime_common::xcm_config::TrustedTeleporters;
 	type UniversalLocation = UniversalLocation;
 	type Barrier = Barrier;
 	type Weigher = FixedWeightBounds<UnitWeightCost, RuntimeCall, MaxInstructions>;