@kamino-finance/klend-sdk 3.2.3 → 3.2.4

package/dist/classes/action.js

@@ -997,40 +997,6 @@ class KaminoAction {
                 else {
                     this.addRefreshObligationIx(addAsSupportIx, false);
                 }
-                if (addAsSupportIx === 'setup') {
-                    // If this is an setup ixn (therefore not an in-between), it means it's either a one off action
-                    // or the first of a two-token-action
-                    if (action === 'liquidate') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
-                        this.addRefreshFarmsForReserve([this.reserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
-                    }
-                    else if (action === 'depositAndBorrow' ||
-                        action === 'depositCollateral' ||
-                        action === 'withdraw' ||
-                        action === 'deposit') {
-                        this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Collateral, undefined, twoTokenAction);
-                    }
-                    else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
-                        this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Debt, undefined, twoTokenAction);
-                    }
-                    else {
-                        throw new Error(`Could not decide on refresh farm for action ${action}`);
-                    }
-                }
-                else {
-                    // If this is an inbetween, it means it's part of a two-token-action
-                    // so we skip the refresh farm obligation of the first reserve as that operation already happened
-                    // add added to 'setup' ixns
-                    if (action === 'depositAndBorrow') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
-                    }
-                    else if (action === 'repayAndWithdraw') {
-                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
-                    }
-                    else {
-                        throw new Error(`Could not decide on refresh farm for action ${action}`);
-                    }
-                }
                 if (action === 'repay' && requestElevationGroup) {
                     const repayObligationLiquidity = this.obligation.borrows.get(this.reserve.address);
                     if (!repayObligationLiquidity) {
@@ -1084,6 +1050,40 @@ class KaminoAction {
                         }
                     }
                 }
+                if (addAsSupportIx === 'setup') {
+                    // If this is an setup ixn (therefore not an in-between), it means it's either a one off action
+                    // or the first of a two-token-action
+                    if (action === 'liquidate') {
+                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
+                        this.addRefreshFarmsForReserve([this.reserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
+                    }
+                    else if (action === 'depositAndBorrow' ||
+                        action === 'depositCollateral' ||
+                        action === 'withdraw' ||
+                        action === 'deposit') {
+                        this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Collateral, undefined, twoTokenAction);
+                    }
+                    else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
+                        this.addRefreshFarmsForReserve(currentReserves, addAsSupportIx, types_1.ReserveFarmKind.Debt, undefined, twoTokenAction);
+                    }
+                    else {
+                        throw new Error(`Could not decide on refresh farm for action ${action}`);
+                    }
+                }
+                else {
+                    // If this is an inbetween, it means it's part of a two-token-action
+                    // so we skip the refresh farm obligation of the first reserve as that operation already happened
+                    // add added to 'setup' ixns
+                    if (action === 'depositAndBorrow') {
+                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Debt);
+                    }
+                    else if (action === 'repayAndWithdraw') {
+                        this.addRefreshFarmsForReserve([this.outflowReserve], addAsSupportIx, types_1.ReserveFarmKind.Collateral);
+                    }
+                    else {
+                        throw new Error(`Could not decide on refresh farm for action ${action}`);
+                    }
+                }
             }
         });
     }