@kamino-finance/klend-sdk 5.10.34 → 5.10.35-beta.1

package/dist/classes/action.js

@@ -143,9 +143,6 @@ class KaminoAction {
                 ...(action === 'deposit' ? [reserve] : []),
                 ...(action === 'depositAndBorrow' ? [outflowReserve] : []),
             ]).toArray().length;
-        if (distinctReserveCount > utils_1.POSITION_LIMIT) {
-            throw Error(`Obligation already has max number of positions: ${utils_1.POSITION_LIMIT}`);
-        }
         return {
             kaminoObligation,
             depositReserves,
@@ -187,7 +184,7 @@ class KaminoAction {
     includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, // to be requested *before* the deposit
     includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
     ) {
         const axn = await KaminoAction.initialize('deposit', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
@@ -203,7 +200,7 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, undefined, overrideElevationGroupRequest);
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable, undefined, overrideElevationGroupRequest);
         axn.addDepositIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
@@ -239,7 +236,7 @@ class KaminoAction {
     static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }, overrideElevationGroupRequest = undefined // if set, when an elevationgroup request is made, it will use this value
     ) {
         const axn = await KaminoAction.initialize('borrow', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
@@ -255,15 +252,14 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, undefined, overrideElevationGroupRequest);
+        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable, undefined, overrideElevationGroupRequest);
         axn.addBorrowIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
     static async buildDepositReserveLiquidityTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
         const axn = await KaminoAction.initialize('mint', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -278,15 +274,14 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('mint', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        await axn.addSupportIxs('mint', includeAtaIxns, requestElevationGroup, false, addInitObligationForFarm, false, false);
         axn.addDepositReserveLiquidityIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
     static async buildRedeemReserveCollateralTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas
-    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    requestElevationGroup = false, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
         const axn = await KaminoAction.initialize('redeem', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -301,7 +296,7 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('redeem', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        await axn.addSupportIxs('redeem', includeAtaIxns, requestElevationGroup, false, addInitObligationForFarm, false, false);
         axn.addRedeemReserveCollateralIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
@@ -309,7 +304,7 @@ class KaminoAction {
     static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas
     requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
         const axn = await KaminoAction.initialize('depositCollateral', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -324,7 +319,7 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
+        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable);
         axn.addDepositObligationCollateralIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
@@ -332,7 +327,7 @@ class KaminoAction {
     static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
         const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndBorrow', depositAmount, depositMint, borrowMint, payer, payer, obligation, borrowAmount, referrer, currentSlot);
         const addInitObligationForFarmForDeposit = true;
         const addInitObligationForFarmForBorrow = false;
@@ -350,16 +345,66 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, twoTokenAction);
-        await axn.addDepositAndBorrowIx();
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, false, createLookupTable, twoTokenAction);
+        axn.addDepositAndBorrowIx();
         await axn.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositAndWithdrawV2Txns(kaminoMarket, depositAmount, depositMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
     referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'depositAndWithdraw', depositAmount, depositMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        const twoTokenAction = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+            axn.outflowReserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('depositAndWithdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, true, twoTokenAction);
+        const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
+        axn.addDepositAndWithdrawV2Ixs(withdrawCollateralAmount);
+        return axn;
+    }
+    static async buildRepayAndWithdrawV2Txns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+        const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdrawV2', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
+        const addInitObligationForFarm = true;
+        const twoTokenAction = true;
+        if (extraComputeBudget > 0) {
+            axn.addComputeBudgetIxn(extraComputeBudget);
+        }
+        const allReserves = new utils_1.PublicKeySet([
+            ...axn.depositReserves,
+            ...axn.borrowReserves,
+            axn.reserve.address,
+            axn.outflowReserve.address,
+        ]).toArray();
+        const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+        if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+            await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+        }
+        await axn.addSupportIxs('repayAndWithdrawV2', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, true, createLookupTable, twoTokenAction);
+        const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
+        axn.addRepayAndWithdrawV2Ixs(withdrawCollateralAmount);
+        return axn;
+    }
+    static async buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata,
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
         const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'repayAndWithdraw', repayAmount, repayMint, withdrawMint, payer, payer, obligation, withdrawAmount, referrer, currentSlot);
         const addInitObligationForFarmForRepay = true;
         const addInitObligationForFarmForWithdraw = false;
@@ -377,7 +422,7 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, twoTokenAction);
+        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, false, createLookupTable, twoTokenAction);
         const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
         await axn.addRepayAndWithdrawIxs(withdrawCollateralAmount);
         await axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw);
@@ -388,7 +433,7 @@ class KaminoAction {
     includeAtaIxns = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup = false, // to be requested *after* the withdraw
     includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = undefined, overrideElevationGroupRequest, 
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = undefined, overrideElevationGroupRequest, 
     // Optional customizations which may be needed if the obligation was mutated by some previous ixn.
     obligationCustomizations) {
         const axn = await KaminoAction.initialize('withdraw', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot);
@@ -406,9 +451,9 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, overrideElevationGroupRequest);
+        await axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable, false, overrideElevationGroupRequest);
         const collateralAmount = axn.getWithdrawCollateralAmount(axn.reserve, axn.amount);
-        await axn.addWithdrawIx(collateralAmount);
+        axn.addWithdrawIx(collateralAmount);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -427,7 +472,7 @@ class KaminoAction {
      * @param includeUserMetadata - if true it includes user metadata
      * @param referrer
      */
-    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, currentSlot, payer = undefined, extraComputeBudget = 1_000_000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, currentSlot, payer = undefined, extraComputeBudget = 1_000_000, includeAtaIxns = true, requestElevationGroup = false, includeUserMetadata = true, createLookupTable = true, referrer = web3_js_1.PublicKey.default, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
         const axn = await KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, payer);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -442,15 +487,15 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-        await axn.addRepayIx();
+        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable);
+        axn.addRepayIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
     static async buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
     requestElevationGroup = false, includeUserMetadata = true, // if true it includes user metadata
-    referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
+    createLookupTable = true, referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
         const axn = await KaminoAction.initializeMultiTokenAction(kaminoMarket, 'liquidate', amount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, minCollateralReceiveAmount, referrer, currentSlot);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -466,8 +511,8 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-        await axn.addLiquidateIx(maxAllowedLtvOverridePercent);
+        await axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable);
+        axn.addLiquidateIx(maxAllowedLtvOverridePercent);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -639,7 +684,7 @@ class KaminoAction {
                 : borrowIx.keys;
         this.lendingIxs.push(borrowIx);
     }
-    async addDepositAndBorrowIx() {
+    addDepositAndBorrowIx() {
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
         this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateral)({
@@ -695,7 +740,7 @@ class KaminoAction {
         borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
         this.lendingIxs.push(borrowIx);
     }
-    async addRepayAndWithdrawIxs(withdrawCollateralAmount) {
+    addRepayAndWithdrawIxs(withdrawCollateralAmount) {
         this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
         this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
         const depositReservesList = this.getAdditionalDepositReservesList();
@@ -745,7 +790,166 @@ class KaminoAction {
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    async addWithdrawIx(withdrawCollateralAmount) {
+    addRepayAndWithdrawV2Ixs(withdrawCollateralAmount) {
+        this.lendingIxsLabels.push(`repayAndWithdrawAndRedeem(repayReserve=${this.reserve.address})(withdrawReserve=${this.outflowReserve.address})(obligation=${this.getObligationPda()})`);
+        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
+        });
+        const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
+        });
+        if (!this.outflowAmount) {
+            throw new Error(`outflowAmount not set`);
+        }
+        if (!this.outflowReserve) {
+            throw new Error(`outflowReserve not set`);
+        }
+        if (!this.additionalTokenAccountAddress) {
+            throw new Error(`additionalTokenAccountAddress not set`);
+        }
+        const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
+            ? {
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
+            }
+            : {
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
+                reserveFarmState: this.outflowReserve.state.farmCollateral,
+            };
+        const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
+            ? {
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
+            }
+            : {
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
+                reserveFarmState: this.reserve.state.farmDebt,
+            };
+        const repayAndWithdrawIx = (0, instructions_1.repayAndWithdrawAndRedeem)({
+            repayAmount: this.amount,
+            withdrawCollateralAmount,
+        }, {
+            repayAccounts: {
+                owner: this.owner,
+                obligation: this.getObligationPda(),
+                lendingMarket: this.kaminoMarket.getAddress(),
+                repayReserve: this.reserve.address,
+                reserveLiquidityMint: this.reserve.getLiquidityMint(),
+                userSourceLiquidity: this.userTokenAccountAddress,
+                reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
+                tokenProgram: this.reserve.getLiquidityTokenProgram(),
+                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            withdrawAccounts: {
+                owner: this.owner,
+                obligation: this.getObligationPda(),
+                lendingMarket: this.kaminoMarket.getAddress(),
+                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                withdrawReserve: this.outflowReserve.address,
+                reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
+                reserveCollateralMint: this.outflowReserve.getCTokenMint(),
+                reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
+                reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
+                userDestinationLiquidity: this.additionalTokenAccountAddress,
+                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
+                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            collateralFarmsAccounts,
+            debtFarmsAccounts,
+            farmsProgram: farms_sdk_1.farmsId,
+        }, this.kaminoMarket.programId);
+        repayAndWithdrawIx.keys = repayAndWithdrawIx.keys.concat([
+            ...depositReserveAccountMetas,
+            ...borrowReserveAccountMetas,
+        ]);
+        this.lendingIxs.push(repayAndWithdrawIx);
+    }
+    addDepositAndWithdrawV2Ixs(withdrawCollateralAmount) {
+        this.lendingIxsLabels.push(`depositAndWithdrawV2(depositReserve=${this.reserve.address})(withdrawReserve=${this.outflowReserve.address})(obligation=${this.getObligationPda()})`);
+        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
+        });
+        const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
+        });
+        if (!this.outflowAmount) {
+            throw new Error(`outflowAmount not set`);
+        }
+        if (!this.outflowReserve) {
+            throw new Error(`outflowReserve not set`);
+        }
+        if (!this.additionalTokenAccountAddress) {
+            throw new Error(`additionalTokenAccountAddress not set`);
+        }
+        const depositFarmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
+            ? {
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
+            }
+            : {
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
+                reserveFarmState: this.reserve.state.farmCollateral,
+            };
+        const withdrawFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
+            ? {
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
+            }
+            : {
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.outflowReserve.state.farmCollateral, this.getObligationPda()),
+                reserveFarmState: this.outflowReserve.state.farmCollateral,
+            };
+        const depositAndWithdrawIx = (0, instructions_1.depositAndWithdraw)({
+            liquidityAmount: this.amount,
+            withdrawCollateralAmount,
+        }, {
+            depositAccounts: {
+                owner: this.owner,
+                obligation: this.getObligationPda(),
+                lendingMarket: this.kaminoMarket.getAddress(),
+                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                reserve: this.reserve.address,
+                reserveLiquidityMint: this.reserve.getLiquidityMint(),
+                reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
+                reserveCollateralMint: this.reserve.getCTokenMint(),
+                reserveDestinationDepositCollateral: this.reserve.state.collateral.supplyVault, // destinationCollateral
+                userSourceLiquidity: this.userTokenAccountAddress,
+                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            withdrawAccounts: {
+                owner: this.owner,
+                obligation: this.getObligationPda(),
+                lendingMarket: this.kaminoMarket.getAddress(),
+                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+                withdrawReserve: this.outflowReserve.address,
+                reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
+                reserveCollateralMint: this.outflowReserve.getCTokenMint(),
+                reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
+                reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
+                userDestinationLiquidity: this.additionalTokenAccountAddress,
+                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+                liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
+                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
+            },
+            depositFarmsAccounts,
+            withdrawFarmsAccounts,
+            farmsProgram: farms_sdk_1.farmsId,
+        }, this.kaminoMarket.programId);
+        depositAndWithdrawIx.keys = depositAndWithdrawIx.keys.concat([
+            ...depositReserveAccountMetas,
+            ...borrowReserveAccountMetas,
+        ]);
+        this.lendingIxs.push(depositAndWithdrawIx);
+    }
+    addWithdrawIx(withdrawCollateralAmount) {
         this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
         this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateral)({
             collateralAmount: withdrawCollateralAmount,
@@ -766,7 +970,7 @@ class KaminoAction {
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    async addRepayIx() {
+    addRepayIx() {
         this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -789,7 +993,7 @@ class KaminoAction {
             this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
         this.lendingIxs.push(repayIx);
     }
-    async addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
+    addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
         this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
         if (!this.outflowReserve) {
             throw Error(`Withdraw reserve during liquidation is not defined`);
@@ -835,7 +1039,7 @@ class KaminoAction {
         this.lendingIxs.push(liquidateIx);
     }
     async addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm) {
-        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'inBetween', requestElevationGroup, addInitObligationForFarm);
+        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, false, 'inBetween', requestElevationGroup, addInitObligationForFarm);
     }
     addRefreshObligation(crank) {
         const uniqueReserveAddresses = new utils_1.PublicKeySet(this.depositReserves.concat(this.borrowReserves)).toArray();
@@ -847,7 +1051,7 @@ class KaminoAction {
         this.addRefreshFarmsForReserve(this.borrowReserves.map((r) => this.kaminoMarket.getReserveByAddress(r)), addAllToSetupIxns, types_1.ReserveFarmKind.Debt, crank);
         this.addRefreshObligationIx(addAllToSetupIxns);
     }
-    async addSupportIxsWithoutInitObligation(action, includeAtaIxns, addAsSupportIx = 'setup', requestElevationGroup = false, addInitObligationForFarm = false, twoTokenAction = false, overrideElevationGroupRequest) {
+    async addSupportIxsWithoutInitObligation(action, includeAtaIxns, useV2Ixs, addAsSupportIx = 'setup', requestElevationGroup = false, addInitObligationForFarm = false, twoTokenAction = false, overrideElevationGroupRequest) {
         // TODO: why are we not doing this first?
         if (includeAtaIxns) {
             await this.addAtaIxs(action);
@@ -861,6 +1065,7 @@ class KaminoAction {
             'repay',
             'depositAndBorrow',
             'repayAndWithdraw',
+            'repayAndWithdrawV2',
             'refreshObligation',
         ].includes(action)) {
             // The support ixns in order are:
@@ -876,11 +1081,14 @@ class KaminoAction {
             // 7. Ixn to refresh the `debt` farm of the obligation
             // 8. Ixn to refresh the `collateral` farm of the obligation
             let currentReserves = [];
-            if (action === 'liquidate' || action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
+            if (action === 'liquidate' ||
+                action === 'depositAndBorrow' ||
+                action === 'repayAndWithdraw' ||
+                action === 'repayAndWithdrawV2') {
                 if (!this.outflowReserve) {
                     throw new Error('outflowReserve is undefined');
                 }
-                if (action === 'depositAndBorrow' || action === 'repayAndWithdraw') {
+                if (action === 'depositAndBorrow' || action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2') {
                     currentReserves = [this.reserve, this.outflowReserve];
                     if (action === 'depositAndBorrow') {
                         if (this.obligation) {
@@ -924,7 +1132,10 @@ class KaminoAction {
                         await this.addInitObligationForFarm(this.outflowReserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                     }
                 }
-                else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
+                else if (action === 'repayAndWithdraw' ||
+                    action === 'borrow' ||
+                    action === 'repay' ||
+                    action === 'repayAndWithdrawV2') {
                     // todo - probably don't need to add both debt and collateral for everything here
                     await this.addInitObligationForFarm(this.reserve, types_1.ReserveFarmKind.Debt, addAsSupportIx);
                     if (this.outflowReserve) {
@@ -955,7 +1166,7 @@ class KaminoAction {
                 this.addRefreshObligationIx(addAsSupportIx);
             }
             if (requestElevationGroup) {
-                if (action === 'repay') {
+                if (action === 'repay' || action === 'repayAndWithdrawV2') {
                     const repayObligationLiquidity = this.obligation.borrows.get(this.reserve.address);
                     if (!repayObligationLiquidity) {
                         throw new Error(`Could not find debt reserve ${this.reserve.address} in obligation`);
@@ -1041,47 +1252,56 @@ class KaminoAction {
                     this.addRequestElevationIx(overrideElevationGroupRequest, 'cleanup', skipReserveIfClosing);
                 }
             }
-            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);
+            if (!useV2Ixs) {
+                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 {
-                    throw new Error(`Could not decide on refresh farm for action ${action}`);
+                    // 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}`);
+                    }
                 }
             }
         }
     }
-    async addSupportIxs(action, includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, twoTokenAction = false, overrideElevationGroupRequest) {
+    async addSupportIxs(action, includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, twoTokenAction = false, overrideElevationGroupRequest) {
         if (!['mint', 'redeem'].includes(action)) {
             const [, ownerUserMetadata] = await this.kaminoMarket.getUserMetadata(this.owner);
             if (!ownerUserMetadata && includeUserMetadata) {
-                await this.addInitUserMetadataIxs();
+                let lookupTable = web3_js_1.PublicKey.default;
+                if (createLookupTable) {
+                    const [createLutIx, lookupTableAddress] = await (0, utils_1.createLookupTableIx)(this.kaminoMarket.getConnection(), this.owner);
+                    lookupTable = lookupTableAddress;
+                    this.setupIxs.push(createLutIx);
+                    this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress.toString()}]`);
+                }
+                this.addInitUserMetadataIxs(lookupTable);
             }
             if (['borrow', 'withdrawReferrerFees'].includes(action)) {
                 await this.addInitReferrerTokenStateIx(this.reserve);
@@ -1090,9 +1310,9 @@ class KaminoAction {
             if (action === 'deposit' && this.outflowReserve) {
                 await this.addInitReferrerTokenStateIx(this.outflowReserve);
             }
-            await this.addInitObligationIxs();
+            this.addInitObligationIxs();
         }
-        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'setup', requestElevationGroup, addInitObligationForFarm, twoTokenAction, overrideElevationGroupRequest);
+        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, useV2Ixs, 'setup', requestElevationGroup, addInitObligationForFarm, twoTokenAction, overrideElevationGroupRequest);
     }
     static optionalAccount(pubkey, programId = lib_1.PROGRAM_ID) {
         if ((0, utils_1.isNotNullPubkey)(pubkey)) {
@@ -1240,15 +1460,13 @@ class KaminoAction {
         }
     }
     addRefreshFarmsForReserve(reserves, addAsSupportIx = 'setup', mode, crank = this.payer, twoTokenAction = false) {
-        const BASE_SEED_USER_STATE = Buffer.from('user');
-        const getPda = (farm) => web3_js_1.PublicKey.findProgramAddressSync([BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()], farms_sdk_1.farmsId)[0];
         const farms = [];
         for (const kaminoReserve of reserves) {
             if (mode === types_1.ReserveFarmKind.Collateral && !kaminoReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)) {
                 farms.push([
                     types_1.ReserveFarmKind.Collateral,
                     kaminoReserve.state.farmCollateral,
-                    getPda(kaminoReserve.state.farmCollateral),
+                    (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmCollateral, this.getObligationPda()),
                     kaminoReserve,
                 ]);
             }
@@ -1256,7 +1474,7 @@ class KaminoAction {
                 farms.push([
                     types_1.ReserveFarmKind.Debt,
                     kaminoReserve.state.farmDebt,
-                    getPda(kaminoReserve.state.farmDebt),
+                    (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmDebt, this.getObligationPda()),
                     kaminoReserve,
                 ]);
             }
@@ -1304,21 +1522,19 @@ class KaminoAction {
         this.cleanupIxsLabels.splice(0, 0, ...this.refreshFarmsCleanupTxnIxsLabels);
     }
     async addInitObligationForFarm(reserve, mode, addAsSupportIx = 'setup') {
-        const BASE_SEED_USER_STATE = Buffer.from('user');
-        const getPda = (farm) => web3_js_1.PublicKey.findProgramAddressSync([BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()], farms_sdk_1.farmsId)[0];
         const farms = [];
         if (mode === types_1.ReserveFarmKind.Collateral && (0, utils_1.isNotNullPubkey)(reserve.state.farmCollateral)) {
-            const pda = getPda(reserve.state.farmCollateral);
+            const pda = (0, utils_1.obligationFarmStatePda)(reserve.state.farmCollateral, this.getObligationPda());
             const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
             if (!account) {
                 farms.push([types_1.ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, pda]);
             }
         }
         if (mode === types_1.ReserveFarmKind.Debt && (0, utils_1.isNotNullPubkey)(reserve.state.farmDebt)) {
-            const pda = getPda(reserve.state.farmDebt);
+            const pda = (0, utils_1.obligationFarmStatePda)(reserve.state.farmDebt, this.getObligationPda());
             const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
             if (!account) {
-                farms.push([types_1.ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, getPda(reserve.state.farmDebt)]);
+                farms.push([types_1.ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, pda]);
             }
         }
         farms.forEach((arg) => {
@@ -1347,7 +1563,7 @@ class KaminoAction {
             }
         });
     }
-    async addInitObligationIxs() {
+    addInitObligationIxs() {
         if (!this.obligation) {
             const obligationPda = this.getObligationPda();
             const [userMetadataAddress, _bump] = (0, utils_1.userMetadataPda)(this.owner, this.kaminoMarket.programId);
@@ -1371,10 +1587,7 @@ class KaminoAction {
             this.setupIxsLabels.push(`InitObligation[${obligationPda.toString()}]`);
         }
     }
-    async addInitUserMetadataIxs() {
-        const [createLutIx, lookupTableAddress] = await (0, utils_1.createLookupTableIx)(this.kaminoMarket.getConnection(), this.owner);
-        this.setupIxs.push(createLutIx);
-        this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress.toString()}]`);
+    addInitUserMetadataIxs(lookupTableAddress) {
         const [userMetadataAddress, _bump] = (0, utils_1.userMetadataPda)(this.owner, this.kaminoMarket.programId);
         const referrerUserMetadataAddress = this.referrer.equals(web3_js_1.PublicKey.default)
             ? this.kaminoMarket.programId
@@ -1433,48 +1646,29 @@ class KaminoAction {
         this.computeBudgetIxsLabels.push(`AddComputeBudget[${units}]`);
     }
     async addAtaIxs(action) {
-        if (this.mint.equals(utils_1.WRAPPED_SOL_MINT) || this.secondaryMint?.equals(utils_1.WRAPPED_SOL_MINT)) {
+        if (this.mint.equals(spl_token_1.NATIVE_MINT) || this.secondaryMint?.equals(spl_token_1.NATIVE_MINT)) {
             await this.updateWSOLAccount(action);
         }
-        if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
+        if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(spl_token_1.NATIVE_MINT)) {
             const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.reserve.getLiquidityMint(), this.owner, this.reserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
-            if (this.positions === utils_1.POSITION_LIMIT) {
-                this.preTxnIxs.push(createUserTokenAccountIx);
-                this.preTxnIxsLabels.push(`CreateLiquidityUserAta[${this.owner}]`);
-            }
-            else {
-                this.setupIxs.unshift(createUserTokenAccountIx);
-                this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${this.owner}]`);
-            }
+            this.setupIxs.unshift(createUserTokenAccountIx);
+            this.setupIxsLabels.unshift(`CreateLiquidityUserAta[${this.owner}]`);
         }
         if (action === 'liquidate') {
             if (!this.outflowReserve) {
                 throw new Error(`Outflow reserve state not found ${this.mint}`);
             }
             const [, createUserTokenAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getLiquidityMint(), this.owner, this.outflowReserve.getLiquidityTokenProgram(), this.userTokenAccountAddress);
-            if (this.positions === utils_1.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
-                this.preTxnIxs.push(createUserTokenAccountIx);
-                this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
-            }
-            else {
-                this.setupIxs.unshift(createUserTokenAccountIx);
-                this.setupIxsLabels.unshift(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
-            }
+            this.setupIxs.unshift(createUserTokenAccountIx);
+            this.setupIxsLabels.unshift(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
             const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, this.outflowReserve.getCTokenMint(), this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
-            if (this.positions === utils_1.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
-                this.preTxnIxs.push(createUserCollateralAccountIx);
-                this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-            }
-            else {
-                this.setupIxs.unshift(createUserCollateralAccountIx);
-                this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-            }
+            this.setupIxs.unshift(createUserCollateralAccountIx);
+            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
             if (!this.additionalTokenAccountAddress) {
                 throw new Error(`Additional token account address not found ${this.mint}`);
             }
         }
-        if (action === 'depositAndBorrow' ||
-            (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(utils_1.WRAPPED_SOL_MINT))) {
+        if (action === 'depositAndBorrow' || (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(spl_token_1.NATIVE_MINT))) {
             if (!this.additionalTokenAccountAddress) {
                 throw new Error(`Additional token account address not found ${this.secondaryMint}`);
             }
@@ -1498,14 +1692,8 @@ class KaminoAction {
         if (action === 'mint') {
             const collateralMintPubkey = this.reserve.getCTokenMint();
             const [, createUserCollateralAccountIx] = (0, utils_1.createAssociatedTokenAccountIdempotentInstruction)(this.owner, collateralMintPubkey, this.owner, spl_token_1.TOKEN_PROGRAM_ID, this.userCollateralAccountAddress);
-            if (this.positions === utils_1.POSITION_LIMIT && this.mint.equals(utils_1.WRAPPED_SOL_MINT)) {
-                this.preTxnIxs.push(createUserCollateralAccountIx);
-                this.preTxnIxsLabels.push(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-            }
-            else {
-                this.setupIxs.unshift(createUserCollateralAccountIx);
-                this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
-            }
+            this.setupIxs.unshift(createUserCollateralAccountIx);
+            this.setupIxsLabels.unshift(`CreateCollateralUserAta[${this.userCollateralAccountAddress.toString()}]`);
         }
     }
     async updateWSOLAccount(action) {
@@ -1517,14 +1705,13 @@ class KaminoAction {
             return;
         }
         let safeRepay = new bn_js_1.default(this.amount);
-        if (this.obligation && action === 'repay' && this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))) {
+        if (this.obligation && (action === 'repay' || action === 'repayAndWithdrawV2') && this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))) {
             const borrow = this.obligation.state.borrows.find((borrow) => borrow.borrowReserve.toString() === this.reserve.address.toString());
             if (!borrow) {
                 throw Error(`Unable to find obligation borrow to repay for ${this.obligation.state.owner.toBase58()}`);
             }
             const cumulativeBorrowRateObligation = obligation_1.KaminoObligation.getCumulativeBorrowRate(borrow);
             const cumulativeBorrowRateReserve = this.reserve.getEstimatedCumulativeBorrowRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
-            // TODO: shouldn't this calc be added to all other stuff as well?
             safeRepay = new bn_js_1.default(Math.floor(obligation_1.KaminoObligation.getBorrowAmount(borrow)
                 .mul(cumulativeBorrowRateReserve)
                 .div(cumulativeBorrowRateObligation)
@@ -1532,7 +1719,7 @@ class KaminoAction {
                 .toNumber()).toString());
         }
         let userTokenAccountAddress = this.userTokenAccountAddress;
-        if (this.secondaryMint?.equals(utils_1.WRAPPED_SOL_MINT)) {
+        if (this.secondaryMint?.equals(spl_token_1.NATIVE_MINT)) {
             if (!this.additionalTokenAccountAddress) {
                 throw new Error(`Additional token account address not found ${this.secondaryMint}`);
             }
@@ -1543,8 +1730,9 @@ class KaminoAction {
         // Add rent exemption lamports for WSOL accounts that need to be pre-funded for inflow/send transactions
         const sendAction = action === 'deposit' ||
             action === 'repay' ||
+            action === 'repayAndWithdrawV2' ||
             action === 'mint' ||
-            (action === 'liquidate' && this.secondaryMint?.equals(utils_1.WRAPPED_SOL_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
+            (action === 'liquidate' && this.secondaryMint?.equals(spl_token_1.NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
         const transferLamportsIx = web3_js_1.SystemProgram.transfer({
             fromPubkey: this.owner,
             toPubkey: userTokenAccountAddress,
@@ -1573,14 +1761,6 @@ class KaminoAction {
             postIxs.push(closeWSOLAccountIx);
             postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
         }
-        // TODO: Consider for liquidations and other types of actions if we have to split up some ixs in 2-3 txs
-        // if (this.positions && this.positions >= POSITION_LIMIT) {
-        //   this.preTxnIxs.push(...preIxs);
-        //   this.preTxnIxsLabels.push(...preIxsLabels);
-        //   this.postTxnIxs.push(...postIxs);
-        //   this.postTxnIxsLabels.push(...postIxsLabels);
-        // } else {
-        // }
         this.setupIxs.unshift(...preIxs);
         this.setupIxsLabels.unshift(...preIxsLabels);
         this.cleanupIxs.push(...postIxs);
@@ -1615,7 +1795,7 @@ class KaminoAction {
             primaryMint = inflowTokenMint;
             secondaryMint = outflowTokenMint;
         }
-        else if (action === 'repayAndWithdraw') {
+        else if (action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2') {
             primaryMint = inflowTokenMint;
             secondaryMint = outflowTokenMint;
             userTokenAccountAddress = userInflowTokenAccountAddress;