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

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

@@ -0,0 +1,119 @@
+import { address, Address } from "@solana/kit" // 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"
+import { borshAddress } from "../utils"
+
+export interface RegularJSON {
+  kind: "Regular"
+}
+
+export class Regular {
+  static readonly discriminator = 0
+  static readonly kind = "Regular"
+  readonly discriminator = 0
+  readonly kind = "Regular"
+
+  toJSON(): RegularJSON {
+    return {
+      kind: "Regular",
+    }
+  }
+
+  toEncodable() {
+    return {
+      Regular: {},
+    }
+  }
+}
+
+export interface IsolatedCollateralJSON {
+  kind: "IsolatedCollateral"
+}
+
+export class IsolatedCollateral {
+  static readonly discriminator = 1
+  static readonly kind = "IsolatedCollateral"
+  readonly discriminator = 1
+  readonly kind = "IsolatedCollateral"
+
+  toJSON(): IsolatedCollateralJSON {
+    return {
+      kind: "IsolatedCollateral",
+    }
+  }
+
+  toEncodable() {
+    return {
+      IsolatedCollateral: {},
+    }
+  }
+}
+
+export interface IsolatedDebtJSON {
+  kind: "IsolatedDebt"
+}
+
+export class IsolatedDebt {
+  static readonly discriminator = 2
+  static readonly kind = "IsolatedDebt"
+  readonly discriminator = 2
+  readonly kind = "IsolatedDebt"
+
+  toJSON(): IsolatedDebtJSON {
+    return {
+      kind: "IsolatedDebt",
+    }
+  }
+
+  toEncodable() {
+    return {
+      IsolatedDebt: {},
+    }
+  }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function fromDecoded(obj: any): types.AssetTierKind {
+  if (typeof obj !== "object") {
+    throw new Error("Invalid enum object")
+  }
+
+  if ("Regular" in obj) {
+    return new Regular()
+  }
+  if ("IsolatedCollateral" in obj) {
+    return new IsolatedCollateral()
+  }
+  if ("IsolatedDebt" in obj) {
+    return new IsolatedDebt()
+  }
+
+  throw new Error("Invalid enum object")
+}
+
+export function fromJSON(obj: types.AssetTierJSON): types.AssetTierKind {
+  switch (obj.kind) {
+    case "Regular": {
+      return new Regular()
+    }
+    case "IsolatedCollateral": {
+      return new IsolatedCollateral()
+    }
+    case "IsolatedDebt": {
+      return new IsolatedDebt()
+    }
+  }
+}
+
+export function layout(property?: string) {
+  const ret = borsh.rustEnum([
+    borsh.struct([], "Regular"),
+    borsh.struct([], "IsolatedCollateral"),
+    borsh.struct([], "IsolatedDebt"),
+  ])
+  if (property !== undefined) {
+    return ret.replicate(property)
+  }
+  return ret
+}

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

@@ -9,17 +9,7 @@ export interface ObligationLiquidityFields {
   borrowReserve: Address
   /** Borrow rate used for calculating interest (big scaled fraction) */
   cumulativeBorrowRateBsf: types.BigFractionBytesFields
-  /**
-   * The timestamp at which this debt was taken.
-   * More specifically: when the *first* borrow operation from this reserve happened.
-   * This means that:
-   * - adding debt of the same reserve does *not* change this timestamp,
-   * - repaying the entire debt of this reserve *does* reset this timestamp.
-   *
-   * Note: this field is *not* only metadata: it is used in the logic, e.g. for enforcing the
-   * fixed-term borrows (i.e. those induced by [ReserveConfig::debt_term_seconds]).
-   */
-  firstBorrowedAtTimestamp: BN
+  padding: BN
   /** Amount of liquidity borrowed plus interest (scaled fraction) */
   borrowedAmountSf: BN
   /** Liquidity market value in quote currency (scaled fraction) */
@@ -36,17 +26,7 @@ export interface ObligationLiquidityJSON {
   borrowReserve: string
   /** Borrow rate used for calculating interest (big scaled fraction) */
   cumulativeBorrowRateBsf: types.BigFractionBytesJSON
-  /**
-   * The timestamp at which this debt was taken.
-   * More specifically: when the *first* borrow operation from this reserve happened.
-   * This means that:
-   * - adding debt of the same reserve does *not* change this timestamp,
-   * - repaying the entire debt of this reserve *does* reset this timestamp.
-   *
-   * Note: this field is *not* only metadata: it is used in the logic, e.g. for enforcing the
-   * fixed-term borrows (i.e. those induced by [ReserveConfig::debt_term_seconds]).
-   */
-  firstBorrowedAtTimestamp: string
+  padding: string
   /** Amount of liquidity borrowed plus interest (scaled fraction) */
   borrowedAmountSf: string
   /** Liquidity market value in quote currency (scaled fraction) */
@@ -64,17 +44,7 @@ export class ObligationLiquidity {
   readonly borrowReserve: Address
   /** Borrow rate used for calculating interest (big scaled fraction) */
   readonly cumulativeBorrowRateBsf: types.BigFractionBytes
-  /**
-   * The timestamp at which this debt was taken.
-   * More specifically: when the *first* borrow operation from this reserve happened.
-   * This means that:
-   * - adding debt of the same reserve does *not* change this timestamp,
-   * - repaying the entire debt of this reserve *does* reset this timestamp.
-   *
-   * Note: this field is *not* only metadata: it is used in the logic, e.g. for enforcing the
-   * fixed-term borrows (i.e. those induced by [ReserveConfig::debt_term_seconds]).
-   */
-  readonly firstBorrowedAtTimestamp: BN
+  readonly padding: BN
   /** Amount of liquidity borrowed plus interest (scaled fraction) */
   readonly borrowedAmountSf: BN
   /** Liquidity market value in quote currency (scaled fraction) */
@@ -90,7 +60,7 @@ export class ObligationLiquidity {
     this.cumulativeBorrowRateBsf = new types.BigFractionBytes({
       ...fields.cumulativeBorrowRateBsf,
     })
-    this.firstBorrowedAtTimestamp = fields.firstBorrowedAtTimestamp
+    this.padding = fields.padding
     this.borrowedAmountSf = fields.borrowedAmountSf
     this.marketValueSf = fields.marketValueSf
     this.borrowFactorAdjustedMarketValueSf =
@@ -105,7 +75,7 @@ export class ObligationLiquidity {
       [
         borshAddress("borrowReserve"),
         types.BigFractionBytes.layout("cumulativeBorrowRateBsf"),
-        borsh.u64("firstBorrowedAtTimestamp"),
+        borsh.u64("padding"),
         borsh.u128("borrowedAmountSf"),
         borsh.u128("marketValueSf"),
         borsh.u128("borrowFactorAdjustedMarketValueSf"),
@@ -123,7 +93,7 @@ export class ObligationLiquidity {
       cumulativeBorrowRateBsf: types.BigFractionBytes.fromDecoded(
         obj.cumulativeBorrowRateBsf
       ),
-      firstBorrowedAtTimestamp: obj.firstBorrowedAtTimestamp,
+      padding: obj.padding,
       borrowedAmountSf: obj.borrowedAmountSf,
       marketValueSf: obj.marketValueSf,
       borrowFactorAdjustedMarketValueSf: obj.borrowFactorAdjustedMarketValueSf,
@@ -139,7 +109,7 @@ export class ObligationLiquidity {
       cumulativeBorrowRateBsf: types.BigFractionBytes.toEncodable(
         fields.cumulativeBorrowRateBsf
       ),
-      firstBorrowedAtTimestamp: fields.firstBorrowedAtTimestamp,
+      padding: fields.padding,
       borrowedAmountSf: fields.borrowedAmountSf,
       marketValueSf: fields.marketValueSf,
       borrowFactorAdjustedMarketValueSf:
@@ -154,7 +124,7 @@ export class ObligationLiquidity {
     return {
       borrowReserve: this.borrowReserve,
       cumulativeBorrowRateBsf: this.cumulativeBorrowRateBsf.toJSON(),
-      firstBorrowedAtTimestamp: this.firstBorrowedAtTimestamp.toString(),
+      padding: this.padding.toString(),
       borrowedAmountSf: this.borrowedAmountSf.toString(),
       marketValueSf: this.marketValueSf.toString(),
       borrowFactorAdjustedMarketValueSf:
@@ -171,7 +141,7 @@ export class ObligationLiquidity {
       cumulativeBorrowRateBsf: types.BigFractionBytes.fromJSON(
         obj.cumulativeBorrowRateBsf
       ),
-      firstBorrowedAtTimestamp: new BN(obj.firstBorrowedAtTimestamp),
+      padding: new BN(obj.padding),
       borrowedAmountSf: new BN(obj.borrowedAmountSf),
       marketValueSf: new BN(obj.marketValueSf),
       borrowFactorAdjustedMarketValueSf: new BN(

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

@@ -77,7 +77,7 @@ export interface ObligationOrderFields {
    */
   opportunityType: number
   /**
-   * Alignment padding.
+   * Internal padding.
    * The fields above take up 2+2+1+1 bytes = 48 bits, which means we need 80 bits = 10 bytes to
    * align with `u128`s.
    */
@@ -162,7 +162,7 @@ export interface ObligationOrderJSON {
    */
   opportunityType: number
   /**
-   * Alignment padding.
+   * Internal padding.
    * The fields above take up 2+2+1+1 bytes = 48 bits, which means we need 80 bits = 10 bytes to
    * align with `u128`s.
    */
@@ -176,7 +176,7 @@ export interface ObligationOrderJSON {
 
 /**
  * A single obligation order.
- * See [Obligation::obligation_orders].
+ * See [Obligation::orders].
  */
 export class ObligationOrder {
   /**
@@ -251,7 +251,7 @@ export class ObligationOrder {
    */
   readonly opportunityType: number
   /**
-   * Alignment padding.
+   * Internal padding.
    * The fields above take up 2+2+1+1 bytes = 48 bits, which means we need 80 bits = 10 bytes to
    * align with `u128`s.
    */

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

@@ -8,18 +8,16 @@ export interface ReserveConfigFields {
   /** Status of the reserve Active/Obsolete/Hidden */
   status: number
   /** Asset tier -> 0 - regular (collateral & debt), 1 - isolated collateral, 2 - isolated debt */
-  paddingDeprecatedAssetTier: number
+  assetTier: number
   /** Flat rate that goes to the host */
   hostFixedInterestRateBps: number
-  /** Starting bonus for deleveraging-related liquidations, in bps. */
-  minDeleveragingBonusBps: number
   /**
-   * Boolean flag indicating whether the reserve can be used in the close lst position process.
-   * See handler_unstake_lst_collateral_start.rs for more information.
+   * [DEPRECATED] Space that used to hold 2 fields:
+   * - Boost for side (debt or collateral)
+   * - Reward points multiplier per obligation type
+   * Can be re-used after making sure all underlying production account data is zeroed.
    */
-  canUnstakeLstCollateral: number
-  /** Past reserved space - feel free to reuse. */
-  reserved1: Array<number>
+  reserved2: Array<number>
   /** Cut of the order execution bonus that the protocol receives, as a percentage */
   protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
@@ -78,14 +76,7 @@ export interface ReserveConfigFields {
    * obligations) is NOT affected by this flag.
    */
   autodeleverageEnabled: number
-  /**
-   * Boolean flag indicating whether the reserve is locked for the proposer authority.
-   *
-   * Once the proposer have finished preparing the reserve, it must be locked to prevent
-   * further changes to the reserve configuration allowing review and voting on the proposal
-   * without alteration during the voting period.
-   */
-  proposerAuthorityLocked: number
+  reserved1: Array<number>
   /**
    * Maximum amount liquidity of this reserve borrowed outside all elevation groups
    * - u64::MAX for inf
@@ -104,49 +95,22 @@ export interface ReserveConfigFields {
    * Only relevant when `autodeleverage_enabled == 1`, and must not be 0 in such case.
    */
   deleveragingBonusIncreaseBpsPerDay: BN
-  /**
-   * The timestamp at which all [Obligation::borrows] using this reserve become liquidatable
-   * (on the same terms as reserve-wide deleveraging).
-   * Inactive when zeroed (i.e. debt never matures).
-   *
-   * Note: this feature is independent of [Self::debt_term_seconds] - the liquidation mechanism
-   * is based directly on the timestamp defined here, on Reserve's level.
-   */
-  debtMaturityTimestamp: BN
-  /**
-   * The duration after which any debt coming from this Reserve must be repaid.
-   * Inactive when zeroed (i.e. funds can be borrowed indefinitely).
-   *
-   * Note: this feature is independent of [Self::debt_maturity_timestamp] - the liquidation
-   * mechanism is based on the [ObligationLiquidity::first_borrowed_at_timestamp].
-   */
-  debtTermSeconds: BN
-  /**
-   * Maximum number of lamports that can differ when comparing LTVs.
-   *
-   * For example, when doing deposit_and_withdraw we want to make sure that new_ltv <= old_ltv
-   * but for some tokens we want to have a little bit of margin in terms of lamports deposited.
-   * This is recommended to be 0 for most (if not all) reserves.
-   */
-  ltvLamportsMargin: BN
 }
 
 export interface ReserveConfigJSON {
   /** Status of the reserve Active/Obsolete/Hidden */
   status: number
   /** Asset tier -> 0 - regular (collateral & debt), 1 - isolated collateral, 2 - isolated debt */
-  paddingDeprecatedAssetTier: number
+  assetTier: number
   /** Flat rate that goes to the host */
   hostFixedInterestRateBps: number
-  /** Starting bonus for deleveraging-related liquidations, in bps. */
-  minDeleveragingBonusBps: number
   /**
-   * Boolean flag indicating whether the reserve can be used in the close lst position process.
-   * See handler_unstake_lst_collateral_start.rs for more information.
+   * [DEPRECATED] Space that used to hold 2 fields:
+   * - Boost for side (debt or collateral)
+   * - Reward points multiplier per obligation type
+   * Can be re-used after making sure all underlying production account data is zeroed.
    */
-  canUnstakeLstCollateral: number
-  /** Past reserved space - feel free to reuse. */
-  reserved1: Array<number>
+  reserved2: Array<number>
   /** Cut of the order execution bonus that the protocol receives, as a percentage */
   protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
@@ -205,14 +169,7 @@ export interface ReserveConfigJSON {
    * obligations) is NOT affected by this flag.
    */
   autodeleverageEnabled: number
-  /**
-   * Boolean flag indicating whether the reserve is locked for the proposer authority.
-   *
-   * Once the proposer have finished preparing the reserve, it must be locked to prevent
-   * further changes to the reserve configuration allowing review and voting on the proposal
-   * without alteration during the voting period.
-   */
-  proposerAuthorityLocked: number
+  reserved1: Array<number>
   /**
    * Maximum amount liquidity of this reserve borrowed outside all elevation groups
    * - u64::MAX for inf
@@ -231,31 +188,6 @@ export interface ReserveConfigJSON {
    * Only relevant when `autodeleverage_enabled == 1`, and must not be 0 in such case.
    */
   deleveragingBonusIncreaseBpsPerDay: string
-  /**
-   * The timestamp at which all [Obligation::borrows] using this reserve become liquidatable
-   * (on the same terms as reserve-wide deleveraging).
-   * Inactive when zeroed (i.e. debt never matures).
-   *
-   * Note: this feature is independent of [Self::debt_term_seconds] - the liquidation mechanism
-   * is based directly on the timestamp defined here, on Reserve's level.
-   */
-  debtMaturityTimestamp: string
-  /**
-   * The duration after which any debt coming from this Reserve must be repaid.
-   * Inactive when zeroed (i.e. funds can be borrowed indefinitely).
-   *
-   * Note: this feature is independent of [Self::debt_maturity_timestamp] - the liquidation
-   * mechanism is based on the [ObligationLiquidity::first_borrowed_at_timestamp].
-   */
-  debtTermSeconds: string
-  /**
-   * Maximum number of lamports that can differ when comparing LTVs.
-   *
-   * For example, when doing deposit_and_withdraw we want to make sure that new_ltv <= old_ltv
-   * but for some tokens we want to have a little bit of margin in terms of lamports deposited.
-   * This is recommended to be 0 for most (if not all) reserves.
-   */
-  ltvLamportsMargin: string
 }
 
 /** Reserve configuration values */
@@ -263,18 +195,16 @@ export class ReserveConfig {
   /** Status of the reserve Active/Obsolete/Hidden */
   readonly status: number
   /** Asset tier -> 0 - regular (collateral & debt), 1 - isolated collateral, 2 - isolated debt */
-  readonly paddingDeprecatedAssetTier: number
+  readonly assetTier: number
   /** Flat rate that goes to the host */
   readonly hostFixedInterestRateBps: number
-  /** Starting bonus for deleveraging-related liquidations, in bps. */
-  readonly minDeleveragingBonusBps: number
   /**
-   * Boolean flag indicating whether the reserve can be used in the close lst position process.
-   * See handler_unstake_lst_collateral_start.rs for more information.
+   * [DEPRECATED] Space that used to hold 2 fields:
+   * - Boost for side (debt or collateral)
+   * - Reward points multiplier per obligation type
+   * Can be re-used after making sure all underlying production account data is zeroed.
    */
-  readonly canUnstakeLstCollateral: number
-  /** Past reserved space - feel free to reuse. */
-  readonly reserved1: Array<number>
+  readonly reserved2: Array<number>
   /** Cut of the order execution bonus that the protocol receives, as a percentage */
   readonly protocolOrderExecutionFeePct: number
   /** Protocol take rate is the amount borrowed interest protocol receives, as a percentage */
@@ -333,14 +263,7 @@ export class ReserveConfig {
    * obligations) is NOT affected by this flag.
    */
   readonly autodeleverageEnabled: number
-  /**
-   * Boolean flag indicating whether the reserve is locked for the proposer authority.
-   *
-   * Once the proposer have finished preparing the reserve, it must be locked to prevent
-   * further changes to the reserve configuration allowing review and voting on the proposal
-   * without alteration during the voting period.
-   */
-  readonly proposerAuthorityLocked: number
+  readonly reserved1: Array<number>
   /**
    * Maximum amount liquidity of this reserve borrowed outside all elevation groups
    * - u64::MAX for inf
@@ -359,39 +282,12 @@ export class ReserveConfig {
    * Only relevant when `autodeleverage_enabled == 1`, and must not be 0 in such case.
    */
   readonly deleveragingBonusIncreaseBpsPerDay: BN
-  /**
-   * The timestamp at which all [Obligation::borrows] using this reserve become liquidatable
-   * (on the same terms as reserve-wide deleveraging).
-   * Inactive when zeroed (i.e. debt never matures).
-   *
-   * Note: this feature is independent of [Self::debt_term_seconds] - the liquidation mechanism
-   * is based directly on the timestamp defined here, on Reserve's level.
-   */
-  readonly debtMaturityTimestamp: BN
-  /**
-   * The duration after which any debt coming from this Reserve must be repaid.
-   * Inactive when zeroed (i.e. funds can be borrowed indefinitely).
-   *
-   * Note: this feature is independent of [Self::debt_maturity_timestamp] - the liquidation
-   * mechanism is based on the [ObligationLiquidity::first_borrowed_at_timestamp].
-   */
-  readonly debtTermSeconds: BN
-  /**
-   * Maximum number of lamports that can differ when comparing LTVs.
-   *
-   * For example, when doing deposit_and_withdraw we want to make sure that new_ltv <= old_ltv
-   * but for some tokens we want to have a little bit of margin in terms of lamports deposited.
-   * This is recommended to be 0 for most (if not all) reserves.
-   */
-  readonly ltvLamportsMargin: BN
 
   constructor(fields: ReserveConfigFields) {
     this.status = fields.status
-    this.paddingDeprecatedAssetTier = fields.paddingDeprecatedAssetTier
+    this.assetTier = fields.assetTier
     this.hostFixedInterestRateBps = fields.hostFixedInterestRateBps
-    this.minDeleveragingBonusBps = fields.minDeleveragingBonusBps
-    this.canUnstakeLstCollateral = fields.canUnstakeLstCollateral
-    this.reserved1 = fields.reserved1
+    this.reserved2 = fields.reserved2
     this.protocolOrderExecutionFeePct = fields.protocolOrderExecutionFeePct
     this.protocolTakeRatePct = fields.protocolTakeRatePct
     this.protocolLiquidationFeePct = fields.protocolLiquidationFeePct
@@ -423,27 +319,22 @@ export class ReserveConfig {
     this.utilizationLimitBlockBorrowingAbovePct =
       fields.utilizationLimitBlockBorrowingAbovePct
     this.autodeleverageEnabled = fields.autodeleverageEnabled
-    this.proposerAuthorityLocked = fields.proposerAuthorityLocked
+    this.reserved1 = fields.reserved1
     this.borrowLimitOutsideElevationGroup =
       fields.borrowLimitOutsideElevationGroup
     this.borrowLimitAgainstThisCollateralInElevationGroup =
       fields.borrowLimitAgainstThisCollateralInElevationGroup
     this.deleveragingBonusIncreaseBpsPerDay =
       fields.deleveragingBonusIncreaseBpsPerDay
-    this.debtMaturityTimestamp = fields.debtMaturityTimestamp
-    this.debtTermSeconds = fields.debtTermSeconds
-    this.ltvLamportsMargin = fields.ltvLamportsMargin
   }
 
   static layout(property?: string) {
     return borsh.struct(
       [
         borsh.u8("status"),
-        borsh.u8("paddingDeprecatedAssetTier"),
+        borsh.u8("assetTier"),
         borsh.u16("hostFixedInterestRateBps"),
-        borsh.u16("minDeleveragingBonusBps"),
-        borsh.u8("canUnstakeLstCollateral"),
-        borsh.array(borsh.u8(), 6, "reserved1"),
+        borsh.array(borsh.u8(), 9, "reserved2"),
         borsh.u8("protocolOrderExecutionFeePct"),
         borsh.u8("protocolTakeRatePct"),
         borsh.u8("protocolLiquidationFeePct"),
@@ -466,7 +357,7 @@ export class ReserveConfig {
         borsh.u8("disableUsageAsCollOutsideEmode"),
         borsh.u8("utilizationLimitBlockBorrowingAbovePct"),
         borsh.u8("autodeleverageEnabled"),
-        borsh.u8("proposerAuthorityLocked"),
+        borsh.array(borsh.u8(), 1, "reserved1"),
         borsh.u64("borrowLimitOutsideElevationGroup"),
         borsh.array(
           borsh.u64(),
@@ -474,9 +365,6 @@ export class ReserveConfig {
           "borrowLimitAgainstThisCollateralInElevationGroup"
         ),
         borsh.u64("deleveragingBonusIncreaseBpsPerDay"),
-        borsh.u64("debtMaturityTimestamp"),
-        borsh.u64("debtTermSeconds"),
-        borsh.u64("ltvLamportsMargin"),
       ],
       property
     )
@@ -486,11 +374,9 @@ export class ReserveConfig {
   static fromDecoded(obj: any) {
     return new ReserveConfig({
       status: obj.status,
-      paddingDeprecatedAssetTier: obj.paddingDeprecatedAssetTier,
+      assetTier: obj.assetTier,
       hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
-      minDeleveragingBonusBps: obj.minDeleveragingBonusBps,
-      canUnstakeLstCollateral: obj.canUnstakeLstCollateral,
-      reserved1: obj.reserved1,
+      reserved2: obj.reserved2,
       protocolOrderExecutionFeePct: obj.protocolOrderExecutionFeePct,
       protocolTakeRatePct: obj.protocolTakeRatePct,
       protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
@@ -519,26 +405,21 @@ export class ReserveConfig {
       utilizationLimitBlockBorrowingAbovePct:
         obj.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: obj.autodeleverageEnabled,
-      proposerAuthorityLocked: obj.proposerAuthorityLocked,
+      reserved1: obj.reserved1,
       borrowLimitOutsideElevationGroup: obj.borrowLimitOutsideElevationGroup,
       borrowLimitAgainstThisCollateralInElevationGroup:
         obj.borrowLimitAgainstThisCollateralInElevationGroup,
       deleveragingBonusIncreaseBpsPerDay:
         obj.deleveragingBonusIncreaseBpsPerDay,
-      debtMaturityTimestamp: obj.debtMaturityTimestamp,
-      debtTermSeconds: obj.debtTermSeconds,
-      ltvLamportsMargin: obj.ltvLamportsMargin,
     })
   }
 
   static toEncodable(fields: ReserveConfigFields) {
     return {
       status: fields.status,
-      paddingDeprecatedAssetTier: fields.paddingDeprecatedAssetTier,
+      assetTier: fields.assetTier,
       hostFixedInterestRateBps: fields.hostFixedInterestRateBps,
-      minDeleveragingBonusBps: fields.minDeleveragingBonusBps,
-      canUnstakeLstCollateral: fields.canUnstakeLstCollateral,
-      reserved1: fields.reserved1,
+      reserved2: fields.reserved2,
       protocolOrderExecutionFeePct: fields.protocolOrderExecutionFeePct,
       protocolTakeRatePct: fields.protocolTakeRatePct,
       protocolLiquidationFeePct: fields.protocolLiquidationFeePct,
@@ -569,26 +450,21 @@ export class ReserveConfig {
       utilizationLimitBlockBorrowingAbovePct:
         fields.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: fields.autodeleverageEnabled,
-      proposerAuthorityLocked: fields.proposerAuthorityLocked,
+      reserved1: fields.reserved1,
       borrowLimitOutsideElevationGroup: fields.borrowLimitOutsideElevationGroup,
       borrowLimitAgainstThisCollateralInElevationGroup:
         fields.borrowLimitAgainstThisCollateralInElevationGroup,
       deleveragingBonusIncreaseBpsPerDay:
         fields.deleveragingBonusIncreaseBpsPerDay,
-      debtMaturityTimestamp: fields.debtMaturityTimestamp,
-      debtTermSeconds: fields.debtTermSeconds,
-      ltvLamportsMargin: fields.ltvLamportsMargin,
     }
   }
 
   toJSON(): ReserveConfigJSON {
     return {
       status: this.status,
-      paddingDeprecatedAssetTier: this.paddingDeprecatedAssetTier,
+      assetTier: this.assetTier,
       hostFixedInterestRateBps: this.hostFixedInterestRateBps,
-      minDeleveragingBonusBps: this.minDeleveragingBonusBps,
-      canUnstakeLstCollateral: this.canUnstakeLstCollateral,
-      reserved1: this.reserved1,
+      reserved2: this.reserved2,
       protocolOrderExecutionFeePct: this.protocolOrderExecutionFeePct,
       protocolTakeRatePct: this.protocolTakeRatePct,
       protocolLiquidationFeePct: this.protocolLiquidationFeePct,
@@ -614,7 +490,7 @@ export class ReserveConfig {
       utilizationLimitBlockBorrowingAbovePct:
         this.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: this.autodeleverageEnabled,
-      proposerAuthorityLocked: this.proposerAuthorityLocked,
+      reserved1: this.reserved1,
       borrowLimitOutsideElevationGroup:
         this.borrowLimitOutsideElevationGroup.toString(),
       borrowLimitAgainstThisCollateralInElevationGroup:
@@ -623,20 +499,15 @@ export class ReserveConfig {
         ),
       deleveragingBonusIncreaseBpsPerDay:
         this.deleveragingBonusIncreaseBpsPerDay.toString(),
-      debtMaturityTimestamp: this.debtMaturityTimestamp.toString(),
-      debtTermSeconds: this.debtTermSeconds.toString(),
-      ltvLamportsMargin: this.ltvLamportsMargin.toString(),
     }
   }
 
   static fromJSON(obj: ReserveConfigJSON): ReserveConfig {
     return new ReserveConfig({
       status: obj.status,
-      paddingDeprecatedAssetTier: obj.paddingDeprecatedAssetTier,
+      assetTier: obj.assetTier,
       hostFixedInterestRateBps: obj.hostFixedInterestRateBps,
-      minDeleveragingBonusBps: obj.minDeleveragingBonusBps,
-      canUnstakeLstCollateral: obj.canUnstakeLstCollateral,
-      reserved1: obj.reserved1,
+      reserved2: obj.reserved2,
       protocolOrderExecutionFeePct: obj.protocolOrderExecutionFeePct,
       protocolTakeRatePct: obj.protocolTakeRatePct,
       protocolLiquidationFeePct: obj.protocolLiquidationFeePct,
@@ -666,7 +537,7 @@ export class ReserveConfig {
       utilizationLimitBlockBorrowingAbovePct:
         obj.utilizationLimitBlockBorrowingAbovePct,
       autodeleverageEnabled: obj.autodeleverageEnabled,
-      proposerAuthorityLocked: obj.proposerAuthorityLocked,
+      reserved1: obj.reserved1,
       borrowLimitOutsideElevationGroup: new BN(
         obj.borrowLimitOutsideElevationGroup
       ),
@@ -677,9 +548,6 @@ export class ReserveConfig {
       deleveragingBonusIncreaseBpsPerDay: new BN(
         obj.deleveragingBonusIncreaseBpsPerDay
       ),
-      debtMaturityTimestamp: new BN(obj.debtMaturityTimestamp),
-      debtTermSeconds: new BN(obj.debtTermSeconds),
-      ltvLamportsMargin: new BN(obj.ltvLamportsMargin),
     })
   }