@kamino-finance/klend-sdk 7.1.4-beta.0 → 7.1.5

package/src/@codegen/klend/accounts/Obligation.ts

@@ -41,7 +41,9 @@ export interface ObligationFields {
   /** The dangerous borrow value at the weighted average liquidation threshold (scaled fraction) */
   unhealthyBorrowValueSf: BN
   /** The asset tier of the deposits */
-  paddingDeprecatedAssetTiers: Array<number>
+  depositsAssetTiers: Array<number>
+  /** The asset tier of the borrows */
+  borrowsAssetTiers: Array<number>
   /** The elevation group id the obligation opted into. */
   elevationGroup: number
   /** The number of obsolete reserves the obligation has a deposit in */
@@ -69,17 +71,10 @@ export interface ObligationFields {
    */
   autodeleverageMarginCallStartedTimestamp: BN
   /**
-   * Owner-defined, permissionlessly-executed repay orders.
+   * Owner-defined, liquidator-executed orders applicable to this obligation.
    * Typical use-cases would be a stop-loss and a take-profit (possibly co-existing).
    */
-  obligationOrders: Array<types.ObligationOrderFields>
-  /**
-   * Owner-defined, permissionlessly-executed borrow order applicable to this obligation.
-   * Non-zeroed only on a newly-initialized fixed-rate, fixed-term obligation.
-   */
-  borrowOrder: types.BorrowOrderFields
-  /** The unstaking ticket pubkey for LST position closing */
-  unstakeTicket: Address
+  orders: Array<types.ObligationOrderFields>
   padding3: Array<BN>
 }
 
@@ -109,7 +104,9 @@ export interface ObligationJSON {
   /** The dangerous borrow value at the weighted average liquidation threshold (scaled fraction) */
   unhealthyBorrowValueSf: string
   /** The asset tier of the deposits */
-  paddingDeprecatedAssetTiers: Array<number>
+  depositsAssetTiers: Array<number>
+  /** The asset tier of the borrows */
+  borrowsAssetTiers: Array<number>
   /** The elevation group id the obligation opted into. */
   elevationGroup: number
   /** The number of obsolete reserves the obligation has a deposit in */
@@ -137,17 +134,10 @@ export interface ObligationJSON {
    */
   autodeleverageMarginCallStartedTimestamp: string
   /**
-   * Owner-defined, permissionlessly-executed repay orders.
+   * Owner-defined, liquidator-executed orders applicable to this obligation.
    * Typical use-cases would be a stop-loss and a take-profit (possibly co-existing).
    */
-  obligationOrders: Array<types.ObligationOrderJSON>
-  /**
-   * Owner-defined, permissionlessly-executed borrow order applicable to this obligation.
-   * Non-zeroed only on a newly-initialized fixed-rate, fixed-term obligation.
-   */
-  borrowOrder: types.BorrowOrderJSON
-  /** The unstaking ticket pubkey for LST position closing */
-  unstakeTicket: string
+  orders: Array<types.ObligationOrderJSON>
   padding3: Array<string>
 }
 
@@ -178,7 +168,9 @@ export class Obligation {
   /** The dangerous borrow value at the weighted average liquidation threshold (scaled fraction) */
   readonly unhealthyBorrowValueSf: BN
   /** The asset tier of the deposits */
-  readonly paddingDeprecatedAssetTiers: Array<number>
+  readonly depositsAssetTiers: Array<number>
+  /** The asset tier of the borrows */
+  readonly borrowsAssetTiers: Array<number>
   /** The elevation group id the obligation opted into. */
   readonly elevationGroup: number
   /** The number of obsolete reserves the obligation has a deposit in */
@@ -206,17 +198,10 @@ export class Obligation {
    */
   readonly autodeleverageMarginCallStartedTimestamp: BN
   /**
-   * Owner-defined, permissionlessly-executed repay orders.
+   * 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 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
-  /** The unstaking ticket pubkey for LST position closing */
-  readonly unstakeTicket: Address
+  readonly orders: Array<types.ObligationOrder>
   readonly padding3: Array<BN>
 
   static readonly discriminator = Buffer.from([
@@ -236,7 +221,8 @@ export class Obligation {
     borsh.u128("borrowedAssetsMarketValueSf"),
     borsh.u128("allowedBorrowValueSf"),
     borsh.u128("unhealthyBorrowValueSf"),
-    borsh.array(borsh.u8(), 13, "paddingDeprecatedAssetTiers"),
+    borsh.array(borsh.u8(), 8, "depositsAssetTiers"),
+    borsh.array(borsh.u8(), 5, "borrowsAssetTiers"),
     borsh.u8("elevationGroup"),
     borsh.u8("numOfObsoleteDepositReserves"),
     borsh.u8("hasDebt"),
@@ -248,10 +234,8 @@ export class Obligation {
     borsh.array(borsh.u8(), 4, "reserved"),
     borsh.u64("highestBorrowFactorPct"),
     borsh.u64("autodeleverageMarginCallStartedTimestamp"),
-    borsh.array(types.ObligationOrder.layout(), 2, "obligationOrders"),
-    types.BorrowOrder.layout("borrowOrder"),
-    borshAddress("unstakeTicket"),
-    borsh.array(borsh.u64(), 69, "padding3"),
+    borsh.array(types.ObligationOrder.layout(), 2, "orders"),
+    borsh.array(borsh.u64(), 93, "padding3"),
   ])
 
   constructor(fields: ObligationFields) {
@@ -273,7 +257,8 @@ export class Obligation {
     this.borrowedAssetsMarketValueSf = fields.borrowedAssetsMarketValueSf
     this.allowedBorrowValueSf = fields.allowedBorrowValueSf
     this.unhealthyBorrowValueSf = fields.unhealthyBorrowValueSf
-    this.paddingDeprecatedAssetTiers = fields.paddingDeprecatedAssetTiers
+    this.depositsAssetTiers = fields.depositsAssetTiers
+    this.borrowsAssetTiers = fields.borrowsAssetTiers
     this.elevationGroup = fields.elevationGroup
     this.numOfObsoleteDepositReserves = fields.numOfObsoleteDepositReserves
     this.hasDebt = fields.hasDebt
@@ -286,11 +271,9 @@ export class Obligation {
     this.highestBorrowFactorPct = fields.highestBorrowFactorPct
     this.autodeleverageMarginCallStartedTimestamp =
       fields.autodeleverageMarginCallStartedTimestamp
-    this.obligationOrders = fields.obligationOrders.map(
+    this.orders = fields.orders.map(
       (item) => new types.ObligationOrder({ ...item })
     )
-    this.borrowOrder = new types.BorrowOrder({ ...fields.borrowOrder })
-    this.unstakeTicket = fields.unstakeTicket
     this.padding3 = fields.padding3
   }
 
@@ -363,7 +346,8 @@ export class Obligation {
       borrowedAssetsMarketValueSf: dec.borrowedAssetsMarketValueSf,
       allowedBorrowValueSf: dec.allowedBorrowValueSf,
       unhealthyBorrowValueSf: dec.unhealthyBorrowValueSf,
-      paddingDeprecatedAssetTiers: dec.paddingDeprecatedAssetTiers,
+      depositsAssetTiers: dec.depositsAssetTiers,
+      borrowsAssetTiers: dec.borrowsAssetTiers,
       elevationGroup: dec.elevationGroup,
       numOfObsoleteDepositReserves: dec.numOfObsoleteDepositReserves,
       hasDebt: dec.hasDebt,
@@ -376,13 +360,11 @@ export class Obligation {
       highestBorrowFactorPct: dec.highestBorrowFactorPct,
       autodeleverageMarginCallStartedTimestamp:
         dec.autodeleverageMarginCallStartedTimestamp,
-      obligationOrders: dec.obligationOrders.map(
+      orders: dec.orders.map(
         (
           item: any /* eslint-disable-line @typescript-eslint/no-explicit-any */
         ) => types.ObligationOrder.fromDecoded(item)
       ),
-      borrowOrder: types.BorrowOrder.fromDecoded(dec.borrowOrder),
-      unstakeTicket: dec.unstakeTicket,
       padding3: dec.padding3,
     })
   }
@@ -403,7 +385,8 @@ export class Obligation {
       borrowedAssetsMarketValueSf: this.borrowedAssetsMarketValueSf.toString(),
       allowedBorrowValueSf: this.allowedBorrowValueSf.toString(),
       unhealthyBorrowValueSf: this.unhealthyBorrowValueSf.toString(),
-      paddingDeprecatedAssetTiers: this.paddingDeprecatedAssetTiers,
+      depositsAssetTiers: this.depositsAssetTiers,
+      borrowsAssetTiers: this.borrowsAssetTiers,
       elevationGroup: this.elevationGroup,
       numOfObsoleteDepositReserves: this.numOfObsoleteDepositReserves,
       hasDebt: this.hasDebt,
@@ -416,9 +399,7 @@ export class Obligation {
       highestBorrowFactorPct: this.highestBorrowFactorPct.toString(),
       autodeleverageMarginCallStartedTimestamp:
         this.autodeleverageMarginCallStartedTimestamp.toString(),
-      obligationOrders: this.obligationOrders.map((item) => item.toJSON()),
-      borrowOrder: this.borrowOrder.toJSON(),
-      unstakeTicket: this.unstakeTicket,
+      orders: this.orders.map((item) => item.toJSON()),
       padding3: this.padding3.map((item) => item.toString()),
     }
   }
@@ -445,7 +426,8 @@ export class Obligation {
       borrowedAssetsMarketValueSf: new BN(obj.borrowedAssetsMarketValueSf),
       allowedBorrowValueSf: new BN(obj.allowedBorrowValueSf),
       unhealthyBorrowValueSf: new BN(obj.unhealthyBorrowValueSf),
-      paddingDeprecatedAssetTiers: obj.paddingDeprecatedAssetTiers,
+      depositsAssetTiers: obj.depositsAssetTiers,
+      borrowsAssetTiers: obj.borrowsAssetTiers,
       elevationGroup: obj.elevationGroup,
       numOfObsoleteDepositReserves: obj.numOfObsoleteDepositReserves,
       hasDebt: obj.hasDebt,
@@ -459,11 +441,7 @@ export class Obligation {
       autodeleverageMarginCallStartedTimestamp: new BN(
         obj.autodeleverageMarginCallStartedTimestamp
       ),
-      obligationOrders: obj.obligationOrders.map((item) =>
-        types.ObligationOrder.fromJSON(item)
-      ),
-      borrowOrder: types.BorrowOrder.fromJSON(obj.borrowOrder),
-      unstakeTicket: address(obj.unstakeTicket),
+      orders: obj.orders.map((item) => types.ObligationOrder.fromJSON(item)),
       padding3: obj.padding3.map((item) => new BN(item)),
     })
   }

package/src/@codegen/klend/accounts/Reserve.ts

@@ -39,8 +39,6 @@ export interface ReserveFields {
    * elevation group when this reserve is part of the collaterals.
    */
   borrowedAmountsAgainstThisReserveInElevationGroups: Array<BN>
-  /** The tracker of ticket-based withdrawals. */
-  withdrawQueue: types.WithdrawQueueFields
   padding: Array<BN>
 }
 
@@ -68,8 +66,6 @@ export interface ReserveJSON {
    * elevation group when this reserve is part of the collaterals.
    */
   borrowedAmountsAgainstThisReserveInElevationGroups: Array<string>
-  /** The tracker of ticket-based withdrawals. */
-  withdrawQueue: types.WithdrawQueueJSON
   padding: Array<string>
 }
 
@@ -97,8 +93,6 @@ export class Reserve {
    * elevation group when this reserve is part of the collaterals.
    */
   readonly borrowedAmountsAgainstThisReserveInElevationGroups: Array<BN>
-  /** The tracker of ticket-based withdrawals. */
-  readonly withdrawQueue: types.WithdrawQueue
   readonly padding: Array<BN>
 
   static readonly discriminator = Buffer.from([
@@ -116,15 +110,14 @@ export class Reserve {
     types.ReserveCollateral.layout("collateral"),
     borsh.array(borsh.u64(), 150, "reserveCollateralPadding"),
     types.ReserveConfig.layout("config"),
-    borsh.array(borsh.u64(), 113, "configPadding"),
+    borsh.array(borsh.u64(), 116, "configPadding"),
     borsh.u64("borrowedAmountOutsideElevationGroup"),
     borsh.array(
       borsh.u64(),
       32,
       "borrowedAmountsAgainstThisReserveInElevationGroups"
     ),
-    types.WithdrawQueue.layout("withdrawQueue"),
-    borsh.array(borsh.u64(), 204, "padding"),
+    borsh.array(borsh.u64(), 207, "padding"),
   ])
 
   constructor(fields: ReserveFields) {
@@ -143,7 +136,6 @@ export class Reserve {
       fields.borrowedAmountOutsideElevationGroup
     this.borrowedAmountsAgainstThisReserveInElevationGroups =
       fields.borrowedAmountsAgainstThisReserveInElevationGroups
-    this.withdrawQueue = new types.WithdrawQueue({ ...fields.withdrawQueue })
     this.padding = fields.padding
   }
 
@@ -210,7 +202,6 @@ export class Reserve {
         dec.borrowedAmountOutsideElevationGroup,
       borrowedAmountsAgainstThisReserveInElevationGroups:
         dec.borrowedAmountsAgainstThisReserveInElevationGroups,
-      withdrawQueue: types.WithdrawQueue.fromDecoded(dec.withdrawQueue),
       padding: dec.padding,
     })
   }
@@ -238,7 +229,6 @@ export class Reserve {
         this.borrowedAmountsAgainstThisReserveInElevationGroups.map((item) =>
           item.toString()
         ),
-      withdrawQueue: this.withdrawQueue.toJSON(),
       padding: this.padding.map((item) => item.toString()),
     }
   }
@@ -267,7 +257,6 @@ export class Reserve {
         obj.borrowedAmountsAgainstThisReserveInElevationGroups.map(
           (item) => new BN(item)
         ),
-      withdrawQueue: types.WithdrawQueue.fromJSON(obj.withdrawQueue),
       padding: obj.padding.map((item) => new BN(item)),
     })
   }

package/src/@codegen/klend/accounts/UserState.ts

@@ -19,17 +19,42 @@ export interface UserStateFields {
   userId: BN
   farmState: Address
   owner: Address
+  /** Indicate if this user state is part of a delegated farm */
   isFarmDelegated: number
   padding0: Array<number>
+  /**
+   * Rewards tally used for computation of gained rewards
+   * (scaled from `Decimal` representation).
+   */
   rewardsTallyScaled: Array<BN>
+  /** Number of reward tokens ready for claim */
   rewardsIssuedUnclaimed: Array<BN>
   lastClaimTs: Array<BN>
+  /**
+   * User stake deposited and usable, generating rewards and fees.
+   * (scaled from `Decimal` representation).
+   */
   activeStakeScaled: BN
+  /**
+   * User stake deposited but not usable and not generating rewards yet.
+   * (scaled from `Decimal` representation).
+   */
   pendingDepositStakeScaled: BN
+  /**
+   * After this timestamp, pending user stake can be moved to user stake
+   * Initialized to now() + delayed user stake period
+   */
   pendingDepositStakeTs: BN
+  /**
+   * User deposits unstaked, pending for withdrawal, not usable and not generating rewards.
+   * (scaled from `Decimal` representation).
+   */
   pendingWithdrawalUnstakeScaled: BN
+  /** After this timestamp, user can withdraw their deposit. */
   pendingWithdrawalUnstakeTs: BN
+  /** User bump used for account address validation */
   bump: BN
+  /** Delegatee used for initialisation - useful to check against */
   delegatee: Address
   lastStakeTs: BN
   padding1: Array<BN>
@@ -39,17 +64,42 @@ export interface UserStateJSON {
   userId: string
   farmState: string
   owner: string
+  /** Indicate if this user state is part of a delegated farm */
   isFarmDelegated: number
   padding0: Array<number>
+  /**
+   * Rewards tally used for computation of gained rewards
+   * (scaled from `Decimal` representation).
+   */
   rewardsTallyScaled: Array<string>
+  /** Number of reward tokens ready for claim */
   rewardsIssuedUnclaimed: Array<string>
   lastClaimTs: Array<string>
+  /**
+   * User stake deposited and usable, generating rewards and fees.
+   * (scaled from `Decimal` representation).
+   */
   activeStakeScaled: string
+  /**
+   * User stake deposited but not usable and not generating rewards yet.
+   * (scaled from `Decimal` representation).
+   */
   pendingDepositStakeScaled: string
+  /**
+   * After this timestamp, pending user stake can be moved to user stake
+   * Initialized to now() + delayed user stake period
+   */
   pendingDepositStakeTs: string
+  /**
+   * User deposits unstaked, pending for withdrawal, not usable and not generating rewards.
+   * (scaled from `Decimal` representation).
+   */
   pendingWithdrawalUnstakeScaled: string
+  /** After this timestamp, user can withdraw their deposit. */
   pendingWithdrawalUnstakeTs: string
+  /** User bump used for account address validation */
   bump: string
+  /** Delegatee used for initialisation - useful to check against */
   delegatee: string
   lastStakeTs: string
   padding1: Array<string>
@@ -59,17 +109,42 @@ export class UserState {
   readonly userId: BN
   readonly farmState: Address
   readonly owner: Address
+  /** Indicate if this user state is part of a delegated farm */
   readonly isFarmDelegated: number
   readonly padding0: Array<number>
+  /**
+   * Rewards tally used for computation of gained rewards
+   * (scaled from `Decimal` representation).
+   */
   readonly rewardsTallyScaled: Array<BN>
+  /** Number of reward tokens ready for claim */
   readonly rewardsIssuedUnclaimed: Array<BN>
   readonly lastClaimTs: Array<BN>
+  /**
+   * User stake deposited and usable, generating rewards and fees.
+   * (scaled from `Decimal` representation).
+   */
   readonly activeStakeScaled: BN
+  /**
+   * User stake deposited but not usable and not generating rewards yet.
+   * (scaled from `Decimal` representation).
+   */
   readonly pendingDepositStakeScaled: BN
+  /**
+   * After this timestamp, pending user stake can be moved to user stake
+   * Initialized to now() + delayed user stake period
+   */
   readonly pendingDepositStakeTs: BN
+  /**
+   * User deposits unstaked, pending for withdrawal, not usable and not generating rewards.
+   * (scaled from `Decimal` representation).
+   */
   readonly pendingWithdrawalUnstakeScaled: BN
+  /** After this timestamp, user can withdraw their deposit. */
   readonly pendingWithdrawalUnstakeTs: BN
+  /** User bump used for account address validation */
   readonly bump: BN
+  /** Delegatee used for initialisation - useful to check against */
   readonly delegatee: Address
   readonly lastStakeTs: BN
   readonly padding1: Array<BN>

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

@@ -19,9 +19,3 @@ export { UserMetadata } from "./UserMetadata"
 export type { UserMetadataFields, UserMetadataJSON } from "./UserMetadata"
 export { Reserve } from "./Reserve"
 export type { ReserveFields, ReserveJSON } from "./Reserve"
-export { WithdrawTicket } from "./WithdrawTicket"
-export type { WithdrawTicketFields, WithdrawTicketJSON } from "./WithdrawTicket"
-export { PoolState } from "./PoolState"
-export type { PoolStateFields, PoolStateJSON } from "./PoolState"
-export { UnstakeTicket } from "./UnstakeTicket"
-export type { UnstakeTicketFields, UnstakeTicketJSON } from "./UnstakeTicket"