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

package/dist/classes/action.js

@@ -180,7 +180,7 @@ class KaminoAction {
         axn.addRequestElevationIx(elevationGroup, 'setup');
         return axn;
     }
-    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositTxns(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, // to be requested *before* the deposit
     includeUserMetadata = true, // if true it includes user metadata
@@ -200,13 +200,8 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, undefined, overrideElevationGroupRequest);
-        if (useV2Ixs) {
-            axn.addDepositIxV2();
-        }
-        else {
-            axn.addDepositIx();
-        }
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable, undefined, overrideElevationGroupRequest);
+        axn.addDepositIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -238,7 +233,7 @@ class KaminoAction {
             feed: feed,
         }, tokens));
     }
-    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    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
     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
@@ -257,13 +252,8 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, undefined, overrideElevationGroupRequest);
-        if (useV2Ixs) {
-            axn.addBorrowIxV2();
-        }
-        else {
-            axn.addBorrowIx();
-        }
+        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable, undefined, overrideElevationGroupRequest);
+        axn.addBorrowIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -311,7 +301,7 @@ class KaminoAction {
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    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
     createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
@@ -329,17 +319,12 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable);
-        if (useV2Ixs) {
-            axn.addDepositObligationCollateralIxV2();
-        }
-        else {
-            axn.addDepositObligationCollateralIx();
-        }
+        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable);
+        axn.addDepositObligationCollateralIx();
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    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,
     createLookupTable = true, referrer = web3_js_1.PublicKey.default, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
@@ -360,18 +345,63 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, useV2Ixs, createLookupTable, twoTokenAction);
-        if (useV2Ixs) {
-            await axn.addDepositAndBorrowIxV2();
+        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 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);
         }
-        else {
-            await axn.addDepositAndBorrowIx();
+        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.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow, useV2Ixs);
-        axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+        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 buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    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' }) {
@@ -392,19 +422,14 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, useV2Ixs, createLookupTable, twoTokenAction);
+        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, false, createLookupTable, twoTokenAction);
         const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve, axn.outflowAmount);
-        if (useV2Ixs) {
-            await axn.addRepayAndWithdrawIxsV2(withdrawCollateralAmount);
-        }
-        else {
-            await axn.addRepayAndWithdrawIxs(withdrawCollateralAmount);
-        }
-        await axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw, useV2Ixs);
+        await axn.addRepayAndWithdrawIxs(withdrawCollateralAmount);
+        await axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildWithdrawTxns(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, // to be requested *after* the withdraw
     includeUserMetadata = true, // if true it includes user metadata
@@ -426,14 +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, useV2Ixs, createLookupTable, false, overrideElevationGroupRequest);
+        await axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable, false, overrideElevationGroupRequest);
         const collateralAmount = axn.getWithdrawCollateralAmount(axn.reserve, axn.amount);
-        if (useV2Ixs) {
-            await axn.addWithdrawIxV2(collateralAmount);
-        }
-        else {
-            await axn.addWithdrawIx(collateralAmount);
-        }
+        axn.addWithdrawIx(collateralAmount);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -452,7 +472,7 @@ class KaminoAction {
      * @param includeUserMetadata - if true it includes user metadata
      * @param referrer
      */
-    static async buildRepayTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, 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' }) {
+    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) {
@@ -467,17 +487,12 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable);
-        if (useV2Ixs) {
-            await axn.addRepayIxV2();
-        }
-        else {
-            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, useV2Ixs, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    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
     createLookupTable = true, referrer = web3_js_1.PublicKey.default, maxAllowedLtvOverridePercent = 0, currentSlot = 0, scopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }) {
@@ -496,13 +511,8 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable);
-        if (useV2Ixs) {
-            await axn.addLiquidateIxV2(maxAllowedLtvOverridePercent);
-        }
-        else {
-            await axn.addLiquidateIx(maxAllowedLtvOverridePercent);
-        }
+        await axn.addSupportIxs('liquidate', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, false, createLookupTable);
+        axn.addLiquidateIx(maxAllowedLtvOverridePercent);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -572,29 +582,31 @@ class KaminoAction {
             return '';
         return await sendTransaction(txn, this.kaminoMarket.getConnection());
     }
-    addDepositReserveLiquidityIx() {
-        this.lendingIxsLabels.push(`depositReserveLiquidity`);
-        this.lendingIxs.push((0, instructions_1.depositReserveLiquidity)({
+    addDepositIx() {
+        this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
+        this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateral)({
             liquidityAmount: this.amount,
         }, {
             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,
-            userDestinationCollateral: this.userCollateralAccountAddress,
+            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    addRedeemReserveCollateralIx() {
-        this.lendingIxsLabels.push(`redeemReserveCollateral`);
-        this.lendingIxs.push((0, instructions_1.redeemReserveCollateral)({
-            collateralAmount: this.amount,
+    addDepositReserveLiquidityIx() {
+        this.lendingIxsLabels.push(`depositReserveLiquidity`);
+        this.lendingIxs.push((0, instructions_1.depositReserveLiquidity)({
+            liquidityAmount: this.amount,
         }, {
             owner: this.owner,
             lendingMarket: this.kaminoMarket.getAddress(),
@@ -603,70 +615,32 @@ class KaminoAction {
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
-            userSourceCollateral: this.userCollateralAccountAddress,
-            userDestinationLiquidity: this.userTokenAccountAddress,
+            userSourceLiquidity: this.userTokenAccountAddress,
+            userDestinationCollateral: this.userCollateralAccountAddress,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    // @deprecated -- use addDepositIxV2 instead
-    addDepositIx() {
-        this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
-        this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateral)({
-            liquidityAmount: this.amount,
+    addRedeemReserveCollateralIx() {
+        this.lendingIxsLabels.push(`redeemReserveCollateral`);
+        this.lendingIxs.push((0, instructions_1.redeemReserveCollateral)({
+            collateralAmount: this.amount,
         }, {
             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,
+            userSourceCollateral: this.userCollateralAccountAddress,
+            userDestinationLiquidity: this.userTokenAccountAddress,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    addDepositIxV2() {
-        const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
-        this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateralV2`);
-        this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateralV2)({
-            liquidityAmount: this.amount,
-        }, {
-            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,
-            },
-            farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId));
-    }
-    /// @deprecated -- use addDepositObligationCollateralIxV2 instead
     addDepositObligationCollateralIx() {
         this.lendingIxsLabels.push(`depositObligationCollateral`);
         this.lendingIxs.push((0, instructions_1.depositObligationCollateral)({
@@ -682,36 +656,6 @@ class KaminoAction {
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    addDepositObligationCollateralIxV2() {
-        const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
-        this.lendingIxsLabels.push(`depositObligationCollateralV2`);
-        this.lendingIxs.push((0, instructions_1.depositObligationCollateralV2)({
-            collateralAmount: this.amount,
-        }, {
-            depositAccounts: {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                depositReserve: this.reserve.address,
-                reserveDestinationCollateral: this.reserve.state.collateral.supplyVault,
-                userSourceCollateral: this.userCollateralAccountAddress,
-                tokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-            farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId));
-    }
-    /// @deprecated -- use addDepositObligationCollateralIxV2 instead
     addBorrowIx() {
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
         const depositReservesList = this.getAdditionalDepositReservesList();
@@ -740,165 +684,7 @@ class KaminoAction {
                 : borrowIx.keys;
         this.lendingIxs.push(borrowIx);
     }
-    addBorrowIxV2() {
-        this.lendingIxsLabels.push(`borrowObligationLiquidityV2`);
-        const depositReservesList = this.getAdditionalDepositReservesList();
-        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        const farmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
-        const borrowIx = (0, instructions_1.borrowObligationLiquidityV2)({
-            liquidityAmount: this.amount,
-        }, {
-            borrowAccounts: {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                borrowReserve: this.reserve.address,
-                borrowReserveLiquidityMint: this.reserve.getLiquidityMint(),
-                reserveSourceLiquidity: this.reserve.state.liquidity.supplyVault,
-                userDestinationLiquidity: this.userTokenAccountAddress,
-                borrowReserveLiquidityFeeReceiver: this.reserve.state.liquidity.feeVault,
-                referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.reserve.address, this.kaminoMarket.programId)[0],
-                tokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId);
-        borrowIx.keys =
-            this.obligation.state.elevationGroup > 0 || this.obligation.refreshedStats.potentialElevationGroupUpdate > 0
-                ? borrowIx.keys.concat([...depositReserveAccountMetas])
-                : borrowIx.keys;
-        this.lendingIxs.push(borrowIx);
-    }
-    /// @deprecated -- use addWithdrawIxV2 instead
-    async addWithdrawIx(collateralAmount) {
-        this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
-        this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateral)({
-            collateralAmount,
-        }, {
-            owner: this.owner,
-            obligation: this.getObligationPda(),
-            lendingMarket: this.kaminoMarket.getAddress(),
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-            withdrawReserve: this.reserve.address,
-            reserveLiquidityMint: this.reserve.getLiquidityMint(),
-            reserveCollateralMint: this.reserve.getCTokenMint(),
-            reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
-            reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
-            userDestinationLiquidity: this.userTokenAccountAddress,
-            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-        }, this.kaminoMarket.programId));
-    }
-    async addWithdrawIxV2(collateralAmount) {
-        const farmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
-        this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateralV2`);
-        this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateralV2)({
-            collateralAmount,
-        }, {
-            withdrawAccounts: {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                withdrawReserve: this.reserve.address,
-                reserveLiquidityMint: this.reserve.getLiquidityMint(),
-                reserveCollateralMint: this.reserve.getCTokenMint(),
-                reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
-                reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
-                userDestinationLiquidity: this.userTokenAccountAddress,
-                placeholderUserDestinationCollateral: this.kaminoMarket.programId,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            farmsAccounts: farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId));
-    }
-    /// @deprecated -- use addRepayIxV2 instead
-    async addRepayIx() {
-        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
-        const depositReservesList = this.getAdditionalDepositReservesList();
-        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        const repayIx = (0, instructions_1.repayObligationLiquidity)({
-            liquidityAmount: this.amount,
-        }, {
-            owner: this.payer,
-            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,
-        }, this.kaminoMarket.programId);
-        repayIx.keys =
-            this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
-        this.lendingIxs.push(repayIx);
-    }
-    async addRepayIxV2() {
-        this.lendingIxsLabels.push(`repayObligationLiquidityV2(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
-        const depositReservesList = this.getAdditionalDepositReservesList();
-        const farmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
-        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        const repayIx = (0, instructions_1.repayObligationLiquidityV2)({
-            liquidityAmount: this.amount,
-        }, {
-            repayAccounts: {
-                owner: this.payer,
-                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,
-            },
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-            farmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId);
-        repayIx.keys =
-            this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
-        this.lendingIxs.push(repayIx);
-    }
-    async addDepositAndBorrowIx() {
+    addDepositAndBorrowIx() {
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
         this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateral)({
@@ -954,89 +740,7 @@ class KaminoAction {
         borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
         this.lendingIxs.push(borrowIx);
     }
-    async addDepositAndBorrowIxV2() {
-        const collateralFarmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmCollateral)[0],
-                reserveFarmState: this.reserve.state.farmCollateral,
-            };
-        this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateralV2`);
-        this.lendingIxsLabels.push(`borrowObligationLiquidityV2`);
-        this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateralV2)({
-            liquidityAmount: this.amount,
-        }, {
-            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,
-            },
-            farmsAccounts: collateralFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId));
-        if (!this.outflowReserve) {
-            throw new Error(`outflowReserve not set`);
-        }
-        if (!this.additionalTokenAccountAddress) {
-            throw new Error(`additionalTokenAccountAddress not set`);
-        }
-        if (!this.outflowAmount) {
-            throw new Error(`outflowAmount not set`);
-        }
-        const depositReservesList = this.getAdditionalDepositReservesList();
-        if (depositReservesList.length === 0) {
-            depositReservesList.push(this.reserve.address);
-        }
-        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        const debtFarmsAccounts = this.outflowReserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmDebt)[0],
-                reserveFarmState: this.outflowReserve.state.farmDebt,
-            };
-        const borrowIx = (0, instructions_1.borrowObligationLiquidityV2)({
-            liquidityAmount: this.outflowAmount,
-        }, {
-            borrowAccounts: {
-                owner: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                borrowReserve: this.outflowReserve.address,
-                borrowReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-                reserveSourceLiquidity: this.outflowReserve.state.liquidity.supplyVault,
-                userDestinationLiquidity: this.additionalTokenAccountAddress,
-                borrowReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-                referrerTokenState: (0, utils_1.referrerTokenStatePda)(this.referrer, this.outflowReserve.address, this.kaminoMarket.programId)[0],
-                tokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            farmsAccounts: debtFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId);
-        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();
@@ -1086,24 +790,45 @@ class KaminoAction {
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    async addRepayAndWithdrawIxsV2(withdrawCollateralAmount) {
-        this.lendingIxsLabels.push(`repayObligationLiquidityV2(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
-        this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateralV2`);
+    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: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
+                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.reserve.state.farmDebt, this.getObligationPda()),
                 reserveFarmState: this.reserve.state.farmDebt,
             };
-        const repayIx = (0, instructions_1.repayObligationLiquidityV2)({
-            liquidityAmount: this.amount,
+        const repayAndWithdrawIx = (0, instructions_1.repayAndWithdrawAndRedeem)({
+            repayAmount: this.amount,
+            withdrawCollateralAmount,
         }, {
             repayAccounts: {
                 owner: this.owner,
@@ -1116,33 +841,88 @@ class KaminoAction {
                 tokenProgram: this.reserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
-            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-            farmsAccounts: debtFarmsAccounts,
+            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);
-        repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
-        this.lendingIxs.push(repayIx);
+        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`);
         }
-        if (!this.outflowAmount) {
-            throw new Error(`outflowAmount not set`);
-        }
-        const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
+        const depositFarmsAccounts = this.reserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
             ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
+                obligationFarmUserState: this.kaminoMarket.programId,
+                reserveFarmState: this.kaminoMarket.programId,
             }
             : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmCollateral)[0],
+                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,
             };
-        this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateralV2)({
-            collateralAmount: withdrawCollateralAmount,
+        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(),
@@ -1159,11 +939,61 @@ class KaminoAction {
                 liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
                 instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
             },
-            farmsAccounts: collateralFarmsAccounts,
+            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,
+        }, {
+            owner: this.owner,
+            obligation: this.getObligationPda(),
+            lendingMarket: this.kaminoMarket.getAddress(),
+            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            withdrawReserve: this.reserve.address,
+            reserveLiquidityMint: this.reserve.getLiquidityMint(),
+            reserveCollateralMint: this.reserve.getCTokenMint(),
+            reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
+            reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
+            userDestinationLiquidity: this.userTokenAccountAddress,
+            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+            collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
+            liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+            instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    async addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
+    addRepayIx() {
+        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+        const depositReservesList = this.getAdditionalDepositReservesList();
+        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+            return { pubkey: reserve, isSigner: false, isWritable: true };
+        });
+        const repayIx = (0, instructions_1.repayObligationLiquidity)({
+            liquidityAmount: this.amount,
+        }, {
+            owner: this.payer,
+            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,
+        }, this.kaminoMarket.programId);
+        repayIx.keys =
+            this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
+        this.lendingIxs.push(repayIx);
+    }
+    addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
         this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
         if (!this.outflowReserve) {
             throw Error(`Withdraw reserve during liquidation is not defined`);
@@ -1208,76 +1038,8 @@ class KaminoAction {
                 : liquidateIx.keys;
         this.lendingIxs.push(liquidateIx);
     }
-    async addLiquidateIxV2(maxAllowedLtvOverridePercent = 0) {
-        this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateralV2`);
-        if (!this.outflowReserve) {
-            throw Error(`Withdraw reserve during liquidation is not defined`);
-        }
-        if (!this.additionalTokenAccountAddress) {
-            throw Error(`Liquidating token account address is not defined`);
-        }
-        const depositReservesList = this.getAdditionalDepositReservesList();
-        const depositReserveAccountMetas = depositReservesList.map((reserve) => {
-            return { pubkey: reserve, isSigner: false, isWritable: true };
-        });
-        const collateralFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.outflowReserve.state.farmCollateral)[0],
-                reserveFarmState: this.outflowReserve.state.farmCollateral,
-            };
-        const debtFarmsAccounts = this.reserve.state.farmDebt.equals(web3_js_1.PublicKey.default)
-            ? {
-                obligationFarmUserState: lib_1.PROGRAM_ID,
-                reserveFarmState: lib_1.PROGRAM_ID,
-            }
-            : {
-                obligationFarmUserState: (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), this.reserve.state.farmDebt)[0],
-                reserveFarmState: this.reserve.state.farmDebt,
-            };
-        const liquidateIx = (0, instructions_1.liquidateObligationAndRedeemReserveCollateralV2)({
-            liquidityAmount: this.amount,
-            // TODO: Configure this when updating liquidator with new interface
-            minAcceptableReceivedLiquidityAmount: this.outflowAmount || new bn_js_1.default(0),
-            maxAllowedLtvOverridePercent: new bn_js_1.default(maxAllowedLtvOverridePercent),
-        }, {
-            liquidationAccounts: {
-                liquidator: this.owner,
-                obligation: this.getObligationPda(),
-                lendingMarket: this.kaminoMarket.getAddress(),
-                lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
-                repayReserve: this.reserve.address,
-                repayReserveLiquidityMint: this.reserve.getLiquidityMint(),
-                repayReserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
-                withdrawReserve: this.outflowReserve.address,
-                withdrawReserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
-                withdrawReserveCollateralMint: this.outflowReserve.getCTokenMint(),
-                withdrawReserveCollateralSupply: this.outflowReserve.state.collateral.supplyVault,
-                withdrawReserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
-                userSourceLiquidity: this.additionalTokenAccountAddress,
-                userDestinationCollateral: this.userCollateralAccountAddress,
-                userDestinationLiquidity: this.userTokenAccountAddress,
-                withdrawReserveLiquidityFeeReceiver: this.outflowReserve.state.liquidity.feeVault,
-                collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
-                repayLiquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
-                withdrawLiquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
-                instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
-            },
-            debtFarmsAccounts,
-            collateralFarmsAccounts,
-            farmsProgram: farms_sdk_1.farmsId,
-        }, this.kaminoMarket.programId);
-        liquidateIx.keys =
-            this.obligation.state.elevationGroup > 0
-                ? liquidateIx.keys.concat([...depositReserveAccountMetas])
-                : liquidateIx.keys;
-        this.lendingIxs.push(liquidateIx);
-    }
-    async addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm, useV2Ixs) {
-        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, useV2Ixs, 'inBetween', requestElevationGroup, addInitObligationForFarm);
+    async addInBetweenIxs(action, includeAtaIxns, 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();
@@ -1303,6 +1065,7 @@ class KaminoAction {
             'repay',
             'depositAndBorrow',
             'repayAndWithdraw',
+            'repayAndWithdrawV2',
             'refreshObligation',
         ].includes(action)) {
             // The support ixns in order are:
@@ -1318,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) {
@@ -1366,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) {
@@ -1397,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`);
@@ -1541,7 +1310,7 @@ class KaminoAction {
             if (action === 'deposit' && this.outflowReserve) {
                 await this.addInitReferrerTokenStateIx(this.outflowReserve);
             }
-            await this.addInitObligationIxs();
+            this.addInitObligationIxs();
         }
         await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, useV2Ixs, 'setup', requestElevationGroup, addInitObligationForFarm, twoTokenAction, overrideElevationGroupRequest);
     }
@@ -1697,7 +1466,7 @@ class KaminoAction {
                 farms.push([
                     types_1.ReserveFarmKind.Collateral,
                     kaminoReserve.state.farmCollateral,
-                    (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), kaminoReserve.state.farmCollateral)[0],
+                    (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmCollateral, this.getObligationPda()),
                     kaminoReserve,
                 ]);
             }
@@ -1705,7 +1474,7 @@ class KaminoAction {
                 farms.push([
                     types_1.ReserveFarmKind.Debt,
                     kaminoReserve.state.farmDebt,
-                    (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), kaminoReserve.state.farmDebt)[0],
+                    (0, utils_1.obligationFarmStatePda)(kaminoReserve.state.farmDebt, this.getObligationPda()),
                     kaminoReserve,
                 ]);
             }
@@ -1755,17 +1524,17 @@ class KaminoAction {
     async addInitObligationForFarm(reserve, mode, addAsSupportIx = 'setup') {
         const farms = [];
         if (mode === types_1.ReserveFarmKind.Collateral && (0, utils_1.isNotNullPubkey)(reserve.state.farmCollateral)) {
-            const userPda = (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), reserve.state.farmCollateral)[0];
-            const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
+            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, userPda]);
+                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 userPda = (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), reserve.state.farmDebt)[0];
-            const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
+            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, userPda]);
+                farms.push([types_1.ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, pda]);
             }
         }
         farms.forEach((arg) => {
@@ -1794,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);
@@ -1936,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)
@@ -1962,6 +1730,7 @@ 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(spl_token_1.NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
         const transferLamportsIx = web3_js_1.SystemProgram.transfer({
@@ -2026,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;