[Penpal] cleanup XCM config setup regarding assets

cumulus/parachains/common/src/impls.rs

@@ -20,7 +20,7 @@ use alloc::boxed::Box;
 use core::marker::PhantomData;
 use frame_support::traits::{
 	fungible, fungibles, tokens::imbalance::ResolveTo, Contains, ContainsPair, Currency, Defensive,
-	Get, Imbalance, OnUnbalanced, OriginTrait,
+	Get, Imbalance, OnUnbalanced, OriginTrait, TypedGet,
 };
 use pallet_asset_tx_payment::HandleCredit;
 use pallet_collator_selection::StakingPotAccountId;
@@ -83,7 +83,12 @@ where
 
 /// A `HandleCredit` implementation that naively transfers the fees to the block author.
 /// Will drop and burn the assets in case the transfer fails.
+#[deprecated(
+	note = "AssetsToBlockAuthor is deprecated and will be removed after June 2026. Please use frame_support::traits::tokens::imbalance::MaybeResolveTo<BlockAuthor, ...> instead."
+)]
 pub struct AssetsToBlockAuthor<R, I>(PhantomData<(R, I)>);
+
+#[allow(deprecated)]
 impl<R, I> HandleCredit<AccountIdOf<R>, pallet_assets::Pallet<R, I>> for AssetsToBlockAuthor<R, I>
 where
 	I: 'static,
@@ -99,6 +104,22 @@ where
 	}
 }
 
+/// Implements `TypedGet` with an option return value to pass into
+/// frame_support::traits::tokens::imbalance::MaybeResolveTo<BlockAuthor, ...>.
+pub struct BlockAuthor<Runtime>(PhantomData<Runtime>);
+
+impl<R> TypedGet for BlockAuthor<R>
+where
+	R: pallet_authorship::Config,
+	AccountIdOf<R>: From<polkadot_primitives::AccountId> + Into<polkadot_primitives::AccountId>,
+{
+	type Type = Option<AccountIdOf<R>>;
+
+	fn get() -> Self::Type {
+		pallet_authorship::Pallet::<R>::author()
+	}
+}
+
 /// Allow checking in assets that have issuance > 0.
 pub struct NonZeroIssuance<AccountId, Assets>(PhantomData<(AccountId, Assets)>);
 impl<AccountId, Assets> Contains<<Assets as fungibles::Inspect<AccountId>>::AssetId>

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

@@ -23,8 +23,8 @@ use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators,
 	snowbridge::{ETHER_MIN_BALANCE, WETH},
 	xcm_emulator::ConvertLocation,
-	PenpalALocation, PenpalASiblingSovereignAccount, PenpalATeleportableAssetLocation,
-	PenpalBLocation, PenpalBSiblingSovereignAccount, PenpalBTeleportableAssetLocation,
+	PenpalALocation, PenpalAPen2TeleportableAssetLocation, PenpalASiblingSovereignAccount,
+	PenpalBLocation, PenpalBPen2TeleportableAssetLocation, PenpalBSiblingSovereignAccount,
 	RESERVABLE_ASSET_ID, SAFE_XCM_VERSION, USDT_ID,
 };
 use parachains_common::{AccountId, Balance};
@@ -99,26 +99,28 @@ pub fn genesis() -> Storage {
 		},
 		foreign_assets: asset_hub_rococo_runtime::ForeignAssetsConfig {
 			assets: vec![
-				// PenpalA's teleportable asset representation
+				// // PenpalA's native asset representation
+				(PenpalALocation::get(), PenpalASiblingSovereignAccount::get(), true, ED),
+				// // PenpalB's native asset representation
+				(PenpalBLocation::get(), PenpalBSiblingSovereignAccount::get(), true, ED),
 				(
-					PenpalATeleportableAssetLocation::get(),
+					PenpalAPen2TeleportableAssetLocation::get(),
 					PenpalASiblingSovereignAccount::get(),
 					false,
 					ED,
 				),
 				// PenpalB's teleportable asset representation
 				(
-					PenpalBTeleportableAssetLocation::get(),
+					PenpalBPen2TeleportableAssetLocation::get(),
 					PenpalBSiblingSovereignAccount::get(),
 					false,
 					ED,
 				),
 				// Ether
 				(
 					EthereumLocation::get(),
-					AssetHubWestendSovereignAccount::get(), /* To emulate double bridging, where
-					                                         * WAH is the owner of assets from
-					                                         * Ethereum on RAH */
+					// Emulate double bridging; WAH is the owner of assets from Ethereum on RAH.
+					AssetHubWestendSovereignAccount::get(),
 					true,
 					ETHER_MIN_BALANCE,
 				),
@@ -137,12 +139,14 @@ pub fn genesis() -> Storage {
 				),
 			],
 			reserves: vec![
+				(PenpalALocation::get(), vec![(PenpalALocation::get(), true).into()]),
+				(PenpalBLocation::get(), vec![(PenpalBLocation::get(), true).into()]),
 				(
-					PenpalATeleportableAssetLocation::get(),
+					PenpalAPen2TeleportableAssetLocation::get(),
 					vec![(PenpalALocation::get(), true).into()],
 				),
 				(
-					PenpalBTeleportableAssetLocation::get(),
+					PenpalBPen2TeleportableAssetLocation::get(),
 					vec![(PenpalBLocation::get(), true).into()],
 				),
 				(EthereumLocation::get(), vec![(AssetHubWestendLocation::get(), false).into()]),

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

@@ -23,8 +23,8 @@ use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators,
 	snowbridge::{ETHER_MIN_BALANCE, WETH},
 	xcm_emulator::ConvertLocation,
-	PenpalALocation, PenpalASiblingSovereignAccount, PenpalATeleportableAssetLocation,
-	PenpalBLocation, PenpalBSiblingSovereignAccount, PenpalBTeleportableAssetLocation,
+	PenpalALocation, PenpalAPen2TeleportableAssetLocation, PenpalASiblingSovereignAccount,
+	PenpalBLocation, PenpalBPen2TeleportableAssetLocation, PenpalBSiblingSovereignAccount,
 	RESERVABLE_ASSET_ID, SAFE_XCM_VERSION, USDT_ID,
 };
 use parachains_common::{AccountId, Balance};
@@ -99,16 +99,19 @@ pub fn genesis() -> Storage {
 		},
 		foreign_assets: asset_hub_westend_runtime::ForeignAssetsConfig {
 			assets: vec![
+				// // Penpals' native asset representation
+				(PenpalALocation::get(), PenpalASiblingSovereignAccount::get(), true, ED),
+				(PenpalBLocation::get(), PenpalBSiblingSovereignAccount::get(), true, ED),
 				// PenpalA's teleportable asset representation
 				(
-					PenpalATeleportableAssetLocation::get(),
+					PenpalAPen2TeleportableAssetLocation::get(),
 					PenpalASiblingSovereignAccount::get(),
 					false,
 					ED,
 				),
 				// PenpalB's teleportable asset representation
 				(
-					PenpalBTeleportableAssetLocation::get(),
+					PenpalBPen2TeleportableAssetLocation::get(),
 					PenpalBSiblingSovereignAccount::get(),
 					false,
 					ED,
@@ -135,12 +138,14 @@ pub fn genesis() -> Storage {
 				),
 			],
 			reserves: vec![
+				(PenpalALocation::get(), vec![(PenpalALocation::get(), true).into()]),
+				(PenpalBLocation::get(), vec![(PenpalBLocation::get(), true).into()]),
 				(
-					PenpalATeleportableAssetLocation::get(),
+					PenpalAPen2TeleportableAssetLocation::get(),
 					vec![(PenpalALocation::get(), true).into()],
 				),
 				(
-					PenpalBTeleportableAssetLocation::get(),
+					PenpalBPen2TeleportableAssetLocation::get(),
 					vec![(PenpalBLocation::get(), true).into()],
 				),
 				(EthereumLocation::get(), vec![(EthereumLocation::get(), false).into()]),

cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/genesis.rs

@@ -23,7 +23,9 @@ use emulated_integration_tests_common::{
 	accounts, build_genesis_storage, collators, SAFE_XCM_VERSION,
 };
 use parachains_common::{AccountId, Balance};
-use penpal_runtime::xcm_config::{LocalReservableFromAssetHub, RelayLocation, UsdtFromAssetHub};
+use penpal_runtime::xcm_config::{
+	LocalPen2Asset, LocalReservableFromAssetHub, RelayLocation, UsdtFromAssetHub,
+};
 // Penpal
 pub const PARA_ID_A: u32 = 2000;
 pub const PARA_ID_B: u32 = 2001;
@@ -70,18 +72,11 @@ pub fn genesis(para_id: u32) -> Storage {
 		},
 		sudo: penpal_runtime::SudoConfig { key: Some(PenpalSudoAccount::get()) },
 		assets: penpal_runtime::AssetsConfig {
-			assets: vec![(
-				penpal_runtime::xcm_config::TELEPORTABLE_ASSET_ID,
-				PenpalAssetOwner::get(),
-				false,
-				ED,
-			)],
-			..Default::default()
-		},
-		foreign_assets: penpal_runtime::ForeignAssetsConfig {
 			assets: vec![
 				// Relay Native asset representation
 				(RelayLocation::get(), PenpalAssetOwner::get(), true, ED),
+				// Local Pen2 representation
+				(LocalPen2Asset::get(), PenpalAssetOwner::get(), false, ED),
 				// Sufficient AssetHub asset representation
 				(LocalReservableFromAssetHub::get(), PenpalAssetOwner::get(), true, ED),
 				// USDT from AssetHub

cumulus/parachains/integration-tests/emulated/chains/parachains/testing/penpal/src/lib.rs

@@ -27,8 +27,7 @@ use sp_core::Encode;
 // Cumulus
 use emulated_integration_tests_common::{
 	impl_accounts_helpers_for_parachain, impl_assert_events_helpers_for_parachain,
-	impl_assets_helpers_for_parachain, impl_foreign_assets_helpers_for_parachain,
-	impl_xcm_helpers_for_parachain,
+	impl_foreign_assets_helpers_for_parachain, impl_xcm_helpers_for_parachain,
 	impls::{NetworkId, Parachain},
 	xcm_emulator::decl_test_parachains,
 	AuraDigestProvider,
@@ -59,7 +58,6 @@ decl_test_parachains! {
 		pallets = {
 			PolkadotXcm: penpal_runtime::PolkadotXcm,
 			Assets: penpal_runtime::Assets,
-			ForeignAssets: penpal_runtime::ForeignAssets,
 			AssetConversion: penpal_runtime::AssetConversion,
 			Balances: penpal_runtime::Balances,
 		}
@@ -84,7 +82,6 @@ decl_test_parachains! {
 		pallets = {
 			PolkadotXcm: penpal_runtime::PolkadotXcm,
 			Assets: penpal_runtime::Assets,
-			ForeignAssets: penpal_runtime::ForeignAssets,
 			AssetConversion: penpal_runtime::AssetConversion,
 			Balances: penpal_runtime::Balances,
 		}
@@ -96,9 +93,17 @@ impl_accounts_helpers_for_parachain!(PenpalA);
 impl_accounts_helpers_for_parachain!(PenpalB);
 impl_assert_events_helpers_for_parachain!(PenpalA);
 impl_assert_events_helpers_for_parachain!(PenpalB);
-impl_assets_helpers_for_parachain!(PenpalA);
-impl_foreign_assets_helpers_for_parachain!(PenpalA, xcm::latest::Location, ForeignAssetReserveData);
-impl_assets_helpers_for_parachain!(PenpalB);
-impl_foreign_assets_helpers_for_parachain!(PenpalB, xcm::latest::Location, ForeignAssetReserveData);
+impl_foreign_assets_helpers_for_parachain!(
+	PenpalA,
+	xcm::latest::Location,
+	ForeignAssetReserveData,
+	Assets
+);
+impl_foreign_assets_helpers_for_parachain!(
+	PenpalB,
+	xcm::latest::Location,
+	ForeignAssetReserveData,
+	Assets
+);
 impl_xcm_helpers_for_parachain!(PenpalA);
 impl_xcm_helpers_for_parachain!(PenpalB);

cumulus/parachains/integration-tests/emulated/common/src/impls.rs

@@ -802,7 +802,18 @@ macro_rules! impl_assets_helpers_for_parachain {
 
 #[macro_export]
 macro_rules! impl_foreign_assets_helpers_for_parachain {
+	// By default, we assume that the pallet_assets instance handling foreign assets is called
+	// `ForeignAssets`. There are exceptions like `Penpal`, where it is simply called `Assets`.
 	($chain:ident, $asset_id_type:ty, $reserve_data_type:ty) => {
+		$crate::impl_foreign_assets_helpers_for_parachain!(
+			$chain,
+			$asset_id_type,
+			$reserve_data_type,
+			ForeignAssets
+		);
+	};
+
+	($chain:ident, $asset_id_type:ty, $reserve_data_type:ty, $pallet_asset_name:ident) => {
 		$crate::impls::paste::paste! {
 			impl<N: $crate::impls::Network> $chain<N> {
 				/// Create foreign assets using sudo `ForeignAssets::force_create()`
@@ -817,20 +828,20 @@ macro_rules! impl_foreign_assets_helpers_for_parachain {
 					let sudo_origin = <$chain<N> as $crate::impls::Chain>::RuntimeOrigin::root();
 					<Self as $crate::impls::TestExt>::execute_with(|| {
 						$crate::impls::assert_ok!(
-							<Self as [<$chain ParaPallet>]>::ForeignAssets::force_create(
+							<Self as [<$chain ParaPallet>]>::$pallet_asset_name::force_create(
 								sudo_origin,
 								id.clone(),
 								owner.clone().into(),
 								is_sufficient,
 								min_balance,
 							)
 						);
-						assert!(<Self as [<$chain ParaPallet>]>::ForeignAssets::asset_exists(id.clone()));
+						assert!(<Self as [<$chain ParaPallet>]>::$pallet_asset_name::asset_exists(id.clone()));
 						type RuntimeEvent<N> = <$chain<N> as $crate::impls::Chain>::RuntimeEvent;
 						$crate::impls::assert_expected_events!(
 							Self,
 							vec![
-								RuntimeEvent::<N>::ForeignAssets(
+								RuntimeEvent::<N>::$pallet_asset_name(
 									$crate::impls::pallet_assets::Event::ForceCreated {
 										asset_id,
 										..
@@ -857,7 +868,7 @@ macro_rules! impl_foreign_assets_helpers_for_parachain {
 						<$chain<N> as $crate::impls::Chain>::RuntimeOrigin::signed(owner.clone());
 					<Self as $crate::impls::TestExt>::execute_with(|| {
 						$crate::impls::assert_ok!(
-							<Self as [<$chain ParaPallet>]>::ForeignAssets::set_reserves(
+							<Self as [<$chain ParaPallet>]>::$pallet_asset_name::set_reserves(
 								owner_origin,
 								id.clone(),
 								reserves.try_into().unwrap(),
@@ -874,7 +885,7 @@ macro_rules! impl_foreign_assets_helpers_for_parachain {
 					amount_to_mint: u128,
 				) {
 					<Self as $crate::impls::TestExt>::execute_with(|| {
-						$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::ForeignAssets::mint(
+						$crate::impls::assert_ok!(<Self as [<$chain ParaPallet>]>::$pallet_asset_name::mint(
 							signed_origin,
 							id.clone().into(),
 							beneficiary.clone().into(),
@@ -886,7 +897,7 @@ macro_rules! impl_foreign_assets_helpers_for_parachain {
 						$crate::impls::assert_expected_events!(
 							Self,
 							vec![
-								RuntimeEvent::<N>::ForeignAssets(
+								RuntimeEvent::<N>::$pallet_asset_name(
 									$crate::impls::pallet_assets::Event::Issued { asset_id, owner, amount }
 								) => {
 									asset_id: *asset_id == id,
@@ -906,7 +917,7 @@ macro_rules! impl_foreign_assets_helpers_for_parachain {
 				) -> $crate::impls::DoubleEncoded<()> {
 					use $crate::impls::{Chain, Encode};
 
-					<Self as Chain>::RuntimeCall::ForeignAssets($crate::impls::pallet_assets::Call::<
+					<Self as Chain>::RuntimeCall::$pallet_asset_name($crate::impls::pallet_assets::Call::<
 						<Self as Chain>::Runtime,
 						$crate::impls::pallet_assets::Instance2,
 					>::create {