@kamino-finance/klend-sdk 4.0.1 → 4.0.2

package/src/classes/obligation.ts

@@ -372,19 +372,31 @@ export class KaminoObligation {
   simulateBorrowChange(
     obligationBorrows: ObligationLiquidity[],
     changeInLamports: number,
-    changeReserve: PublicKey
+    changeReserve: PublicKey,
+    cumulativeBorrowRate: Decimal
   ): ObligationLiquidity[] {
     const newBorrows: ObligationLiquidity[] = [];
-    for (let i = 0; i < obligationBorrows.length; i++) {
-      if (obligationBorrows[i].borrowReserve.equals(changeReserve)) {
-        const borrow: ObligationLiquidityFields = { ...obligationBorrows[i] };
-        const newBorrowedAmount: Decimal = new Fraction(borrow.borrowedAmountSf).toDecimal().add(changeInLamports);
-        const newBorrowedAmountSf = Fraction.fromDecimal(positiveOrZero(newBorrowedAmount)).getValue();
-        borrow.borrowedAmountSf = newBorrowedAmountSf;
-        newBorrows.push(new ObligationLiquidity(borrow));
-      } else {
-        newBorrows.push(obligationBorrows[i]);
-      }
+    const borrowIndex = obligationBorrows.findIndex((borrow) => borrow.borrowReserve.equals(changeReserve));
+
+    if (borrowIndex !== -1) {
+      const borrow: ObligationLiquidityFields = { ...obligationBorrows[borrowIndex] };
+      const newBorrowedAmount: Decimal = new Fraction(borrow.borrowedAmountSf).toDecimal().add(changeInLamports);
+      const newBorrowedAmountSf = Fraction.fromDecimal(positiveOrZero(newBorrowedAmount)).getValue();
+      borrow.borrowedAmountSf = newBorrowedAmountSf;
+      newBorrows.push(new ObligationLiquidity(borrow));
+    } else {
+      const firstBorrowIndexAvailable = obligationBorrows.findIndex((borrow) =>
+        borrow.borrowReserve.equals(PublicKey.default)
+      );
+
+      const borrow: ObligationLiquidityFields = { ...obligationBorrows[firstBorrowIndexAvailable] };
+      borrow.borrowedAmountSf = Fraction.fromDecimal(new Decimal(changeInLamports)).getValue();
+      borrow.borrowReserve = changeReserve;
+      borrow.cumulativeBorrowRateBsf = {
+        padding: [],
+        value: [Fraction.fromDecimal(cumulativeBorrowRate).getValue(), new BN(0), new BN(0), new BN(0)],
+      };
+      newBorrows.push(new ObligationLiquidity(borrow));
     }
 
     return newBorrows;
@@ -412,11 +424,7 @@ export class KaminoObligation {
     const { amountCollateral, amountDebt, action, mintCollateral, mintDebt, market } = params;
     let newStats = { ...this.refreshedStats };
 
-    const { collateralExchangeRates, cumulativeBorrowRates } = KaminoObligation.getRatesForObligation(
-      market,
-      this.state,
-      params.slot
-    );
+    const { collateralExchangeRates } = KaminoObligation.getRatesForObligation(market, this.state, params.slot);
 
     const elevationGroup = params.elevationGroupOverride ?? this.state.elevationGroup;
 
@@ -427,8 +435,11 @@ export class KaminoObligation {
     // so we have to recalculate the entire position, not just an updated deposit or borrow
     // as both LTVs and borrow factors can change, affecting all calcs
 
-    const collateralReserve = mintCollateral ? market.getReserveByMint(mintCollateral)!.address : undefined;
-    const debtReserve = mintDebt ? market.getReserveByMint(mintDebt)!.address : undefined;
+    const collateralReservePk = mintCollateral ? market.getReserveByMint(mintCollateral)!.address : undefined;
+    const debtReservePk = mintDebt ? market.getReserveByMint(mintDebt)!.address : undefined;
+    const debtReserveCumulativeBorrowRate = mintDebt
+      ? market.getReserveByMint(mintDebt)!.getCumulativeBorrowRate()
+      : undefined;
 
     let newObligationDeposits = this.state.deposits;
     let newObligationBorrows = this.state.borrows;
@@ -441,7 +452,7 @@ export class KaminoObligation {
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           amountCollateral.toNumber(),
-          collateralReserve!,
+          collateralReservePk!,
           collateralExchangeRates
         );
         break;
@@ -451,14 +462,25 @@ export class KaminoObligation {
           throw Error('amountDebt & mintDebt are required for borrow action');
         }
 
-        newObligationBorrows = this.simulateBorrowChange(this.state.borrows, amountDebt.toNumber(), debtReserve!);
+        newObligationBorrows = this.simulateBorrowChange(
+          this.state.borrows,
+          amountDebt.toNumber(),
+          debtReservePk!,
+          debtReserveCumulativeBorrowRate!
+        );
         break;
       }
       case 'repay': {
         if (amountDebt === undefined || mintDebt === undefined) {
           throw Error('amountDebt & mintDebt are required for repay action');
         }
-        newObligationBorrows = this.simulateBorrowChange(this.state.borrows, amountDebt.neg().toNumber(), debtReserve!);
+
+        newObligationBorrows = this.simulateBorrowChange(
+          this.state.borrows,
+          amountDebt.neg().toNumber(),
+          debtReservePk!,
+          debtReserveCumulativeBorrowRate!
+        );
 
         break;
       }
@@ -470,7 +492,7 @@ export class KaminoObligation {
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           amountCollateral.neg().toNumber(),
-          collateralReserve!,
+          collateralReservePk!,
           collateralExchangeRates
         );
         break;
@@ -487,10 +509,16 @@ export class KaminoObligation {
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           amountCollateral.toNumber(),
-          collateralReserve!,
+          collateralReservePk!,
           collateralExchangeRates
         );
-        newObligationBorrows = this.simulateBorrowChange(this.state.borrows, amountDebt.toNumber(), debtReserve!);
+
+        newObligationBorrows = this.simulateBorrowChange(
+          this.state.borrows,
+          amountDebt.toNumber(),
+          debtReservePk!,
+          debtReserveCumulativeBorrowRate!
+        );
         break;
       }
       case 'repayAndWithdraw': {
@@ -505,10 +533,15 @@ export class KaminoObligation {
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           amountCollateral.neg().toNumber(),
-          collateralReserve!,
+          collateralReservePk!,
           collateralExchangeRates
         );
-        newObligationBorrows = this.simulateBorrowChange(this.state.borrows, amountDebt.neg().toNumber(), debtReserve!);
+        newObligationBorrows = this.simulateBorrowChange(
+          this.state.borrows,
+          amountDebt.neg().toNumber(),
+          debtReservePk!,
+          debtReserveCumulativeBorrowRate!
+        );
         break;
       }
       default: {
@@ -522,7 +555,7 @@ export class KaminoObligation {
       newObligationBorrows,
       elevationGroup,
       collateralExchangeRates,
-      cumulativeBorrowRates
+      null
     );
 
     newStats = refreshedStats;
@@ -568,7 +601,7 @@ export class KaminoObligation {
     obligationBorrows: ObligationLiquidity[],
     elevationGroup: number,
     collateralExchangeRates: Map<PublicKey, Decimal>,
-    cumulativeBorrowRates: Map<PublicKey, Decimal>
+    cumulativeBorrowRates: Map<PublicKey, Decimal> | null
   ): {
     borrows: Map<PublicKey, Position>;
     deposits: Map<PublicKey, Position>;
@@ -904,8 +937,8 @@ export class KaminoObligation {
     //    - [x] due to collateral / debt reserves combination
     //    - [x] due to LTV, etc
 
-    const reserveDeposits: string[] = Array.from(this.deposits.keys()).map((x) => x.toString());
-    const reserveBorrows: string[] = Array.from(this.borrows.keys()).map((x) => x.toString());
+    const reserveDeposits: PublicKey[] = Array.from(this.deposits.keys());
+    const reserveBorrows: PublicKey[] = Array.from(this.borrows.keys());
 
     if (reserveBorrows.length > 1) {
       return false;
@@ -918,11 +951,11 @@ export class KaminoObligation {
 
       // Has to be a subset
       const allCollsIncluded = reserveDeposits.every((reserve) =>
-        elevationGroupDescription.collateralReserves.includes(reserve)
+        elevationGroupDescription.collateralReserves.contains(reserve)
       );
       const allDebtsIncluded =
         reserveBorrows.length === 0 ||
-        (reserveBorrows.length === 1 && elevationGroupDescription.debtReserve === reserveBorrows[0]);
+        (reserveBorrows.length === 1 && elevationGroupDescription.debtReserve.equals(reserveBorrows[0]));
 
       if (!allCollsIncluded || !allDebtsIncluded) {
         return false;

package/src/classes/reserve.ts

@@ -935,9 +935,9 @@ export class KaminoReserve {
       currentValue: Decimal;
     }[] = market
       .getMarketElevationGroupDescriptions()
-      .filter((x) => x.debtReserve === this.address.toString())
+      .filter((x) => x.debtReserve.equals(this.address))
       .map((elevationGroupDescription: ElevationGroupDescription) =>
-        elevationGroupDescription.collateralReserves.map((collateralReserveAddress) => {
+        elevationGroupDescription.collateralReserves.toArray().map((collateralReserveAddress) => {
           const collRes = market.reserves.get(new PublicKey(collateralReserveAddress))!;
 
           const debtLimitAgainstThisCollInGroup =
@@ -1015,14 +1015,15 @@ export class KaminoReserve {
           positiveOrZero(remainingGlobalCap),
           positiveOrZero(liquidityGivenUtilizationCap)
         );
-
         return availableInCrossMode;
       } else {
-        const remainingInsideEmodeCaps = Decimal.min(
-          ...caps.debtAgainstCollateralReserveCaps
-            .filter((x) => x.elevationGroup === elevationGroup)
-            .map((x) => x.maxDebt.minus(x.currentValue))
+        let remainingInsideEmodeCaps = new Decimal(0);
+        const capsGivenEgroup = caps.debtAgainstCollateralReserveCaps.filter(
+          (x) => x.elevationGroup === elevationGroup
         );
+        if (capsGivenEgroup.length > 0) {
+          remainingInsideEmodeCaps = Decimal.min(...capsGivenEgroup.map((x) => x.maxDebt.minus(x.currentValue)));
+        }
         return Decimal.min(
           positiveOrZero(liquidityAvailable),
           positiveOrZero(remainingInsideEmodeCaps),