Asset Conversion: Pool Account ID derivation with additional Pallet ID seed

cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs

@@ -359,15 +359,24 @@ pub type NativeAndAssets = fungible::UnionOf<
 	AccountId,
 >;
 
+pub type PoolIdToAccountId = pallet_asset_conversion::AccountIdConverter<
+	AssetConversionPalletId,
+	(xcm::v3::Location, xcm::v3::Location),
+>;
+
 impl pallet_asset_conversion::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type HigherPrecisionBalance = sp_core::U256;
 	type AssetKind = xcm::v3::Location;
 	type Assets = NativeAndAssets;
 	type PoolId = (Self::AssetKind, Self::AssetKind);
-	type PoolLocator =
-		pallet_asset_conversion::WithFirstAsset<TokenLocationV3, AccountId, Self::AssetKind>;
+	type PoolLocator = pallet_asset_conversion::WithFirstAsset<
+		TokenLocationV3,
+		AccountId,
+		Self::AssetKind,
+		PoolIdToAccountId,
+	>;
 	type PoolAssetId = u32;
 	type PoolAssets = PoolAssets;
 	type PoolSetupFee = ConstU128<0>; // Asset class deposit fees are sufficient to prevent spam
@@ -985,12 +994,48 @@ pub type SignedExtra = (
 /// Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
+
+parameter_types! {
+	pub PerAccountMigrationWeight: Weight = {
+		// 2 balance + 2 deposit
+		<Runtime as frame_system::Config>::DbWeight::get().reads(5)
+			.saturating_add(
+				<weights::pallet_assets_local::WeightInfo<Runtime> as pallet_assets::WeightInfo>::transfer()
+			).saturating_add(
+				<weights::pallet_assets_foreign::WeightInfo<Runtime> as pallet_assets::WeightInfo>::transfer()
+			).saturating_add(
+				<weights::pallet_assets_local::WeightInfo<Runtime> as pallet_assets::WeightInfo>::refund_other()
+			).saturating_add(
+				<weights::pallet_assets_foreign::WeightInfo<Runtime> as pallet_assets::WeightInfo>::refund_other()
+			).saturating_add( // team reset
+				<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 1)
+			)
+	};
+}
+
 /// Migrations to apply on runtime upgrade.
+#[allow(deprecated)]
 pub type Migrations = (
 	pallet_collator_selection::migration::v1::MigrateToV1<Runtime>,
 	InitStorageVersions,
 	// unreleased
 	cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	// unreleased
+	pallet_asset_conversion::migration::new_pool_account_id::Migrate<
+		Runtime,
+		pallet_asset_conversion::WithFirstAsset<
+			TokenLocationV3,
+			AccountId,
+			xcm::v3::Location,
+			pallet_asset_conversion::AccountIdConverterNoSeed<(
+				xcm::v3::Location,
+				xcm::v3::Location,
+			)>,
+		>,
+		<Runtime as pallet_asset_conversion::Config>::PoolAssets,
+		<Runtime as pallet_asset_conversion::Config>::Assets,
+		PerAccountMigrationWeight,
+	>,
 );
 
 /// Migration to initialize storage versions for pallets added after genesis.

cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs

@@ -315,15 +315,24 @@ pub type NativeAndAssets = fungible::UnionOf<
 	AccountId,
 >;
 
+pub type PoolIdToAccountId = pallet_asset_conversion::AccountIdConverter<
+	AssetConversionPalletId,
+	(xcm::v3::Location, xcm::v3::Location),
+>;
+
 impl pallet_asset_conversion::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Balance = Balance;
 	type HigherPrecisionBalance = sp_core::U256;
 	type AssetKind = xcm::v3::Location;
 	type Assets = NativeAndAssets;
 	type PoolId = (Self::AssetKind, Self::AssetKind);
-	type PoolLocator =
-		pallet_asset_conversion::WithFirstAsset<WestendLocationV3, AccountId, Self::AssetKind>;
+	type PoolLocator = pallet_asset_conversion::WithFirstAsset<
+		WestendLocationV3,
+		AccountId,
+		Self::AssetKind,
+		PoolIdToAccountId,
+	>;
 	type PoolAssetId = u32;
 	type PoolAssets = PoolAssets;
 	type PoolSetupFee = ConstU128<0>; // Asset class deposit fees are sufficient to prevent spam
@@ -930,6 +939,24 @@ pub type SignedExtra = (
 pub type UncheckedExtrinsic =
 	generic::UncheckedExtrinsic<Address, RuntimeCall, Signature, SignedExtra>;
 
+parameter_types! {
+	pub PerAccountMigrationWeight: Weight = {
+		// 2 balance + 2 deposit
+		<Runtime as frame_system::Config>::DbWeight::get().reads(5)
+			.saturating_add(
+				<weights::pallet_assets_local::WeightInfo<Runtime> as pallet_assets::WeightInfo>::transfer()
+			).saturating_add(
+				<weights::pallet_assets_foreign::WeightInfo<Runtime> as pallet_assets::WeightInfo>::transfer()
+			).saturating_add(
+				<weights::pallet_assets_local::WeightInfo<Runtime> as pallet_assets::WeightInfo>::refund_other()
+			).saturating_add(
+				<weights::pallet_assets_foreign::WeightInfo<Runtime> as pallet_assets::WeightInfo>::refund_other()
+			).saturating_add( // team reset
+				<Runtime as frame_system::Config>::DbWeight::get().reads_writes(1, 1)
+			)
+	};
+}
+
 /// Migrations to apply on runtime upgrade.
 pub type Migrations = (
 	// v9420
@@ -944,6 +971,22 @@ pub type Migrations = (
 	DeleteUndecodableStorage,
 	// unreleased
 	cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	// unreleased
+	pallet_asset_conversion::migration::new_pool_account_id::Migrate<
+		Runtime,
+		pallet_asset_conversion::WithFirstAsset<
+			WestendLocationV3,
+			AccountId,
+			xcm::v3::Location,
+			pallet_asset_conversion::AccountIdConverterNoSeed<(
+				xcm::v3::Location,
+				xcm::v3::Location,
+			)>,
+		>,
+		<Runtime as pallet_asset_conversion::Config>::PoolAssets,
+		<Runtime as pallet_asset_conversion::Config>::Assets,
+		PerAccountMigrationWeight,
+	>,
 );
 
 /// Asset Hub Westend has some undecodable storage, delete it.

substrate/bin/node/runtime/src/lib.rs

@@ -62,7 +62,7 @@ use frame_system::{
 };
 pub use node_primitives::{AccountId, Signature};
 use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Moment, Nonce};
-use pallet_asset_conversion::{Ascending, Chain, WithFirstAsset};
+use pallet_asset_conversion::{AccountIdConverter, Ascending, Chain, WithFirstAsset};
 use pallet_broker::{CoreAssignment, CoreIndex, CoretimeInterface, PartsOf57600};
 use pallet_election_provider_multi_phase::{GeometricDepositBase, SolutionAccuracyOf};
 use pallet_identity::legacy::IdentityInfo;
@@ -1688,8 +1688,17 @@ impl pallet_asset_conversion::Config for Runtime {
 	type Assets = UnionOf<Balances, Assets, NativeFromLeft, NativeOrWithId<u32>, AccountId>;
 	type PoolId = (Self::AssetKind, Self::AssetKind);
 	type PoolLocator = Chain<
-		WithFirstAsset<Native, AccountId, NativeOrWithId<u32>>,
-		Ascending<AccountId, NativeOrWithId<u32>>,
+		WithFirstAsset<
+			Native,
+			AccountId,
+			NativeOrWithId<u32>,
+			AccountIdConverter<AssetConversionPalletId, Self::PoolId>,
+		>,
+		Ascending<
+			AccountId,
+			NativeOrWithId<u32>,
+			AccountIdConverter<AssetConversionPalletId, Self::PoolId>,
+		>,
 	>;
 	type PoolAssetId = <Self as pallet_assets::Config<Instance2>>::AssetId;
 	type PoolAssets = PoolAssets;

substrate/frame/asset-conversion/Cargo.toml

@@ -17,6 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false }
+log = { version = "0.4.20", default-features = false }
 frame-support = { path = "../support", default-features = false }
 frame-system = { path = "../system", default-features = false }
 frame-benchmarking = { path = "../benchmarking", default-features = false, optional = true }
@@ -40,6 +41,7 @@ std = [
 	"frame-benchmarking?/std",
 	"frame-support/std",
 	"frame-system/std",
+	"log/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
 	"primitive-types/std",

substrate/frame/asset-conversion/src/lib.rs

@@ -56,6 +56,7 @@
 
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
+pub mod migration;
 #[cfg(test)]
 mod mock;
 mod swap;