@kamino-finance/klend-sdk 5.11.0 → 5.11.2-beta.0

package/src/classes/action.ts

@@ -21,6 +21,7 @@ import BN from 'bn.js';
 import Decimal from 'decimal.js';
 import {
   borrowObligationLiquidity,
+  depositAndWithdraw,
   borrowObligationLiquidityV2,
   depositObligationCollateral,
   depositObligationCollateralV2,
@@ -41,6 +42,7 @@ import {
   RefreshObligationFarmsForReserveAccounts,
   RefreshObligationFarmsForReserveArgs,
   refreshReserve,
+  repayAndWithdrawAndRedeem,
   repayObligationLiquidity,
   repayObligationLiquidityV2,
   requestElevationGroup,
@@ -90,7 +92,9 @@ export type ActionType =
   | 'repayAndWithdraw'
   | 'refreshObligation'
   | 'requestElevationGroup'
-  | 'withdrawReferrerFees';
+  | 'withdrawReferrerFees'
+  | 'repayAndWithdrawV2'
+  | 'depositAndWithdraw';
 
 export type AuxiliaryIx = 'setup' | 'inBetween' | 'cleanup';
 
@@ -817,6 +821,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,
@@ -1328,10 +1458,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(
-            this.getObligationPda(),
-            this.reserve.state.farmCollateral
-          )[0],
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
           reserveFarmState: this.reserve.state.farmCollateral,
         };
 
@@ -1396,10 +1523,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(
-            this.getObligationPda(),
-            this.reserve.state.farmCollateral
-          )[0],
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
           reserveFarmState: this.reserve.state.farmCollateral,
         };
 
@@ -1481,7 +1605,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
           reserveFarmState: this.reserve.state.farmDebt,
         };
 
@@ -1556,10 +1680,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(
-            this.getObligationPda(),
-            this.reserve.state.farmCollateral
-          )[0],
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
           reserveFarmState: this.reserve.state.farmCollateral,
         };
 
@@ -1643,7 +1764,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
           reserveFarmState: this.reserve.state.farmDebt,
         };
     const depositReserveAccountMetas = depositReservesList.map((reserve) => {
@@ -1679,6 +1800,208 @@ export class KaminoAction {
     this.lendingIxs.push(repayIx);
   }
 
+  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);
+  }
+
   async addDepositAndBorrowIx() {
     this.lendingIxsLabels.push(`depositReserveLiquidityAndObligationCollateral`);
     this.lendingIxsLabels.push(`borrowObligationLiquidity`);
@@ -1764,10 +2087,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(
-            this.getObligationPda(),
-            this.reserve.state.farmCollateral
-          )[0],
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmCollateral, this.getObligationPda()),
           reserveFarmState: this.reserve.state.farmCollateral,
         };
 
@@ -1828,10 +2148,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(
-            this.getObligationPda(),
-            this.outflowReserve.state.farmDebt!
-          )[0],
+          obligationFarmUserState: obligationFarmStatePda(this.outflowReserve.state.farmDebt, this.getObligationPda()),
           reserveFarmState: this.outflowReserve.state.farmDebt,
         };
 
@@ -1957,7 +2274,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
           reserveFarmState: this.reserve.state.farmDebt,
         };
 
@@ -2006,9 +2323,9 @@ export class KaminoAction {
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
-            this.getObligationPda(),
-            this.outflowReserve.state.farmCollateral
-          )[0],
+            this.outflowReserve.state.farmCollateral,
+            this.getObligationPda()
+          ),
           reserveFarmState: this.outflowReserve.state.farmCollateral,
         };
 
@@ -2042,7 +2359,7 @@ export class KaminoAction {
     );
   }
 
-  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`);
@@ -2115,9 +2432,9 @@ export class KaminoAction {
         }
       : {
           obligationFarmUserState: obligationFarmStatePda(
-            this.getObligationPda(),
-            this.outflowReserve.state.farmCollateral
-          )[0],
+            this.outflowReserve.state.farmCollateral,
+            this.getObligationPda()
+          ),
           reserveFarmState: this.outflowReserve.state.farmCollateral,
         };
 
@@ -2127,7 +2444,7 @@ export class KaminoAction {
           reserveFarmState: PROGRAM_ID,
         }
       : {
-          obligationFarmUserState: obligationFarmStatePda(this.getObligationPda(), this.reserve.state.farmDebt)[0],
+          obligationFarmUserState: obligationFarmStatePda(this.reserve.state.farmDebt, this.getObligationPda()),
           reserveFarmState: this.reserve.state.farmDebt,
         };
 
@@ -2239,6 +2556,7 @@ export class KaminoAction {
         'repay',
         'depositAndBorrow',
         'repayAndWithdraw',
+        'repayAndWithdrawV2',
         'refreshObligation',
       ].includes(action)
     ) {
@@ -2257,12 +2575,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) {
@@ -2307,7 +2630,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) {
@@ -2338,7 +2666,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) {
@@ -2527,7 +2855,7 @@ export class KaminoAction {
       if (action === 'deposit' && this.outflowReserve) {
         await this.addInitReferrerTokenStateIx(this.outflowReserve);
       }
-      await this.addInitObligationIxs();
+      this.addInitObligationIxs();
     }
 
     await this.addSupportIxsWithoutInitObligation(
@@ -2759,7 +3087,7 @@ export class KaminoAction {
         farms.push([
           ReserveFarmKind.Collateral,
           kaminoReserve.state.farmCollateral,
-          obligationFarmStatePda(this.getObligationPda(), kaminoReserve.state.farmCollateral)[0],
+          obligationFarmStatePda(kaminoReserve.state.farmCollateral, this.getObligationPda()),
           kaminoReserve,
         ]);
       }
@@ -2767,7 +3095,7 @@ export class KaminoAction {
         farms.push([
           ReserveFarmKind.Debt,
           kaminoReserve.state.farmDebt,
-          obligationFarmStatePda(this.getObligationPda(), kaminoReserve.state.farmDebt)[0],
+          obligationFarmStatePda(kaminoReserve.state.farmDebt, this.getObligationPda()),
           kaminoReserve,
         ]);
       }
@@ -2851,18 +3179,18 @@ export class KaminoAction {
     const farms: [number, PublicKey, PublicKey][] = [];
 
     if (mode === ReserveFarmKind.Collateral && isNotNullPubkey(reserve.state.farmCollateral)) {
-      const userPda = obligationFarmStatePda(this.getObligationPda(), reserve.state.farmCollateral)[0];
-      const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
+      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, userPda]);
+        farms.push([ReserveFarmKind.Collateral.discriminator, reserve.state.farmCollateral, pda]);
       }
     }
 
     if (mode === ReserveFarmKind.Debt && isNotNullPubkey(reserve.state.farmDebt)) {
-      const userPda = obligationFarmStatePda(this.getObligationPda(), reserve.state.farmDebt)[0];
-      const account = await this.kaminoMarket.getConnection().getAccountInfo(userPda);
+      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, userPda]);
+        farms.push([ReserveFarmKind.Debt.discriminator, reserve.state.farmDebt, pda]);
       }
     }
 
@@ -2896,7 +3224,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);
@@ -3119,7 +3447,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()
       );
@@ -3133,7 +3461,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)
@@ -3161,6 +3489,7 @@ export class KaminoAction {
     const sendAction =
       action === 'deposit' ||
       action === 'repay' ||
+      action === 'repayAndWithdrawV2' ||
       action === 'mint' ||
       (action === 'liquidate' && this.secondaryMint?.equals(NATIVE_MINT)); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
 
@@ -3270,7 +3599,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;

package/src/classes/obligation.ts

@@ -266,7 +266,7 @@ export class KaminoObligation {
   /**
    * @returns total borrow power of the obligation, relative to max LTV of each asset's reserve
    */
-  getAllowedBorrowValue(): Decimal {
+  getMaxAllowedBorrowValue(): Decimal {
     return new Fraction(this.state.allowedBorrowValueSf).toDecimal();
   }