fix(xcm): charge delivery fees (#457)

* resolve rebase conflicts

* fix(xcm): reserve_transfer_native_asset_from_para_to_system_para accounts for delivery fees

* fix(integration-tests): handle delivery_fees only with mainnet feature on

fmt after rebase

fmt

changes after rebase

fmt

Author: al3mart

Cargo.lock

@@ -22,7 +22,10 @@ use emulated_integration_tests_common::{
 };
 use frame_support::{pallet_prelude::Weight, sp_runtime::DispatchResult};
 use pop_runtime_common::Balance;
+#[cfg(not(feature = "mainnet"))]
 use pop_runtime_devnet::config::xcm::XcmConfig as PopNetworkXcmConfig;
+#[cfg(feature = "mainnet")]
+use pop_runtime_mainnet::config::xcm::XcmConfig as PopNetworkXcmConfig;
 use xcm::prelude::*;
 
 mod chains;
@@ -313,7 +316,19 @@ fn reserve_transfer_native_asset_from_para_to_system_para() {
 	let destination = PopNetworkPara::sibling_location_of(AssetHubPara::para_id());
 	let beneficiary_id = AssetHubParaReceiver::get(); // bob on asset hub
 	let amount_to_send = PopNetworkPara::account_data_of(PopNetworkParaReceiver::get()).free; // bob on pop balance
-	let assets = (Parent, amount_to_send).into();
+	let assets: Assets = (Parent, amount_to_send).into();
+
+	let delivery_fees = PopNetworkPara::execute_with(|| {
+		xcm_helpers::teleport_assets_delivery_fees::<
+			<PopNetworkXcmConfig as xcm_executor::Config>::XcmSender,
+		>(
+			assets.clone(), 0, Unlimited, Location::from(beneficiary_id.clone()), destination.clone()
+		)
+	});
+	#[cfg(feature = "mainnet")]
+	let amount_to_send = amount_to_send - (ASSET_HUB_ED + delivery_fees);
+	#[cfg(feature = "mainnet")]
+	let assets: Assets = (Parent, amount_to_send).into();
 
 	let test_args = TestContext {
 		sender: PopNetworkParaReceiver::get(), // bob on pop
@@ -341,16 +356,11 @@ fn reserve_transfer_native_asset_from_para_to_system_para() {
 	let sender_balance_after = test.sender.balance;
 	let receiver_balance_after = test.receiver.balance;
 
-	let delivery_fees = PopNetworkPara::execute_with(|| {
-		xcm_helpers::teleport_assets_delivery_fees::<
-			<PopNetworkXcmConfig as xcm_executor::Config>::XcmSender,
-		>(
-			test.args.assets.clone(), 0, test.args.weight_limit, test.args.beneficiary, test.args.dest
-		)
-	});
-
 	// Sender's balance is reduced
 	assert_eq!(sender_balance_before - amount_to_send - delivery_fees, sender_balance_after);
+	// Sender's balance is the remaining ED.
+	#[cfg(feature = "mainnet")]
+	assert_eq!(ASSET_HUB_ED, sender_balance_after);
 	// Receiver's balance is increased
 	assert!(receiver_balance_after > receiver_balance_before);
 	// Receiver's balance increased by `amount_to_send - delivery_fees - bought_execution`;

integration-tests/src/lib.rs

@@ -87,6 +87,7 @@ parachains-common.workspace = true
 enumflags2 = "0.7.9"
 env_logger = "0.11.2"
 hex = "0.4.3"
+polkadot-runtime-parachains.workspace = true
 
 [features]
 default = [ "std" ]

runtime/mainnet/Cargo.toml

@@ -16,7 +16,7 @@ use parachains_common::{
 	xcm_config::ParentRelayOrSiblingParachains,
 };
 use polkadot_parachain_primitives::primitives::Sibling;
-use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
+use polkadot_runtime_common::xcm_sender::ExponentialPrice;
 use sp_runtime::{traits::AccountIdConversion, Vec};
 use xcm::latest::prelude::*;
 use xcm_builder::{
@@ -31,10 +31,16 @@ use xcm_builder::{
 use xcm_executor::XcmExecutor;
 
 use crate::{
-	config::{governance::SudoAddress, monetary::fee::WeightToFee, system::RuntimeBlockWeights},
-	AccountId, AllPalletsWithSystem, Balances, ParachainInfo, ParachainSystem,
-	PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
-	XcmpQueue, Perbill,
+	config::{
+		monetary::{
+			fee::{WeightToFee, CENTS},
+			TransactionByteFee,
+		},
+		system::RuntimeBlockWeights,
+	},
+	AccountId, AllPalletsWithSystem, Balances, MessageQueue, PalletId, ParachainInfo,
+	ParachainSystem, Perbill, PolkadotXcm, Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin,
+	XcmpQueue,
 };
 
 parameter_types! {
@@ -46,6 +52,7 @@ parameter_types! {
 	pub MessageQueueIdleServiceWeight: Weight = Perbill::from_percent(20) * RuntimeBlockWeights::get().max_block;
 	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
 	pub TreasuryAccount: AccountId = PalletId(*b"treasury").into_account_truncating();
+	pub const BaseDeliveryFee: u128 = CENTS.saturating_mul(3);
 }
 
 impl pallet_message_queue::Config for Runtime {
@@ -261,7 +268,8 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	// Limit the number of HRMP channels.
 	// note: https://github.com/polkadot-fellows/runtimes/blob/76d1fa680d00c3e447e40199e7b2250862ad4bfa/system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs#L692C2-L693C90
 	type MaxPageSize = ConstU32<{ 103 * 1024 }>;
-	type PriceForSiblingDelivery = NoPriceForMessageDelivery<ParaId>;
+	type PriceForSiblingDelivery =
+		ExponentialPrice<RelayLocation, BaseDeliveryFee, TransactionByteFee, XcmpQueue>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = PolkadotXcm;
 	type WeightInfo = cumulus_pallet_xcmp_queue::weights::SubstrateWeight<Runtime>;
@@ -273,9 +281,19 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 mod tests {
 	use std::any::TypeId;
 
+	use polkadot_runtime_common::xcm_sender::*;
+	use polkadot_runtime_parachains::FeeTracker;
+	use sp_runtime::FixedPointNumber;
 	use xcm_executor::traits::{FeeManager, FeeReason};
 
 	use super::*;
+	use crate::System;
+
+	fn new_test_ext() -> sp_io::TestExternalities {
+		let mut ext = sp_io::TestExternalities::new_empty();
+		ext.execute_with(|| System::set_block_number(1));
+		ext
+	}
 
 	mod reserves_config {
 		use super::*;
@@ -338,6 +356,7 @@ mod tests {
 			));
 		}
 	}
+
 	mod message_queue {
 		use super::*;
 
@@ -1038,13 +1057,35 @@ mod tests {
 		}
 
 		#[test]
-		#[ignore]
 		fn price_for_sibling_delivery() {
 			assert_eq!(
 				TypeId::of::<<Runtime as cumulus_pallet_xcmp_queue::Config>::PriceForSiblingDelivery>(
 				),
-				TypeId::of::<NoPriceForMessageDelivery<ParaId>>()
+				TypeId::of::<
+					ExponentialPrice<RelayLocation, BaseDeliveryFee, TransactionByteFee, XcmpQueue>,
+				>()
 			);
+
+			new_test_ext().execute_with(|| {
+				type ExponentialDeliveryPrice =
+					ExponentialPrice<RelayLocation, BaseDeliveryFee, TransactionByteFee, XcmpQueue>;
+				let id: ParaId = 420.into();
+				let b: u128 = BaseDeliveryFee::get();
+				let m: u128 = TransactionByteFee::get();
+
+				// F * (B + msg_length * M)
+				// A: RelayLocation
+				// B: BaseDeliveryFee
+				// M: TransactionByteFee
+				// F: XcmpQueue
+				//
+				// message_length = 1
+				let result: u128 = XcmpQueue::get_fee_factor(id).saturating_mul_int(b + m);
+				assert_eq!(
+					ExponentialDeliveryPrice::price_for_delivery(id, &Xcm(vec![])),
+					(RelayLocation::get(), result).into()
+				);
+			})
 		}
 
 		#[test]

runtime/mainnet/src/config/xcm.rs

@@ -15,21 +15,16 @@ extern crate alloc;
 use alloc::{borrow::Cow, vec::Vec};
 
 pub use apis::{RuntimeApi, RUNTIME_API_VERSIONS};
-use config::{
-	monetary::deposit,
-	system::{ConsensusHook, RuntimeBlockWeights},
-	xcm::XcmOriginToTransactDispatchOrigin,
-};
-use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
+use config::{monetary::deposit, system::ConsensusHook};
+use cumulus_primitives_core::AggregateMessageOrigin;
 use cumulus_primitives_storage_weight_reclaim::StorageWeightReclaim;
 use frame_metadata_hash_extension::CheckMetadataHash;
 use frame_support::{
 	dispatch::DispatchClass,
 	parameter_types,
 	traits::{
 		fungible::HoldConsideration, tokens::imbalance::ResolveTo, ConstBool, ConstU32, ConstU64,
-		ConstU8, Contains, EitherOfDiverse, EverythingBut, LinearStoragePrice, VariantCountOf,
-		EqualPrivilegeOnly, TransformOrigin,
+		ConstU8, EqualPrivilegeOnly, LinearStoragePrice, VariantCountOf,
 	},
 	weights::{ConstantMultiplier, Weight},
 	PalletId,