@kamino-finance/klend-sdk 4.0.1 → 4.1.0

package/src/classes/action.ts

@@ -15,6 +15,7 @@ import {
   NATIVE_MINT,
   TOKEN_PROGRAM_ID,
   createCloseAccountInstruction,
+  createSyncNativeInstruction,
 } from '@solana/spl-token';
 import BN from 'bn.js';
 import Decimal from 'decimal.js';
@@ -47,7 +48,6 @@ import {
   buildComputeBudgetIx,
   createAssociatedTokenAccountIdempotentInstruction,
   ObligationType,
-  syncNative,
   U64_MAX,
   referrerTokenStatePda,
   userMetadataPda,
@@ -1043,14 +1043,14 @@ export class KaminoAction {
     kaminoMarket: KaminoMarket,
     currentSlot: number = 0
   ) {
-    const { axn, createAtasIxns } = await KaminoAction.initializeWithdrawReferrerFees(
+    const { axn, createAtaIxs } = await KaminoAction.initializeWithdrawReferrerFees(
       tokenMint,
       owner,
       kaminoMarket,
       currentSlot
     );
 
-    axn.preTxnIxs.push(...createAtasIxns);
+    axn.preTxnIxs.push(...createAtaIxs);
     axn.preTxnIxsLabels.push(`createAtasIxs[${axn.userTokenAccountAddress.toString()}]`);
 
     axn.addRefreshReserveIxs([axn.reserve.address]);
@@ -2445,70 +2445,57 @@ export class KaminoAction {
     }
 
     if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && !this.mint.equals(WRAPPED_SOL_MINT)) {
-      const userTokenAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
-
-      if (!userTokenAccountInfo) {
-        const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
-          this.owner,
-          this.reserve.getLiquidityMint(),
-          this.owner,
-          this.reserve.getLiquidityTokenProgram(),
-          this.userTokenAccountAddress
-        );
+      const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
+        this.owner,
+        this.reserve.getLiquidityMint(),
+        this.owner,
+        this.reserve.getLiquidityTokenProgram(),
+        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}]`);
-        }
+      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}]`);
       }
     }
 
     if (action === 'liquidate') {
-      const userTokenAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
-
       if (!this.outflowReserve) {
         throw new Error(`Outflow reserve state not found ${this.mint}`);
       }
 
-      if (!userTokenAccountInfo) {
-        const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
-          this.owner,
-          this.outflowReserve.getLiquidityMint(),
-          this.owner,
-          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()}]`);
-        }
+      const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
+        this.owner,
+        this.outflowReserve.getLiquidityMint(),
+        this.owner,
+        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()}]`);
       }
 
-      const userCollateralAccountInfo = await this.kaminoMarket
-        .getConnection()
-        .getAccountInfo(this.userCollateralAccountAddress);
-      if (!userCollateralAccountInfo) {
-        const [, createUserCollateralAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
-          this.owner,
-          this.outflowReserve.getCTokenMint(),
-          this.owner,
-          TOKEN_PROGRAM_ID,
-          this.userCollateralAccountAddress
-        );
+      const [, createUserCollateralAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
+        this.owner,
+        this.outflowReserve.getCTokenMint(),
+        this.owner,
+        TOKEN_PROGRAM_ID,
+        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()}]`);
-        }
+      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()}]`);
       }
 
       if (!this.additionalTokenAccountAddress) {
@@ -2547,43 +2534,32 @@ export class KaminoAction {
     }
 
     if (action === 'withdraw' || action === 'mint' || action === 'deposit' || action === 'repayAndWithdraw') {
-      const userTokenAccountInfo = await this.kaminoMarket.getConnection().getAccountInfo(this.userTokenAccountAddress);
-
-      // TODO: Might need to remove this
-      if (!userTokenAccountInfo) {
-        const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
-          this.owner,
-          this.reserve.getLiquidityMint(),
-          this.owner,
-          this.reserve.getLiquidityTokenProgram(),
-          this.userTokenAccountAddress
-        );
-        this.preTxnIxs.push(createUserTokenAccountIx);
-        this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
-      }
+      const [, createUserTokenAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
+        this.owner,
+        this.reserve.getLiquidityMint(),
+        this.owner,
+        this.reserve.getLiquidityTokenProgram(),
+        this.userTokenAccountAddress
+      );
+      this.preTxnIxs.push(createUserTokenAccountIx);
+      this.preTxnIxsLabels.push(`CreateUserAta[${this.userTokenAccountAddress.toBase58()}]`);
     }
     if (action === 'mint') {
-      const userCollateralAccountInfo = await this.kaminoMarket
-        .getConnection()
-        .getAccountInfo(this.userCollateralAccountAddress);
-
-      if (!userCollateralAccountInfo) {
-        const collateralMintPubkey = this.reserve.getCTokenMint();
-        const [, createUserCollateralAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
-          this.owner,
-          collateralMintPubkey,
-          this.owner,
-          TOKEN_PROGRAM_ID,
-          this.userCollateralAccountAddress
-        );
+      const collateralMintPubkey = this.reserve.getCTokenMint();
+      const [, createUserCollateralAccountIx] = createAssociatedTokenAccountIdempotentInstruction(
+        this.owner,
+        collateralMintPubkey,
+        this.owner,
+        TOKEN_PROGRAM_ID,
+        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()}]`);
-        }
+      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()}]`);
       }
     }
   }
@@ -2661,7 +2637,7 @@ export class KaminoAction {
       TOKEN_PROGRAM_ID
     );
 
-    const syncIx = syncNative(userTokenAccountAddress);
+    const syncIx = createSyncNativeInstruction(userTokenAccountAddress);
     if (userWSOLAccountInfo) {
       if (sendAction) {
         preIxs.push(syncIx);
@@ -2801,12 +2777,12 @@ export class KaminoAction {
       throw new Error(`Reserve ${mint} not found in market ${kaminoMarket.getAddress().toBase58()}`);
     }
 
-    const { atas, createAtasIxns } = await getAtasWithCreateIxnsIfMissing(
-      kaminoMarket.getConnection(),
-      owner,
-      [reserve.getLiquidityMint()],
-      [reserve.getLiquidityTokenProgram()]
-    );
+    const { atas, createAtaIxs } = await getAtasWithCreateIxnsIfMissing(kaminoMarket.getConnection(), owner, [
+      {
+        mint: reserve.getLiquidityMint(),
+        tokenProgram: reserve.getLiquidityTokenProgram(),
+      },
+    ]);
 
     const userTokenAccountAddress = atas[0];
 
@@ -2830,7 +2806,7 @@ export class KaminoAction {
         undefined,
         undefined
       ),
-      createAtasIxns,
+      createAtaIxs,
     };
   }
 
@@ -2867,7 +2843,7 @@ export class KaminoAction {
     owner: PublicKey,
     kaminoObligation: KaminoObligation | null,
     referrer: PublicKey
-  ) {
+  ): Promise<PublicKey> {
     let referrerKey = referrer;
     if (!referrer || referrer.equals(PublicKey.default)) {
       if (kaminoObligation === null) {
@@ -2881,4 +2857,22 @@ export class KaminoAction {
     }
     return referrerKey;
   }
+
+  public static actionToIxs(action: KaminoAction): Array<TransactionInstruction> {
+    const ixs: TransactionInstruction[] = [...action.setupIxs];
+    ixs.push(...KaminoAction.actionToLendingIxs(action));
+    ixs.push(...action.cleanupIxs);
+    return ixs;
+  }
+
+  public static actionToLendingIxs(action: KaminoAction): Array<TransactionInstruction> {
+    const ixs: TransactionInstruction[] = [];
+    for (let i = 0; i < action.lendingIxs.length; i++) {
+      ixs.push(action.lendingIxs[i]);
+      if (i !== action.lendingIxs.length - 1) {
+        ixs.push(...action.inBetweenIxs);
+      }
+    }
+    return ixs;
+  }
 }

package/src/classes/market.ts

@@ -20,6 +20,7 @@ import {
   cacheOrGetSwitchboardPrice,
   PubkeyHashMap,
   CandidatePrice,
+  PublicKeySet,
 } from '../utils';
 import base58 from 'bs58';
 import { BN } from '@coral-xyz/anchor';
@@ -1208,10 +1209,10 @@ export class KaminoMarket {
         continue;
       }
       elevationGroups.push({
-        collateralReserves: [],
-        collateralLiquidityMints: [],
-        debtReserve: elevationGroup.debtReserve.toString(),
-        debtLiquidityMint: '',
+        collateralReserves: new PublicKeySet<PublicKey>([]),
+        collateralLiquidityMints: new PublicKeySet<PublicKey>([]),
+        debtReserve: elevationGroup.debtReserve,
+        debtLiquidityMint: PublicKey.default,
         elevationGroup: elevationGroup.id,
       });
     }
@@ -1219,7 +1220,7 @@ export class KaminoMarket {
     // Fill the remaining
     for (const reserve of this.reserves.values()) {
       const reserveLiquidityMint = reserve.getLiquidityMint();
-      const reserveAddress = reserve.address.toString();
+      const reserveAddress = reserve.address;
       const reserveElevationGroups = reserve.state.config.elevationGroups;
       for (const elevationGroupId of reserveElevationGroups) {
         if (elevationGroupId === 0) {
@@ -1228,14 +1229,14 @@ export class KaminoMarket {
 
         const elevationGroupDescription = elevationGroups[elevationGroupId - 1];
         if (elevationGroupDescription) {
-          if (reserveAddress === elevationGroupDescription.debtReserve) {
-            elevationGroups[elevationGroupId - 1].debtLiquidityMint = reserveLiquidityMint.toString();
+          if (reserveAddress.equals(elevationGroupDescription.debtReserve)) {
+            elevationGroups[elevationGroupId - 1].debtLiquidityMint = reserveLiquidityMint;
           } else {
-            elevationGroups[elevationGroupId - 1].collateralReserves.push(reserveAddress);
-            elevationGroups[elevationGroupId - 1].collateralLiquidityMints.push(reserveLiquidityMint.toString());
+            elevationGroups[elevationGroupId - 1].collateralReserves.add(reserveAddress);
+            elevationGroups[elevationGroupId - 1].collateralLiquidityMints.add(reserveLiquidityMint);
           }
         } else {
-          throw new Error(`Invalid elevation group id ${elevationGroupId} at reserve ${reserveAddress}`);
+          throw new Error(`Invalid elevation group id ${elevationGroupId} at reserve ${reserveAddress.toString()}`);
         }
       }
     }
@@ -1252,10 +1253,8 @@ export class KaminoMarket {
 
     return allElevationGroups.filter((elevationGroupDescription) => {
       return (
-        collLiquidityMints.every((mint) =>
-          elevationGroupDescription.collateralLiquidityMints.includes(mint.toString())
-        ) &&
-        (debtLiquidityMint == undefined || debtLiquidityMint.toString() === elevationGroupDescription.debtLiquidityMint)
+        collLiquidityMints.every((mint) => elevationGroupDescription.collateralLiquidityMints.contains(mint)) &&
+        (debtLiquidityMint == undefined || debtLiquidityMint.equals(elevationGroupDescription.debtLiquidityMint))
       );
     });
   }
@@ -1269,8 +1268,8 @@ export class KaminoMarket {
 
     return allElevationGroups.filter((elevationGroupDescription) => {
       return (
-        collReserves.every((mint) => elevationGroupDescription.collateralReserves.includes(mint.toString())) &&
-        (debtReserve == undefined || debtReserve.toString() === elevationGroupDescription.debtReserve)
+        collReserves.every((mint) => elevationGroupDescription.collateralReserves.contains(mint)) &&
+        (debtReserve == undefined || debtReserve.equals(elevationGroupDescription.debtReserve))
       );
     });
   }
@@ -1305,10 +1304,10 @@ export type BorrowCapsAndCounters = {
 };
 
 export type ElevationGroupDescription = {
-  collateralReserves: string[];
-  collateralLiquidityMints: string[];
-  debtReserve: string;
-  debtLiquidityMint: string;
+  collateralReserves: PublicKeySet<PublicKey>;
+  collateralLiquidityMints: PublicKeySet<PublicKey>;
+  debtReserve: PublicKey;
+  debtLiquidityMint: PublicKey;
   elevationGroup: number;
 };
 

package/src/classes/obligation.ts

@@ -305,6 +305,15 @@ export class KaminoObligation {
     return this.refreshedStats.netAccountValue;
   }
 
+  /**
+   * Get the loan to value and liquidation loan to value for a collateral token reserve as ratios, accounting for the obligation elevation group if it is active
+   * @param market
+   * @param reserve
+   */
+  public getLtvForReserve(market: KaminoMarket, reserve: KaminoReserve): { maxLtv: Decimal; liquidationLtv: Decimal } {
+    return KaminoObligation.getLtvForReserve(market, reserve, this.state.elevationGroup);
+  }
+
   /**
    * @returns the potential elevation groups the obligation qualifies for
    */
@@ -372,19 +381,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 +433,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 +444,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 +461,7 @@ export class KaminoObligation {
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           amountCollateral.toNumber(),
-          collateralReserve!,
+          collateralReservePk!,
           collateralExchangeRates
         );
         break;
@@ -451,14 +471,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 +501,7 @@ export class KaminoObligation {
         newObligationDeposits = this.simulateDepositChange(
           this.state.deposits,
           amountCollateral.neg().toNumber(),
-          collateralReserve!,
+          collateralReservePk!,
           collateralExchangeRates
         );
         break;
@@ -487,10 +518,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 +542,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 +564,7 @@ export class KaminoObligation {
       newObligationBorrows,
       elevationGroup,
       collateralExchangeRates,
-      cumulativeBorrowRates
+      null
     );
 
     newStats = refreshedStats;
@@ -568,7 +610,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>;
@@ -774,12 +816,12 @@ export class KaminoObligation {
     return borrowLimit.div(userTotalDeposit);
   }
 
-  /* 
-    How much of a given token can a user borrow extra given an elevation group, 
+  /*
+    How much of a given token can a user borrow extra given an elevation group,
     regardless of caps and liquidity or assuming infinite liquidity and infinite caps,
     until it hits max LTV.
 
-    This is purely a function about the borrow power of an obligation, 
+    This is purely a function about the borrow power of an obligation,
     not a reserve-specific, caps-specific, liquidity-specific function.
 
     * @param market - The KaminoMarket instance.
@@ -857,7 +899,7 @@ export class KaminoObligation {
     return Decimal.max(new Decimal(0), maxBorrowAmount);
   }
 
-  /* 
+  /*
     How much of a given token can a user borrow extra given an elevation group,
     and a specific reserve, until it hits max LTV and given available liquidity and caps.
 
@@ -891,7 +933,7 @@ export class KaminoObligation {
     }
   }
 
-  /* 
+  /*
     Returns true if the loan is eligible for the elevation group, including for the default one.
     * @param market - The KaminoMarket object representing the market.
     * @param slot - The slot number of the loan.
@@ -904,8 +946,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 +960,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;
@@ -946,7 +988,7 @@ export class KaminoObligation {
     return isEligibleBasedOnLtv;
   }
 
-  /* 
+  /*
     Returns all elevation groups for a given obligation, except the default one
     * @param market - The KaminoMarket instance.
     * @returns An array of ElevationGroupDescription objects representing the elevation groups for the obligation.