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

package/src/classes/action.ts

@@ -76,7 +76,11 @@ 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 } from '@solana-program/token-2022';
+import {
+  getCloseAccountInstruction,
+  getSyncNativeInstruction,
+  TOKEN_2022_PROGRAM_ADDRESS,
+} from '@solana-program/token-2022';
 import { getTransferSolInstruction, SYSTEM_PROGRAM_ADDRESS } from '@solana-program/system';
 import { noopSigner } from '../utils/signer';
 
@@ -3289,8 +3293,13 @@ 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: (userWSOLAccountInfo.exists ? 0n : rentExemptLamports) + (sendAction ? BigInt(safeRepay.toString()) : 0n),
+      amount: (isValidTokenAccount ? 0n : rentExemptLamports) + (sendAction ? BigInt(safeRepay.toString()) : 0n),
       source: this.owner,
       destination: userTokenAccountAddress,
     });
@@ -3312,29 +3321,20 @@ export class KaminoAction {
       },
       { programAddress: TOKEN_PROGRAM_ADDRESS }
     );
-    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}]`);
-    }
+
+    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

@@ -191,49 +191,15 @@ export class ConfigUpdater<M extends BorshEnum, C> {
    */
   encodeAllUpdates(currentConfig: C | undefined, newConfig: C): EncodedConfigUpdate<M>[] {
     const updates: EncodedConfigUpdate<M>[] = [];
-    let ltvUpdate: EncodedConfigUpdate<M> | undefined;
-    let liquidationThresholdUpdate: EncodedConfigUpdate<M> | 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.kind === 'UpdateLoanToValuePct') {
-          ltvUpdate = update;
-        } else if (mode.kind === 'UpdateLiquidationThresholdPct') {
-          liquidationThresholdUpdate = update;
-        } else {
-          updates.push(update);
-        }
+        updates.push({ mode, value });
       }
     }
-
-    // Handle ordering of LTV and LiquidationThreshold updates
-    // ensure LiquidationThreshold >= LTV at all times
-    if (ltvUpdate && liquidationThresholdUpdate) {
-      const currentLiquidationThreshold = currentConfig ? (currentConfig as any).liquidationThresholdPct : 0;
-      const newLiquidationThreshold = (newConfig as any).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);
-    }
-
     return updates;
   }
 

package/src/classes/farm_utils.ts

@@ -8,6 +8,7 @@ import {
   scaleDownWads,
   WAD,
   RewardInfo,
+  RewardType,
 } from '@kamino-finance/farms-sdk';
 import {
   address,
@@ -174,7 +175,7 @@ export type UnstakeAndWithdrawFromFarmIxs = {
   withdrawIx: Instruction;
 };
 
-export function getRewardPerTimeUnitSecond(reward: RewardInfo) {
+export function getRewardPerTimeUnitSecond(reward: RewardInfo, farmTotalStakeLamports: Decimal) {
   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++) {
@@ -196,8 +197,11 @@ export function getRewardPerTimeUnitSecond(reward: RewardInfo) {
   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,6 +24,7 @@ import {
   INITIAL_COLLATERAL_RATE,
   lendingMarketAuthPda,
   MarketWithAddress,
+  MIN_INITIAL_DEPOSIT,
   ONE_HUNDRED_PCT_IN_BPS,
   reservePdas,
   SLOTS_PER_DAY,
@@ -48,7 +49,7 @@ import {
   UpdateReserveConfigArgs,
 } from '../lib';
 import { aprToApy, KaminoPrices } from '@kamino-finance/kliquidity-sdk';
-import { FarmState, RewardInfo } from '@kamino-finance/farms-sdk';
+import { FarmAndKey, 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';
@@ -69,7 +70,7 @@ export class KaminoReserve {
 
   tokenOraclePrice: TokenOracleData;
   stats: ReserveDataType;
-  private farmData: ReserveFarmInfo = { fetched: false, farmStates: [] };
+  private farmData: ReserveFarmInfo = { fetched: false, farms: [] };
 
   private rpc: Rpc<KaminoReserveRpcApi>;
   private readonly recentSlotDurationMs: number;
@@ -812,22 +813,22 @@ export class KaminoReserve {
 
   async loadFarmStates() {
     if (!this.farmData.fetched) {
-      const farmStates: FarmState[] = [];
+      const farmStates: FarmAndKey[] = [];
       const debtFarmAddress = this.getDebtFarmAddress();
       if (isSome(debtFarmAddress)) {
         const farmState = await FarmState.fetch(this.rpc, debtFarmAddress.value);
         if (farmState !== null) {
-          farmStates.push(farmState);
+          farmStates.push({ farmState, key: debtFarmAddress.value });
         }
       }
       const collateralFarmAddress = this.getCollateralFarmAddress();
       if (isSome(collateralFarmAddress)) {
         const farmState = await FarmState.fetch(this.rpc, collateralFarmAddress.value);
         if (farmState !== null) {
-          farmStates.push(farmState);
+          farmStates.push({ farmState, key: collateralFarmAddress.value });
         }
       }
-      this.farmData.farmStates = farmStates;
+      this.farmData.farms = farmStates;
       this.farmData.fetched = true;
     }
   }
@@ -838,14 +839,19 @@ export class KaminoReserve {
       throw Error('KaminoMarket must call loadReserves.');
     }
 
-    const isDebtReward = this.state.farmDebt === this.address;
     await this.loadFarmStates();
     const yields: ReserveRewardYield[] = [];
-    for (const farmState of this.farmData.farmStates) {
-      for (const rewardInfo of farmState.rewardInfos.filter(
+    for (const farmAndKey of this.farmData.farms) {
+      const isDebtReward = this.state.farmDebt === farmAndKey.key;
+      for (const rewardInfo of farmAndKey.farmState.rewardInfos.filter(
         (x) => x.token.mint !== DEFAULT_PUBLIC_KEY && !x.rewardsAvailable.isZero()
       )) {
-        const { apy, apr } = this.calculateRewardYield(prices, rewardInfo, isDebtReward);
+        const { apy, apr } = this.calculateRewardYield(
+          prices,
+          rewardInfo,
+          isDebtReward,
+          new Decimal(farmAndKey.farmState.totalActiveStakeScaled.toString())
+        );
         if (apy.isZero() && apr.isZero()) {
           continue;
         }
@@ -855,9 +861,14 @@ export class KaminoReserve {
     return yields;
   }
 
-  private calculateRewardYield(prices: KaminoPrices, rewardInfo: RewardInfo, isDebtReward: boolean) {
+  calculateRewardYield(
+    prices: KaminoPrices,
+    rewardInfo: RewardInfo,
+    isDebtReward: boolean,
+    farmTotalStakeLamports: Decimal
+  ) {
     const mintAddress = this.getLiquidityMint();
-    const rewardPerTimeUnitSecond = getRewardPerTimeUnitSecond(rewardInfo);
+    const rewardPerTimeUnitSecond = getRewardPerTimeUnitSecond(rewardInfo, farmTotalStakeLamports);
     const reserveToken = prices.spot[mintAddress.toString()];
     const rewardToken = prices.spot[rewardInfo.token.mint.toString()];
 
@@ -1302,7 +1313,6 @@ export const RESERVE_CONFIG_UPDATER = new ConfigUpdater(UpdateConfigMode.fromDec
   [UpdateConfigMode.UpdateBlockCTokenUsage.kind]: config.blockCtokenUsage,
 }));
 
-// TODO : this needs to be deprecated
 export async function updateEntireReserveConfigIx(
   signer: TransactionSigner,
   marketAddress: Address,
@@ -1359,60 +1369,30 @@ export type ReserveWithAddress = {
   state: Reserve;
 };
 
-// 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,
+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,
 ];
 
 function shouldSkipValidation(mode: UpdateConfigModeKind, reserve: Reserve | undefined): boolean {
-  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;
+  return (
+    NON_VALIDATED_DISCRIMINATORS.includes(mode.discriminator) &&
+    !reserve?.liquidity.availableAmount.gten(MIN_INITIAL_DEPOSIT)
+  );
 }
 
-// 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;
+      return 1;
   }
 }

package/src/classes/shared.ts

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