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

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,
@@ -183,11 +180,11 @@ class KaminoAction {
         axn.addRequestElevationIx(elevationGroup, 'setup');
         return axn;
     }
-    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, 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
-    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,8 +200,13 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, undefined, overrideElevationGroupRequest);
-        axn.addDepositIx();
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, undefined, overrideElevationGroupRequest);
+        if (useV2Ixs) {
+            axn.addDepositIxV2();
+        }
+        else {
+            axn.addDepositIx();
+        }
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -236,10 +238,10 @@ class KaminoAction {
             feed: feed,
         }, tokens));
     }
-    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildBorrowTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, 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 +257,19 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, undefined, overrideElevationGroupRequest);
-        axn.addBorrowIx();
+        await axn.addSupportIxs('borrow', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, undefined, overrideElevationGroupRequest);
+        if (useV2Ixs) {
+            axn.addBorrowIxV2();
+        }
+        else {
+            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 +284,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,15 +306,15 @@ 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;
     }
-    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositObligationCollateralTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, 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,15 +329,20 @@ class KaminoAction {
         if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
             await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
         }
-        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm);
-        axn.addDepositObligationCollateralIx();
+        await axn.addSupportIxs('depositCollateral', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable);
+        if (useV2Ixs) {
+            axn.addDepositObligationCollateralIxV2();
+        }
+        else {
+            axn.addDepositObligationCollateralIx();
+        }
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildDepositAndBorrowTxns(kaminoMarket, depositAmount, depositMint, borrowAmount, borrowMint, payer, obligation, useV2Ixs, 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 +360,21 @@ 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.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow);
+        await axn.addSupportIxs('deposit', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForDeposit, useV2Ixs, createLookupTable, twoTokenAction);
+        if (useV2Ixs) {
+            await axn.addDepositAndBorrowIxV2();
+        }
+        else {
+            await axn.addDepositAndBorrowIx();
+        }
+        await axn.addInBetweenIxs('depositAndBorrow', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForBorrow, useV2Ixs);
         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 buildRepayAndWithdrawTxns(kaminoMarket, repayAmount, repayMint, withdrawAmount, withdrawMint, payer, currentSlot, obligation, useV2Ixs, 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' }) {
+    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,17 +392,23 @@ 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.addRepayAndWithdrawIxs();
-        await axn.addInBetweenIxs('repayAndWithdraw', includeAtaIxns, requestElevationGroup, addInitObligationForFarmForWithdraw);
+        await axn.addSupportIxs('repay', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarmForRepay, useV2Ixs, 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);
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
-    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, extraComputeBudget = 1_000_000, // if > 0 then adds the ixn
+    static async buildWithdrawTxns(kaminoMarket, amount, mint, owner, obligation, useV2Ixs, 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
-    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);
@@ -405,8 +426,14 @@ 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.addWithdrawIx();
+        await axn.addSupportIxs('withdraw', includeAtaIxns, requestElevationGroup, includeUserMetadata, addInitObligationForFarm, useV2Ixs, createLookupTable, false, overrideElevationGroupRequest);
+        const collateralAmount = axn.getWithdrawCollateralAmount(axn.reserve, axn.amount);
+        if (useV2Ixs) {
+            await axn.addWithdrawIxV2(collateralAmount);
+        }
+        else {
+            await axn.addWithdrawIx(collateralAmount);
+        }
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -425,7 +452,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, 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' }) {
         const axn = await KaminoAction.initialize('repay', amount, mint, owner, kaminoMarket, obligation, referrer, currentSlot, payer);
         const addInitObligationForFarm = true;
         if (extraComputeBudget > 0) {
@@ -440,15 +467,20 @@ 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, useV2Ixs, createLookupTable);
+        if (useV2Ixs) {
+            await axn.addRepayIxV2();
+        }
+        else {
+            await 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
+    static async buildLiquidateTxns(kaminoMarket, amount, minCollateralReceiveAmount, repayTokenMint, withdrawTokenMint, liquidator, obligationOwner, obligation, useV2Ixs, 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) {
@@ -464,8 +496,13 @@ 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, useV2Ixs, createLookupTable);
+        if (useV2Ixs) {
+            await axn.addLiquidateIxV2(maxAllowedLtvOverridePercent);
+        }
+        else {
+            await axn.addLiquidateIx(maxAllowedLtvOverridePercent);
+        }
         axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
         return axn;
     }
@@ -535,31 +572,29 @@ class KaminoAction {
             return '';
         return await sendTransaction(txn, this.kaminoMarket.getConnection());
     }
-    addDepositIx() {
-        this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
-        this.lendingIxs.push((0, instructions_1.depositReserveLiquidityAndObligationCollateral)({
+    addDepositReserveLiquidityIx() {
+        this.lendingIxsLabels.push(`depositReserveLiquidity`);
+        this.lendingIxs.push((0, instructions_1.depositReserveLiquidity)({
             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,
-            placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+            userDestinationCollateral: this.userCollateralAccountAddress,
             collateralTokenProgram: spl_token_1.TOKEN_PROGRAM_ID,
             liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    addDepositReserveLiquidityIx() {
-        this.lendingIxsLabels.push(`depositReserveLiquidity`);
-        this.lendingIxs.push((0, instructions_1.depositReserveLiquidity)({
-            liquidityAmount: this.amount,
+    addRedeemReserveCollateralIx() {
+        this.lendingIxsLabels.push(`redeemReserveCollateral`);
+        this.lendingIxs.push((0, instructions_1.redeemReserveCollateral)({
+            collateralAmount: this.amount,
         }, {
             owner: this.owner,
             lendingMarket: this.kaminoMarket.getAddress(),
@@ -568,32 +603,70 @@ class KaminoAction {
             reserveLiquidityMint: this.reserve.getLiquidityMint(),
             reserveLiquiditySupply: this.reserve.state.liquidity.supplyVault,
             reserveCollateralMint: this.reserve.getCTokenMint(),
-            userSourceLiquidity: this.userTokenAccountAddress,
-            userDestinationCollateral: this.userCollateralAccountAddress,
+            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));
     }
-    addRedeemReserveCollateralIx() {
-        this.lendingIxsLabels.push(`redeemReserveCollateral`);
-        this.lendingIxs.push((0, instructions_1.redeemReserveCollateral)({
-            collateralAmount: this.amount,
+    // @deprecated -- use addDepositIxV2 instead
+    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(),
-            userSourceCollateral: this.userCollateralAccountAddress,
-            userDestinationLiquidity: this.userTokenAccountAddress,
+            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,
         }, 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)({
@@ -609,6 +682,36 @@ 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();
@@ -637,6 +740,164 @@ 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() {
         this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
         this.lendingIxsLabels.push(`borrowObligationLiquidity`);
@@ -693,7 +954,89 @@ class KaminoAction {
         borrowIx.keys = borrowIx.keys.concat([...depositReserveAccountMetas]);
         this.lendingIxs.push(borrowIx);
     }
-    async addRepayAndWithdrawIxs() {
+    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) {
         this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
         this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
         const depositReservesList = this.getAdditionalDepositReservesList();
@@ -724,11 +1067,8 @@ class KaminoAction {
         if (!this.outflowAmount) {
             throw new Error(`outflowAmount not set`);
         }
-        const collateralExchangeRate = this.outflowReserve.getEstimatedCollateralExchangeRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
         this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateral)({
-            collateralAmount: this.outflowAmount.eq(new bn_js_1.default(utils_1.U64_MAX))
-                ? this.outflowAmount
-                : new bn_js_1.default(new decimal_js_1.default(this.outflowAmount.toString()).mul(collateralExchangeRate).ceil().toString()),
+            collateralAmount: withdrawCollateralAmount,
         }, {
             owner: this.owner,
             obligation: this.getObligationPda(),
@@ -746,53 +1086,82 @@ class KaminoAction {
             instructionSysvarAccount: web3_js_1.SYSVAR_INSTRUCTIONS_PUBKEY,
         }, this.kaminoMarket.programId));
     }
-    async addWithdrawIx() {
-        const collateralExchangeRate = this.reserve.getEstimatedCollateralExchangeRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
-        const collateralAmount = this.amount.eq(new bn_js_1.default(utils_1.U64_MAX))
-            ? this.amount
-            : new bn_js_1.default(new decimal_js_1.default(this.amount.toString()).mul(collateralExchangeRate).ceil().toString());
-        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 addRepayIx() {
-        this.lendingIxsLabels.push(`repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+    async addRepayAndWithdrawIxsV2(withdrawCollateralAmount) {
+        this.lendingIxsLabels.push(`repayObligationLiquidityV2(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`);
+        this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateralV2`);
         const depositReservesList = this.getAdditionalDepositReservesList();
         const depositReserveAccountMetas = depositReservesList.map((reserve) => {
             return { pubkey: reserve, isSigner: false, isWritable: true };
         });
-        const repayIx = (0, instructions_1.repayObligationLiquidity)({
+        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 repayIx = (0, instructions_1.repayObligationLiquidityV2)({
             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,
+            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,
+            },
+            lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+            farmsAccounts: debtFarmsAccounts,
+            farmsProgram: farms_sdk_1.farmsId,
         }, this.kaminoMarket.programId);
-        repayIx.keys =
-            this.obligation.state.elevationGroup > 0 ? repayIx.keys.concat([...depositReserveAccountMetas]) : repayIx.keys;
+        repayIx.keys = repayIx.keys.concat([...depositReserveAccountMetas]);
         this.lendingIxs.push(repayIx);
+        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)
+            ? {
+                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,
+            };
+        this.lendingIxs.push((0, instructions_1.withdrawObligationCollateralAndRedeemReserveCollateralV2)({
+            collateralAmount: withdrawCollateralAmount,
+        }, {
+            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,
+            },
+            farmsAccounts: collateralFarmsAccounts,
+            farmsProgram: farms_sdk_1.farmsId,
+        }, this.kaminoMarket.programId));
     }
     async addLiquidateIx(maxAllowedLtvOverridePercent = 0) {
         this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
@@ -839,8 +1208,76 @@ class KaminoAction {
                 : liquidateIx.keys;
         this.lendingIxs.push(liquidateIx);
     }
-    async addInBetweenIxs(action, includeAtaIxns, requestElevationGroup, addInitObligationForFarm) {
-        await this.addSupportIxsWithoutInitObligation(action, includeAtaIxns, 'inBetween', requestElevationGroup, addInitObligationForFarm);
+    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);
     }
     addRefreshObligation(crank) {
         const uniqueReserveAddresses = new utils_1.PublicKeySet(this.depositReserves.concat(this.borrowReserves)).toArray();
@@ -852,7 +1289,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);
@@ -1046,47 +1483,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);
@@ -1097,7 +1543,7 @@ class KaminoAction {
             }
             await 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)) {
@@ -1245,15 +1691,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)(this.getObligationPda(), kaminoReserve.state.farmCollateral)[0],
                     kaminoReserve,
                 ]);
             }
@@ -1261,7 +1705,7 @@ class KaminoAction {
                 farms.push([
                     types_1.ReserveFarmKind.Debt,
                     kaminoReserve.state.farmDebt,
-                    getPda(kaminoReserve.state.farmDebt),
+                    (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), kaminoReserve.state.farmDebt)[0],
                     kaminoReserve,
                 ]);
             }
@@ -1309,21 +1753,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 account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
+            const userPda = (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), reserve.state.farmCollateral)[0];
+            const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
             if (!account) {
-                farms.push([types_1.ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, pda]);
+                farms.push([types_1.ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, userPda]);
             }
         }
         if (mode === types_1.ReserveFarmKind.Debt && (0, utils_1.isNotNullPubkey)(reserve.state.farmDebt)) {
-            const pda = getPda(reserve.state.farmDebt);
-            const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
+            const userPda = (0, utils_1.obligationFarmStatePda)(this.getObligationPda(), reserve.state.farmDebt)[0];
+            const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
             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, userPda]);
             }
         }
         farms.forEach((arg) => {
@@ -1376,10 +1818,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
@@ -1438,48 +1877,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}`);
             }
@@ -1503,14 +1923,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) {
@@ -1537,7 +1951,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}`);
             }
@@ -1549,7 +1963,7 @@ class KaminoAction {
         const sendAction = action === 'deposit' ||
             action === 'repay' ||
             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,
@@ -1578,14 +1992,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);
@@ -1649,6 +2055,12 @@ class KaminoAction {
             createAtaIxs: [createAtaIx],
         };
     }
+    getWithdrawCollateralAmount(reserve, amount) {
+        const collateralExchangeRate = reserve.getEstimatedCollateralExchangeRate(this.currentSlot, this.kaminoMarket.state.referralFeeBps);
+        return amount.eq(new bn_js_1.default(utils_1.U64_MAX))
+            ? amount
+            : new bn_js_1.default(new decimal_js_1.default(amount.toString()).mul(collateralExchangeRate).ceil().toString());
+    }
     getObligationPda() {
         return this.obligation
             ? this.obligation.obligationAddress