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

package/src/classes/action.ts

@@ -21,6 +21,7 @@ import BN from 'bn.js';
 import Decimal from 'decimal.js';
 import {
   borrowObligationLiquidity,
+  depositAndWithdraw,
   depositObligationCollateral,
   depositReserveLiquidity,
   depositReserveLiquidityAndObligationCollateral,
@@ -37,6 +38,7 @@ import {
   RefreshObligationFarmsForReserveAccounts,
   RefreshObligationFarmsForReserveArgs,
   refreshReserve,
+  repayAndWithdrawAndRedeem,
   repayObligationLiquidity,
   requestElevationGroup,
   RequestElevationGroupAccounts,
@@ -54,11 +56,10 @@ import {
   createLookupTableIx,
   isNotNullPubkey,
   PublicKeySet,
-  WRAPPED_SOL_MINT,
   getAssociatedTokenAddress,
   ScopeRefresh,
   createAtasIdempotent,
-  POSITION_LIMIT,
+  obligationFarmStatePda,
 } from '../utils';
 import { KaminoMarket } from './market';
 import { KaminoObligation } from './obligation';
@@ -85,7 +86,9 @@ export type ActionType =
   | 'repayAndWithdraw'
   | 'refreshObligation'
   | 'requestElevationGroup'
-  | 'withdrawReferrerFees';
+  | 'withdrawReferrerFees'
+  | 'repayAndWithdrawV2'
+  | 'depositAndWithdraw';
 
 export type AuxiliaryIx = 'setup' | 'inBetween' | 'cleanup';
 
@@ -322,10 +325,6 @@ export class KaminoAction {
         ...(action === 'depositAndBorrow' ? [outflowReserve!] : []),
       ]).toArray().length;
 
-    if (distinctReserveCount > POSITION_LIMIT) {
-      throw Error(`Obligation already has max number of positions: ${POSITION_LIMIT}`);
-    }
-
     return {
       kaminoObligation,
       depositReserves,
@@ -413,6 +412,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false, // to be requested *before* the deposit
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' },
@@ -450,6 +450,8 @@ export class KaminoAction {
       requestElevationGroup,
       includeUserMetadata,
       addInitObligationForFarm,
+      false,
+      createLookupTable,
       undefined,
       overrideElevationGroupRequest
     );
@@ -507,6 +509,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' },
@@ -544,6 +547,8 @@ export class KaminoAction {
       requestElevationGroup,
       includeUserMetadata,
       addInitObligationForFarm,
+      false,
+      createLookupTable,
       undefined,
       overrideElevationGroupRequest
     );
@@ -562,7 +567,6 @@ export class KaminoAction {
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
-    includeUserMetadata: boolean = true, // if true it includes user metadata
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
@@ -598,8 +602,10 @@ export class KaminoAction {
       'mint',
       includeAtaIxns,
       requestElevationGroup,
-      includeUserMetadata,
-      addInitObligationForFarm
+      false,
+      addInitObligationForFarm,
+      false,
+      false
     );
     axn.addDepositReserveLiquidityIx();
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -615,7 +621,6 @@ export class KaminoAction {
     extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
-    includeUserMetadata: boolean = true, // if true it includes user metadata,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
@@ -651,8 +656,10 @@ export class KaminoAction {
       'redeem',
       includeAtaIxns,
       requestElevationGroup,
-      includeUserMetadata,
-      addInitObligationForFarm
+      false,
+      addInitObligationForFarm,
+      false,
+      false
     );
     axn.addRedeemReserveCollateralIx();
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -669,6 +676,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
@@ -705,7 +713,9 @@ export class KaminoAction {
       includeAtaIxns,
       requestElevationGroup,
       includeUserMetadata,
-      addInitObligationForFarm
+      addInitObligationForFarm,
+      false,
+      createLookupTable
     );
     axn.addDepositObligationCollateralIx();
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
@@ -724,6 +734,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata,
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
@@ -767,9 +778,11 @@ export class KaminoAction {
       requestElevationGroup,
       includeUserMetadata,
       addInitObligationForFarmForDeposit,
+      false,
+      createLookupTable,
       twoTokenAction
     );
-    await axn.addDepositAndBorrowIx();
+    axn.addDepositAndBorrowIx();
     await axn.addInBetweenIxs(
       'depositAndBorrow',
       includeAtaIxns,
@@ -780,6 +793,132 @@ export class KaminoAction {
     return axn;
   }
 
+  static async buildDepositAndWithdrawV2Txns(
+    kaminoMarket: KaminoMarket,
+    depositAmount: string | BN,
+    depositMint: PublicKey,
+    withdrawAmount: string | BN,
+    withdrawMint: PublicKey,
+    payer: PublicKey,
+    currentSlot: number,
+    obligation: KaminoObligation | ObligationType,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup: boolean = false,
+    includeUserMetadata: boolean = true, // if true it includes user metadata,
+    referrer: PublicKey = PublicKey.default,
+    scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
+  ) {
+    const axn = await KaminoAction.initializeMultiTokenAction(
+      kaminoMarket,
+      'depositAndWithdraw',
+      depositAmount,
+      depositMint,
+      withdrawMint,
+      payer,
+      payer,
+      obligation,
+      withdrawAmount,
+      referrer,
+      currentSlot
+    );
+    const addInitObligationForFarm = true;
+    const twoTokenAction = true;
+    if (extraComputeBudget > 0) {
+      axn.addComputeBudgetIxn(extraComputeBudget);
+    }
+
+    const allReserves = new PublicKeySet<PublicKey>([
+      ...axn.depositReserves,
+      ...axn.borrowReserves,
+      axn.reserve.address,
+      axn.outflowReserve!.address,
+    ]).toArray();
+    const tokenIds = axn.getTokenIdsForScopeRefresh(kaminoMarket, allReserves);
+
+    if (tokenIds.length > 0 && scopeRefresh.includeScopeRefresh) {
+      await axn.addScopeRefreshIxs(tokenIds, scopeRefresh.scopeFeed);
+    }
+
+    await axn.addSupportIxs(
+      'depositAndWithdraw',
+      includeAtaIxns,
+      requestElevationGroup,
+      includeUserMetadata,
+      addInitObligationForFarm,
+      true,
+      twoTokenAction
+    );
+    const withdrawCollateralAmount = axn.getWithdrawCollateralAmount(axn.outflowReserve!, axn.outflowAmount!);
+    axn.addDepositAndWithdrawV2Ixs(withdrawCollateralAmount);
+
+    return axn;
+  }
+
+  static async buildRepayAndWithdrawV2Txns(
+    kaminoMarket: KaminoMarket,
+    repayAmount: string | BN,
+    repayMint: PublicKey,
+    withdrawAmount: string | BN,
+    withdrawMint: PublicKey,
+    payer: PublicKey,
+    currentSlot: number,
+    obligation: KaminoObligation | ObligationType,
+    extraComputeBudget: number = 1_000_000, // if > 0 then adds the ixn
+    includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
+    requestElevationGroup: boolean = false,
+    includeUserMetadata: boolean = true, // if true it includes user metadata,
+    createLookupTable: boolean = true,
+    referrer: PublicKey = PublicKey.default,
+    scopeRefresh: 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 PublicKeySet<PublicKey>([
+      ...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: KaminoMarket,
     repayAmount: string | BN,
@@ -793,6 +932,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata,
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
@@ -834,6 +974,8 @@ export class KaminoAction {
       requestElevationGroup,
       includeUserMetadata,
       addInitObligationForFarmForRepay,
+      false,
+      createLookupTable,
       twoTokenAction
     );
 
@@ -860,6 +1002,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas,
     requestElevationGroup: boolean = false, // to be requested *after* the withdraw
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     currentSlot: number = 0,
     scopeRefresh: ScopeRefresh | undefined = undefined,
@@ -906,12 +1049,14 @@ export class KaminoAction {
       includeUserMetadata,
       addInitObligationForFarm,
       false,
+      createLookupTable,
+      false,
       overrideElevationGroupRequest
     );
 
     const collateralAmount = axn.getWithdrawCollateralAmount(axn.reserve, axn.amount);
 
-    await axn.addWithdrawIx(collateralAmount);
+    axn.addWithdrawIx(collateralAmount);
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
 
     return axn;
@@ -944,6 +1089,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true,
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true,
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     scopeRefresh: ScopeRefresh = { includeScopeRefresh: false, scopeFeed: 'hubble' }
   ) {
@@ -980,9 +1126,11 @@ export class KaminoAction {
       includeAtaIxns,
       requestElevationGroup,
       includeUserMetadata,
-      addInitObligationForFarm
+      addInitObligationForFarm,
+      false,
+      createLookupTable
     );
-    await axn.addRepayIx();
+    axn.addRepayIx();
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
 
     return axn;
@@ -1001,6 +1149,7 @@ export class KaminoAction {
     includeAtaIxns: boolean = true, // if true it includes create and close wsol and token atas, and creates all other token atas if they don't exist
     requestElevationGroup: boolean = false,
     includeUserMetadata: boolean = true, // if true it includes user metadata
+    createLookupTable: boolean = true,
     referrer: PublicKey = PublicKey.default,
     maxAllowedLtvOverridePercent: number = 0,
     currentSlot: number = 0,
@@ -1042,9 +1191,11 @@ export class KaminoAction {
       includeAtaIxns,
       requestElevationGroup,
       includeUserMetadata,
-      addInitObligationForFarm
+      addInitObligationForFarm,
+      false,
+      createLookupTable
     );
-    await axn.addLiquidateIx(maxAllowedLtvOverridePercent);
+    axn.addLiquidateIx(maxAllowedLtvOverridePercent);
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
 
     return axn;
@@ -1308,7 +1459,7 @@ export class KaminoAction {
     this.lendingIxs.push(borrowIx);
   }
 
-  async addDepositAndBorrowIx() {
+  addDepositAndBorrowIx() {
     this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
     this.lendingIxsLabels.push(`borrowObligationLiquidity`);
     this.lendingIxs.push(
@@ -1386,7 +1537,7 @@ export class KaminoAction {
     this.lendingIxs.push(borrowIx);
   }
 
-  async addRepayAndWithdrawIxs(withdrawCollateralAmount: BN) {
+  addRepayAndWithdrawIxs(withdrawCollateralAmount: BN) {
     this.lendingIxsLabels.push(
       `repayObligationLiquidity(reserve=${this.reserve!.address})(obligation=${this.getObligationPda()})`
     );
@@ -1456,7 +1607,209 @@ export class KaminoAction {
     );
   }
 
-  async addWithdrawIx(withdrawCollateralAmount: BN) {
+  addRepayAndWithdrawV2Ixs(withdrawCollateralAmount: BN) {
+    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(PublicKey.default)
+      ? {
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
+        }
+      : {
+          obligationFarmUserState: obligationFarmStatePda(
+            this.outflowReserve.state.farmCollateral,
+            this.getObligationPda()
+          ),
+          reserveFarmState: this.outflowReserve.state.farmCollateral,
+        };
+
+    const debtFarmsAccounts = this.reserve.state.farmDebt.equals(PublicKey.default)
+      ? {
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
+        }
+      : {
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
+          reserveFarmState: this.reserve.state.farmDebt,
+        };
+
+    const repayAndWithdrawIx = repayAndWithdrawAndRedeem(
+      {
+        repayAmount: this.amount,
+        withdrawCollateralAmount,
+      },
+      {
+        repayAccounts: {
+          owner: this.owner,
+          obligation: this.getObligationPda(),
+          lendingMarket: this.kaminoMarket.getAddress(),
+          repayReserve: this.reserve!.address,
+          reserveLiquidityMint: this.reserve.getLiquidityMint(),
+          userSourceLiquidity: this.userTokenAccountAddress,
+          reserveDestinationLiquidity: this.reserve.state.liquidity.supplyVault,
+          tokenProgram: this.reserve.getLiquidityTokenProgram(),
+          instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
+        },
+        withdrawAccounts: {
+          owner: this.owner,
+          obligation: this.getObligationPda(),
+          lendingMarket: this.kaminoMarket.getAddress(),
+          lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+          withdrawReserve: this.outflowReserve.address,
+          reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
+          reserveCollateralMint: this.outflowReserve.getCTokenMint(),
+          reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
+          reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
+          userDestinationLiquidity: this.additionalTokenAccountAddress,
+          placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+          collateralTokenProgram: TOKEN_PROGRAM_ID,
+          liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
+          instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
+        },
+        collateralFarmsAccounts,
+        debtFarmsAccounts,
+        farmsProgram: farmsId,
+      },
+      this.kaminoMarket.programId
+    );
+
+    repayAndWithdrawIx.keys = repayAndWithdrawIx.keys.concat([
+      ...depositReserveAccountMetas,
+      ...borrowReserveAccountMetas,
+    ]);
+
+    this.lendingIxs.push(repayAndWithdrawIx);
+  }
+
+  addDepositAndWithdrawV2Ixs(withdrawCollateralAmount: BN) {
+    this.lendingIxsLabels.push(
+      `depositAndWithdrawV2(depositReserve=${this.reserve!.address})(withdrawReserve=${
+        this.outflowReserve!.address
+      })(obligation=${this.getObligationPda()})`
+    );
+
+    const depositReservesList = this.getAdditionalDepositReservesList();
+
+    const depositReserveAccountMetas = depositReservesList.map((reserve) => {
+      return { pubkey: reserve, isSigner: false, isWritable: true };
+    });
+    const borrowReserveAccountMetas = this.borrowReserves.map((reserve) => {
+      return { pubkey: reserve, isSigner: false, isWritable: true };
+    });
+
+    if (!this.outflowAmount) {
+      throw new Error(`outflowAmount not set`);
+    }
+
+    if (!this.outflowReserve) {
+      throw new Error(`outflowReserve not set`);
+    }
+
+    if (!this.additionalTokenAccountAddress) {
+      throw new Error(`additionalTokenAccountAddress not set`);
+    }
+
+    const depositFarmsAccounts = this.reserve.state.farmCollateral.equals(PublicKey.default)
+      ? {
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
+        }
+      : {
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
+          reserveFarmState: this.reserve.state.farmCollateral,
+        };
+    const withdrawFarmsAccounts = this.outflowReserve.state.farmCollateral.equals(PublicKey.default)
+      ? {
+          obligationFarmUserState: this.kaminoMarket.programId,
+          reserveFarmState: this.kaminoMarket.programId,
+        }
+      : {
+          obligationFarmUserState: obligationFarmStatePda(
+            this.outflowReserve.state.farmCollateral,
+            this.getObligationPda()
+          ),
+          reserveFarmState: this.outflowReserve.state.farmCollateral,
+        };
+
+    const depositAndWithdrawIx = 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: TOKEN_PROGRAM_ID,
+          liquidityTokenProgram: this.reserve.getLiquidityTokenProgram(),
+          instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
+        },
+        withdrawAccounts: {
+          owner: this.owner,
+          obligation: this.getObligationPda(),
+          lendingMarket: this.kaminoMarket.getAddress(),
+          lendingMarketAuthority: this.kaminoMarket.getLendingMarketAuthority(),
+          withdrawReserve: this.outflowReserve.address,
+          reserveLiquidityMint: this.outflowReserve.getLiquidityMint(),
+          reserveCollateralMint: this.outflowReserve.getCTokenMint(),
+          reserveLiquiditySupply: this.outflowReserve.state.liquidity.supplyVault,
+          reserveSourceCollateral: this.outflowReserve.state.collateral.supplyVault,
+          userDestinationLiquidity: this.additionalTokenAccountAddress,
+          placeholderUserDestinationCollateral: this.kaminoMarket.programId,
+          collateralTokenProgram: TOKEN_PROGRAM_ID,
+          liquidityTokenProgram: this.outflowReserve.getLiquidityTokenProgram(),
+          instructionSysvarAccount: SYSVAR_INSTRUCTIONS_PUBKEY,
+        },
+        depositFarmsAccounts,
+        withdrawFarmsAccounts,
+        farmsProgram: farmsId,
+      },
+      this.kaminoMarket.programId
+    );
+
+    depositAndWithdrawIx.keys = depositAndWithdrawIx.keys.concat([
+      ...depositReserveAccountMetas,
+      ...borrowReserveAccountMetas,
+    ]);
+
+    this.lendingIxs.push(depositAndWithdrawIx);
+  }
+
+  addWithdrawIx(withdrawCollateralAmount: BN) {
     this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
     this.lendingIxs.push(
       withdrawObligationCollateralAndRedeemReserveCollateral(
@@ -1484,7 +1837,7 @@ export class KaminoAction {
     );
   }
 
-  async addRepayIx() {
+  addRepayIx() {
     this.lendingIxsLabels.push(
       `repayObligationLiquidity(reserve=${this.reserve.address})(obligation=${this.getObligationPda()})`
     );
@@ -1519,7 +1872,7 @@ export class KaminoAction {
     this.lendingIxs.push(repayIx);
   }
 
-  async addLiquidateIx(maxAllowedLtvOverridePercent: number = 0) {
+  addLiquidateIx(maxAllowedLtvOverridePercent: number = 0) {
     this.lendingIxsLabels.push(`liquidateObligationAndRedeemReserveCollateral`);
     if (!this.outflowReserve) {
       throw Error(`Withdraw reserve during liquidation is not defined`);
@@ -1580,6 +1933,7 @@ export class KaminoAction {
     await this.addSupportIxsWithoutInitObligation(
       action,
       includeAtaIxns,
+      false,
       'inBetween',
       requestElevationGroup,
       addInitObligationForFarm
@@ -1612,6 +1966,7 @@ export class KaminoAction {
   async addSupportIxsWithoutInitObligation(
     action: ActionType,
     includeAtaIxns: boolean,
+    useV2Ixs: boolean,
     addAsSupportIx: AuxiliaryIx = 'setup',
     requestElevationGroup: boolean = false,
     addInitObligationForFarm: boolean = false,
@@ -1633,6 +1988,7 @@ export class KaminoAction {
         'repay',
         'depositAndBorrow',
         'repayAndWithdraw',
+        'repayAndWithdrawV2',
         'refreshObligation',
       ].includes(action)
     ) {
@@ -1651,12 +2007,17 @@ export class KaminoAction {
 
       let currentReserves: KaminoReserve[] = [];
 
-      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) {
@@ -1701,7 +2062,12 @@ export class KaminoAction {
           if (this.outflowReserve) {
             await this.addInitObligationForFarm(this.outflowReserve, 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, ReserveFarmKind.Debt, addAsSupportIx);
           if (this.outflowReserve) {
@@ -1732,7 +2098,7 @@ export class KaminoAction {
       }
 
       if (requestElevationGroup) {
-        if (action === 'repay') {
+        if (action === 'repay' || action === 'repayAndWithdrawV2') {
           const repayObligationLiquidity = this.obligation!.borrows.get(this.reserve.address);
 
           if (!repayObligationLiquidity) {
@@ -1840,46 +2206,48 @@ export class KaminoAction {
         }
       }
 
-      if (addAsSupportIx === 'setup') {
-        // If this is an setup ixn (therefore not an in-between), it means it's either a one off action
-        // or the first of a two-token-action
-        if (action === 'liquidate') {
-          this.addRefreshFarmsForReserve([this.outflowReserve!], addAsSupportIx, ReserveFarmKind.Collateral);
-          this.addRefreshFarmsForReserve([this.reserve], addAsSupportIx, ReserveFarmKind.Debt);
-        } else if (
-          action === 'depositAndBorrow' ||
-          action === 'depositCollateral' ||
-          action === 'withdraw' ||
-          action === 'deposit'
-        ) {
-          this.addRefreshFarmsForReserve(
-            currentReserves,
-            addAsSupportIx,
-            ReserveFarmKind.Collateral,
-            undefined,
-            twoTokenAction
-          );
-        } else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
-          this.addRefreshFarmsForReserve(
-            currentReserves,
-            addAsSupportIx,
-            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, ReserveFarmKind.Debt);
-        } else if (action === 'repayAndWithdraw') {
-          this.addRefreshFarmsForReserve([this.outflowReserve!], addAsSupportIx, 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, ReserveFarmKind.Collateral);
+            this.addRefreshFarmsForReserve([this.reserve], addAsSupportIx, ReserveFarmKind.Debt);
+          } else if (
+            action === 'depositAndBorrow' ||
+            action === 'depositCollateral' ||
+            action === 'withdraw' ||
+            action === 'deposit'
+          ) {
+            this.addRefreshFarmsForReserve(
+              currentReserves,
+              addAsSupportIx,
+              ReserveFarmKind.Collateral,
+              undefined,
+              twoTokenAction
+            );
+          } else if (action === 'repayAndWithdraw' || action === 'borrow' || action === 'repay') {
+            this.addRefreshFarmsForReserve(
+              currentReserves,
+              addAsSupportIx,
+              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, ReserveFarmKind.Debt);
+          } else if (action === 'repayAndWithdraw') {
+            this.addRefreshFarmsForReserve([this.outflowReserve!], addAsSupportIx, ReserveFarmKind.Collateral);
+          } else {
+            throw new Error(`Could not decide on refresh farm for action ${action}`);
+          }
         }
       }
     }
@@ -1891,13 +2259,25 @@ export class KaminoAction {
     requestElevationGroup: boolean,
     includeUserMetadata: boolean,
     addInitObligationForFarm: boolean,
+    useV2Ixs: boolean,
+    createLookupTable: boolean,
     twoTokenAction: boolean = false,
     overrideElevationGroupRequest?: number
   ) {
     if (!['mint', 'redeem'].includes(action)) {
       const [, ownerUserMetadata] = await this.kaminoMarket.getUserMetadata(this.owner);
       if (!ownerUserMetadata && includeUserMetadata) {
-        await this.addInitUserMetadataIxs();
+        let lookupTable: PublicKey = PublicKey.default;
+        if (createLookupTable) {
+          const [createLutIx, lookupTableAddress] = await 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)) {
@@ -1907,12 +2287,13 @@ export 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,
@@ -2126,13 +2507,6 @@ export class KaminoAction {
     crank: PublicKey = this.payer,
     twoTokenAction: boolean = false
   ) {
-    const BASE_SEED_USER_STATE = Buffer.from('user');
-    const getPda = (farm: PublicKey) =>
-      PublicKey.findProgramAddressSync(
-        [BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()],
-        farmsId
-      )[0];
-
     const farms: [
       typeof ReserveFarmKind.Collateral | typeof ReserveFarmKind.Debt,
       PublicKey,
@@ -2145,7 +2519,7 @@ export class KaminoAction {
         farms.push([
           ReserveFarmKind.Collateral,
           kaminoReserve.state.farmCollateral,
-          getPda(kaminoReserve.state.farmCollateral),
+          obligationFarmStatePda(kaminoReserve.state.farmCollateral, this.getObligationPda()),
           kaminoReserve,
         ]);
       }
@@ -2153,7 +2527,7 @@ export class KaminoAction {
         farms.push([
           ReserveFarmKind.Debt,
           kaminoReserve.state.farmDebt,
-          getPda(kaminoReserve.state.farmDebt),
+          obligationFarmStatePda(kaminoReserve.state.farmDebt, this.getObligationPda()),
           kaminoReserve,
         ]);
       }
@@ -2234,17 +2608,10 @@ export class KaminoAction {
     mode: typeof ReserveFarmKind.Collateral | typeof ReserveFarmKind.Debt,
     addAsSupportIx: AuxiliaryIx = 'setup'
   ): Promise<void> {
-    const BASE_SEED_USER_STATE = Buffer.from('user');
-    const getPda = (farm: PublicKey) =>
-      PublicKey.findProgramAddressSync(
-        [BASE_SEED_USER_STATE, farm.toBytes(), this.getObligationPda().toBytes()],
-        farmsId
-      )[0];
-
     const farms: [number, PublicKey, PublicKey][] = [];
 
     if (mode === ReserveFarmKind.Collateral && isNotNullPubkey(reserve.state.farmCollateral)) {
-      const pda = getPda(reserve.state.farmCollateral);
+      const pda = obligationFarmStatePda(reserve.state.farmCollateral, this.getObligationPda());
       const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
       if (!account) {
         farms.push([ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, pda]);
@@ -2252,10 +2619,10 @@ export class KaminoAction {
     }
 
     if (mode === ReserveFarmKind.Debt && isNotNullPubkey(reserve.state.farmDebt)) {
-      const pda = getPda(reserve.state.farmDebt);
+      const pda = obligationFarmStatePda(reserve.state.farmDebt, this.getObligationPda());
       const account = await this.kaminoMarket.getConnection().getAccountInfo(pda);
       if (!account) {
-        farms.push([ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, getPda(reserve.state.farmDebt)]);
+        farms.push([ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, pda]);
       }
     }
 
@@ -2289,7 +2656,7 @@ export class KaminoAction {
     });
   }
 
-  private async addInitObligationIxs() {
+  private addInitObligationIxs() {
     if (!this.obligation) {
       const obligationPda = this.getObligationPda();
       const [userMetadataAddress, _bump] = userMetadataPda(this.owner, this.kaminoMarket.programId);
@@ -2318,10 +2685,7 @@ export class KaminoAction {
     }
   }
 
-  private async addInitUserMetadataIxs() {
-    const [createLutIx, lookupTableAddress] = await createLookupTableIx(this.kaminoMarket.getConnection(), this.owner);
-    this.setupIxs.push(createLutIx);
-    this.setupIxsLabels.push(`createUserLutIx[${lookupTableAddress.toString()}]`);
+  private addInitUserMetadataIxs(lookupTableAddress: PublicKey) {
     const [userMetadataAddress, _bump] = userMetadataPda(this.owner, this.kaminoMarket.programId);
     const referrerUserMetadataAddress = this.referrer.equals(PublicKey.default)
       ? this.kaminoMarket.programId
@@ -2401,11 +2765,11 @@ export class KaminoAction {
   }
 
   private async addAtaIxs(action: ActionType) {
-    if (this.mint.equals(WRAPPED_SOL_MINT) || this.secondaryMint?.equals(WRAPPED_SOL_MINT)) {
+    if (this.mint.equals(NATIVE_MINT) || this.secondaryMint?.equals(NATIVE_MINT)) {
       await this.updateWSOLAccount(action);
     }
 
-    if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(WRAPPED_SOL_MINT)) {
+    if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(NATIVE_MINT)) {
       const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
         this.owner,
         this.reserve.getLiquidityMint(),
@@ -2414,13 +2778,8 @@ export class KaminoAction {
         this.userTokenAccountAddress
       );
 
-      if (this.positions === 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') {
@@ -2435,13 +2794,9 @@ export class KaminoAction {
         this.outflowReserve.getLiquidityTokenProgram(),
         this.userTokenAccountAddress
       );
-      if (this.positions === POSITION_LIMIT && this.mint.equals(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] = createAssociatedTokenAccountIdempotentInstruction(
         this.owner,
@@ -2451,23 +2806,15 @@ export class KaminoAction {
         this.userCollateralAccountAddress
       );
 
-      if (this.positions === POSITION_LIMIT && this.mint.equals(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(WRAPPED_SOL_MINT))
-    ) {
+    if (action === 'depositAndBorrow' || (action === 'repayAndWithdraw' && !this.secondaryMint?.equals(NATIVE_MINT))) {
       if (!this.additionalTokenAccountAddress) {
         throw new Error(`Additional token account address not found ${this.secondaryMint}`);
       }
@@ -2515,13 +2862,8 @@ export class KaminoAction {
         this.userCollateralAccountAddress
       );
 
-      if (this.positions === POSITION_LIMIT && this.mint.equals(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()}]`);
     }
   }
 
@@ -2537,7 +2879,7 @@ export class KaminoAction {
 
     let safeRepay = new BN(this.amount);
 
-    if (this.obligation && action === 'repay' && this.amount.eq(new BN(U64_MAX))) {
+    if (this.obligation && (action === 'repay' || action === 'repayAndWithdrawV2') && this.amount.eq(new BN(U64_MAX))) {
       const borrow = this.obligation.state.borrows.find(
         (borrow) => borrow.borrowReserve.toString() === this.reserve.address.toString()
       );
@@ -2551,7 +2893,7 @@ export class KaminoAction {
         this.currentSlot,
         this.kaminoMarket.state.referralFeeBps
       );
-      // TODO: shouldn't this calc be added to all other stuff as well?
+
       safeRepay = new BN(
         Math.floor(
           KaminoObligation.getBorrowAmount(borrow)
@@ -2564,7 +2906,7 @@ export class KaminoAction {
     }
 
     let userTokenAccountAddress = this.userTokenAccountAddress;
-    if (this.secondaryMint?.equals(WRAPPED_SOL_MINT)) {
+    if (this.secondaryMint?.equals(NATIVE_MINT)) {
       if (!this.additionalTokenAccountAddress) {
         throw new Error(`Additional token account address not found ${this.secondaryMint}`);
       }
@@ -2579,8 +2921,9 @@ export class KaminoAction {
     const sendAction =
       action === 'deposit' ||
       action === 'repay' ||
+      action === 'repayAndWithdrawV2' ||
       action === 'mint' ||
-      (action === 'liquidate' && this.secondaryMint?.equals(WRAPPED_SOL_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
+      (action === 'liquidate' && this.secondaryMint?.equals(NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
 
     const transferLamportsIx = SystemProgram.transfer({
       fromPubkey: this.owner,
@@ -2623,14 +2966,6 @@ export class KaminoAction {
       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);
@@ -2696,7 +3031,7 @@ export class KaminoAction {
       additionalUserTokenAccountAddress = userOutflowTokenAccountAddress;
       primaryMint = inflowTokenMint;
       secondaryMint = outflowTokenMint;
-    } else if (action === 'repayAndWithdraw') {
+    } else if (action === 'repayAndWithdraw' || action === 'repayAndWithdrawV2') {
       primaryMint = inflowTokenMint;
       secondaryMint = outflowTokenMint;
       userTokenAccountAddress = userInflowTokenAccountAddress;