@kamino-finance/klend-sdk 5.11.18 → 5.12.1

package/src/idl_codegen/types/UpdateLendingMarketMode.ts

@@ -509,6 +509,29 @@ export class UpdateInitialDepositAmount {
   }
 }
 
+export interface UpdateObligationOrdersEnabledJSON {
+  kind: "UpdateObligationOrdersEnabled"
+}
+
+export class UpdateObligationOrdersEnabled {
+  static readonly discriminator = 22
+  static readonly kind = "UpdateObligationOrdersEnabled"
+  readonly discriminator = 22
+  readonly kind = "UpdateObligationOrdersEnabled"
+
+  toJSON(): UpdateObligationOrdersEnabledJSON {
+    return {
+      kind: "UpdateObligationOrdersEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateObligationOrdersEnabled: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if (typeof obj !== "object") {
@@ -581,6 +604,9 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdateInitialDepositAmount" in obj) {
     return new UpdateInitialDepositAmount()
   }
+  if ("UpdateObligationOrdersEnabled" in obj) {
+    return new UpdateObligationOrdersEnabled()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -655,6 +681,9 @@ export function fromJSON(
     case "UpdateInitialDepositAmount": {
       return new UpdateInitialDepositAmount()
     }
+    case "UpdateObligationOrdersEnabled": {
+      return new UpdateObligationOrdersEnabled()
+    }
   }
 }
 
@@ -682,6 +711,7 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateName"),
     borsh.struct([], "UpdateIndividualAutodeleverageMarginCallPeriodSecs"),
     borsh.struct([], "UpdateInitialDepositAmount"),
+    borsh.struct([], "UpdateObligationOrdersEnabled"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/idl_codegen/types/index.ts

@@ -16,7 +16,7 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateProtocolTakeRate
   | UpdateConfigMode.UpdateFeesBorrowFee
   | UpdateConfigMode.UpdateFeesFlashLoanFee
-  | UpdateConfigMode.UpdateFeesReferralFeeBps
+  | UpdateConfigMode.DeprecatedUpdateFeesReferralFeeBps
   | UpdateConfigMode.UpdateDepositLimit
   | UpdateConfigMode.UpdateBorrowLimit
   | UpdateConfigMode.UpdateTokenInfoLowerHeuristic
@@ -36,8 +36,8 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateEntireReserveConfig
   | UpdateConfigMode.UpdateDebtWithdrawalCap
   | UpdateConfigMode.UpdateDepositWithdrawalCap
-  | UpdateConfigMode.UpdateDebtWithdrawalCapCurrentTotal
-  | UpdateConfigMode.UpdateDepositWithdrawalCapCurrentTotal
+  | UpdateConfigMode.DeprecatedUpdateDebtWithdrawalCapCurrentTotal
+  | UpdateConfigMode.DeprecatedUpdateDepositWithdrawalCapCurrentTotal
   | UpdateConfigMode.UpdateBadDebtLiquidationBonusBps
   | UpdateConfigMode.UpdateMinLiquidationBonusBps
   | UpdateConfigMode.UpdateDeleveragingMarginCallPeriod
@@ -58,6 +58,7 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateHostFixedInterestRateBps
   | UpdateConfigMode.UpdateAutodeleverageEnabled
   | UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDay
+  | UpdateConfigMode.UpdateProtocolOrderExecutionFee
 export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateLoanToValuePctJSON
   | UpdateConfigMode.UpdateMaxLiquidationBonusBpsJSON
@@ -66,7 +67,7 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateProtocolTakeRateJSON
   | UpdateConfigMode.UpdateFeesBorrowFeeJSON
   | UpdateConfigMode.UpdateFeesFlashLoanFeeJSON
-  | UpdateConfigMode.UpdateFeesReferralFeeBpsJSON
+  | UpdateConfigMode.DeprecatedUpdateFeesReferralFeeBpsJSON
   | UpdateConfigMode.UpdateDepositLimitJSON
   | UpdateConfigMode.UpdateBorrowLimitJSON
   | UpdateConfigMode.UpdateTokenInfoLowerHeuristicJSON
@@ -86,8 +87,8 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateEntireReserveConfigJSON
   | UpdateConfigMode.UpdateDebtWithdrawalCapJSON
   | UpdateConfigMode.UpdateDepositWithdrawalCapJSON
-  | UpdateConfigMode.UpdateDebtWithdrawalCapCurrentTotalJSON
-  | UpdateConfigMode.UpdateDepositWithdrawalCapCurrentTotalJSON
+  | UpdateConfigMode.DeprecatedUpdateDebtWithdrawalCapCurrentTotalJSON
+  | UpdateConfigMode.DeprecatedUpdateDepositWithdrawalCapCurrentTotalJSON
   | UpdateConfigMode.UpdateBadDebtLiquidationBonusBpsJSON
   | UpdateConfigMode.UpdateMinLiquidationBonusBpsJSON
   | UpdateConfigMode.UpdateDeleveragingMarginCallPeriodJSON
@@ -108,6 +109,7 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateHostFixedInterestRateBpsJSON
   | UpdateConfigMode.UpdateAutodeleverageEnabledJSON
   | UpdateConfigMode.UpdateDeleveragingBonusIncreaseBpsPerDayJSON
+  | UpdateConfigMode.UpdateProtocolOrderExecutionFeeJSON
 
 export { UpdateLendingMarketConfigValue }
 
@@ -157,6 +159,7 @@ export type UpdateLendingMarketModeKind =
   | UpdateLendingMarketMode.UpdateName
   | UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecs
   | UpdateLendingMarketMode.UpdateInitialDepositAmount
+  | UpdateLendingMarketMode.UpdateObligationOrdersEnabled
 export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateOwnerJSON
   | UpdateLendingMarketMode.UpdateEmergencyModeJSON
@@ -180,6 +183,7 @@ export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateNameJSON
   | UpdateLendingMarketMode.UpdateIndividualAutodeleverageMarginCallPeriodSecsJSON
   | UpdateLendingMarketMode.UpdateInitialDepositAmountJSON
+  | UpdateLendingMarketMode.UpdateObligationOrdersEnabledJSON
 
 export { LastUpdate } from "./LastUpdate"
 export type { LastUpdateFields, LastUpdateJSON } from "./LastUpdate"
@@ -200,6 +204,11 @@ export type {
   ObligationLiquidityFields,
   ObligationLiquidityJSON,
 } from "./ObligationLiquidity"
+export { ObligationOrder } from "./ObligationOrder"
+export type {
+  ObligationOrderFields,
+  ObligationOrderJSON,
+} from "./ObligationOrder"
 export { AssetTier }
 
 export type AssetTierKind =

package/src/idl_codegen/zero_padding/ObligationZP.ts

@@ -40,8 +40,8 @@ export class ObligationZP {
   readonly borrowsAssetTiers: Array<number>
   /** The elevation group id the obligation opted into. */
   readonly elevationGroup: number
-  /** The number of deprecated reserves the obligation has a deposit */
-  readonly numOfObsoleteReserves: number
+  /** The number of obsolete reserves the obligation has a deposit in */
+  readonly numOfObsoleteDepositReserves: number
   /** Marked = 1 if borrows array is not empty, 0 = borrows empty */
   readonly hasDebt: number
   /** Wallet address of the referrer */
@@ -49,19 +49,26 @@ export class ObligationZP {
   /** Marked = 1 if borrowing disabled, 0 = borrowing enabled */
   readonly borrowingDisabled: number
   /**
-   *  A target LTV set by the risk council when marking this obligation for deleveraging. 
-   * Only effective when `deleveraging_margin_call_started_slot != 0`. 
-   * */
+   * A target LTV set by the risk council when marking this obligation for deleveraging.
+   * Only effective when `deleveraging_margin_call_started_slot != 0`.
+   */
   readonly autodeleverageTargetLtvPct: number
   /** The lowest max LTV found amongst the collateral deposits */
   readonly lowestReserveDepositMaxLtvPct: number
+  /** The number of obsolete reserves the obligation has a borrow in */
+  readonly numOfObsoleteBorrowReserves: number
   readonly reserved: Array<number>
   readonly highestBorrowFactorPct: BN
-  /** 
+  /**
    * A timestamp at which the risk council most-recently marked this obligation for deleveraging.
-   *  Zero if not currently subject to deleveraging. 
-   * */
+   * Zero if not currently subject to deleveraging.
+   */
   readonly autodeleverageMarginCallStartedTimestamp: BN
+  /**
+   * Owner-defined, liquidator-executed orders applicable to this obligation.
+   * Typical use-cases would be a stop-loss and a take-profit (possibly co-existing).
+   */
+  readonly orders: Array<types.ObligationOrder>
   readonly padding3: Array<BN> = new Array(0)
 
   static readonly layout = borsh.struct([
@@ -80,15 +87,17 @@ export class ObligationZP {
     borsh.array(borsh.u8(), 8, "depositsAssetTiers"),
     borsh.array(borsh.u8(), 5, "borrowsAssetTiers"),
     borsh.u8("elevationGroup"),
-    borsh.u8("numOfObsoleteReserves"),
+    borsh.u8("numOfObsoleteDepositReserves"),
     borsh.u8("hasDebt"),
     borsh.publicKey("referrer"),
     borsh.u8("borrowingDisabled"),
     borsh.u8("autodeleverageTargetLtvPct"),
     borsh.u8("lowestReserveDepositMaxLtvPct"),
-    borsh.array(borsh.u8(), 5, "reserved"),
+    borsh.u8("numOfObsoleteBorrowReserves"),
+    borsh.array(borsh.u8(), 4, "reserved"),
     borsh.u64("highestBorrowFactorPct"),
     borsh.u64("autodeleverageMarginCallStartedTimestamp"),
+    borsh.array(types.ObligationOrder.layout(), 2, "orders"),
   ])
 
   constructor(fields: ObligationFields) {
@@ -113,15 +122,20 @@ export class ObligationZP {
     this.depositsAssetTiers = fields.depositsAssetTiers
     this.borrowsAssetTiers = fields.borrowsAssetTiers
     this.elevationGroup = fields.elevationGroup
-    this.numOfObsoleteReserves = fields.numOfObsoleteReserves
+    this.numOfObsoleteDepositReserves = fields.numOfObsoleteDepositReserves
     this.hasDebt = fields.hasDebt
     this.referrer = fields.referrer
     this.borrowingDisabled = fields.borrowingDisabled
     this.autodeleverageTargetLtvPct = fields.autodeleverageTargetLtvPct
     this.lowestReserveDepositMaxLtvPct = fields.lowestReserveDepositMaxLtvPct
+    this.numOfObsoleteBorrowReserves = fields.numOfObsoleteBorrowReserves
     this.reserved = new Array<number>(0)
     this.highestBorrowFactorPct = fields.highestBorrowFactorPct
-    this.autodeleverageMarginCallStartedTimestamp = fields.autodeleverageMarginCallStartedTimestamp
+    this.autodeleverageMarginCallStartedTimestamp =
+      fields.autodeleverageMarginCallStartedTimestamp
+    this.orders = fields.orders.map(
+      (item) => new types.ObligationOrder({ ...item })
+    )
     this.padding3 = new Array<BN>(0);
   }
 
@@ -178,7 +192,8 @@ export class ObligationZP {
           item: any /* eslint-disable-line @typescript-eslint/no-explicit-any */
         ) => types.ObligationCollateral.fromDecoded(item)
       ),
-      lowestReserveDepositLiquidationLtv: dec.lowestReserveDepositLiquidationLtv,
+      lowestReserveDepositLiquidationLtv:
+        dec.lowestReserveDepositLiquidationLtv,
       depositedValueSf: dec.depositedValueSf,
       borrows: dec.borrows.map(
         (
@@ -192,15 +207,22 @@ export class ObligationZP {
       depositsAssetTiers: dec.depositsAssetTiers,
       borrowsAssetTiers: dec.borrowsAssetTiers,
       elevationGroup: dec.elevationGroup,
-      numOfObsoleteReserves: dec.numOfObsoleteReserves,
+      numOfObsoleteDepositReserves: dec.numOfObsoleteDepositReserves,
       hasDebt: dec.hasDebt,
       referrer: dec.referrer,
       borrowingDisabled: dec.borrowingDisabled,
       autodeleverageTargetLtvPct: dec.autodeleverageTargetLtvPct,
       lowestReserveDepositMaxLtvPct: dec.lowestReserveDepositMaxLtvPct,
+      numOfObsoleteBorrowReserves: dec.numOfObsoleteBorrowReserves,
       reserved: dec.reserved,
       highestBorrowFactorPct: dec.highestBorrowFactorPct,
-      autodeleverageMarginCallStartedTimestamp: dec.autodeleverageMarginCallStartedTimestamp,
+      autodeleverageMarginCallStartedTimestamp:
+      dec.autodeleverageMarginCallStartedTimestamp,
+      orders: dec.orders.map(
+        (
+          item: any /* eslint-disable-line @typescript-eslint/no-explicit-any */
+        ) => types.ObligationOrder.fromDecoded(item)
+      ),
       padding3: [],
     })
   }

package/src/utils/instruction.ts

@@ -28,7 +28,8 @@ export async function buildAndSendTxnWithLogs(
   owner: Keypair,
   signers: Signer[],
   withLogsIfSuccess: boolean = false,
-  withDescription: string = ''
+  withDescription: string = '',
+  throwOnError: boolean = false // TODO(error-surfacing): the "recovery" logic is broken/outdated + the "hide error" behavior seems wrong in general - migrate to "just throw"
 ): Promise<TransactionSignature> {
   tx.sign([owner, ...signers]);
 
@@ -47,6 +48,9 @@ export async function buildAndSendTxnWithLogs(
     }
     return sig;
   } catch (e: any) {
+    if (throwOnError) {
+      throw e;
+    }
     console.log(e);
     process.stdout.write(e.logs.toString());
     const sig = e.toString().split(' failed ')[0].split('Transaction ')[1];

package/src/utils/managerTypes.ts

@@ -292,6 +292,7 @@ function buildReserveConfig(fields: {
     liquidationThresholdPct: fields.configParams.liquidationThresholdPct,
     minLiquidationBonusBps: fields.configParams.minLiquidationBonusBps,
     protocolLiquidationFeePct: 0,
+    protocolOrderExecutionFeePct: 0,
     protocolTakeRatePct: fields.configParams.protocolTakeRate,
     assetTier: 0,
     maxLiquidationBonusBps: fields.configParams.maxLiquidationBonusBps,
@@ -345,8 +346,7 @@ function buildReserveConfig(fields: {
     borrowLimitAgainstThisCollateralInElevationGroup: Array(32).fill(new BN(0)),
     deleveragingBonusIncreaseBpsPerDay: new BN(100),
     reserved1: Array(1).fill(0),
-    reserved2: Array(2).fill(0),
-    reserved3: Array(8).fill(0),
+    reserved2: Array(9).fill(0),
   };
 
   return new ReserveConfig(reserveConfigFields);