@kamino-finance/klend-sdk 7.3.8 → 7.3.10-beta.0

package/dist/classes/shared.d.ts

@@ -1,6 +1,6 @@
 import { Address } from '@solana/kit';
 import Decimal from 'decimal.js';
-import { FarmAndKey, RewardInfo } from '@kamino-finance/farms-sdk';
+import { FarmState, RewardInfo } from '@kamino-finance/farms-sdk';
 export type ConfigType = Array<MarketConfigType>;
 export type MarketConfigType = {
     name: string;
@@ -48,7 +48,7 @@ export type ReserveRewardYield = {
 };
 export type ReserveFarmInfo = {
     fetched: boolean;
-    farms: FarmAndKey[];
+    farmStates: FarmState[];
 };
 export declare enum FeeCalculation {
     Inclusive = "Inclusive",

package/dist/classes/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/classes/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAEnE,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAEjD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,cAAc,EAAE;QACd,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAEF,oBAAY,aAAa;IACvB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,4BAA4B,EAAE,MAAM,CAAC;IACrC,2BAA2B,EAAE,MAAM,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,OAAO,GAAG,SAAS,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,UAAU,EAAE,CAAC;CACrB,CAAC;AAEF,oBAAY,cAAc;IACxB,SAAS,cAAc;IACvB,SAAS,cAAc;CACxB;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;OAEG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../src/classes/shared.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAElE,MAAM,MAAM,UAAU,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;AAEjD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,cAAc,EAAE;QACd,MAAM,EAAE,MAAM,CAAC;QACf,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAEF,oBAAY,aAAa;IACvB,MAAM,WAAW;IACjB,QAAQ,aAAa;IACrB,MAAM,WAAW;CAClB;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,MAAM,EAAE,aAAa,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,WAAW,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC;IAChC,WAAW,EAAE,MAAM,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,mBAAmB,EAAE,MAAM,CAAC;IAC5B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,mBAAmB,EAAE,OAAO,CAAC;IAC7B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,4BAA4B,EAAE,MAAM,CAAC;IACrC,2BAA2B,EAAE,MAAM,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,MAAM,CAAC;IACzB,uBAAuB,EAAE,OAAO,CAAC;IACjC,eAAe,EAAE,OAAO,CAAC;IACzB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,OAAO,GAAG,SAAS,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,EAAE,OAAO,CAAC;IACb,GAAG,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,UAAU,CAAC;CACxB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,EAAE,SAAS,EAAE,CAAC;CACzB,CAAC;AAEF,oBAAY,cAAc;IACxB,SAAS,cAAc;IACvB,SAAS,cAAc;CACxB;AAED,MAAM,MAAM,IAAI,GAAG;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,WAAW,GAAG;IACxB;;OAEG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;OAEG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kamino-finance/klend-sdk",
-  "version": "7.3.8",
+  "version": "7.3.10-beta.0",
   "description": "Typescript SDK for interacting with the Kamino Lending (klend) protocol",
   "repository": {
     "type": "git",

package/src/classes/action.ts

@@ -76,11 +76,7 @@ import { Scope } from '@kamino-finance/scope-sdk';
 import { ObligationOrderAtIndex } from './obligationOrder';
 import { ASSOCIATED_TOKEN_PROGRAM_ADDRESS, TOKEN_PROGRAM_ADDRESS } from '@solana-program/token';
 import { SYSVAR_INSTRUCTIONS_ADDRESS, SYSVAR_RENT_ADDRESS } from '@solana/sysvars';
-import {
-  getCloseAccountInstruction,
-  getSyncNativeInstruction,
-  TOKEN_2022_PROGRAM_ADDRESS,
-} from '@solana-program/token-2022';
+import { getCloseAccountInstruction, getSyncNativeInstruction } from '@solana-program/token-2022';
 import { getTransferSolInstruction, SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system';
 import { noopSigner } from '../utils/signer';
 
@@ -3293,13 +3289,8 @@ export class KaminoAction {
       action === 'mint' ||
       (action === 'liquidate' && this.mint === WRAPPED_SOL_MINT); // only sync WSOL amount if liquidator repays SOL which is secondaryMint
 
-    const isValidTokenAccount =
-      userWSOLAccountInfo.exists &&
-      (userWSOLAccountInfo.programAddress === TOKEN_PROGRAM_ADDRESS ||
-        userWSOLAccountInfo.programAddress === TOKEN_2022_PROGRAM_ADDRESS);
-
     const transferLamportsIx = getTransferSolInstruction({
-      amount: (isValidTokenAccount ? 0n : rentExemptLamports) + (sendAction ? BigInt(safeRepay.toString()) : 0n),
+      amount: (userWSOLAccountInfo.exists ? 0n : rentExemptLamports) + (sendAction ? BigInt(safeRepay.toString()) : 0n),
       source: this.owner,
       destination: userTokenAccountAddress,
     });
@@ -3321,20 +3312,29 @@ export class KaminoAction {
       },
       { programAddress: TOKEN_PROGRAM_ADDRESS }
     );
-
-    const [, createUserWSOLAccountIx] = await createAssociatedTokenAccountIdempotentInstruction(
-      this.owner,
-      WRAPPED_SOL_MINT,
-      this.owner.address,
-      TOKEN_PROGRAM_ADDRESS,
-      userTokenAccountAddress
-    );
-    preIxs.push(createUserWSOLAccountIx);
-    preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
-    preIxs.push(syncIx);
-    preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
-    postIxs.push(closeWSOLAccountIx);
-    postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
+    if (userWSOLAccountInfo.exists) {
+      if (sendAction) {
+        preIxs.push(syncIx);
+        preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
+      } else {
+        postIxs.push(closeWSOLAccountIx);
+        postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
+      }
+    } else {
+      const [, createUserWSOLAccountIx] = await createAssociatedTokenAccountIdempotentInstruction(
+        this.owner,
+        WRAPPED_SOL_MINT,
+        this.owner.address,
+        TOKEN_PROGRAM_ADDRESS,
+        userTokenAccountAddress
+      );
+      preIxs.push(createUserWSOLAccountIx);
+      preIxsLabels.push(`CreateUserAtaSOL[${userTokenAccountAddress}]`);
+      preIxs.push(syncIx);
+      preIxsLabels.push(`SyncUserAtaSOL[${userTokenAccountAddress}]`);
+      postIxs.push(closeWSOLAccountIx);
+      postIxsLabels.push(`CloseUserAtaSOL[${userTokenAccountAddress}]`);
+    }
 
     this.setupIxs.unshift(...preIxs);
     this.setupIxsLabels.unshift(...preIxsLabels);

package/src/classes/configItems.ts

@@ -1,6 +1,8 @@
 import { struct, Layout } from '@coral-xyz/borsh';
 import { blobEquals, orThrow, toJson } from './utils';
 import { Buffer } from 'buffer';
+import { ReserveConfig } from '../lib';
+import { UpdateConfigModeKind, UpdateConfigMode } from '../@codegen/klend/types';
 
 /**
  * An object literal specifying *all* "update mode" enum values (of type {@code M}) and their corresponding config items
@@ -151,7 +153,7 @@ export class ConfigItemUpdater<C, A> {
  * A resolver of config item changes.
  */
 export class ConfigUpdater<M extends BorshEnum, C> {
-  private readonly itemUpdaters: Map<M['kind'], [M, ConfigItemUpdater<C, any>[]]>;
+  protected readonly itemUpdaters: Map<M['kind'], [M, ConfigItemUpdater<C, any>[]]>;
 
   /**
    * A resolving constructor.
@@ -235,6 +237,61 @@ export class ConfigUpdater<M extends BorshEnum, C> {
   }
 }
 
+export class EntireReserveConfigUpdater extends ConfigUpdater<UpdateConfigModeKind, ReserveConfig> {
+  encodeAllUpdates(
+    currentConfig: ReserveConfig | undefined,
+    newConfig: ReserveConfig
+  ): EncodedConfigUpdate<UpdateConfigModeKind>[] {
+    const updates: EncodedConfigUpdate<UpdateConfigModeKind>[] = [];
+    let ltvUpdate: EncodedConfigUpdate<UpdateConfigModeKind> | undefined;
+    let liquidationThresholdUpdate: EncodedConfigUpdate<UpdateConfigModeKind> | undefined;
+
+    for (const [mode, itemUpdaters] of this.itemUpdaters.values()) {
+      for (const itemUpdater of itemUpdaters) {
+        const value = itemUpdater.encodeUpdatedItemFrom(currentConfig, newConfig);
+        if (value === undefined) {
+          continue;
+        }
+
+        const update = { mode, value };
+
+        if (mode.discriminator === UpdateConfigMode.UpdateLoanToValuePct.discriminator) {
+          ltvUpdate = update;
+        } else if (mode.discriminator === UpdateConfigMode.UpdateLiquidationThresholdPct.discriminator) {
+          liquidationThresholdUpdate = update;
+          // If reserve is already initialized, skip fields that require global admin signature on update
+        } else {
+          updates.push(update);
+        }
+      }
+    }
+
+    // Handle ordering of LTV and LiquidationThreshold updates
+    // ensure LiquidationThreshold >= LTV at all times
+    if (ltvUpdate && liquidationThresholdUpdate) {
+      const currentLiquidationThreshold = currentConfig ? currentConfig.liquidationThresholdPct : 0;
+      const newLiquidationThreshold = newConfig.liquidationThresholdPct;
+
+      if (newLiquidationThreshold > currentLiquidationThreshold) {
+        // Liquidation threshold is increasing, so it must be updated first
+        updates.push(liquidationThresholdUpdate);
+        updates.push(ltvUpdate);
+      } else {
+        // All other cases, it's safer to update the LTV first
+        updates.push(ltvUpdate);
+        updates.push(liquidationThresholdUpdate);
+      }
+    } else if (ltvUpdate) {
+      updates.push(ltvUpdate);
+    } else if (liquidationThresholdUpdate) {
+      updates.push(liquidationThresholdUpdate);
+    }
+
+    updates.sort((left, right) => priorityOf(left.mode) - priorityOf(right.mode));
+    return updates;
+  }
+}
+
 /**
  * The update mode discriminator and the serialized value needed to construct an update ix.
  */
@@ -293,3 +350,44 @@ type Getter<C, A> = (config: C) => A;
 function toArray<T>(singleOrArray: SingleOrArray<T>): T[] {
   return Array.isArray(singleOrArray) ? singleOrArray : [singleOrArray];
 }
+
+// Lowest priority gets updated first
+function priorityOf(mode: UpdateConfigModeKind): number {
+  switch (mode.discriminator) {
+    case UpdateConfigMode.UpdateScopePriceFeed.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoScopeTwap.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoScopeChain.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoLowerHeuristic.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoUpperHeuristic.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoExpHeuristic.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoTwapDivergence.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoName.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoPriceMaxAge.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateTokenInfoTwapMaxAge.discriminator:
+      return 0;
+    case UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay.discriminator:
+      return priorityOf(new UpdateConfigMode.UpdateAutodeleverageEnabled()) - 1;
+    case UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.discriminator:
+      return priorityOf(new UpdateConfigMode.UpdateAutodeleverageEnabled()) - 1;
+    case UpdateConfigMode.UpdateDeleveragingThresholdDecreaseBpsPerDay.discriminator:
+      return priorityOf(new UpdateConfigMode.UpdateAutodeleverageEnabled()) - 1;
+    case UpdateConfigMode.UpdateAutodeleverageEnabled.discriminator:
+      return 4;
+    // Always update last bc we cannot skip validation
+    case UpdateConfigMode.UpdateDepositLimit.discriminator:
+      return 63;
+    case UpdateConfigMode.UpdateBorrowLimit.discriminator:
+      return 63;
+    default:
+      return 10;
+  }
+}

package/src/classes/farm_utils.ts

@@ -8,7 +8,6 @@ import {
   scaleDownWads,
   WAD,
   RewardInfo,
-  RewardType,
 } from '@kamino-finance/farms-sdk';
 import {
   address,
@@ -175,7 +174,7 @@ export type UnstakeAndWithdrawFromFarmIxs = {
   withdrawIx: Instruction;
 };
 
-export function getRewardPerTimeUnitSecond(reward: RewardInfo, farmTotalStakeLamports: Decimal) {
+export function getRewardPerTimeUnitSecond(reward: RewardInfo) {
   const now = new Decimal(new Date().getTime()).div(1000);
   let rewardPerTimeUnitSecond = new Decimal(0);
   for (let i = 0; i < reward.rewardScheduleCurve.points.length - 1; i++) {
@@ -197,11 +196,8 @@ export function getRewardPerTimeUnitSecond(reward: RewardInfo, farmTotalStakeLam
   const rewardTokenDecimals = reward.token.decimals.toNumber();
   const rewardAmountPerUnitDecimals = new Decimal(10).pow(reward.rewardsPerSecondDecimals.toString());
   const rewardAmountPerUnitLamports = new Decimal(10).pow(rewardTokenDecimals.toString());
-  const constantRewardStakeAdjustment =
-    reward.rewardType === RewardType.Constant.discriminator ? farmTotalStakeLamports : new Decimal(1);
 
   const rpsAdjusted = new Decimal(rewardPerTimeUnitSecond.toString())
-    .mul(constantRewardStakeAdjustment)
     .div(rewardAmountPerUnitDecimals)
     .div(rewardAmountPerUnitLamports);
 

package/src/classes/reserve.ts

@@ -24,7 +24,6 @@ import {
   INITIAL_COLLATERAL_RATE,
   lendingMarketAuthPda,
   MarketWithAddress,
-  MIN_INITIAL_DEPOSIT,
   ONE_HUNDRED_PCT_IN_BPS,
   reservePdas,
   SLOTS_PER_DAY,
@@ -37,7 +36,7 @@ import { FeeCalculation, Fees, ReserveDataType, ReserveFarmInfo, ReserveRewardYi
 import { Reserve, ReserveFields } from '../@codegen/klend/accounts';
 import { CurvePointFields, ReserveConfig, UpdateConfigMode, UpdateConfigModeKind } from '../@codegen/klend/types';
 import { calculateAPYFromAPR, getBorrowRate, lamportsToNumberDecimal, parseTokenSymbol, positiveOrZero } from './utils';
-import { CompositeConfigItem, encodeUsingLayout, ConfigUpdater } from './configItems';
+import { CompositeConfigItem, encodeUsingLayout, EntireReserveConfigUpdater } from './configItems';
 import { bfToDecimal, Fraction } from './fraction';
 import { ActionType } from './action';
 import { BorrowCapsAndCounters, ElevationGroupDescription, KaminoMarket } from './market';
@@ -49,7 +48,7 @@ import {
   UpdateReserveConfigArgs,
 } from '../lib';
 import { aprToApy, KaminoPrices } from '@kamino-finance/kliquidity-sdk';
-import { FarmAndKey, FarmState, RewardInfo } from '@kamino-finance/farms-sdk';
+import { FarmState, RewardInfo } from '@kamino-finance/farms-sdk';
 import { TOKEN_PROGRAM_ADDRESS } from '@solana-program/token';
 import { maxBigInt } from '../utils/bigint';
 import { getCreateAccountInstruction, SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system';
@@ -70,7 +69,7 @@ export class KaminoReserve {
 
   tokenOraclePrice: TokenOracleData;
   stats: ReserveDataType;
-  private farmData: ReserveFarmInfo = { fetched: false, farms: [] };
+  private farmData: ReserveFarmInfo = { fetched: false, farmStates: [] };
 
   private rpc: Rpc<KaminoReserveRpcApi>;
   private readonly recentSlotDurationMs: number;
@@ -813,22 +812,22 @@ export class KaminoReserve {
 
   async loadFarmStates() {
     if (!this.farmData.fetched) {
-      const farmStates: FarmAndKey[] = [];
+      const farmStates: FarmState[] = [];
       const debtFarmAddress = this.getDebtFarmAddress();
       if (isSome(debtFarmAddress)) {
         const farmState = await FarmState.fetch(this.rpc, debtFarmAddress.value);
         if (farmState !== null) {
-          farmStates.push({ farmState, key: debtFarmAddress.value });
+          farmStates.push(farmState);
         }
       }
       const collateralFarmAddress = this.getCollateralFarmAddress();
       if (isSome(collateralFarmAddress)) {
         const farmState = await FarmState.fetch(this.rpc, collateralFarmAddress.value);
         if (farmState !== null) {
-          farmStates.push({ farmState, key: collateralFarmAddress.value });
+          farmStates.push(farmState);
         }
       }
-      this.farmData.farms = farmStates;
+      this.farmData.farmStates = farmStates;
       this.farmData.fetched = true;
     }
   }
@@ -839,19 +838,14 @@ export class KaminoReserve {
       throw Error('KaminoMarket must call loadReserves.');
     }
 
+    const isDebtReward = this.state.farmDebt === this.address;
     await this.loadFarmStates();
     const yields: ReserveRewardYield[] = [];
-    for (const farmAndKey of this.farmData.farms) {
-      const isDebtReward = this.state.farmDebt === farmAndKey.key;
-      for (const rewardInfo of farmAndKey.farmState.rewardInfos.filter(
+    for (const farmState of this.farmData.farmStates) {
+      for (const rewardInfo of farmState.rewardInfos.filter(
         (x) => x.token.mint !== DEFAULT_PUBLIC_KEY && !x.rewardsAvailable.isZero()
       )) {
-        const { apy, apr } = this.calculateRewardYield(
-          prices,
-          rewardInfo,
-          isDebtReward,
-          new Decimal(farmAndKey.farmState.totalActiveStakeScaled.toString())
-        );
+        const { apy, apr } = this.calculateRewardYield(prices, rewardInfo, isDebtReward);
         if (apy.isZero() && apr.isZero()) {
           continue;
         }
@@ -861,14 +855,9 @@ export class KaminoReserve {
     return yields;
   }
 
-  calculateRewardYield(
-    prices: KaminoPrices,
-    rewardInfo: RewardInfo,
-    isDebtReward: boolean,
-    farmTotalStakeLamports: Decimal
-  ) {
+  private calculateRewardYield(prices: KaminoPrices, rewardInfo: RewardInfo, isDebtReward: boolean) {
     const mintAddress = this.getLiquidityMint();
-    const rewardPerTimeUnitSecond = getRewardPerTimeUnitSecond(rewardInfo, farmTotalStakeLamports);
+    const rewardPerTimeUnitSecond = getRewardPerTimeUnitSecond(rewardInfo);
     const reserveToken = prices.spot[mintAddress.toString()];
     const rewardToken = prices.spot[rewardInfo.token.mint.toString()];
 
@@ -1250,69 +1239,74 @@ export async function updateReserveConfigIx(
   return updateReserveConfig(args, accounts, undefined, programId);
 }
 
-export const RESERVE_CONFIG_UPDATER = new ConfigUpdater(UpdateConfigMode.fromDecoded, ReserveConfig, (config) => ({
-  [UpdateConfigMode.UpdateLoanToValuePct.kind]: config.loanToValuePct,
-  [UpdateConfigMode.UpdateMaxLiquidationBonusBps.kind]: config.maxLiquidationBonusBps,
-  [UpdateConfigMode.UpdateLiquidationThresholdPct.kind]: config.liquidationThresholdPct,
-  [UpdateConfigMode.UpdateProtocolLiquidationFee.kind]: config.protocolLiquidationFeePct,
-  [UpdateConfigMode.UpdateProtocolTakeRate.kind]: config.protocolTakeRatePct,
-  [UpdateConfigMode.UpdateFeesOriginationFee.kind]: config.fees.originationFeeSf,
-  [UpdateConfigMode.UpdateFeesFlashLoanFee.kind]: config.fees.flashLoanFeeSf,
-  [UpdateConfigMode.DeprecatedUpdateFeesReferralFeeBps.kind]: [], // deprecated
-  [UpdateConfigMode.UpdateDepositLimit.kind]: config.depositLimit,
-  [UpdateConfigMode.UpdateBorrowLimit.kind]: config.borrowLimit,
-  [UpdateConfigMode.UpdateTokenInfoLowerHeuristic.kind]: config.tokenInfo.heuristic.lower,
-  [UpdateConfigMode.UpdateTokenInfoUpperHeuristic.kind]: config.tokenInfo.heuristic.upper,
-  [UpdateConfigMode.UpdateTokenInfoExpHeuristic.kind]: config.tokenInfo.heuristic.exp,
-  [UpdateConfigMode.UpdateTokenInfoTwapDivergence.kind]: config.tokenInfo.maxTwapDivergenceBps,
-  [UpdateConfigMode.UpdateTokenInfoScopeTwap.kind]: config.tokenInfo.scopeConfiguration.twapChain,
-  [UpdateConfigMode.UpdateTokenInfoScopeChain.kind]: config.tokenInfo.scopeConfiguration.priceChain,
-  [UpdateConfigMode.UpdateTokenInfoName.kind]: config.tokenInfo.name,
-  [UpdateConfigMode.UpdateTokenInfoPriceMaxAge.kind]: config.tokenInfo.maxAgePriceSeconds,
-  [UpdateConfigMode.UpdateTokenInfoTwapMaxAge.kind]: config.tokenInfo.maxAgeTwapSeconds,
-  [UpdateConfigMode.UpdateScopePriceFeed.kind]: config.tokenInfo.scopeConfiguration.priceFeed,
-  [UpdateConfigMode.UpdatePythPrice.kind]: config.tokenInfo.pythConfiguration.price,
-  [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.UpdateDebtWithdrawalCap.kind]: new CompositeConfigItem(
-    config.debtWithdrawalCap.configCapacity,
-    config.debtWithdrawalCap.configIntervalLengthSeconds
-  ),
-  [UpdateConfigMode.UpdateDepositWithdrawalCap.kind]: new CompositeConfigItem(
-    config.depositWithdrawalCap.configCapacity,
-    config.depositWithdrawalCap.configIntervalLengthSeconds
-  ),
-  [UpdateConfigMode.DeprecatedUpdateDebtWithdrawalCapCurrentTotal.kind]: [], // deprecated
-  [UpdateConfigMode.DeprecatedUpdateDepositWithdrawalCapCurrentTotal.kind]: [], // deprecated
-  [UpdateConfigMode.UpdateBadDebtLiquidationBonusBps.kind]: config.badDebtLiquidationBonusBps,
-  [UpdateConfigMode.UpdateMinLiquidationBonusBps.kind]: config.minLiquidationBonusBps,
-  [UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.kind]: config.deleveragingMarginCallPeriodSecs,
-  [UpdateConfigMode.UpdateBorrowFactor.kind]: config.borrowFactorPct,
-  [UpdateConfigMode.UpdateAssetTier.kind]: config.assetTier,
-  [UpdateConfigMode.UpdateElevationGroup.kind]: config.elevationGroups,
-  [UpdateConfigMode.UpdateDeleveragingThresholdDecreaseBpsPerDay.kind]: config.deleveragingThresholdDecreaseBpsPerDay,
-  [UpdateConfigMode.DeprecatedUpdateMultiplierSideBoost.kind]: [], // deprecated
-  [UpdateConfigMode.DeprecatedUpdateMultiplierTagBoost.kind]: [], // deprecated
-  [UpdateConfigMode.UpdateReserveStatus.kind]: config.status,
-  [UpdateConfigMode.UpdateFarmCollateral.kind]: [], // the farm fields live on the `Reserve` level...
-  [UpdateConfigMode.UpdateFarmDebt.kind]: [], // ...so we are not concerned with them in the `ReserveConfig`'s field-by-field update tx
-  [UpdateConfigMode.UpdateDisableUsageAsCollateralOutsideEmode.kind]: config.disableUsageAsCollOutsideEmode,
-  [UpdateConfigMode.UpdateBlockBorrowingAboveUtilizationPct.kind]: config.utilizationLimitBlockBorrowingAbovePct,
-  [UpdateConfigMode.UpdateBlockPriceUsage.kind]: config.tokenInfo.blockPriceUsage,
-  [UpdateConfigMode.UpdateBorrowLimitOutsideElevationGroup.kind]: config.borrowLimitOutsideElevationGroup,
-  [UpdateConfigMode.UpdateBorrowLimitsInElevationGroupAgainstThisReserve.kind]:
-    config.borrowLimitAgainstThisCollateralInElevationGroup,
-  [UpdateConfigMode.UpdateHostFixedInterestRateBps.kind]: config.hostFixedInterestRateBps,
-  [UpdateConfigMode.UpdateAutodeleverageEnabled.kind]: config.autodeleverageEnabled,
-  [UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay.kind]: config.deleveragingBonusIncreaseBpsPerDay,
-  [UpdateConfigMode.UpdateProtocolOrderExecutionFee.kind]: config.protocolOrderExecutionFeePct,
-  [UpdateConfigMode.UpdateProposerAuthorityLock.kind]: config.proposerAuthorityLocked,
-  [UpdateConfigMode.UpdateMinDeleveragingBonusBps.kind]: config.minDeleveragingBonusBps,
-  [UpdateConfigMode.UpdateBlockCTokenUsage.kind]: config.blockCtokenUsage,
-}));
-
+export const RESERVE_CONFIG_UPDATER = new EntireReserveConfigUpdater(
+  UpdateConfigMode.fromDecoded,
+  ReserveConfig,
+  (config) => ({
+    [UpdateConfigMode.UpdateLoanToValuePct.kind]: config.loanToValuePct,
+    [UpdateConfigMode.UpdateMaxLiquidationBonusBps.kind]: config.maxLiquidationBonusBps,
+    [UpdateConfigMode.UpdateLiquidationThresholdPct.kind]: config.liquidationThresholdPct,
+    [UpdateConfigMode.UpdateProtocolLiquidationFee.kind]: config.protocolLiquidationFeePct,
+    [UpdateConfigMode.UpdateProtocolTakeRate.kind]: config.protocolTakeRatePct,
+    [UpdateConfigMode.UpdateFeesOriginationFee.kind]: config.fees.originationFeeSf,
+    [UpdateConfigMode.UpdateFeesFlashLoanFee.kind]: config.fees.flashLoanFeeSf,
+    [UpdateConfigMode.DeprecatedUpdateFeesReferralFeeBps.kind]: [], // deprecated
+    [UpdateConfigMode.UpdateDepositLimit.kind]: config.depositLimit,
+    [UpdateConfigMode.UpdateBorrowLimit.kind]: config.borrowLimit,
+    [UpdateConfigMode.UpdateTokenInfoLowerHeuristic.kind]: config.tokenInfo.heuristic.lower,
+    [UpdateConfigMode.UpdateTokenInfoUpperHeuristic.kind]: config.tokenInfo.heuristic.upper,
+    [UpdateConfigMode.UpdateTokenInfoExpHeuristic.kind]: config.tokenInfo.heuristic.exp,
+    [UpdateConfigMode.UpdateTokenInfoTwapDivergence.kind]: config.tokenInfo.maxTwapDivergenceBps,
+    [UpdateConfigMode.UpdateTokenInfoScopeTwap.kind]: config.tokenInfo.scopeConfiguration.twapChain,
+    [UpdateConfigMode.UpdateTokenInfoScopeChain.kind]: config.tokenInfo.scopeConfiguration.priceChain,
+    [UpdateConfigMode.UpdateTokenInfoName.kind]: config.tokenInfo.name,
+    [UpdateConfigMode.UpdateTokenInfoPriceMaxAge.kind]: config.tokenInfo.maxAgePriceSeconds,
+    [UpdateConfigMode.UpdateTokenInfoTwapMaxAge.kind]: config.tokenInfo.maxAgeTwapSeconds,
+    [UpdateConfigMode.UpdateScopePriceFeed.kind]: config.tokenInfo.scopeConfiguration.priceFeed,
+    [UpdateConfigMode.UpdatePythPrice.kind]: config.tokenInfo.pythConfiguration.price,
+    [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.UpdateDebtWithdrawalCap.kind]: new CompositeConfigItem(
+      config.debtWithdrawalCap.configCapacity,
+      config.debtWithdrawalCap.configIntervalLengthSeconds
+    ),
+    [UpdateConfigMode.UpdateDepositWithdrawalCap.kind]: new CompositeConfigItem(
+      config.depositWithdrawalCap.configCapacity,
+      config.depositWithdrawalCap.configIntervalLengthSeconds
+    ),
+    [UpdateConfigMode.DeprecatedUpdateDebtWithdrawalCapCurrentTotal.kind]: [], // deprecated
+    [UpdateConfigMode.DeprecatedUpdateDepositWithdrawalCapCurrentTotal.kind]: [], // deprecated
+    [UpdateConfigMode.UpdateBadDebtLiquidationBonusBps.kind]: config.badDebtLiquidationBonusBps,
+    [UpdateConfigMode.UpdateMinLiquidationBonusBps.kind]: config.minLiquidationBonusBps,
+    [UpdateConfigMode.UpdateDeleveragingMarginCallPeriod.kind]: config.deleveragingMarginCallPeriodSecs,
+    [UpdateConfigMode.UpdateBorrowFactor.kind]: config.borrowFactorPct,
+    [UpdateConfigMode.UpdateAssetTier.kind]: config.assetTier,
+    [UpdateConfigMode.UpdateElevationGroup.kind]: config.elevationGroups,
+    [UpdateConfigMode.UpdateDeleveragingThresholdDecreaseBpsPerDay.kind]: config.deleveragingThresholdDecreaseBpsPerDay,
+    [UpdateConfigMode.DeprecatedUpdateMultiplierSideBoost.kind]: [], // deprecated
+    [UpdateConfigMode.DeprecatedUpdateMultiplierTagBoost.kind]: [], // deprecated
+    [UpdateConfigMode.UpdateReserveStatus.kind]: config.status,
+    [UpdateConfigMode.UpdateFarmCollateral.kind]: [], // the farm fields live on the `Reserve` level...
+    [UpdateConfigMode.UpdateFarmDebt.kind]: [], // ...so we are not concerned with them in the `ReserveConfig`'s field-by-field update tx
+    [UpdateConfigMode.UpdateDisableUsageAsCollateralOutsideEmode.kind]: config.disableUsageAsCollOutsideEmode,
+    [UpdateConfigMode.UpdateBlockBorrowingAboveUtilizationPct.kind]: config.utilizationLimitBlockBorrowingAbovePct,
+    [UpdateConfigMode.UpdateBlockPriceUsage.kind]: config.tokenInfo.blockPriceUsage,
+    [UpdateConfigMode.UpdateBorrowLimitOutsideElevationGroup.kind]: config.borrowLimitOutsideElevationGroup,
+    [UpdateConfigMode.UpdateBorrowLimitsInElevationGroupAgainstThisReserve.kind]:
+      config.borrowLimitAgainstThisCollateralInElevationGroup,
+    [UpdateConfigMode.UpdateHostFixedInterestRateBps.kind]: config.hostFixedInterestRateBps,
+    [UpdateConfigMode.UpdateAutodeleverageEnabled.kind]: config.autodeleverageEnabled,
+    [UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay.kind]: config.deleveragingBonusIncreaseBpsPerDay,
+    [UpdateConfigMode.UpdateProtocolOrderExecutionFee.kind]: config.protocolOrderExecutionFeePct,
+    [UpdateConfigMode.UpdateProposerAuthorityLock.kind]: config.proposerAuthorityLocked,
+    [UpdateConfigMode.UpdateMinDeleveragingBonusBps.kind]: config.minDeleveragingBonusBps,
+    [UpdateConfigMode.UpdateBlockCTokenUsage.kind]: config.blockCtokenUsage,
+  })
+);
+
+// TODO : this needs to be deprecated
 export async function updateEntireReserveConfigIx(
   signer: TransactionSigner,
   marketAddress: Address,
@@ -1348,19 +1342,20 @@ export function parseForChangesReserveConfigAndGetIxs(
   lendingMarketOwner: TransactionSigner = noopSigner(marketWithAddress.state.lendingMarketOwner)
 ): Promise<Instruction[]> {
   const encodedConfigUpdates = RESERVE_CONFIG_UPDATER.encodeAllUpdates(reserve?.config, reserveConfig);
-  encodedConfigUpdates.sort((left, right) => priorityOf(left.mode) - priorityOf(right.mode));
   return Promise.all(
-    encodedConfigUpdates.map(async (encodedConfigUpdate) =>
-      updateReserveConfigIx(
-        lendingMarketOwner,
-        marketWithAddress.address,
-        reserveAddress,
-        encodedConfigUpdate.mode,
-        encodedConfigUpdate.value,
-        programId,
-        shouldSkipValidation(encodedConfigUpdate.mode, reserve)
+    encodedConfigUpdates
+      .filter((encodedConfigUpdate) => !isAdminOnly(encodedConfigUpdate.mode))
+      .map(async (encodedConfigUpdate) =>
+        updateReserveConfigIx(
+          lendingMarketOwner,
+          marketWithAddress.address,
+          reserveAddress,
+          encodedConfigUpdate.mode,
+          encodedConfigUpdate.value,
+          programId,
+          shouldSkipValidation(encodedConfigUpdate.mode, reserve)
+        )
       )
-    )
   );
 }
 
@@ -1369,30 +1364,39 @@ 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)
-  );
+  if (VALIDATED_DISCRIMINATORS.includes(mode.discriminator)) {
+    return false;
+  }
+  if (reserve == undefined) {
+    return true;
+  }
+  const is_usage_blocked = reserve.config.depositLimit.isZero() && reserve.config.borrowLimit.isZero();
+  return is_usage_blocked;
 }
 
-function priorityOf(mode: UpdateConfigModeKind): number {
-  switch (mode.discriminator) {
-    case UpdateConfigMode.UpdateScopePriceFeed.discriminator:
-      return 0;
-    case UpdateConfigMode.UpdateTokenInfoScopeChain.discriminator:
-      return 0;
-    default:
-      return 1;
+function isAdminOnly(mode: UpdateConfigModeKind): boolean {
+  for (const adminOnlyMode of ADMIN_ONLY_MODES) {
+    if (mode.discriminator === adminOnlyMode.discriminator) {
+      return true;
+    }
   }
+  return false;
 }
+
+// These need to be skipped when updating the entire reserve config
+const ADMIN_ONLY_MODES = [
+  UpdateConfigMode.UpdateProtocolTakeRate,
+  UpdateConfigMode.UpdateProtocolLiquidationFee,
+  UpdateConfigMode.UpdateHostFixedInterestRateBps,
+  UpdateConfigMode.UpdateProtocolOrderExecutionFee,
+  UpdateConfigMode.UpdateFeesOriginationFee,
+  UpdateConfigMode.UpdateFeesFlashLoanFee,
+  UpdateConfigMode.UpdateBlockCTokenUsage,
+];

package/src/classes/shared.ts

@@ -1,6 +1,6 @@
 import { Address } from '@solana/kit';
 import Decimal from 'decimal.js';
-import { FarmAndKey, RewardInfo } from '@kamino-finance/farms-sdk';
+import { FarmState, RewardInfo } from '@kamino-finance/farms-sdk';
 
 export type ConfigType = Array<MarketConfigType>;
 
@@ -55,7 +55,7 @@ export type ReserveRewardYield = {
 
 export type ReserveFarmInfo = {
   fetched: boolean;
-  farms: FarmAndKey[];
+  farmStates: FarmState[];
 };
 
 export enum FeeCalculation {