change withdraw ammSle parameter order

XRPLF · Oct 1, 2024 · a1e2249 · a1e2249
1 parent 2796e8d
commit a1e2249
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 16 deletions.
diff --git a/src/xrpld/app/tx/detail/AMMClawback.cpp b/src/xrpld/app/tx/detail/AMMClawback.cpp
@@ -198,6 +198,7 @@ AMMClawback::applyGuts(Sandbox& sb)
                 amountBalance,
                 amount2Balance,
                 lptAMMBalance,
+                holdLPtokens,
                 *clawAmount);
 
     if (result != tesSUCCESS)
@@ -221,6 +222,9 @@ AMMClawback::applyGuts(Sandbox& sb)
     // will claw the paired asset as well. We already checked if
     // tfClawTwoAssets is enabled, the two assets have to be issued by the
     // same issuer.
+    if (!amount2Withdraw)
+        return tecINTERNAL;  // LCOV_EXCL_LINE
+
     auto const flags = ctx_.tx.getFlags();
     if (flags & tfClawTwoAssets)
         return rippleCredit(sb, holder, issuer, *amount2Withdraw, true, j_);
@@ -237,14 +241,14 @@ AMMClawback::equalWithdrawMatchingOneAmount(
     STAmount const& amountBalance,
     STAmount const& amount2Balance,
     STAmount const& lptAMMBalance,
+    STAmount const& holdLPtokens,
     STAmount const& amount)
 {
     auto frac = Number{amount} / amountBalance;
     auto const amount2Withdraw = amount2Balance * frac;
 
     auto const lpTokensWithdraw =
         toSTAmount(lptAMMBalance.issue(), lptAMMBalance * frac);
-    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. Because we are doing a two-asset withdrawal,
@@ -268,9 +272,9 @@ AMMClawback::equalWithdrawMatchingOneAmount(
     // tfee is actually not used, so pass tfee as 0.
     return AMMWithdraw::withdraw(
         sb,
+        ammSle,
         ammAccount,
         holder,
-        ammSle,
         amountBalance,
         amount,
         toSTAmount(amount2Balance.issue(), amount2Withdraw),

diff --git a/src/xrpld/app/tx/detail/AMMClawback.h b/src/xrpld/app/tx/detail/AMMClawback.h
@@ -66,6 +66,7 @@ class AMMClawback : public Transactor
         STAmount const& amountBalance,
         STAmount const& amount2Balance,
         STAmount const& lptAMMBalance,
+        STAmount const& holdLPtokens,
         STAmount const& amount);
 };
 

diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.cpp b/src/xrpld/app/tx/detail/AMMWithdraw.cpp
@@ -448,8 +448,8 @@ AMMWithdraw::doApply()
 std::pair<TER, STAmount>
 AMMWithdraw::withdraw(
     Sandbox& view,
-    AccountID const& ammAccount,
     SLE const& ammSle,
+    AccountID const& ammAccount,
     STAmount const& amountBalance,
     STAmount const& amountWithdraw,
     std::optional<STAmount> const& amount2Withdraw,
@@ -461,9 +461,9 @@ AMMWithdraw::withdraw(
     STAmount newLPTokenBalance;
     std::tie(ter, newLPTokenBalance, std::ignore, std::ignore) = withdraw(
         view,
+        ammSle,
         ammAccount,
         account_,
-        ammSle,
         amountBalance,
         amountWithdraw,
         amount2Withdraw,
@@ -479,9 +479,9 @@ AMMWithdraw::withdraw(
 std::tuple<TER, STAmount, STAmount, std::optional<STAmount>>
 AMMWithdraw::withdraw(
     Sandbox& view,
+    SLE const& ammSle,
     AccountID const& ammAccount,
     AccountID const& account,
-    SLE const& ammSle,
     STAmount const& amountBalance,
     STAmount const& amountWithdraw,
     std::optional<STAmount> const& amount2Withdraw,
@@ -734,9 +734,9 @@ AMMWithdraw::equalWithdrawTokens(
         {
             return withdraw(
                 view,
+                ammSle,
                 ammAccount,
                 account,
-                ammSle,
                 amountBalance,
                 amountBalance,
                 amount2Balance,
@@ -762,9 +762,9 @@ AMMWithdraw::equalWithdrawTokens(
 
         return withdraw(
             view,
+            ammSle,
             ammAccount,
             account,
-            ammSle,
             amountBalance,
             withdrawAmount,
             withdraw2Amount,
@@ -828,8 +828,8 @@ AMMWithdraw::equalWithdrawLimit(
     {
         return withdraw(
             view,
-            ammAccount,
             ammSle,
+            ammAccount,
             amountBalance,
             amount,
             toSTAmount(amount2.issue(), amount2Withdraw),
@@ -843,8 +843,8 @@ AMMWithdraw::equalWithdrawLimit(
     assert(amountWithdraw <= amount);
     return withdraw(
         view,
-        ammAccount,
         ammSle,
+        ammAccount,
         amountBalance,
         toSTAmount(amount.issue(), amountWithdraw),
         amount2,
@@ -874,8 +874,8 @@ AMMWithdraw::singleWithdraw(
 
     return withdraw(
         view,
-        ammAccount,
         ammSle,
+        ammAccount,
         amountBalance,
         amount,
         std::nullopt,
@@ -911,8 +911,8 @@ AMMWithdraw::singleWithdrawTokens(
     {
         return withdraw(
             view,
-            ammAccount,
             ammSle,
+            ammAccount,
             amountBalance,
             amountWithdraw,
             std::nullopt,
@@ -975,8 +975,8 @@ AMMWithdraw::singleWithdrawEPrice(
     {
         return withdraw(
             view,
-            ammAccount,
             ammSle,
+            ammAccount,
             amountBalance,
             amountWithdraw,
             std::nullopt,

diff --git a/src/xrpld/app/tx/detail/AMMWithdraw.h b/src/xrpld/app/tx/detail/AMMWithdraw.h
@@ -118,7 +118,8 @@ class AMMWithdraw : public Transactor
      * Return new total LPToken balance and the withdrawn amounts for both
      * assets.
      * @param view
-     * @param ammAccount
+     * @param ammSle AMM ledger entry
+     * @param ammAccount AMM account
      * @param amountBalance current LP asset1 balance
      * @param amountWithdraw asset1 withdraw amount
      * @param amount2Withdraw asset2 withdraw amount
@@ -131,9 +132,9 @@ class AMMWithdraw : public Transactor
     static std::tuple<TER, STAmount, STAmount, std::optional<STAmount>>
     withdraw(
         Sandbox& view,
+        SLE const& ammSle,
         AccountID const& ammAccount,
         AccountID const& account,
-        SLE const& ammSle,
         STAmount const& amountBalance,
         STAmount const& amountWithdraw,
         std::optional<STAmount> const& amount2Withdraw,
@@ -160,7 +161,8 @@ class AMMWithdraw : public Transactor
     /** Withdraw requested assets and token from AMM into LP account.
      * Return new total LPToken balance.
      * @param view
-     * @param ammAccount
+     * @param ammSle AMM ledger entry
+     * @param ammAccount AMM account
      * @param amountBalance current LP asset1 balance
      * @param amountWithdraw asset1 withdraw amount
      * @param amount2Withdraw asset2 withdraw amount
@@ -171,8 +173,8 @@ class AMMWithdraw : public Transactor
     std::pair<TER, STAmount>
     withdraw(
         Sandbox& view,
-        AccountID const& ammAccount,
         SLE const& ammSle,
+        AccountID const& ammAccount,
         STAmount const& amountBalance,
         STAmount const& amountWithdraw,
         std::optional<STAmount> const& amount2Withdraw,