@kamino-finance/klend-sdk 4.0.0 → 4.0.2

package/dist/utils/userMetadata.js

@@ -4,7 +4,7 @@ exports.getUserLutAddressAndSetupIxns = void 0;
 exports.getAllUserMetadatasWithFilter = getAllUserMetadatasWithFilter;
 const web3_js_1 = require("@solana/web3.js");
 const lib_1 = require("../lib");
-const farms_sdk_1 = require("@hubbleprotocol/farms-sdk");
+const farms_sdk_1 = require("@kamino-finance/farms-sdk");
 const getUserLutAddressAndSetupIxns = async (kaminoMarket, user, referrer = web3_js_1.PublicKey.default, withExtendLut = true, multiplyMints = [], leverageMints = [], repayWithCollObligation = undefined, payer = web3_js_1.PublicKey.default) => {
     const [userMetadataAddress, userMetadataState] = await kaminoMarket.getUserMetadata(user);
     const initUserMetadataIxs = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/klend-sdk",
-  "version": "4.0.0",
+  "version": "4.0.2",
   "description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
   "repository": {
     "type": "git",
@@ -50,9 +50,9 @@
     "@bokuweb/zstd-wasm": "^0.0.20",
     "@coral-xyz/anchor": "^0.28.0",
     "@coral-xyz/borsh": "^0.28.0",
-    "@hubbleprotocol/farms-sdk": "^1.0.3",
-    "@hubbleprotocol/scope-sdk": "^5.0.20",
-    "@kamino-finance/kliquidity-sdk": "^6.1.0",
+    "@kamino-finance/farms-sdk": "^2.0.3",
+    "@kamino-finance/kliquidity-sdk": "^6.2.1",
+    "@kamino-finance/scope-sdk": "^8.0.2",
     "@pythnetwork/client": "^2.5.1",
     "@solana/buffer-layout": "^4.0.0",
     "@solana/spl-token": "^0.4.8",
@@ -101,8 +101,8 @@
     "typescript-eslint": "^0.0.1-alpha.0"
   },
   "resolutions": {
-    "@kamino-finance/kliquidity-sdk": "^6.1.0",
-    "@hubbleprotocol/farms-sdk": "^1.0.3"
+    "@kamino-finance/farms-sdk": "^2.0.3",
+    "@kamino-finance/kliquidity-sdk": "^6.2.1"
   },
   "packageManager": "yarn@1.22.22+sha1.ac34549e6aa8e7ead463a7407e1c7390f61a6610"
 }

package/src/classes/action.ts

@@ -64,11 +64,11 @@ import { KaminoMarket } from './market';
 import { KaminoObligation } from './obligation';
 import { KaminoReserve } from './reserve';
 import { ReserveFarmKind } from '../idl_codegen/types';
-import { farmsId } from '@hubbleprotocol/farms-sdk';
+import { farmsId } from '@kamino-finance/farms-sdk';
 import { Reserve } from '../idl_codegen/accounts';
 import { VanillaObligation } from '../utils/ObligationType';
 import { PROGRAM_ID } from '../lib';
-import { U16_MAX } from '@hubbleprotocol/scope-sdk';
+import { U16_MAX } from '@kamino-finance/scope-sdk';
 
 export const POSITION_LIMIT = 10;
 export const BORROWS_LIMIT = 5;

package/src/classes/manager.ts

@@ -34,7 +34,7 @@ import {
   UpdateLendingMarketOwnerAccounts,
 } from '../lib';
 import { PROGRAM_ID } from '../idl_codegen/programId';
-import { Scope, TokenMetadatas, U16_MAX } from '@hubbleprotocol/scope-sdk';
+import { Scope, TokenMetadatas, U16_MAX } from '@kamino-finance/scope-sdk';
 import BN from 'bn.js';
 import { ElevationGroup, ReserveConfig, UpdateLendingMarketMode } from '../idl_codegen/types';
 import Decimal from 'decimal.js';

package/src/classes/market.ts

@@ -20,14 +20,15 @@ import {
   cacheOrGetSwitchboardPrice,
   PubkeyHashMap,
   CandidatePrice,
+  PublicKeySet,
 } from '../utils';
 import base58 from 'bs58';
 import { BN } from '@coral-xyz/anchor';
 import Decimal from 'decimal.js';
-import { FarmState } from '@hubbleprotocol/farms-sdk';
+import { FarmState } from '@kamino-finance/farms-sdk';
 import { PROGRAM_ID } from '../idl_codegen/programId';
 import bs58 from 'bs58';
-import { OraclePrices, Scope } from '@hubbleprotocol/scope-sdk';
+import { OraclePrices, Scope } from '@kamino-finance/scope-sdk';
 import { Fraction } from './fraction';
 import { chunks, KaminoPrices, MintToPriceMap } from '@kamino-finance/kliquidity-sdk';
 import { parseTokenSymbol } from './utils';
@@ -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

@@ -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

@@ -39,7 +39,7 @@ import * as anchor from '@coral-xyz/anchor';
 import { TOKEN_PROGRAM_ID } from '@solana/spl-token';
 import { UpdateBorrowRateCurve } from '../idl_codegen/types/UpdateConfigMode';
 import { aprToApy, KaminoPrices } from '@kamino-finance/kliquidity-sdk';
-import { FarmState, RewardInfo } from '@hubbleprotocol/farms-sdk';
+import { FarmState, RewardInfo } from '@kamino-finance/farms-sdk';
 
 export const DEFAULT_RECENT_SLOT_DURATION_MS = 450;
 
@@ -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),

package/src/classes/shared.ts

@@ -1,6 +1,6 @@
 import { PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-import { FarmState, RewardInfo } from '@hubbleprotocol/farms-sdk';
+import { FarmState, RewardInfo } from '@kamino-finance/farms-sdk';
 
 export type ConfigType = Array<MarketConfigType>;
 

package/src/utils/managerTypes.ts

@@ -17,7 +17,7 @@ import { Fraction, ZERO_FRACTION } from '../classes/fraction';
 import BN from 'bn.js';
 import { numberToLamportsDecimal } from '../classes';
 import { NULL_PUBKEY } from './pubkey';
-import { OracleType, U16_MAX } from '@hubbleprotocol/scope-sdk';
+import { OracleType, U16_MAX } from '@kamino-finance/scope-sdk';
 import { LendingMarket } from '../lib';
 
 export type ScopeOracleConfig = {

package/src/utils/oracle.ts

@@ -1,8 +1,7 @@
 import { parsePriceData } from '@pythnetwork/client';
 import { AccountInfo, Connection, PublicKey } from '@solana/web3.js';
 import Decimal from 'decimal.js';
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { OraclePrices, Scope } from '@hubbleprotocol/scope-sdk';
+import { OraclePrices, Scope } from '@kamino-finance/scope-sdk';
 import { isNotNullPubkey, PubkeyHashMap, PublicKeySet } from './pubkey';
 import { parseTokenSymbol } from '../classes';
 import SwitchboardProgram from '@switchboard-xyz/sbv2-lite';

package/src/utils/userMetadata.ts

@@ -21,7 +21,7 @@ import {
   UserMetadata,
   PublicKeySet,
 } from '../lib';
-import { farmsId } from '@hubbleprotocol/farms-sdk';
+import { farmsId } from '@kamino-finance/farms-sdk';
 import { KaminoReserve } from '../classes/reserve';
 
 export type KaminoUserMetadata = {