@kamino-finance/klend-sdk 7.4.0-beta.2 → 7.4.0-beta.3

package/src/classes/market.ts

@@ -40,10 +40,8 @@ import {
   MultiplyObligation,
   MultiplyObligationFixedRate,
   ObligationType,
-  FloatRateReserveKind,
   PythPrices,
   referrerTokenStatePda,
-  ReserveKind,
   setOrAppend,
   userMetadataPda,
   VanillaObligation,
@@ -573,12 +571,6 @@ export class KaminoMarket {
     return checkDefined(this.getReserveByAddress(address), `${description} reserve ${address} not found`);
   }
 
-  /**
-   * Returns all reserves for the given mint address (both float rate and fixed rate).
-   *
-   * @param mint The liquidity mint address
-   * @returns Array of all reserves for this mint
-   */
   getReservesByMint(address: Address): KaminoReserve[] {
     const reserves: KaminoReserve[] = [];
     for (const reserve of this.reserves.values()) {
@@ -589,97 +581,14 @@ export class KaminoMarket {
     return reserves;
   }
 
-  getExistingReservesByMint(address: Address, description: string = 'Requested'): KaminoReserve[] {
-    return checkArrayNotEmpty(this.getReservesByMint(address), `${description} reserve with mint ${address} not found`);
-  }
-
-  /**
-   * Returns this market's reserve matching the given mint address and reserve kind.
-   * Since a market can have multiple reserves for the same mint (with different terms),
-   * the reserve kind specifies which reserve to select.
-   *
-   * Example for fixed-term reserves:
-   * const fixedReserveKind = new FixedReserveKind(new BN(30 * 24 * 60 * 60), 500); // 30 days, 5% borrow rate
-   * const fixedReserve = market.getReserveByMintAndKind(tokenMint, fixedReserveKind)!;
-
-   * @param mint The liquidity mint address
-   * @param reserveKind The reserve kind to match (e.g., FloatRateReserveKind or FixedRateReserveKind)
-   */
-  getReserveByMintAndKind(mint: Address, reserveKind: ReserveKind): KaminoReserve | undefined {
-    for (const reserve of this.reserves.values()) {
-      if (reserve.getLiquidityMint() === mint && reserveKind.matches(reserve)) {
-        return reserve;
-      }
-    }
-    return undefined;
-  }
-
-  /**
-   * Returns this market's reserve matching the given mint address and reserve kind,
-   * or throws an error if not found.
-   *
-   * @param mint The liquidity mint address
-   * @param reserveKind The reserve kind to match
-   * @param description Optional description for the error message
-   */
-  getExistingReserveByMintAndKind(
-    mint: Address,
-    reserveKind: ReserveKind,
-    description: string = 'Requested'
-  ): KaminoReserve {
-    return checkDefined(
-      this.getReserveByMintAndKind(mint, reserveKind),
-      `${description} reserve with mint ${mint} and kind ${reserveKind.toString()} not found`
-    );
-  }
-
   /**
-   * Returns this market's float rate reserve for the given mint address.
-   * Float rate reserves are reserves without a fixed term (debtTermSeconds = 0).
-   *
-   * @param mint The liquidity mint address
-   * @returns The float rate reserve, or undefined if not found
+   * Returns this market's reserve of the given mint address, or throws an error (including the given description) if
+   * such reserve does not exist.
    */
-  getFloatRateReserveByMint(mint: Address): KaminoReserve | undefined {
-    return this.getReserveByMintAndKind(mint, new FloatRateReserveKind());
-  }
-
-  /**
-   * Returns this market's float rate reserve for the given mint address,
-   * or throws an error if not found.
-   *
-   * @param mint The liquidity mint address
-   * @param description Optional description for the error message
-   * @returns The float rate reserve
-   */
-  getExistingFloatRateReserveByMint(mint: Address, description: string = 'Requested'): KaminoReserve {
-    return checkDefined(this.getFloatRateReserveByMint(mint), `${description} float rate reserve with mint ${mint} not found`);
-  }
-
-  /**
-   * Returns all fixed rate reserves for the given mint address.
-   * Fixed rate reserves have a non-zero debt term (debtTermSeconds > 0).
-   *
-   * @param mint The liquidity mint address
-   * @returns Array of all fixed rate reserves for this mint
-   */
-  getFixedRateReservesByMint(mint: Address): KaminoReserve[] {
-    const fixedRateReserves: KaminoReserve[] = [];
-    const floatRateReserveKind = new FloatRateReserveKind();
-    for (const reserve of this.reserves.values()) {
-      if (reserve.getLiquidityMint() === mint && !floatRateReserveKind.matches(reserve)) {
-        fixedRateReserves.push(reserve);
-      }
-    }
-    return fixedRateReserves;
+  getExistingReservesByMint(address: Address, description: string = 'Requested'): KaminoReserve[] {
+    return checkArrayNotEmpty(this.getReservesByMint(address), `${description} reserve with mint ${address} not found`);
   }
 
-  /**
-   * Returns all reserves for the given symbol (both float rate and fixed rate).
-   *
-   * @param symbol The reserve symbol
-   * @returns Array of all reserves for this symbol
-   */
   getReservesBySymbol(symbol: string): KaminoReserve[] {
     const reserves: KaminoReserve[] = [];
     for (const reserve of this.reserves.values()) {
@@ -690,6 +599,10 @@ export class KaminoMarket {
     return reserves;
   }
 
+  /**
+   * Returns this market's reserve of the given symbol, or throws an error (including the given description) if
+   * such reserve does not exist.
+   */
   getExistingReservesBySymbol(symbol: string, description: string = 'Requested'): KaminoReserve[] {
     return checkArrayNotEmpty(
       this.getReservesBySymbol(symbol),
@@ -697,94 +610,6 @@ export class KaminoMarket {
     );
   }
 
-  /**
-   * Returns this market's reserve matching the given symbol and reserve kind.
-   * Since a market can have multiple reserves for the same symbol (with different terms),
-   * the reserve kind specifies which reserve to select.
-   *
-   * @param symbol The reserve symbol
-   * @param reserveKind The reserve kind to match (e.g., FloatRateReserveKind or FixedRateReserveKind)
-   */
-  getReserveBySymbolAndKind(symbol: string, reserveKind: ReserveKind): KaminoReserve | undefined {
-    for (const reserve of this.reserves.values()) {
-      if (reserve.symbol === symbol && reserveKind.matches(reserve)) {
-        return reserve;
-      }
-    }
-    return undefined;
-  }
-
-  /**
-   * Returns this market's reserve matching the given symbol and reserve kind,
-   * or throws an error if not found.
-   *
-   * @param symbol The reserve symbol
-   * @param reserveKind The reserve kind to match
-   * @param description Optional description for the error message
-   */
-  getExistingReserveBySymbolAndKind(
-    symbol: string,
-    reserveKind: ReserveKind,
-    description: string = 'Requested'
-  ): KaminoReserve {
-    return checkDefined(
-      this.getReserveBySymbolAndKind(symbol, reserveKind),
-      `${description} reserve with symbol ${symbol} and kind ${reserveKind.toString()} not found`
-    );
-  }
-
-  /**
-   * Returns this market's float rate reserve for the given symbol.
-   * Float rate reserves are reserves without a fixed term (debtTermSeconds = 0).
-   *
-   * @param symbol The reserve symbol
-   * @returns The float rate reserve, or undefined if not found
-   */
-  getFloatRateReserveBySymbol(symbol: string): KaminoReserve | undefined {
-    return this.getReserveBySymbolAndKind(symbol, new FloatRateReserveKind());
-  }
-
-  /**
-   * Returns this market's float rate reserve for the given symbol,
-   * or throws an error if not found.
-   *
-   * @param symbol The reserve symbol
-   * @param description Optional description for the error message
-   * @returns The float rate reserve
-   */
-  getExistingFloatRateReserveBySymbol(symbol: string, description: string = 'Requested'): KaminoReserve {
-    return checkDefined(
-      this.getFloatRateReserveBySymbol(symbol),
-      `${description} float rate reserve with symbol ${symbol} not found`
-    );
-  }
-
-  /**
-   * Returns all fixed rate reserves for the given symbol.
-   * Fixed rate reserves have a non-zero debt term (debtTermSeconds > 0).
-   *
-   * @param symbol The reserve symbol
-   * @returns Array of all fixed rate reserves for this symbol
-   */
-  getFixedRateReservesBySymbol(symbol: string): KaminoReserve[] {
-    const fixedRateReserves: KaminoReserve[] = [];
-    const floatRateReserveKind = new FloatRateReserveKind();
-    for (const reserve of this.reserves.values()) {
-      if (reserve.symbol === symbol && !floatRateReserveKind.matches(reserve)) {
-        fixedRateReserves.push(reserve);
-      }
-    }
-    return fixedRateReserves;
-  }
-
-  getReserveMintBySymbol(symbol: string) {
-    const reserves = this.getReservesBySymbol(symbol);
-    if (reserves.length === 0) {
-      throw new Error(`No reserves found for symbol ${symbol}`);
-    }
-    return reserves[0].getLiquidityMint();
-  }
-
   async getReserveFarmInfo(
     reserveAddress: Address,
     getRewardPrice: (mint: Address) => Promise<number>

package/src/classes/reserve.ts

@@ -19,7 +19,6 @@ import Decimal from 'decimal.js';
 import {
   AllOracleAccounts,
   DEFAULT_PUBLIC_KEY,
-  FixedRateReserveKind,
   getTokenOracleData,
   globalConfigPda,
   INITIAL_COLLATERAL_RATE,
@@ -27,9 +26,7 @@ import {
   MarketWithAddress,
   MIN_INITIAL_DEPOSIT,
   ONE_HUNDRED_PCT_IN_BPS,
-  FloatRateReserveKind,
   reservePdas,
-  ReserveKind,
   SLOTS_PER_DAY,
   SLOTS_PER_SECOND,
   SLOTS_PER_YEAR,
@@ -79,7 +76,6 @@ export class KaminoReserve {
   private readonly recentSlotDurationMs: number;
 
   private metadata?: ScopeEntryMetadata[];
-  private reserveKind: ReserveKind;
 
   constructor(
     state: Reserve,
@@ -95,7 +91,6 @@ export class KaminoReserve {
     this.rpc = connection;
     this.symbol = parseTokenSymbol(state.config.tokenInfo.name);
     this.recentSlotDurationMs = recentSlotDurationMs;
-    this.reserveKind = KaminoReserve.createReserveKind(state);
   }
 
   static initialize(
@@ -135,16 +130,6 @@ export class KaminoReserve {
     return new KaminoReserve(reserve, address, tokenOracleData, rpc, recentSlotDurationMs);
   }
 
-  static createReserveKind(state: Reserve): ReserveKind {
-    const debtTermSeconds = state.config.debtTermSeconds;
-    if (debtTermSeconds.eqn(0)) {
-      return new FloatRateReserveKind();
-    } else {
-      const borrowRateBps = state.config.borrowRateCurve.points[0]?.borrowRateBps || 0;
-      return new FixedRateReserveKind(debtTermSeconds, borrowRateBps);
-    }
-  }
-
   /// GETTERS
 
   /**
@@ -178,7 +163,7 @@ export class KaminoReserve {
    * @returns the available liquidity amount of the reserve in lamports
    */
   getLiquidityAvailableAmount(): Decimal {
-    return new Decimal(this.state.liquidity.availableAmount.toString());
+    return new Decimal(this.state.liquidity.totalAvailableAmount.toString());
   }
 
   /**
@@ -748,15 +733,6 @@ export class KaminoReserve {
     return this.state.collateral.mintPubkey;
   }
 
-  /**
-   * Returns the reserve kind (FloatRateReserveKind or FixedRateReserveKind) for this reserve.
-   *
-   * @returns The reserve kind instance
-   */
-  getKind(): ReserveKind {
-    return this.reserveKind;
-  }
-
   calculateFees(
     amountLamports: Decimal,
     borrowFeeRate: Decimal,
@@ -1299,7 +1275,7 @@ export const RESERVE_CONFIG_UPDATER = new ConfigUpdater(UpdateConfigMode.fromDec
   [UpdateConfigMode.UpdateSwitchboardFeed.kind]: config.tokenInfo.switchboardConfiguration.priceAggregator,
   [UpdateConfigMode.UpdateSwitchboardTwapFeed.kind]: config.tokenInfo.switchboardConfiguration.twapAggregator,
   [UpdateConfigMode.UpdateBorrowRateCurve.kind]: config.borrowRateCurve,
-  [UpdateConfigMode.UpdateEntireReserveConfig.kind]: [], // technically `config` would be a valid thing here, but we actually do NOT want entire config update among ixs produced for field-by-field updates
+  [UpdateConfigMode.DeprecatedUpdateEntireReserveConfig.kind]: [], // technically `config` would be a valid thing here, but we actually do NOT want entire config update among ixs produced for field-by-field updates
   [UpdateConfigMode.UpdateDebtWithdrawalCap.kind]: new CompositeConfigItem(
     config.debtWithdrawalCap.configCapacity,
     config.debtWithdrawalCap.configIntervalLengthSeconds
@@ -1339,32 +1315,6 @@ export const RESERVE_CONFIG_UPDATER = new ConfigUpdater(UpdateConfigMode.fromDec
   [UpdateConfigMode.UpdateDebtTermSeconds.kind]: config.debtTermSeconds,
 }));
 
-export async function updateEntireReserveConfigIx(
-  signer: TransactionSigner,
-  marketAddress: Address,
-  reserveAddress: Address,
-  reserveConfig: ReserveConfig,
-  programId: Address
-): Promise<Instruction> {
-  const args: UpdateReserveConfigArgs = {
-    mode: new UpdateConfigMode.UpdateEntireReserveConfig(),
-    value: encodeUsingLayout(ReserveConfig.layout(), reserveConfig),
-    skipConfigIntegrityValidation: false,
-  };
-
-  const globalConfig = await globalConfigPda(programId);
-  const accounts: UpdateReserveConfigAccounts = {
-    signer,
-    lendingMarket: marketAddress,
-    reserve: reserveAddress,
-    globalConfig,
-  };
-
-  const ix = updateReserveConfig(args, accounts, undefined, programId);
-
-  return ix;
-}
-
 export function parseForChangesReserveConfigAndGetIxs(
   marketWithAddress: MarketWithAddress,
   reserve: Reserve | undefined,
@@ -1395,30 +1345,57 @@ export type ReserveWithAddress = {
   state: Reserve;
 };
 
-const NON_VALIDATED_DISCRIMINATORS = [
-  UpdateConfigMode.UpdateScopePriceFeed.discriminator,
-  UpdateConfigMode.UpdateTokenInfoScopeChain.discriminator,
-  UpdateConfigMode.UpdateTokenInfoScopeTwap.discriminator,
-  UpdateConfigMode.UpdateTokenInfoExpHeuristic.discriminator,
-  UpdateConfigMode.UpdateTokenInfoTwapDivergence.discriminator,
-  UpdateConfigMode.UpdateTokenInfoPriceMaxAge.discriminator,
-  UpdateConfigMode.UpdateTokenInfoTwapMaxAge.discriminator,
+// Updating the deposit/borrow limit will automatically unblock usage and force validation inside the smart contract
+const VALIDATED_DISCRIMINATORS = [
+  UpdateConfigMode.UpdateDepositLimit.discriminator,
+  UpdateConfigMode.UpdateBorrowLimit.discriminator,
 ];
 
-function shouldSkipValidation(mode: UpdateConfigModeKind, reserve: Reserve | undefined): boolean {
-  return (
-    NON_VALIDATED_DISCRIMINATORS.includes(mode.discriminator) &&
-    !reserve?.liquidity.availableAmount.gten(MIN_INITIAL_DEPOSIT)
-  );
+export function shouldSkipValidation(mode: UpdateConfigModeKind, reserve: Reserve | undefined): boolean {
+  if (VALIDATED_DISCRIMINATORS.includes(mode.discriminator)) {
+    return false;
+  }
+  if (reserve == undefined) {
+    return true;
+  }
+  return reserve.config.depositLimit.isZero() && reserve.config.borrowLimit.isZero();
 }
 
-function priorityOf(mode: UpdateConfigModeKind): number {
+// Lowest priority gets updated first
+export function priorityOf(mode: UpdateConfigModeKind): number {
   switch (mode.discriminator) {
     case UpdateConfigMode.UpdateScopePriceFeed.discriminator:
-      return 0;
+    case UpdateConfigMode.UpdateTokenInfoScopeTwap.discriminator:
     case UpdateConfigMode.UpdateTokenInfoScopeChain.discriminator:
+    case UpdateConfigMode.UpdateTokenInfoLowerHeuristic.discriminator:
+    case UpdateConfigMode.UpdateTokenInfoUpperHeuristic.discriminator:
+    case UpdateConfigMode.UpdateTokenInfoExpHeuristic.discriminator:
+    case UpdateConfigMode.UpdateTokenInfoTwapDivergence.discriminator:
+    case UpdateConfigMode.UpdateTokenInfoName.discriminator:
+    case UpdateConfigMode.UpdateTokenInfoPriceMaxAge.discriminator:
+    case UpdateConfigMode.UpdateTokenInfoTwapMaxAge.discriminator:
+    case UpdateConfigMode.UpdatePythPrice.discriminator:
+    case UpdateConfigMode.UpdateSwitchboardFeed.discriminator:
+    case UpdateConfigMode.UpdateSwitchboardTwapFeed.discriminator:
       return 0;
+    case UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay.discriminator:
+    case UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.discriminator:
+    case UpdateConfigMode.UpdateDeleveragingThresholdDecreaseBpsPerDay.discriminator:
+      return 3;
+    case UpdateConfigMode.UpdateAutodeleverageEnabled.discriminator:
+      return 4;
+    case UpdateConfigMode.UpdateBorrowFactor.discriminator:
+      return 7;
+    case UpdateConfigMode.UpdateLoanToValuePct.discriminator:
+      return 8;
+    case UpdateConfigMode.UpdateLiquidationThresholdPct.discriminator:
+      return 9;
+    // Always update last bc we cannot skip validation
+    case UpdateConfigMode.UpdateDepositLimit.discriminator:
+      return 63;
+    case UpdateConfigMode.UpdateBorrowLimit.discriminator:
+      return 63;
     default:
-      return 1;
+      return 10;
   }
 }