cross-chain-transaction-fee

integration-tests/bifrost-kusama/src/slp.rs

@@ -379,7 +379,7 @@ fn transfer_to() {
 	Kusama::execute_with(|| {
 		assert_eq!(
 			kusama_runtime::Balances::free_balance(&AccountId::from(KSM_DELEGATOR_0_ACCOUNT)),
-			10049999921672574
+			10050009921672574
 		);
 	});
 }

pallets/fee-share/src/mock.rs

@@ -57,7 +57,7 @@ use crate as bifrost_fee_share;
 
 pub type BlockNumber = u64;
 pub type Amount = i128;
-pub type Balance = u64;
+pub type Balance = u128;
 
 pub type AccountId = AccountId32;
 pub const ALICE: AccountId = AccountId32::new([0u8; 32]);
@@ -301,6 +301,9 @@ impl bifrost_slp::Config for Runtime {
 	type MaxLengthLimit = MaxLengthLimit;
 	type XcmWeightAndFeeHandler = ();
 	type ChannelCommission = ();
+	type StablePoolHandler = ();
+	type AssetIdMaps = AssetIdMaps<Runtime>;
+	type TreasuryAccount = TreasuryAccount;
 }
 
 parameter_type_with_key! {

pallets/slp/Cargo.toml

@@ -32,6 +32,7 @@ bifrost-xcm-interface = { workspace = true }
 bifrost-vtoken-minting = { workspace = true }
 bifrost-asset-registry = { workspace = true }
 bifrost-parachain-staking = { workspace = true }
+bifrost-stable-pool = { workspace = true }
 
 [dev-dependencies]
 hex = "0.4.3"
@@ -72,6 +73,7 @@ std = [
     "bifrost-asset-registry/std",
     "bifrost-parachain-staking/std",
     "orml-xtokens/std",
+    "bifrost-stable-pool/std",
 ]
 
 runtime-benchmarks = [

pallets/slp/src/agents/astar_agent/agent.rs

@@ -129,7 +129,7 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		let (query_id, timeout, _fee, xcm_message) =
+		let (query_id, timeout, fee, xcm_message) =
 			Pallet::<T>::construct_xcm_as_subaccount_with_query_id(
 				XcmOperationType::Bond,
 				call.encode(),
@@ -138,6 +138,10 @@ impl<T: Config>
 				weight_and_fee,
 			)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		// Insert a delegator ledger update record into DelegatorLedgerXcmUpdateQueue<T>.
 		Self::insert_delegator_ledger_update_entry(
 			who,
@@ -171,14 +175,18 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		Pallet::<T>::construct_xcm_and_send_as_subaccount_without_query_id(
+		let fee = Pallet::<T>::construct_xcm_and_send_as_subaccount_without_query_id(
 			XcmOperationType::Payout,
 			call,
 			who,
 			currency_id,
 			weight_and_fee,
 		)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		Ok(Zero::zero())
 	}
 
@@ -220,7 +228,7 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		let (query_id, timeout, _, xcm_message) =
+		let (query_id, timeout, fee, xcm_message) =
 			Pallet::<T>::construct_xcm_as_subaccount_with_query_id(
 				XcmOperationType::Unbond,
 				call.encode(),
@@ -229,6 +237,10 @@ impl<T: Config>
 				weight_and_fee,
 			)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		// Insert a delegator ledger update record into DelegatorLedgerXcmUpdateQueue<T>.
 		Self::insert_delegator_ledger_update_entry(
 			who,
@@ -323,14 +335,18 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		Pallet::<T>::construct_xcm_and_send_as_subaccount_without_query_id(
+		let fee = Pallet::<T>::construct_xcm_and_send_as_subaccount_without_query_id(
 			XcmOperationType::Payout,
 			call,
 			who,
 			currency_id,
 			weight_and_fee,
 		)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		Ok(Zero::zero())
 	}
 
@@ -355,7 +371,7 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		let (query_id, timeout, _fee, xcm_message) =
+		let (query_id, timeout, fee, xcm_message) =
 			Pallet::<T>::construct_xcm_as_subaccount_with_query_id(
 				XcmOperationType::Liquidize,
 				call.encode(),
@@ -364,6 +380,10 @@ impl<T: Config>
 				weight_and_fee,
 			)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		// Insert a delegator ledger update record into DelegatorLedgerXcmUpdateQueue<T>.
 		Self::insert_delegator_ledger_update_entry(
 			who,
@@ -450,14 +470,18 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		Pallet::<T>::construct_xcm_and_send_as_subaccount_without_query_id(
+		let fee = Pallet::<T>::construct_xcm_and_send_as_subaccount_without_query_id(
 			XcmOperationType::TransferBack,
 			call.encode(),
 			from,
 			currency_id,
 			weight_and_fee,
 		)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		Ok(())
 	}
 
@@ -481,6 +505,14 @@ impl<T: Config>
 		let (entrance_account, _) = T::VtokenMinting::get_entrance_and_exit_accounts();
 		ensure!(from_account_id == entrance_account, Error::<T>::InvalidAccount);
 
+		// transfer supplementary fee from treasury to the "from" account. Return the added up
+		// amount
+		let amount = Pallet::<T>::get_transfer_to_added_amount_and_supplement(
+			from_account_id,
+			amount,
+			currency_id,
+		)?;
+
 		Pallet::<T>::do_transfer_to(from, to, amount, currency_id)?;
 
 		Ok(())

pallets/slp/src/agents/common.rs

@@ -21,9 +21,10 @@ use crate::{
 		ParachainStakingLedgerUpdateEntry, ParachainStakingLedgerUpdateOperation, TIMEOUT_BLOCKS,
 	},
 	traits::QueryResponseManager,
-	vec, BalanceOf, BlockNumberFor, BoundedVec, Box, Config, CurrencyDelays, DelegationsOccupied,
-	DelegatorLatestTuneRecord, DelegatorLedgerXcmUpdateQueue, DelegatorLedgers, DelegatorNextIndex,
-	DelegatorsIndex2Multilocation, DelegatorsMultilocation2Index, Encode, Event, FeeSources,
+	vec, AccountIdOf, BalanceOf, BlockNumberFor, BoundedVec, Box, Config, CurrencyDelays,
+	DelegationsOccupied, DelegatorLatestTuneRecord, DelegatorLedgerXcmUpdateQueue,
+	DelegatorLedgers, DelegatorNextIndex, DelegatorsIndex2Multilocation,
+	DelegatorsMultilocation2Index, Encode, Event, FeeSources,
 	Junction::{AccountId32, Parachain},
 	Junctions::X1,
 	Ledger, LedgerUpdateEntry, MinimumsAndMaximums, MultiLocation, Pallet, TimeUnit, Validators,
@@ -35,7 +36,7 @@ use orml_traits::{MultiCurrency, XcmTransfer};
 use polkadot_parachain_primitives::primitives::Sibling;
 use sp_core::{Get, U256};
 use sp_runtime::{
-	traits::{AccountIdConversion, UniqueSaturatedFrom, UniqueSaturatedInto},
+	traits::{AccountIdConversion, CheckedAdd, UniqueSaturatedFrom, UniqueSaturatedInto},
 	DispatchResult, Saturating,
 };
 use xcm::{opaque::v3::Instruction, v3::prelude::*, VersionedMultiLocation};
@@ -629,4 +630,30 @@ impl<T: Config> Pallet<T> {
 
 		Ok(Some(unlock_time_unit))
 	}
+
+	pub(crate) fn get_transfer_to_added_amount_and_supplement(
+		from: AccountIdOf<T>,
+		amount: BalanceOf<T>,
+		currency_id: CurrencyId,
+	) -> Result<BalanceOf<T>, Error<T>> {
+		// get transfer_to extra fee
+		let (_weight, supplementary_fee) = T::XcmWeightAndFeeHandler::get_operation_weight_and_fee(
+			currency_id,
+			XcmOperationType::TransferTo,
+		)
+		.ok_or(Error::<T>::WeightAndFeeNotExists)?;
+
+		// transfer supplementary_fee from treasury to "from" account
+		// get fee source first
+		let (source_location, _reserved_fee) =
+			FeeSources::<T>::get(currency_id).ok_or(Error::<T>::FeeSourceNotExist)?;
+		let source_account = Self::native_multilocation_to_account(&source_location)?;
+
+		// transfer supplementary_fee from treasury to "from" account
+		T::MultiCurrency::transfer(currency_id, &source_account, &from, supplementary_fee)
+			.map_err(|_| Error::<T>::Unexpected)?;
+		let added_amount = amount.checked_add(&supplementary_fee).ok_or(Error::<T>::OverFlow)?;
+
+		Ok(added_amount)
+	}
 }

pallets/slp/src/agents/parachain_staking_agent/agent.rs

@@ -1448,6 +1448,14 @@ impl<T: Config>
 			T::MultiCurrency::transfer(currency_id, &from_account_id, &to_account, amount)
 				.map_err(|_| Error::<T>::Unexpected)?;
 		} else {
+			// transfer supplementary fee from treasury to the "from" account. Return the added up
+			// amount
+			let amount = Pallet::<T>::get_transfer_to_added_amount_and_supplement(
+				from_account_id,
+				amount,
+				currency_id,
+			)?;
+
 			Pallet::<T>::do_transfer_to(from, to, amount, currency_id)?;
 		}
 

pallets/slp/src/agents/phala_agent/agent.rs

@@ -136,7 +136,7 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		let (query_id, timeout, _fee, xcm_message) =
+		let (query_id, timeout, fee, xcm_message) =
 			Pallet::<T>::construct_xcm_as_subaccount_with_query_id(
 				XcmOperationType::Bond,
 				calls,
@@ -145,6 +145,10 @@ impl<T: Config>
 				weight_and_fee,
 			)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		// Calculate how many shares we can get by the amount at current price
 		let shares = if let Some(MultiLocation {
 			parents: _,
@@ -253,7 +257,7 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		let (query_id, timeout, _fee, xcm_message) =
+		let (query_id, timeout, fee, xcm_message) =
 			Pallet::<T>::construct_xcm_as_subaccount_with_query_id(
 				XcmOperationType::Unbond,
 				call,
@@ -262,6 +266,10 @@ impl<T: Config>
 				weight_and_fee,
 			)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		// Insert a delegator ledger update record into DelegatorLedgerXcmUpdateQueue<T>.
 		Self::insert_delegator_ledger_update_entry(
 			who,
@@ -487,7 +495,7 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		let (query_id, _timeout, _fee, xcm_message) =
+		let (query_id, _timeout, fee, xcm_message) =
 			Pallet::<T>::construct_xcm_as_subaccount_with_query_id(
 				XcmOperationType::Payout,
 				call,
@@ -496,6 +504,10 @@ impl<T: Config>
 				weight_and_fee,
 			)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		// Send out the xcm message.
 		let dest = Pallet::<T>::get_para_multilocation_by_currency_id(currency_id)?;
 		send_xcm::<T::XcmRouter>(dest, xcm_message).map_err(|_e| Error::<T>::XcmFailure)?;
@@ -588,14 +600,18 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		Pallet::<T>::construct_xcm_and_send_as_subaccount_without_query_id(
+		let fee = Pallet::<T>::construct_xcm_and_send_as_subaccount_without_query_id(
 			XcmOperationType::TransferBack,
 			call.encode(),
 			from,
 			currency_id,
 			weight_and_fee,
 		)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		Ok(())
 	}
 
@@ -619,6 +635,14 @@ impl<T: Config>
 		let (entrance_account, _) = T::VtokenMinting::get_entrance_and_exit_accounts();
 		ensure!(from_account_id == entrance_account, Error::<T>::InvalidAccount);
 
+		// transfer supplementary fee from treasury to the "from" account. Return the added up
+		// amount
+		let amount = Pallet::<T>::get_transfer_to_added_amount_and_supplement(
+			from_account_id,
+			amount,
+			currency_id,
+		)?;
+
 		Pallet::<T>::do_transfer_to(from, to, amount, currency_id)?;
 
 		Ok(())
@@ -653,7 +677,7 @@ impl<T: Config>
 
 		// Wrap the xcm message as it is sent from a subaccount of the parachain account, and
 		// send it out.
-		let (query_id, _timeout, _fee, xcm_message) =
+		let (query_id, _timeout, fee, xcm_message) =
 			Pallet::<T>::construct_xcm_as_subaccount_with_query_id(
 				XcmOperationType::ConvertAsset,
 				call.encode(),
@@ -662,6 +686,10 @@ impl<T: Config>
 				weight_and_fee,
 			)?;
 
+		// withdraw this xcm fee from treasury. If treasury doesn't have this money, stop the
+		// process.
+		Pallet::<T>::burn_fee_from_source_account(fee, currency_id)?;
+
 		// Send out the xcm message.
 		let dest = Pallet::<T>::get_para_multilocation_by_currency_id(currency_id)?;
 		send_xcm::<T::XcmRouter>(dest, xcm_message).map_err(|_e| Error::<T>::XcmFailure)?;