@kamino-finance/klend-sdk 7.1.7 → 7.1.9

package/src/classes/obligation.ts

@@ -39,6 +39,11 @@ export type Position = {
   marketValueRefreshed: Decimal;
 };
 
+export type PositionChange = {
+  reserveAddress: Address;
+  amountChangeLamports: Decimal;
+};
+
 export type ObligationStats = {
   userTotalDeposit: Decimal;
   userTotalCollateralDeposit: Decimal;
@@ -491,19 +496,20 @@ export class KaminoObligation {
 
   simulateDepositChange(
     obligationDeposits: ObligationCollateral[],
-    changeInLamports: number,
-    changeReserve: Address,
+    depositChange: PositionChange,
     collateralExchangeRates: Map<Address, Decimal>
   ): ObligationCollateral[] {
     const newDeposits: ObligationCollateral[] = [];
-    const depositIndex = obligationDeposits.findIndex((deposit) => deposit.depositReserve === changeReserve);
+    const depositIndex = obligationDeposits.findIndex(
+      (deposit) => deposit.depositReserve === depositChange.reserveAddress
+    );
 
     // Always copy the previous deposits and modify the changeReserve one if it exists
     for (let i = 0; i < obligationDeposits.length; i++) {
-      if (obligationDeposits[i].depositReserve === changeReserve) {
+      if (obligationDeposits[i].depositReserve === depositChange.reserveAddress) {
         const coll: ObligationCollateralFields = { ...obligationDeposits[i] };
-        const exchangeRate = collateralExchangeRates.get(changeReserve)!;
-        const changeInCollateral = new Decimal(changeInLamports).mul(exchangeRate).toFixed(0);
+        const exchangeRate = collateralExchangeRates.get(depositChange.reserveAddress)!;
+        const changeInCollateral = new Decimal(depositChange.amountChangeLamports).mul(exchangeRate).toFixed(0);
         const updatedDeposit = new Decimal(obligationDeposits[i].depositedAmount.toNumber()).add(changeInCollateral);
         coll.depositedAmount = new BN(positiveOrZero(updatedDeposit).toString());
         newDeposits.push(new ObligationCollateral(coll));
@@ -523,10 +529,10 @@ export class KaminoObligation {
       }
 
       const coll: ObligationCollateralFields = { ...obligationDeposits[firstBorrowIndexAvailable] };
-      const exchangeRate = collateralExchangeRates.get(changeReserve)!;
-      const changeInCollateral = new Decimal(changeInLamports).mul(exchangeRate).toFixed(0);
+      const exchangeRate = collateralExchangeRates.get(depositChange.reserveAddress)!;
+      const changeInCollateral = new Decimal(depositChange.amountChangeLamports).mul(exchangeRate).toFixed(0);
       coll.depositedAmount = new BN(positiveOrZero(new Decimal(changeInCollateral)).toString());
-      coll.depositReserve = changeReserve;
+      coll.depositReserve = depositChange.reserveAddress;
 
       newDeposits[firstBorrowIndexAvailable] = new ObligationCollateral(coll);
     }
@@ -536,18 +542,19 @@ export class KaminoObligation {
 
   simulateBorrowChange(
     obligationBorrows: ObligationLiquidity[],
-    changeInLamports: number,
-    changeReserve: Address,
+    borrowChange: PositionChange,
     cumulativeBorrowRate: Decimal
   ): ObligationLiquidity[] {
     const newBorrows: ObligationLiquidity[] = [];
-    const borrowIndex = obligationBorrows.findIndex((borrow) => borrow.borrowReserve === changeReserve);
+    const borrowIndex = obligationBorrows.findIndex((borrow) => borrow.borrowReserve === borrowChange.reserveAddress);
 
     // Always copy the previous borrows and modify the changeReserve one if it exists
     for (let i = 0; i < obligationBorrows.length; i++) {
-      if (obligationBorrows[i].borrowReserve === changeReserve) {
+      if (obligationBorrows[i].borrowReserve === borrowChange.reserveAddress) {
         const borrow: ObligationLiquidityFields = { ...obligationBorrows[borrowIndex] };
-        const newBorrowedAmount: Decimal = new Fraction(borrow.borrowedAmountSf).toDecimal().add(changeInLamports);
+        const newBorrowedAmount: Decimal = new Fraction(borrow.borrowedAmountSf)
+          .toDecimal()
+          .add(borrowChange.amountChangeLamports);
         const newBorrowedAmountSf = Fraction.fromDecimal(positiveOrZero(newBorrowedAmount)).getValue();
         borrow.borrowedAmountSf = newBorrowedAmountSf;
 
@@ -568,8 +575,8 @@ export class KaminoObligation {
       }
 
       const borrow: ObligationLiquidityFields = { ...obligationBorrows[firstBorrowIndexAvailable] };
-      borrow.borrowedAmountSf = Fraction.fromDecimal(new Decimal(changeInLamports)).getValue();
-      borrow.borrowReserve = changeReserve;
+      borrow.borrowedAmountSf = Fraction.fromDecimal(new Decimal(borrowChange.amountChangeLamports)).getValue();
+      borrow.borrowReserve = borrowChange.reserveAddress;
       borrow.cumulativeBorrowRateBsf = {
         padding: [],
         value: [Fraction.fromDecimal(cumulativeBorrowRate).getValue(), new BN(0), new BN(0), new BN(0)],
@@ -643,8 +650,10 @@ export class KaminoObligation {
         }
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
-          amountCollateral.toNumber(),
-          collateralReservePk!,
+          {
+            reserveAddress: collateralReservePk!,
+            amountChangeLamports: amountCollateral,
+          },
           collateralExchangeRates
         );
         break;
@@ -656,8 +665,10 @@ export class KaminoObligation {
 
         newObligationBorrows = this.simulateBorrowChange(
           this.state.borrows,
-          amountDebt.toNumber(),
-          debtReservePk!,
+          {
+            reserveAddress: debtReservePk!,
+            amountChangeLamports: amountDebt,
+          },
           debtReserveCumulativeBorrowRate!
         );
         break;
@@ -669,8 +680,10 @@ export class KaminoObligation {
 
         newObligationBorrows = this.simulateBorrowChange(
           this.state.borrows,
-          amountDebt.neg().toNumber(),
-          debtReservePk!,
+          {
+            reserveAddress: debtReservePk!,
+            amountChangeLamports: amountDebt.neg(),
+          },
           debtReserveCumulativeBorrowRate!
         );
 
@@ -683,8 +696,10 @@ export class KaminoObligation {
         }
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
-          amountCollateral.neg().toNumber(),
-          collateralReservePk!,
+          {
+            reserveAddress: collateralReservePk!,
+            amountChangeLamports: amountCollateral.neg(),
+          },
           collateralExchangeRates
         );
         break;
@@ -700,15 +715,19 @@ export class KaminoObligation {
         }
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
-          amountCollateral.toNumber(),
-          collateralReservePk!,
+          {
+            reserveAddress: collateralReservePk!,
+            amountChangeLamports: amountCollateral,
+          },
           collateralExchangeRates
         );
 
         newObligationBorrows = this.simulateBorrowChange(
           this.state.borrows,
-          amountDebt.toNumber(),
-          debtReservePk!,
+          {
+            reserveAddress: debtReservePk!,
+            amountChangeLamports: amountDebt,
+          },
           debtReserveCumulativeBorrowRate!
         );
         break;
@@ -724,14 +743,18 @@ export class KaminoObligation {
         }
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
-          amountCollateral.neg().toNumber(),
-          collateralReservePk!,
+          {
+            reserveAddress: collateralReservePk!,
+            amountChangeLamports: amountCollateral.neg(),
+          },
           collateralExchangeRates
         );
         newObligationBorrows = this.simulateBorrowChange(
           this.state.borrows,
-          amountDebt.neg().toNumber(),
-          debtReservePk!,
+          {
+            reserveAddress: debtReservePk!,
+            amountChangeLamports: amountDebt.neg(),
+          },
           debtReserveCumulativeBorrowRate!
         );
         break;
@@ -803,14 +826,18 @@ export class KaminoObligation {
     let newObligationDeposits = this.state.deposits;
     newObligationDeposits = this.simulateDepositChange(
       newObligationDeposits,
-      withdrawAmountLamports.neg().toNumber(),
-      withdrawReserveAddress,
+      {
+        reserveAddress: withdrawReserveAddress,
+        amountChangeLamports: withdrawAmountLamports.neg(),
+      },
       collateralExchangeRates
     );
     newObligationDeposits = this.simulateDepositChange(
       newObligationDeposits,
-      depositAmountLamports.toNumber(),
-      depositReserveAddress,
+      {
+        reserveAddress: depositReserveAddress,
+        amountChangeLamports: depositAmountLamports,
+      },
       collateralExchangeRates
     );
 
@@ -947,6 +974,7 @@ export class KaminoObligation {
       } else {
         exchangeRate = reserve.getCollateralExchangeRate();
       }
+
       const supplyAmount = new Decimal(deposit.depositedAmount.toString()).div(exchangeRate);
 
       const depositValueUsd = supplyAmount.mul(getPx(reserve)).div(reserve.getMintFactor());
@@ -1055,23 +1083,98 @@ export class KaminoObligation {
     };
   }
 
-  getMaxLoanLtvGivenElevationGroup(market: KaminoMarket, elevationGroup: number, slot: Slot): Decimal {
+  getMaxLoanLtvAndLiquidationLtvGivenElevationGroup(
+    market: KaminoMarket,
+    elevationGroup: number,
+    slot: Slot
+  ): { maxLtv: Decimal; liquidationLtv: Decimal } {
     const getOraclePx = (reserve: KaminoReserve) => reserve.getOracleMarketPrice();
     const { collateralExchangeRates } = KaminoObligation.getRatesForObligation(market, this.state, slot);
 
-    const { borrowLimit, userTotalCollateralDeposit } = KaminoObligation.calculateObligationDeposits(
+    const { borrowLimit, userTotalCollateralDeposit, borrowLiquidationLimit } =
+      KaminoObligation.calculateObligationDeposits(
+        market,
+        this.state.deposits,
+        collateralExchangeRates,
+        elevationGroup,
+        getOraclePx
+      );
+
+    if (userTotalCollateralDeposit.eq(0)) {
+      return { maxLtv: new Decimal(0), liquidationLtv: new Decimal(0) };
+    }
+
+    return {
+      maxLtv: borrowLimit.div(userTotalCollateralDeposit),
+      liquidationLtv: borrowLiquidationLimit.div(userTotalCollateralDeposit),
+    };
+  }
+
+  /**
+   * Creates a new KaminoObligation with simulated position changes applied.
+   * This allows you to model what the obligation would look like with deposits/borrows
+   * without actually executing those transactions.
+   *
+   * @param market - The KaminoMarket instance
+   * @param slot - The slot number for rate calculations
+   * @param depositChanges - Optional array of deposit changes to apply
+   * @param borrowChanges - Optional array of borrow changes to apply
+   * @returns A new KaminoObligation instance with the changes applied
+   */
+  withPositionChanges(
+    market: KaminoMarket,
+    slot: Slot,
+    depositChanges?: PositionChange[],
+    borrowChanges?: PositionChange[]
+  ): KaminoObligation {
+    const reservesToRefresh: Address[] = [];
+
+    if (depositChanges) {
+      reservesToRefresh.push(...depositChanges.map((change) => change.reserveAddress));
+    }
+    if (borrowChanges) {
+      reservesToRefresh.push(...borrowChanges.map((change) => change.reserveAddress));
+    }
+
+    const { collateralExchangeRates, cumulativeBorrowRates } = KaminoObligation.getRatesForObligation(
       market,
-      this.state.deposits,
-      collateralExchangeRates,
-      elevationGroup,
-      getOraclePx
+      this.state,
+      slot,
+      reservesToRefresh
     );
 
-    if (borrowLimit.eq(0) || userTotalCollateralDeposit.eq(0)) {
-      return new Decimal(0);
+    let newDeposits: ObligationCollateral[] = this.state.deposits;
+    if (depositChanges) {
+      for (const depositChange of depositChanges) {
+        newDeposits = this.simulateDepositChange(newDeposits, depositChange, collateralExchangeRates);
+      }
     }
 
-    return borrowLimit.div(userTotalCollateralDeposit);
+    let newBorrows: ObligationLiquidity[] = this.state.borrows;
+    if (borrowChanges) {
+      for (const borrowChange of borrowChanges) {
+        const reserve = market.getReserveByAddress(borrowChange.reserveAddress);
+        if (!reserve) {
+          throw new Error(`Reserve not found: ${borrowChange.reserveAddress}`);
+        }
+        newBorrows = this.simulateBorrowChange(newBorrows, borrowChange, reserve.getCumulativeBorrowRate());
+      }
+    }
+
+    // Create a deep copy of the obligation state and override deposits/borrows
+    const newObligationState = new Obligation({
+      ...this.state,
+      deposits: newDeposits,
+      borrows: newBorrows,
+    });
+
+    return new KaminoObligation(
+      market,
+      this.obligationAddress,
+      newObligationState,
+      collateralExchangeRates,
+      cumulativeBorrowRates
+    );
   }
 
   /*
@@ -1196,6 +1299,36 @@ export class KaminoObligation {
     }
   }
 
+  /*
+    Same as getMaxBorrowAmountV2 but assumes a deposit is made first, calculating
+    the new borrow power after the deposit, without overriding the obligation itself.
+
+    * @param market - The KaminoMarket instance.
+    * @param liquidityMint - The liquidity mint Address.
+    * @param slot - The slot number.
+    * @param elevationGroup - The elevation group number (default: this.state.elevationGroup).
+    * @returns The maximum borrow amount as a Decimal.
+    * @throws Error if the reserve is not found.
+  */
+  getMaxBorrowAmountV2WithDeposit(
+    market: KaminoMarket,
+    liquidityMint: Address,
+    slot: Slot,
+    elevationGroup: number = this.state.elevationGroup,
+    depositAmountLamports: Decimal,
+    depositReserveAddress: Address
+  ): Decimal {
+    const depositChanges = [
+      {
+        reserveAddress: depositReserveAddress,
+        amountChangeLamports: depositAmountLamports,
+      },
+    ];
+    const obligationWithDeposit = this.withPositionChanges(market, slot, depositChanges);
+
+    return obligationWithDeposit.getMaxBorrowAmountV2(market, liquidityMint, slot, elevationGroup);
+  }
+
   /*
     Returns true if the loan is eligible for the elevation group, including for the default one.
     * @param market - The KaminoMarket object representing the market.
@@ -1447,6 +1580,44 @@ export class KaminoObligation {
     return Decimal.max(0, Decimal.min(userDepositPositionAmount, maxWithdrawAmount, reserveWithdrawalLimit));
   }
 
+  /**
+   * Same as getMaxWithdrawAmount but assumes a repay is made first, calculating
+   * the new withdraw power after the repay, without overriding the obligation itself.
+   *
+   * @param market - The KaminoMarket instance.
+   * @param tokenMint - The liquidity mint Address.
+   * @param slot - The slot number.
+   * @param repayAmountLamports - The amount to repay in lamports (use U64_MAX for full repay).
+   * @param repayReserveAddress - The reserve address of the borrow being repaid.
+   * @returns The maximum withdraw amount as a Decimal.
+   * @throws Error if the reserve is not found.
+   */
+  getMaxWithdrawAmountWithRepay(
+    market: KaminoMarket,
+    tokenMint: Address,
+    slot: Slot,
+    repayAmountLamports: Decimal,
+    repayReserveAddress: Address
+  ): Decimal {
+    const repayReserve = market.getReserveByAddress(repayReserveAddress);
+    if (!repayReserve) {
+      throw new Error('Reserve not found');
+    }
+
+    const repayAmount = repayAmountLamports.equals(U64_MAX)
+      ? this.getBorrowAmountByReserve(repayReserve)
+      : repayAmountLamports;
+    const borrowChanges = [
+      {
+        reserveAddress: repayReserveAddress,
+        amountChangeLamports: repayAmount.neg(), // as it's a repay
+      },
+    ];
+    const obligationWithRepay = this.withPositionChanges(market, slot, undefined, borrowChanges);
+
+    return obligationWithRepay.getMaxWithdrawAmount(market, tokenMint, slot);
+  }
+
   getObligationLiquidityByReserve(reserveAddress: Address): ObligationLiquidity {
     const obligationLiquidity = this.state.borrows.find((borrow) => borrow.borrowReserve === reserveAddress);
 

package/src/classes/vault.ts

@@ -970,7 +970,7 @@ export class KaminoVaultClient {
     const [{ ata: adminTokenAta, createAtaIx }] = await createAtasIdempotent(vaultAdmin, [
       {
         mint: vaultState.tokenMint,
-        tokenProgram: TOKEN_PROGRAM_ADDRESS,
+        tokenProgram: vaultState.tokenProgram,
       },
     ]);
 
@@ -1744,7 +1744,7 @@ export class KaminoVaultClient {
       baseVaultAuthority: vaultState.baseVaultAuthority,
       tokenAta: adminTokenAta,
       tokenMint: vaultState.tokenMint,
-      tokenProgram: TOKEN_PROGRAM_ADDRESS,
+      tokenProgram: vaultState.tokenProgram,
       /** CPI accounts */
       lendingMarket: marketAddress,
       lendingMarketAuthority: lendingMarketAuth,

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -302,7 +302,7 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
 
   // 2. Flash borrow & repay the debt to repay amount needed
   const { flashBorrowIx, flashRepayIx } = getFlashLoanInstructions({
-    borrowIxIndex: budgetIxs.length + atasAndIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
+    borrowIxIndex: atasAndIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
     userTransferAuthority: owner,
     lendingMarketAuthority: await market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -371,13 +371,13 @@ async function buildRepayWithCollateralIxs<QuoteResponse>(
 
     const ixs = [
       ...scopeRefreshIx,
-      ...budgetIxs,
       ...atasAndIxs.map((x) => x.createAtaIx),
       flashBorrowIx,
       ...preActionIxs,
       ...KaminoAction.actionToIxs(repayAndWithdrawAction),
       ...swapInstructions,
       flashRepayIx,
+      ...budgetIxs,
     ];
 
     const res: LeverageIxsOutput = {

package/src/lending_operations/swap_collateral_operations.ts

@@ -273,7 +273,7 @@ async function getKlendIxs(
   scopeRefreshIx: Instruction[]
 ): Promise<SwapCollKlendIxs> {
   const { ataCreationIxs, targetCollAta } = await getAtaCreationIxs(context);
-  const setupIxs = [...context.budgetAndPriorityFeeIxs, ...ataCreationIxs];
+  const setupIxs = [...ataCreationIxs];
 
   if (scopeRefreshIx) {
     setupIxs.unshift(...scopeRefreshIx);
@@ -294,7 +294,7 @@ async function getKlendIxs(
     context
   );
 
-  const cleanupIxs = await getAtaCloseIxs(context);
+  const cleanupIxs = [...(await getAtaCloseIxs(context)), ...context.budgetAndPriorityFeeIxs];
 
   return {
     setupIxs,

package/src/leverage/operations.ts

@@ -324,8 +324,7 @@ async function buildDepositWithLeverageIxs<QuoteResponse>(
   // 2. Flash borrow & repay the collateral amount needed for given leverage
   // if user deposits coll, then we borrow the diff, else we borrow the entire amount
   const { flashBorrowIx, flashRepayIx } = getFlashLoanInstructions({
-    borrowIxIndex:
-      budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
+    borrowIxIndex: createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
     userTransferAuthority: owner,
     lendingMarketAuthority: await market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -371,13 +370,13 @@ async function buildDepositWithLeverageIxs<QuoteResponse>(
       flashLoanInfo,
       instructions: [
         ...scopeRefreshIx,
-        ...budgetIxs,
         ...createAtasIxs,
         ...fillWsolAtaIxs,
         ...[flashBorrowIx],
         ...KaminoAction.actionToIxs(kaminoDepositAndBorrowAction),
         ...swapInstructions,
         ...[flashRepayIx],
+        ...budgetIxs,
       ],
     };
   });
@@ -675,8 +674,7 @@ export async function buildWithdrawWithLeverageIxs<QuoteResponse>(
   // We borrow exactly how much we need to repay
   // and repay that + flash amount fee
   const { flashBorrowIx, flashRepayIx } = getFlashLoanInstructions({
-    borrowIxIndex:
-      budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
+    borrowIxIndex: createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
     userTransferAuthority: owner,
     lendingMarketAuthority: await market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -719,7 +717,6 @@ export async function buildWithdrawWithLeverageIxs<QuoteResponse>(
       },
       instructions: [
         ...scopeRefreshIx,
-        ...budgetIxs,
         ...createAtasIxs,
         ...fillWsolAtaIxs,
         ...[flashBorrowIx],
@@ -727,6 +724,7 @@ export async function buildWithdrawWithLeverageIxs<QuoteResponse>(
         ...swapInstructions,
         ...[flashRepayIx],
         ...closeWsolAtaIxs,
+        ...budgetIxs,
       ],
     };
   });
@@ -1129,7 +1127,7 @@ async function buildIncreaseLeverageIxs<QuoteResponse>(
 
   // 2. Create borrow flash loan instruction
   const { flashBorrowIx, flashRepayIx } = getFlashLoanInstructions({
-    borrowIxIndex: budgetIxs.length + createAtasIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0), // TODO: how about user metadata ixs
+    borrowIxIndex: createAtasIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0), // TODO: how about user metadata ixs
     userTransferAuthority: owner,
     lendingMarketAuthority: await kaminoMarket.getLendingMarketAuthority(),
     lendingMarketAddress: kaminoMarket.getAddress(),
@@ -1180,13 +1178,13 @@ async function buildIncreaseLeverageIxs<QuoteResponse>(
 
     const ixs = [
       ...scopeRefreshIx,
-      ...budgetIxs,
       ...createAtasIxs,
       ...[flashBorrowIx],
       ...KaminoAction.actionToIxs(depositAction),
       ...KaminoAction.actionToIxs(borrowAction),
       ...swapInstructions,
       ...[flashRepayIx],
+      ...budgetIxs,
     ];
 
     const flashBorrowReserve = collReserve!;
@@ -1270,8 +1268,7 @@ async function buildDecreaseLeverageIxs<QuoteResponse>(
 
   // 3. Flash borrow & repay amount to repay (debt)
   const { flashBorrowIx, flashRepayIx } = getFlashLoanInstructions({
-    borrowIxIndex:
-      budgetIxs.length + createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
+    borrowIxIndex: createAtasIxs.length + fillWsolAtaIxs.length + (scopeRefreshIx.length > 0 ? 1 : 0),
     userTransferAuthority: owner,
     lendingMarketAuthority: await kaminoMarket.getLendingMarketAuthority(),
     lendingMarketAddress: kaminoMarket.getAddress(),
@@ -1325,7 +1322,6 @@ async function buildDecreaseLeverageIxs<QuoteResponse>(
 
     const ixs = [
       ...scopeRefreshIx,
-      ...budgetIxs,
       ...createAtasIxs,
       ...fillWsolAtaIxs,
       ...[flashBorrowIx],
@@ -1334,6 +1330,7 @@ async function buildDecreaseLeverageIxs<QuoteResponse>(
       ...swapInstructions,
       ...[flashRepayIx],
       ...closeWsolAtaIxs,
+      ...budgetIxs,
     ];
 
     const res: LeverageIxsOutput = {