From a072ce81d2118a67e6ffbc417ae0815d0a56185f Mon Sep 17 00:00:00 2001
From: Adrian Catangiu <adrian@parity.io>
Date: Fri, 25 Oct 2024 17:40:42 +0300
Subject: [PATCH] asset-hubs: simplify xcm-config (#6222)
`ForeignCreatorsSovereignAccountOf` is used by `ForeignCreators` filter
to convert location to `AccountId`, _after_ `ForeignCreators::IsForeign`
filter passes for an (asset, location) pair.
The `IsForeign` filter is the actual differentiator, so if a location
passes it, we should support converting it to an `AccountId`.
As such, this commit replaces `ForeignCreatorsSovereignAccountOf`
converter with the more general `LocationToAccountId` converter.
Signed-off-by: Adrian Catangiu <adrian@parity.io>
---
.../runtimes/assets/asset-hub-rococo/src/lib.rs | 4 ++--
.../runtimes/assets/asset-hub-rococo/src/xcm_config.rs | 8 --------
.../runtimes/assets/asset-hub-rococo/tests/tests.rs | 8 ++++----
.../runtimes/assets/asset-hub-westend/src/lib.rs | 8 ++++----
.../runtimes/assets/asset-hub-westend/src/xcm_config.rs | 8 --------
.../runtimes/assets/asset-hub-westend/tests/tests.rs | 9 ++++-----
6 files changed, 14 insertions(+), 31 deletions(-)
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
index f768f803aea..420fa67f41f 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
@@ -82,7 +82,7 @@ use parachains_common::{
use sp_runtime::{Perbill, RuntimeDebug};
use testnet_parachains_constants::rococo::{consensus::*, currency::*, fee::WeightToFee, time::*};
use xcm_config::{
- ForeignAssetsConvertedConcreteId, ForeignCreatorsSovereignAccountOf, GovernanceLocation,
+ ForeignAssetsConvertedConcreteId, GovernanceLocation, LocationToAccountId,
PoolAssetsConvertedConcreteId, TokenLocation, TrustBackedAssetsConvertedConcreteId,
TrustBackedAssetsPalletLocation,
};
@@ -424,7 +424,7 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
FromNetwork<xcm_config::UniversalLocation, EthereumNetwork, xcm::v4::Location>,
xcm_config::bridging::to_westend::WestendOrEthereumAssetFromAssetHubWestend,
),
- ForeignCreatorsSovereignAccountOf,
+ LocationToAccountId,
AccountId,
xcm::v4::Location,
>;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
index 32fbfb6d019..637c5900f7d 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/xcm_config.rs
@@ -512,14 +512,6 @@ impl cumulus_pallet_xcm::Config for Runtime {
type XcmExecutor = XcmExecutor<XcmConfig>;
}
-pub type ForeignCreatorsSovereignAccountOf = (
- SiblingParachainConvertsVia<Sibling, AccountId>,
- AccountId32Aliases<RelayNetwork, AccountId>,
- ParentIsPreset<AccountId>,
- GlobalConsensusEthereumConvertsFor<AccountId>,
- GlobalConsensusParachainConvertsFor<UniversalLocation, AccountId>,
-);
-
/// Simple conversion of `u32` into an `AssetId` for use in benchmarking.
pub struct XcmBenchmarkHelper;
#[cfg(feature = "runtime-benchmarks")]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
index 6e10f916899..81432313532 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-rococo/tests/tests.rs
@@ -21,8 +21,8 @@ use asset_hub_rococo_runtime::{
xcm_config,
xcm_config::{
bridging, AssetFeeAsExistentialDepositMultiplierFeeCharger, CheckingAccount,
- ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf,
- LocationToAccountId, StakingPot, TokenLocation, TrustBackedAssetsPalletLocation, XcmConfig,
+ ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger, LocationToAccountId, StakingPot,
+ TokenLocation, TrustBackedAssetsPalletLocation, XcmConfig,
},
AllPalletsWithoutSystem, AssetConversion, AssetDeposit, Assets, Balances, CollatorSelection,
ExistentialDeposit, ForeignAssets, ForeignAssetsInstance, MetadataDepositBase,
@@ -941,7 +941,7 @@ asset_test_utils::include_teleports_for_foreign_assets_works!(
CheckingAccount,
WeightToFee,
ParachainSystem,
- ForeignCreatorsSovereignAccountOf,
+ LocationToAccountId,
ForeignAssetsInstance,
collator_session_keys(),
slot_durations(),
@@ -1015,7 +1015,7 @@ asset_test_utils::include_create_and_manage_foreign_assets_for_local_consensus_p
Runtime,
XcmConfig,
WeightToFee,
- ForeignCreatorsSovereignAccountOf,
+ LocationToAccountId,
ForeignAssetsInstance,
Location,
WithLatestLocationConverter<Location>,
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
index adfa2b74df6..066a1c2bdfd 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
@@ -79,9 +79,9 @@ use testnet_parachains_constants::westend::{
consensus::*, currency::*, fee::WeightToFee, snowbridge::EthereumNetwork, time::*,
};
use xcm_config::{
- ForeignAssetsConvertedConcreteId, ForeignCreatorsSovereignAccountOf,
- PoolAssetsConvertedConcreteId, TrustBackedAssetsConvertedConcreteId,
- TrustBackedAssetsPalletLocation, WestendLocation, XcmOriginToTransactDispatchOrigin,
+ ForeignAssetsConvertedConcreteId, LocationToAccountId, PoolAssetsConvertedConcreteId,
+ TrustBackedAssetsConvertedConcreteId, TrustBackedAssetsPalletLocation, WestendLocation,
+ XcmOriginToTransactDispatchOrigin,
};
#[cfg(any(feature = "std", test))]
@@ -423,7 +423,7 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
FromNetwork<xcm_config::UniversalLocation, EthereumNetwork, xcm::v4::Location>,
xcm_config::bridging::to_rococo::RococoAssetFromAssetHubRococo,
),
- ForeignCreatorsSovereignAccountOf,
+ LocationToAccountId,
AccountId,
xcm::v4::Location,
>;
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
index cfd9fd2fd46..b554d00508b 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/xcm_config.rs
@@ -535,14 +535,6 @@ impl cumulus_pallet_xcm::Config for Runtime {
type XcmExecutor = XcmExecutor<XcmConfig>;
}
-pub type ForeignCreatorsSovereignAccountOf = (
- SiblingParachainConvertsVia<Sibling, AccountId>,
- AccountId32Aliases<RelayNetwork, AccountId>,
- ParentIsPreset<AccountId>,
- GlobalConsensusEthereumConvertsFor<AccountId>,
- GlobalConsensusParachainConvertsFor<UniversalLocation, AccountId>,
-);
-
/// Simple conversion of `u32` into an `AssetId` for use in benchmarking.
pub struct XcmBenchmarkHelper;
#[cfg(feature = "runtime-benchmarks")]
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
index ff84bdea69f..6a48b19ce94 100644
--- a/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
+++ b/cumulus/parachains/runtimes/assets/asset-hub-westend/tests/tests.rs
@@ -21,9 +21,8 @@ use asset_hub_westend_runtime::{
xcm_config,
xcm_config::{
bridging, AssetFeeAsExistentialDepositMultiplierFeeCharger, CheckingAccount,
- ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger, ForeignCreatorsSovereignAccountOf,
- LocationToAccountId, StakingPot, TrustBackedAssetsPalletLocation, WestendLocation,
- XcmConfig,
+ ForeignAssetFeeAsExistentialDepositMultiplierFeeCharger, LocationToAccountId, StakingPot,
+ TrustBackedAssetsPalletLocation, WestendLocation, XcmConfig,
},
AllPalletsWithoutSystem, Assets, Balances, ExistentialDeposit, ForeignAssets,
ForeignAssetsInstance, MetadataDepositBase, MetadataDepositPerByte, ParachainSystem,
@@ -966,7 +965,7 @@ asset_test_utils::include_teleports_for_foreign_assets_works!(
CheckingAccount,
WeightToFee,
ParachainSystem,
- ForeignCreatorsSovereignAccountOf,
+ LocationToAccountId,
ForeignAssetsInstance,
collator_session_keys(),
slot_durations(),
@@ -1044,7 +1043,7 @@ asset_test_utils::include_create_and_manage_foreign_assets_for_local_consensus_p
Runtime,
XcmConfig,
WeightToFee,
- ForeignCreatorsSovereignAccountOf,
+ LocationToAccountId,
ForeignAssetsInstance,
xcm::v4::Location,
WithLatestLocationConverter<xcm::v4::Location>,
--
GitLab