Skip to content

with_fee_currency support ED when use none-native token #2194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xlc merged 1 commit into from
Jun 13, 2022
Merged

with_fee_currency support ED when use none-native token #2194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions modules/transaction-payment/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,8 +802,6 @@ where
call: &CallOf<T>,
reason: WithdrawReasons,
) -> Result<(T::AccountId, Balance), DispatchError> {
let custom_fee_surplus = T::CustomFeeSurplus::get().mul_ceil(fee);
let custom_fee_amount = fee.saturating_add(custom_fee_surplus);
match call.is_sub_type() {
Some(Call::with_fee_path { fee_swap_path, .. }) => {
ensure!(
Expand All @@ -812,6 +810,9 @@ where
&& fee_swap_path.last() == Some(&T::NativeCurrencyId::get()),
Error::<T>::InvalidSwapPath
);
let fee = Self::check_native_is_not_enough(who, fee, reason).map_or_else(|| fee, |amount| amount);
let custom_fee_surplus = T::CustomFeeSurplus::get().mul_ceil(fee);
let custom_fee_amount = fee.saturating_add(custom_fee_surplus);
T::DEX::swap_with_specific_path(
who,
fee_swap_path,
Expand All @@ -824,12 +825,15 @@ where
TokenExchangeRate::<T>::contains_key(currency_id),
Error::<T>::InvalidToken
);
let fee_amount = if T::DefaultFeeTokens::get().contains(currency_id) {
fee.saturating_add(T::AlternativeFeeSurplus::get().mul_ceil(fee))
let fee = Self::check_native_is_not_enough(who, fee, reason).map_or_else(|| fee, |amount| amount);
let alternative_fee_surplus = T::AlternativeFeeSurplus::get().mul_ceil(fee);
let custom_fee_surplus = T::CustomFeeSurplus::get().mul_ceil(fee);
let (fee_amount, fee_surplus) = if T::DefaultFeeTokens::get().contains(currency_id) {
(fee.saturating_add(alternative_fee_surplus), alternative_fee_surplus)
} else {
custom_fee_amount
(fee.saturating_add(custom_fee_surplus), custom_fee_surplus)
};
Self::swap_from_pool_or_dex(who, fee_amount, *currency_id).map(|_| (who.clone(), fee_amount))
Self::swap_from_pool_or_dex(who, fee_amount, *currency_id).map(|_| (who.clone(), fee_surplus))
}
Some(Call::with_fee_paid_by {
call: _,
Expand Down
65 changes: 47 additions & 18 deletions modules/transaction-payment/src/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -506,26 +506,27 @@ fn charges_fee_when_validate_with_fee_path_call() {
// Enable dex with Alice, and initialize tx charge fee pool
builder_with_dex_and_fee_pool(true).execute_with(|| {
let dex_acc: AccountId = PalletId(*b"aca/dexm").into_account();
let dex_ausd = Currencies::free_balance(ACA, &dex_acc);
let dex_aca = Currencies::free_balance(ACA, &dex_acc);

let fee: Balance = 50 * 2 + 100;
let fee_perc = CustomFeeSurplus::get();
let surplus = fee_perc.mul_ceil(fee);
let fee_surplus = fee + surplus;
let fee: Balance = 50 * 2 + 100 + 10;
let fee_surplus = fee + CustomFeeSurplus::get().mul_ceil(fee);
assert_eq!(315, fee_surplus);

assert_ok!(Currencies::update_balance(Origin::root(), BOB, AUSD, 10000));

// AUSD - ACA
assert_ok!(ChargeTransactionPayment::<Runtime>::from(0).validate(
&ALICE,
&BOB,
&with_fee_path_call(vec![AUSD, ACA]),
&INFO2,
50
));
System::assert_has_event(crate::mock::Event::DEXModule(module_dex::Event::Swap {
trader: ALICE,
trader: BOB,
path: vec![AUSD, ACA],
liquidity_changes: vec![31, fee_surplus], // 31 AUSD - 300 ACA
liquidity_changes: vec![33, fee_surplus], // 33 AUSD - 315 ACA
}));
assert_eq!(dex_ausd - fee_surplus, Currencies::free_balance(ACA, &dex_acc));
assert_eq!(dex_aca - fee_surplus, Currencies::free_balance(ACA, &dex_acc));

// DOT - ACA swap dex is invalid
assert_noop!(
Expand All @@ -539,18 +540,26 @@ fn charges_fee_when_validate_with_fee_path_call() {
);

// DOT - AUSD - ACA
let fee: Balance = 50 * 2 + 100;
let fee_surplus2 = fee + CustomFeeSurplus::get().mul_ceil(fee);
assert_eq!(300, fee_surplus2);

assert_ok!(Currencies::update_balance(Origin::root(), BOB, DOT, 10000));
assert_ok!(ChargeTransactionPayment::<Runtime>::from(0).validate(
&ALICE,
&BOB,
&with_fee_path_call(vec![DOT, AUSD, ACA]),
&INFO2,
50
));
System::assert_has_event(crate::mock::Event::DEXModule(module_dex::Event::Swap {
trader: ALICE,
trader: BOB,
path: vec![DOT, AUSD, ACA],
liquidity_changes: vec![4, 33, fee_surplus], // 4 DOT - 33 AUSD - 300 ACA
liquidity_changes: vec![4, 34, fee_surplus2], // 4 DOT - 34 AUSD - 300 ACA
}));
assert_eq!(dex_ausd - fee_surplus * 2, Currencies::free_balance(ACA, &dex_acc));
assert_eq!(
dex_aca - fee_surplus - fee_surplus2,
Currencies::free_balance(ACA, &dex_acc)
);
});
}

Expand All @@ -565,28 +574,48 @@ fn charges_fee_when_validate_with_fee_currency_call() {
let sub_dot_aca = Currencies::free_balance(ACA, &dot_acc);
let sub_dot_dot = Currencies::free_balance(DOT, &dot_acc);

let fee: Balance = 50 * 2 + 100;
let fee: Balance = 50 * 2 + 100 + 10;
let fee_perc = AlternativeFeeSurplus::get();
let surplus = fee_perc.mul_ceil(fee);
let fee_amount = fee + surplus;
let surplus = fee_perc.mul_ceil(fee); // 53
let fee_amount = fee + surplus; // 263

assert_ok!(Currencies::update_balance(Origin::root(), BOB, AUSD, 10000));
assert_eq!(0, Currencies::free_balance(ACA, &BOB));
assert_ok!(ChargeTransactionPayment::<Runtime>::from(0).validate(
&ALICE,
&BOB,
&with_fee_currency_call(AUSD),
&INFO2,
50
));
assert_eq!(10, Currencies::free_balance(ACA, &BOB)); // ED
assert_eq!(7370, Currencies::free_balance(AUSD, &BOB));
System::assert_has_event(crate::mock::Event::Tokens(orml_tokens::Event::Transfer {
currency_id: AUSD,
from: BOB,
to: ausd_acc.clone(),
amount: 2630,
}));
System::assert_has_event(crate::mock::Event::PalletBalances(pallet_balances::Event::Transfer {
from: ausd_acc.clone(),
to: BOB,
amount: 263,
}));

assert_eq!(sub_ausd_aca - fee_amount, Currencies::free_balance(ACA, &ausd_acc));
assert_eq!(
sub_ausd_usd + fee_amount * 10,
Currencies::free_balance(AUSD, &ausd_acc)
);

let fee: Balance = 50 * 2 + 100;
let fee_perc = CustomFeeSurplus::get();
let surplus = fee_perc.mul_ceil(fee);
let fee_amount = fee + surplus;

assert_ok!(Currencies::update_balance(Origin::root(), BOB, DOT, 10000));
assert_eq!(10, Currencies::free_balance(ACA, &BOB));
assert_ok!(ChargeTransactionPayment::<Runtime>::from(0).validate(
&ALICE,
&BOB,
&with_fee_currency_call(DOT),
&INFO2,
50
Expand Down