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

package/src/@codegen/klend/types/UpdateLendingMarketMode.ts

@@ -625,6 +625,98 @@ export class UpdatePriceTriggeredLiquidationDisabled {
   }
 }
 
+export interface UpdateMatureReserveDebtLiquidationEnabledJSON {
+  kind: "UpdateMatureReserveDebtLiquidationEnabled"
+}
+
+export class UpdateMatureReserveDebtLiquidationEnabled {
+  static readonly discriminator = 27
+  static readonly kind = "UpdateMatureReserveDebtLiquidationEnabled"
+  readonly discriminator = 27
+  readonly kind = "UpdateMatureReserveDebtLiquidationEnabled"
+
+  toJSON(): UpdateMatureReserveDebtLiquidationEnabledJSON {
+    return {
+      kind: "UpdateMatureReserveDebtLiquidationEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateMatureReserveDebtLiquidationEnabled: {},
+    }
+  }
+}
+
+export interface UpdateObligationBorrowDebtTermLiquidationEnabledJSON {
+  kind: "UpdateObligationBorrowDebtTermLiquidationEnabled"
+}
+
+export class UpdateObligationBorrowDebtTermLiquidationEnabled {
+  static readonly discriminator = 28
+  static readonly kind = "UpdateObligationBorrowDebtTermLiquidationEnabled"
+  readonly discriminator = 28
+  readonly kind = "UpdateObligationBorrowDebtTermLiquidationEnabled"
+
+  toJSON(): UpdateObligationBorrowDebtTermLiquidationEnabledJSON {
+    return {
+      kind: "UpdateObligationBorrowDebtTermLiquidationEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateObligationBorrowDebtTermLiquidationEnabled: {},
+    }
+  }
+}
+
+export interface UpdateBorrowOrderCreationEnabledJSON {
+  kind: "UpdateBorrowOrderCreationEnabled"
+}
+
+export class UpdateBorrowOrderCreationEnabled {
+  static readonly discriminator = 29
+  static readonly kind = "UpdateBorrowOrderCreationEnabled"
+  readonly discriminator = 29
+  readonly kind = "UpdateBorrowOrderCreationEnabled"
+
+  toJSON(): UpdateBorrowOrderCreationEnabledJSON {
+    return {
+      kind: "UpdateBorrowOrderCreationEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateBorrowOrderCreationEnabled: {},
+    }
+  }
+}
+
+export interface UpdateBorrowOrderExecutionEnabledJSON {
+  kind: "UpdateBorrowOrderExecutionEnabled"
+}
+
+export class UpdateBorrowOrderExecutionEnabled {
+  static readonly discriminator = 30
+  static readonly kind = "UpdateBorrowOrderExecutionEnabled"
+  readonly discriminator = 30
+  readonly kind = "UpdateBorrowOrderExecutionEnabled"
+
+  toJSON(): UpdateBorrowOrderExecutionEnabledJSON {
+    return {
+      kind: "UpdateBorrowOrderExecutionEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateBorrowOrderExecutionEnabled: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if (typeof obj !== "object") {
@@ -712,6 +804,18 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdatePriceTriggeredLiquidationDisabled" in obj) {
     return new UpdatePriceTriggeredLiquidationDisabled()
   }
+  if ("UpdateMatureReserveDebtLiquidationEnabled" in obj) {
+    return new UpdateMatureReserveDebtLiquidationEnabled()
+  }
+  if ("UpdateObligationBorrowDebtTermLiquidationEnabled" in obj) {
+    return new UpdateObligationBorrowDebtTermLiquidationEnabled()
+  }
+  if ("UpdateBorrowOrderCreationEnabled" in obj) {
+    return new UpdateBorrowOrderCreationEnabled()
+  }
+  if ("UpdateBorrowOrderExecutionEnabled" in obj) {
+    return new UpdateBorrowOrderExecutionEnabled()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -801,6 +905,18 @@ export function fromJSON(
     case "UpdatePriceTriggeredLiquidationDisabled": {
       return new UpdatePriceTriggeredLiquidationDisabled()
     }
+    case "UpdateMatureReserveDebtLiquidationEnabled": {
+      return new UpdateMatureReserveDebtLiquidationEnabled()
+    }
+    case "UpdateObligationBorrowDebtTermLiquidationEnabled": {
+      return new UpdateObligationBorrowDebtTermLiquidationEnabled()
+    }
+    case "UpdateBorrowOrderCreationEnabled": {
+      return new UpdateBorrowOrderCreationEnabled()
+    }
+    case "UpdateBorrowOrderExecutionEnabled": {
+      return new UpdateBorrowOrderExecutionEnabled()
+    }
   }
 }
 
@@ -833,6 +949,10 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateObligationOrderCreationEnabled"),
     borsh.struct([], "UpdateProposerAuthority"),
     borsh.struct([], "UpdatePriceTriggeredLiquidationDisabled"),
+    borsh.struct([], "UpdateMatureReserveDebtLiquidationEnabled"),
+    borsh.struct([], "UpdateObligationBorrowDebtTermLiquidationEnabled"),
+    borsh.struct([], "UpdateBorrowOrderCreationEnabled"),
+    borsh.struct([], "UpdateBorrowOrderExecutionEnabled"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/@codegen/klend/types/index.ts

@@ -2,11 +2,15 @@ import * as UpdateConfigMode from "./UpdateConfigMode"
 import * as UpdateLendingMarketConfigValue from "./UpdateLendingMarketConfigValue"
 import * as UpdateLendingMarketMode from "./UpdateLendingMarketMode"
 import * as UpdateGlobalConfigMode from "./UpdateGlobalConfigMode"
-import * as AssetTier from "./AssetTier"
 import * as FeeCalculation from "./FeeCalculation"
 import * as ReserveFarmKind from "./ReserveFarmKind"
 import * as ReserveStatus from "./ReserveStatus"
 
+export { BorrowOrderConfigArgs } from "./BorrowOrderConfigArgs"
+export type {
+  BorrowOrderConfigArgsFields,
+  BorrowOrderConfigArgsJSON,
+} from "./BorrowOrderConfigArgs"
 export { UpdateConfigMode }
 
 export type UpdateConfigModeKind =
@@ -43,7 +47,7 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateMinLiquidationBonusBps
   | UpdateConfigMode.UpdateDeleveragingMarginCallPeriod
   | UpdateConfigMode.UpdateBorrowFactor
-  | UpdateConfigMode.UpdateAssetTier
+  | UpdateConfigMode.DeprecatedUpdateAssetTier
   | UpdateConfigMode.UpdateElevationGroup
   | UpdateConfigMode.UpdateDeleveragingThresholdDecreaseBpsPerDay
   | UpdateConfigMode.DeprecatedUpdateMultiplierSideBoost
@@ -63,6 +67,8 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateProposerAuthorityLock
   | UpdateConfigMode.UpdateMinDeleveragingBonusBps
   | UpdateConfigMode.UpdateBlockCTokenUsage
+  | UpdateConfigMode.UpdateDebtMaturityTimestamp
+  | UpdateConfigMode.UpdateDebtTermSeconds
 export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateLoanToValuePctJSON
   | UpdateConfigMode.UpdateMaxLiquidationBonusBpsJSON
@@ -97,7 +103,7 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateMinLiquidationBonusBpsJSON
   | UpdateConfigMode.UpdateDeleveragingMarginCallPeriodJSON
   | UpdateConfigMode.UpdateBorrowFactorJSON
-  | UpdateConfigMode.UpdateAssetTierJSON
+  | UpdateConfigMode.DeprecatedUpdateAssetTierJSON
   | UpdateConfigMode.UpdateElevationGroupJSON
   | UpdateConfigMode.UpdateDeleveragingThresholdDecreaseBpsPerDayJSON
   | UpdateConfigMode.DeprecatedUpdateMultiplierSideBoostJSON
@@ -117,6 +123,8 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateProposerAuthorityLockJSON
   | UpdateConfigMode.UpdateMinDeleveragingBonusBpsJSON
   | UpdateConfigMode.UpdateBlockCTokenUsageJSON
+  | UpdateConfigMode.UpdateDebtMaturityTimestampJSON
+  | UpdateConfigMode.UpdateDebtTermSecondsJSON
 
 export { UpdateLendingMarketConfigValue }
 
@@ -171,6 +179,10 @@ export type UpdateLendingMarketModeKind =
   | UpdateLendingMarketMode.UpdateObligationOrderCreationEnabled
   | UpdateLendingMarketMode.UpdateProposerAuthority
   | UpdateLendingMarketMode.UpdatePriceTriggeredLiquidationDisabled
+  | UpdateLendingMarketMode.UpdateMatureReserveDebtLiquidationEnabled
+  | UpdateLendingMarketMode.UpdateObligationBorrowDebtTermLiquidationEnabled
+  | UpdateLendingMarketMode.UpdateBorrowOrderCreationEnabled
+  | UpdateLendingMarketMode.UpdateBorrowOrderExecutionEnabled
 export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateOwnerJSON
   | UpdateLendingMarketMode.UpdateEmergencyModeJSON
@@ -199,6 +211,10 @@ export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateObligationOrderCreationEnabledJSON
   | UpdateLendingMarketMode.UpdateProposerAuthorityJSON
   | UpdateLendingMarketMode.UpdatePriceTriggeredLiquidationDisabledJSON
+  | UpdateLendingMarketMode.UpdateMatureReserveDebtLiquidationEnabledJSON
+  | UpdateLendingMarketMode.UpdateObligationBorrowDebtTermLiquidationEnabledJSON
+  | UpdateLendingMarketMode.UpdateBorrowOrderCreationEnabledJSON
+  | UpdateLendingMarketMode.UpdateBorrowOrderExecutionEnabledJSON
 
 export { UpdateGlobalConfigMode }
 
@@ -213,6 +229,8 @@ export { LastUpdate } from "./LastUpdate"
 export type { LastUpdateFields, LastUpdateJSON } from "./LastUpdate"
 export { ElevationGroup } from "./ElevationGroup"
 export type { ElevationGroupFields, ElevationGroupJSON } from "./ElevationGroup"
+export { BorrowOrder } from "./BorrowOrder"
+export type { BorrowOrderFields, BorrowOrderJSON } from "./BorrowOrder"
 export { InitObligationArgs } from "./InitObligationArgs"
 export type {
   InitObligationArgsFields,
@@ -233,17 +251,6 @@ export type {
   ObligationOrderFields,
   ObligationOrderJSON,
 } from "./ObligationOrder"
-export { AssetTier }
-
-export type AssetTierKind =
-  | AssetTier.Regular
-  | AssetTier.IsolatedCollateral
-  | AssetTier.IsolatedDebt
-export type AssetTierJSON =
-  | AssetTier.RegularJSON
-  | AssetTier.IsolatedCollateralJSON
-  | AssetTier.IsolatedDebtJSON
-
 export { BigFractionBytes } from "./BigFractionBytes"
 export type {
   BigFractionBytesFields,

package/src/@codegen/klend/zero_padding/ObligationZP.ts

@@ -43,9 +43,7 @@ export class ObligationZP {
   /** The dangerous borrow value at the weighted average liquidation threshold (scaled fraction) */
   readonly unhealthyBorrowValueSf: BN
   /** The asset tier of the deposits */
-  readonly depositsAssetTiers: Array<number>
-  /** The asset tier of the borrows */
-  readonly borrowsAssetTiers: Array<number>
+  readonly paddingDeprecatedAssetTiers: Array<number>
   /** The elevation group id the obligation opted into. */
   readonly elevationGroup: number
   /** The number of obsolete reserves the obligation has a deposit in */
@@ -73,10 +71,15 @@ export class ObligationZP {
    */
   readonly autodeleverageMarginCallStartedTimestamp: BN
   /**
-   * Owner-defined, liquidator-executed orders applicable to this obligation.
+   * Owner-defined, permissionlessly-executed repay orders.
    * Typical use-cases would be a stop-loss and a take-profit (possibly co-existing).
    */
-  readonly orders: Array<types.ObligationOrder>
+  readonly obligationOrders: Array<types.ObligationOrder>
+  /**
+   * Owner-defined, permissionlessly-executed borrow order applicable to this obligation.
+   * Non-zeroed only on a newly-initialized fixed-rate, fixed-term obligation.
+   */
+  readonly borrowOrder: types.BorrowOrder
   readonly padding3: Array<BN> = new Array(0)
 
   static readonly layout = borsh.struct<ObligationZP>([
@@ -92,8 +95,7 @@ export class ObligationZP {
     borsh.u128("borrowedAssetsMarketValueSf"),
     borsh.u128("allowedBorrowValueSf"),
     borsh.u128("unhealthyBorrowValueSf"),
-    borsh.array(borsh.u8(), 8, "depositsAssetTiers"),
-    borsh.array(borsh.u8(), 5, "borrowsAssetTiers"),
+    borsh.array(borsh.u8(), 13, "paddingDeprecatedAssetTiers"),
     borsh.u8("elevationGroup"),
     borsh.u8("numOfObsoleteDepositReserves"),
     borsh.u8("hasDebt"),
@@ -105,7 +107,8 @@ export class ObligationZP {
     borsh.array(borsh.u8(), 4, "reserved"),
     borsh.u64("highestBorrowFactorPct"),
     borsh.u64("autodeleverageMarginCallStartedTimestamp"),
-    borsh.array(types.ObligationOrder.layout(), 2, "orders"),
+    borsh.array(types.ObligationOrder.layout(), 2, "obligationOrders"),
+    types.BorrowOrder.layout("borrowOrder"),
   ])
 
   constructor(fields: ObligationFields) {
@@ -127,8 +130,7 @@ export class ObligationZP {
     this.borrowedAssetsMarketValueSf = fields.borrowedAssetsMarketValueSf
     this.allowedBorrowValueSf = fields.allowedBorrowValueSf
     this.unhealthyBorrowValueSf = fields.unhealthyBorrowValueSf
-    this.depositsAssetTiers = fields.depositsAssetTiers
-    this.borrowsAssetTiers = fields.borrowsAssetTiers
+    this.paddingDeprecatedAssetTiers = fields.paddingDeprecatedAssetTiers
     this.elevationGroup = fields.elevationGroup
     this.numOfObsoleteDepositReserves = fields.numOfObsoleteDepositReserves
     this.hasDebt = fields.hasDebt
@@ -141,9 +143,10 @@ export class ObligationZP {
     this.highestBorrowFactorPct = fields.highestBorrowFactorPct
     this.autodeleverageMarginCallStartedTimestamp =
       fields.autodeleverageMarginCallStartedTimestamp
-    this.orders = fields.orders.map(
+    this.obligationOrders = fields.obligationOrders.map(
       (item) => new types.ObligationOrder({ ...item })
     )
+    this.borrowOrder = new types.BorrowOrder({ ...fields.borrowOrder })
     this.padding3 = new Array<BN>(0);
   }
 
@@ -212,8 +215,7 @@ export class ObligationZP {
       borrowedAssetsMarketValueSf: dec.borrowedAssetsMarketValueSf,
       allowedBorrowValueSf: dec.allowedBorrowValueSf,
       unhealthyBorrowValueSf: dec.unhealthyBorrowValueSf,
-      depositsAssetTiers: dec.depositsAssetTiers,
-      borrowsAssetTiers: dec.borrowsAssetTiers,
+      paddingDeprecatedAssetTiers: dec.paddingDeprecatedAssetTiers,
       elevationGroup: dec.elevationGroup,
       numOfObsoleteDepositReserves: dec.numOfObsoleteDepositReserves,
       hasDebt: dec.hasDebt,
@@ -226,11 +228,12 @@ export class ObligationZP {
       highestBorrowFactorPct: dec.highestBorrowFactorPct,
       autodeleverageMarginCallStartedTimestamp:
         dec.autodeleverageMarginCallStartedTimestamp,
-      orders: dec.orders.map(
+      obligationOrders: dec.obligationOrders.map(
         (
           item: any /* eslint-disable-line @typescript-eslint/no-explicit-any */
         ) => types.ObligationOrder.fromDecoded(item)
       ),
+      borrowOrder: types.BorrowOrder.fromDecoded(dec.borrowOrder),
       padding3: [],
     })
   }

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

@@ -1,8 +1,6 @@
 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
@@ -153,7 +151,7 @@ export class ConfigItemUpdater<C, A> {
  * A resolver of config item changes.
  */
 export class ConfigUpdater<M extends BorshEnum, C> {
-  protected readonly itemUpdaters: Map<M['kind'], [M, ConfigItemUpdater<C, any>[]]>;
+  private readonly itemUpdaters: Map<M['kind'], [M, ConfigItemUpdater<C, any>[]]>;
 
   /**
    * A resolving constructor.
@@ -237,61 +235,6 @@ 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.
  */
@@ -350,44 +293,3 @@ 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,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/manager.ts

@@ -1796,6 +1796,11 @@ export const MARKET_UPDATER = new ConfigUpdater(UpdateLendingMarketMode.fromDeco
   [UpdateLendingMarketMode.UpdateObligationOrderExecutionEnabled.kind]: config.obligationOrderExecutionEnabled,
   [UpdateLendingMarketMode.UpdateProposerAuthority.kind]: config.proposerAuthority,
   [UpdateLendingMarketMode.UpdatePriceTriggeredLiquidationDisabled.kind]: config.priceTriggeredLiquidationDisabled,
+  [UpdateLendingMarketMode.UpdateMatureReserveDebtLiquidationEnabled.kind]: config.matureReserveDebtLiquidationEnabled,
+  [UpdateLendingMarketMode.UpdateObligationBorrowDebtTermLiquidationEnabled.kind]:
+    config.obligationBorrowDebtTermLiquidationEnabled,
+  [UpdateLendingMarketMode.UpdateBorrowOrderCreationEnabled.kind]: config.borrowOrderCreationEnabled,
+  [UpdateLendingMarketMode.UpdateBorrowOrderExecutionEnabled.kind]: config.borrowOrderExecutionEnabled,  
 }));
 
 function parseForChangesMarketConfigAndGetIxs(

package/src/classes/market.ts

@@ -121,6 +121,22 @@ export class KaminoMarket {
     );
   }
 
+  /**
+   * TESTING ONLY!
+   *
+   * Used to create mock markets for testing
+   */
+  static createMarket(
+    rpc: Rpc<KaminoMarketRpcApi>,
+    state: LendingMarket,
+    marketAddress: Address,
+    reserves: Map<Address, KaminoReserve>,
+    recentSlotDurationMs: number,
+    programId: Address = PROGRAM_ID
+  ) {
+    return new KaminoMarket(rpc, state, marketAddress, reserves, recentSlotDurationMs, programId);
+  }
+
   /**
    * Load a new market with all of its associated reserves
    * @param rpc

package/src/classes/obligation.ts

@@ -275,7 +275,7 @@ export class KaminoObligation {
    * Returns obligation orders (including the null ones, i.e. non-active positions in the orders' array).
    */
   getOrders(): Array<KaminoObligationOrder | null> {
-    return this.state.orders.map((order) => KaminoObligationOrder.fromState(order));
+    return this.state.obligationOrders.map((order) => KaminoObligationOrder.fromState(order));
   }
 
   /**