Use tfee as 0 since it is a two asset withdrawal

XRPLF · Sep 24, 2024 · 8a8553d · 8a8553d
1 parent 3be6878
commit 8a8553d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/src/xrpld/app/tx/detail/AMMClawback.cpp b/src/xrpld/app/tx/detail/AMMClawback.cpp
@@ -172,9 +172,10 @@ AMMClawback::applyGuts(Sandbox& sb)
     if (holdLPtokens == beast::zero)
         return tecINTERNAL;
 
-    auto const tfee = getTradingFee(ctx_.view(), *ammSle, holder);
     if (!clawAmount)
     {
+        // Because we are doing a two-asset withdrawal,
+        // tfee is actually not used, so pass tfee as 0.
         std::tie(result, newLPTokenBalance, amountWithdraw, amount2Withdraw) =
             AMMWithdraw::equalWithdrawTokens(
                 sb,
@@ -186,7 +187,7 @@ AMMClawback::applyGuts(Sandbox& sb)
                 lptAMMBalance,
                 holdLPtokens,
                 holdLPtokens,
-                tfee,
+                0,
                 ctx_.journal,
                 ctx_.tx,
                 true);
@@ -201,8 +202,7 @@ AMMClawback::applyGuts(Sandbox& sb)
                 amountBalance,
                 amount2Balance,
                 lptAMMBalance,
-                *clawAmount,
-                tfee);
+                *clawAmount);
 
     if (result != tesSUCCESS)
         return result;  // LCOV_EXCL_LINE
@@ -242,8 +242,7 @@ AMMClawback::equalWithdrawMatchingOneAmount(
     STAmount const& amountBalance,
     STAmount const& amount2Balance,
     STAmount const& lptAMMBalance,
-    STAmount const& amount,
-    std::uint16_t tfee)
+    STAmount const& amount)
 {
     auto frac = Number{amount} / amountBalance;
     auto const amount2Withdraw = amount2Balance * frac;
@@ -253,7 +252,8 @@ AMMClawback::equalWithdrawMatchingOneAmount(
     auto const holdLPtokens = ammLPHolds(sb, ammSle, holder, j_);
     if (lpTokensWithdraw > holdLPtokens)
         // if lptoken balance less than what the issuer intended to clawback,
-        // clawback all the tokens
+        // clawback all the tokens. Because we are doing a two-asset withdrawal,
+        // tfee is actually not used, so pass tfee as 0.
         return AMMWithdraw::equalWithdrawTokens(
             sb,
             ammSle,
@@ -264,11 +264,13 @@ AMMClawback::equalWithdrawMatchingOneAmount(
             lptAMMBalance,
             holdLPtokens,
             holdLPtokens,
-            tfee,
+            0,
             ctx_.journal,
             ctx_.tx,
             true);
 
+    // Because we are doing a two-asset withdrawal,
+    // tfee is actually not used, so pass tfee as 0.
     return withdraw(
         sb,
         ammAccount,
@@ -279,7 +281,7 @@ AMMClawback::equalWithdrawMatchingOneAmount(
         toSTAmount(amount2Balance.issue(), amount2Withdraw),
         lptAMMBalance,
         toSTAmount(lptAMMBalance.issue(), lptAMMBalance * frac),
-        tfee,
+        0,
         ctx_.journal,
         ctx_.tx,
         false);

diff --git a/src/xrpld/app/tx/detail/AMMClawback.h b/src/xrpld/app/tx/detail/AMMClawback.h
@@ -48,13 +48,13 @@ class AMMClawback : public Transactor
 
     /** Withdraw both assets by providing maximum amount of asset1,
      * asset2's amount will be calculated according to the current proportion.
+     * Since it is two-asset withdrawal, tfee is omitted.
      * @param view
      * @param ammAccount current AMM account
      * @param amountBalance current AMM asset1 balance
      * @param amount2Balance current AMM asset2 balance
      * @param lptAMMBalance current AMM LPT balance
      * @param amount asset1 withdraw amount
-     * @param tfee trading fee in basis points
      * @return
      */
     std::tuple<TER, STAmount, STAmount, std::optional<STAmount>>
@@ -66,8 +66,7 @@ class AMMClawback : public Transactor
         STAmount const& amountBalance,
         STAmount const& amount2Balance,
         STAmount const& lptAMMBalance,
-        STAmount const& amount,
-        std::uint16_t tfee);
+        STAmount const& amount);
 };
 
 }  // namespace ripple