@exponent-labs/klend-idl 0.9.24 → 0.9.26

package/src/types/ObligationLiquidity.ts

@@ -6,33 +6,39 @@ import * as borsh from "@coral-xyz/borsh"
 export interface ObligationLiquidityFields {
   borrowReserve: PublicKey
   cumulativeBorrowRateBsf: types.BigFractionBytesFields
-  padding: BN
+  lastBorrowedAtTimestamp: BN
   borrowedAmountSf: BN
   marketValueSf: BN
   borrowFactorAdjustedMarketValueSf: BN
   borrowedAmountOutsideElevationGroups: BN
+  fixedTermBorrowRolloverConfig: types.FixedTermBorrowRolloverConfigFields
+  borrowedAmountAtExpiration: BN
   padding2: Array<BN>
 }
 
 export interface ObligationLiquidityJSON {
   borrowReserve: string
   cumulativeBorrowRateBsf: types.BigFractionBytesJSON
-  padding: string
+  lastBorrowedAtTimestamp: string
   borrowedAmountSf: string
   marketValueSf: string
   borrowFactorAdjustedMarketValueSf: string
   borrowedAmountOutsideElevationGroups: string
+  fixedTermBorrowRolloverConfig: types.FixedTermBorrowRolloverConfigJSON
+  borrowedAmountAtExpiration: string
   padding2: Array<string>
 }
 
 export class ObligationLiquidity {
   readonly borrowReserve: PublicKey
   readonly cumulativeBorrowRateBsf: types.BigFractionBytes
-  readonly padding: BN
+  readonly lastBorrowedAtTimestamp: BN
   readonly borrowedAmountSf: BN
   readonly marketValueSf: BN
   readonly borrowFactorAdjustedMarketValueSf: BN
   readonly borrowedAmountOutsideElevationGroups: BN
+  readonly fixedTermBorrowRolloverConfig: types.FixedTermBorrowRolloverConfig
+  readonly borrowedAmountAtExpiration: BN
   readonly padding2: Array<BN>
 
   constructor(fields: ObligationLiquidityFields) {
@@ -40,13 +46,18 @@ export class ObligationLiquidity {
     this.cumulativeBorrowRateBsf = new types.BigFractionBytes({
       ...fields.cumulativeBorrowRateBsf,
     })
-    this.padding = fields.padding
+    this.lastBorrowedAtTimestamp = fields.lastBorrowedAtTimestamp
     this.borrowedAmountSf = fields.borrowedAmountSf
     this.marketValueSf = fields.marketValueSf
     this.borrowFactorAdjustedMarketValueSf =
       fields.borrowFactorAdjustedMarketValueSf
     this.borrowedAmountOutsideElevationGroups =
       fields.borrowedAmountOutsideElevationGroups
+    this.fixedTermBorrowRolloverConfig =
+      new types.FixedTermBorrowRolloverConfig({
+        ...fields.fixedTermBorrowRolloverConfig,
+      })
+    this.borrowedAmountAtExpiration = fields.borrowedAmountAtExpiration
     this.padding2 = fields.padding2
   }
 
@@ -55,12 +66,16 @@ export class ObligationLiquidity {
       [
         borsh.publicKey("borrowReserve"),
         types.BigFractionBytes.layout("cumulativeBorrowRateBsf"),
-        borsh.u64("padding"),
+        borsh.u64("lastBorrowedAtTimestamp"),
         borsh.u128("borrowedAmountSf"),
         borsh.u128("marketValueSf"),
         borsh.u128("borrowFactorAdjustedMarketValueSf"),
         borsh.u64("borrowedAmountOutsideElevationGroups"),
-        borsh.array(borsh.u64(), 7, "padding2"),
+        types.FixedTermBorrowRolloverConfig.layout(
+          "fixedTermBorrowRolloverConfig"
+        ),
+        borsh.u64("borrowedAmountAtExpiration"),
+        borsh.array(borsh.u64(), 4, "padding2"),
       ],
       property
     )
@@ -73,12 +88,17 @@ export class ObligationLiquidity {
       cumulativeBorrowRateBsf: types.BigFractionBytes.fromDecoded(
         obj.cumulativeBorrowRateBsf
       ),
-      padding: obj.padding,
+      lastBorrowedAtTimestamp: obj.lastBorrowedAtTimestamp,
       borrowedAmountSf: obj.borrowedAmountSf,
       marketValueSf: obj.marketValueSf,
       borrowFactorAdjustedMarketValueSf: obj.borrowFactorAdjustedMarketValueSf,
       borrowedAmountOutsideElevationGroups:
         obj.borrowedAmountOutsideElevationGroups,
+      fixedTermBorrowRolloverConfig:
+        types.FixedTermBorrowRolloverConfig.fromDecoded(
+          obj.fixedTermBorrowRolloverConfig
+        ),
+      borrowedAmountAtExpiration: obj.borrowedAmountAtExpiration,
       padding2: obj.padding2,
     })
   }
@@ -89,13 +109,18 @@ export class ObligationLiquidity {
       cumulativeBorrowRateBsf: types.BigFractionBytes.toEncodable(
         fields.cumulativeBorrowRateBsf
       ),
-      padding: fields.padding,
+      lastBorrowedAtTimestamp: fields.lastBorrowedAtTimestamp,
       borrowedAmountSf: fields.borrowedAmountSf,
       marketValueSf: fields.marketValueSf,
       borrowFactorAdjustedMarketValueSf:
         fields.borrowFactorAdjustedMarketValueSf,
       borrowedAmountOutsideElevationGroups:
         fields.borrowedAmountOutsideElevationGroups,
+      fixedTermBorrowRolloverConfig:
+        types.FixedTermBorrowRolloverConfig.toEncodable(
+          fields.fixedTermBorrowRolloverConfig
+        ),
+      borrowedAmountAtExpiration: fields.borrowedAmountAtExpiration,
       padding2: fields.padding2,
     }
   }
@@ -104,13 +129,16 @@ export class ObligationLiquidity {
     return {
       borrowReserve: this.borrowReserve.toString(),
       cumulativeBorrowRateBsf: this.cumulativeBorrowRateBsf.toJSON(),
-      padding: this.padding.toString(),
+      lastBorrowedAtTimestamp: this.lastBorrowedAtTimestamp.toString(),
       borrowedAmountSf: this.borrowedAmountSf.toString(),
       marketValueSf: this.marketValueSf.toString(),
       borrowFactorAdjustedMarketValueSf:
         this.borrowFactorAdjustedMarketValueSf.toString(),
       borrowedAmountOutsideElevationGroups:
         this.borrowedAmountOutsideElevationGroups.toString(),
+      fixedTermBorrowRolloverConfig:
+        this.fixedTermBorrowRolloverConfig.toJSON(),
+      borrowedAmountAtExpiration: this.borrowedAmountAtExpiration.toString(),
       padding2: this.padding2.map((item) => item.toString()),
     }
   }
@@ -121,7 +149,7 @@ export class ObligationLiquidity {
       cumulativeBorrowRateBsf: types.BigFractionBytes.fromJSON(
         obj.cumulativeBorrowRateBsf
       ),
-      padding: new BN(obj.padding),
+      lastBorrowedAtTimestamp: new BN(obj.lastBorrowedAtTimestamp),
       borrowedAmountSf: new BN(obj.borrowedAmountSf),
       marketValueSf: new BN(obj.marketValueSf),
       borrowFactorAdjustedMarketValueSf: new BN(
@@ -130,6 +158,11 @@ export class ObligationLiquidity {
       borrowedAmountOutsideElevationGroups: new BN(
         obj.borrowedAmountOutsideElevationGroups
       ),
+      fixedTermBorrowRolloverConfig:
+        types.FixedTermBorrowRolloverConfig.fromJSON(
+          obj.fixedTermBorrowRolloverConfig
+        ),
+      borrowedAmountAtExpiration: new BN(obj.borrowedAmountAtExpiration),
       padding2: obj.padding2.map((item) => new BN(item)),
     })
   }

package/src/types/ObligationOrder.ts

@@ -0,0 +1,121 @@
+import { PublicKey } from "@solana/web3.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import BN from "bn.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as types from "../types" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as borsh from "@coral-xyz/borsh"
+
+export interface ObligationOrderFields {
+  conditionThresholdSf: BN
+  opportunityParameterSf: BN
+  minExecutionBonusBps: number
+  maxExecutionBonusBps: number
+  conditionType: number
+  opportunityType: number
+  padding1: Array<number>
+  padding2: Array<BN>
+}
+
+export interface ObligationOrderJSON {
+  conditionThresholdSf: string
+  opportunityParameterSf: string
+  minExecutionBonusBps: number
+  maxExecutionBonusBps: number
+  conditionType: number
+  opportunityType: number
+  padding1: Array<number>
+  padding2: Array<string>
+}
+
+export class ObligationOrder {
+  readonly conditionThresholdSf: BN
+  readonly opportunityParameterSf: BN
+  readonly minExecutionBonusBps: number
+  readonly maxExecutionBonusBps: number
+  readonly conditionType: number
+  readonly opportunityType: number
+  readonly padding1: Array<number>
+  readonly padding2: Array<BN>
+
+  constructor(fields: ObligationOrderFields) {
+    this.conditionThresholdSf = fields.conditionThresholdSf
+    this.opportunityParameterSf = fields.opportunityParameterSf
+    this.minExecutionBonusBps = fields.minExecutionBonusBps
+    this.maxExecutionBonusBps = fields.maxExecutionBonusBps
+    this.conditionType = fields.conditionType
+    this.opportunityType = fields.opportunityType
+    this.padding1 = fields.padding1
+    this.padding2 = fields.padding2
+  }
+
+  static layout(property?: string) {
+    return borsh.struct(
+      [
+        borsh.u128("conditionThresholdSf"),
+        borsh.u128("opportunityParameterSf"),
+        borsh.u16("minExecutionBonusBps"),
+        borsh.u16("maxExecutionBonusBps"),
+        borsh.u8("conditionType"),
+        borsh.u8("opportunityType"),
+        borsh.array(borsh.u8(), 10, "padding1"),
+        borsh.array(borsh.u128(), 5, "padding2"),
+      ],
+      property
+    )
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  static fromDecoded(obj: any) {
+    return new ObligationOrder({
+      conditionThresholdSf: obj.conditionThresholdSf,
+      opportunityParameterSf: obj.opportunityParameterSf,
+      minExecutionBonusBps: obj.minExecutionBonusBps,
+      maxExecutionBonusBps: obj.maxExecutionBonusBps,
+      conditionType: obj.conditionType,
+      opportunityType: obj.opportunityType,
+      padding1: obj.padding1,
+      padding2: obj.padding2,
+    })
+  }
+
+  static toEncodable(fields: ObligationOrderFields) {
+    return {
+      conditionThresholdSf: fields.conditionThresholdSf,
+      opportunityParameterSf: fields.opportunityParameterSf,
+      minExecutionBonusBps: fields.minExecutionBonusBps,
+      maxExecutionBonusBps: fields.maxExecutionBonusBps,
+      conditionType: fields.conditionType,
+      opportunityType: fields.opportunityType,
+      padding1: fields.padding1,
+      padding2: fields.padding2,
+    }
+  }
+
+  toJSON(): ObligationOrderJSON {
+    return {
+      conditionThresholdSf: this.conditionThresholdSf.toString(),
+      opportunityParameterSf: this.opportunityParameterSf.toString(),
+      minExecutionBonusBps: this.minExecutionBonusBps,
+      maxExecutionBonusBps: this.maxExecutionBonusBps,
+      conditionType: this.conditionType,
+      opportunityType: this.opportunityType,
+      padding1: this.padding1,
+      padding2: this.padding2.map((item) => item.toString()),
+    }
+  }
+
+  static fromJSON(obj: ObligationOrderJSON): ObligationOrder {
+    return new ObligationOrder({
+      conditionThresholdSf: new BN(obj.conditionThresholdSf),
+      opportunityParameterSf: new BN(obj.opportunityParameterSf),
+      minExecutionBonusBps: obj.minExecutionBonusBps,
+      maxExecutionBonusBps: obj.maxExecutionBonusBps,
+      conditionType: obj.conditionType,
+      opportunityType: obj.opportunityType,
+      padding1: obj.padding1,
+      padding2: obj.padding2.map((item) => new BN(item)),
+    })
+  }
+
+  toEncodable() {
+    return ObligationOrder.toEncodable(this)
+  }
+}

package/src/types/ProgressCallbackType.ts

@@ -0,0 +1,90 @@
+import { PublicKey } from "@solana/web3.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import BN from "bn.js" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as types from "../types" // eslint-disable-line @typescript-eslint/no-unused-vars
+import * as borsh from "@coral-xyz/borsh"
+
+export interface NoneJSON {
+  kind: "None"
+}
+
+export class None {
+  static readonly discriminator = 0
+  static readonly kind = "None"
+  readonly discriminator = 0
+  readonly kind = "None"
+
+  toJSON(): NoneJSON {
+    return {
+      kind: "None",
+    }
+  }
+
+  toEncodable() {
+    return {
+      None: {},
+    }
+  }
+}
+
+export interface KlendQueueAccountingHandlerOnKvaultJSON {
+  kind: "KlendQueueAccountingHandlerOnKvault"
+}
+
+export class KlendQueueAccountingHandlerOnKvault {
+  static readonly discriminator = 1
+  static readonly kind = "KlendQueueAccountingHandlerOnKvault"
+  readonly discriminator = 1
+  readonly kind = "KlendQueueAccountingHandlerOnKvault"
+
+  toJSON(): KlendQueueAccountingHandlerOnKvaultJSON {
+    return {
+      kind: "KlendQueueAccountingHandlerOnKvault",
+    }
+  }
+
+  toEncodable() {
+    return {
+      KlendQueueAccountingHandlerOnKvault: {},
+    }
+  }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function fromDecoded(obj: any): types.ProgressCallbackTypeKind {
+  if (typeof obj !== "object") {
+    throw new Error("Invalid enum object")
+  }
+
+  if ("None" in obj) {
+    return new None()
+  }
+  if ("KlendQueueAccountingHandlerOnKvault" in obj) {
+    return new KlendQueueAccountingHandlerOnKvault()
+  }
+
+  throw new Error("Invalid enum object")
+}
+
+export function fromJSON(
+  obj: types.ProgressCallbackTypeJSON
+): types.ProgressCallbackTypeKind {
+  switch (obj.kind) {
+    case "None": {
+      return new None()
+    }
+    case "KlendQueueAccountingHandlerOnKvault": {
+      return new KlendQueueAccountingHandlerOnKvault()
+    }
+  }
+}
+
+export function layout(property?: string) {
+  const ret = borsh.rustEnum([
+    borsh.struct([], "None"),
+    borsh.struct([], "KlendQueueAccountingHandlerOnKvault"),
+  ])
+  if (property !== undefined) {
+    return ret.replicate(property)
+  }
+  return ret
+}