@kamino-finance/klend-sdk 7.4.0-beta.2 → 7.4.0-beta.3

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

@@ -717,6 +717,144 @@ export class UpdateBorrowOrderExecutionEnabled {
   }
 }
 
+export interface UpdateWithdrawTicketIssuanceEnabledJSON {
+  kind: "UpdateWithdrawTicketIssuanceEnabled"
+}
+
+export class UpdateWithdrawTicketIssuanceEnabled {
+  static readonly discriminator = 31
+  static readonly kind = "UpdateWithdrawTicketIssuanceEnabled"
+  readonly discriminator = 31
+  readonly kind = "UpdateWithdrawTicketIssuanceEnabled"
+
+  toJSON(): UpdateWithdrawTicketIssuanceEnabledJSON {
+    return {
+      kind: "UpdateWithdrawTicketIssuanceEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateWithdrawTicketIssuanceEnabled: {},
+    }
+  }
+}
+
+export interface UpdateWithdrawTicketRedemptionEnabledJSON {
+  kind: "UpdateWithdrawTicketRedemptionEnabled"
+}
+
+export class UpdateWithdrawTicketRedemptionEnabled {
+  static readonly discriminator = 32
+  static readonly kind = "UpdateWithdrawTicketRedemptionEnabled"
+  readonly discriminator = 32
+  readonly kind = "UpdateWithdrawTicketRedemptionEnabled"
+
+  toJSON(): UpdateWithdrawTicketRedemptionEnabledJSON {
+    return {
+      kind: "UpdateWithdrawTicketRedemptionEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateWithdrawTicketRedemptionEnabled: {},
+    }
+  }
+}
+
+export interface UpdateMinWithdrawQueuedLiquidityValueJSON {
+  kind: "UpdateMinWithdrawQueuedLiquidityValue"
+}
+
+export class UpdateMinWithdrawQueuedLiquidityValue {
+  static readonly discriminator = 33
+  static readonly kind = "UpdateMinWithdrawQueuedLiquidityValue"
+  readonly discriminator = 33
+  readonly kind = "UpdateMinWithdrawQueuedLiquidityValue"
+
+  toJSON(): UpdateMinWithdrawQueuedLiquidityValueJSON {
+    return {
+      kind: "UpdateMinWithdrawQueuedLiquidityValue",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateMinWithdrawQueuedLiquidityValue: {},
+    }
+  }
+}
+
+export interface UpdateFixedRolloverWindowDurationSecondsJSON {
+  kind: "UpdateFixedRolloverWindowDurationSeconds"
+}
+
+export class UpdateFixedRolloverWindowDurationSeconds {
+  static readonly discriminator = 34
+  static readonly kind = "UpdateFixedRolloverWindowDurationSeconds"
+  readonly discriminator = 34
+  readonly kind = "UpdateFixedRolloverWindowDurationSeconds"
+
+  toJSON(): UpdateFixedRolloverWindowDurationSecondsJSON {
+    return {
+      kind: "UpdateFixedRolloverWindowDurationSeconds",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateFixedRolloverWindowDurationSeconds: {},
+    }
+  }
+}
+
+export interface UpdateVariableRolloverWindowDurationSecondsJSON {
+  kind: "UpdateVariableRolloverWindowDurationSeconds"
+}
+
+export class UpdateVariableRolloverWindowDurationSeconds {
+  static readonly discriminator = 35
+  static readonly kind = "UpdateVariableRolloverWindowDurationSeconds"
+  readonly discriminator = 35
+  readonly kind = "UpdateVariableRolloverWindowDurationSeconds"
+
+  toJSON(): UpdateVariableRolloverWindowDurationSecondsJSON {
+    return {
+      kind: "UpdateVariableRolloverWindowDurationSeconds",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateVariableRolloverWindowDurationSeconds: {},
+    }
+  }
+}
+
+export interface UpdateObligationBorrowRolloverConfigurationEnabledJSON {
+  kind: "UpdateObligationBorrowRolloverConfigurationEnabled"
+}
+
+export class UpdateObligationBorrowRolloverConfigurationEnabled {
+  static readonly discriminator = 36
+  static readonly kind = "UpdateObligationBorrowRolloverConfigurationEnabled"
+  readonly discriminator = 36
+  readonly kind = "UpdateObligationBorrowRolloverConfigurationEnabled"
+
+  toJSON(): UpdateObligationBorrowRolloverConfigurationEnabledJSON {
+    return {
+      kind: "UpdateObligationBorrowRolloverConfigurationEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      UpdateObligationBorrowRolloverConfigurationEnabled: {},
+    }
+  }
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if (typeof obj !== "object") {
@@ -816,6 +954,24 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdateBorrowOrderExecutionEnabled" in obj) {
     return new UpdateBorrowOrderExecutionEnabled()
   }
+  if ("UpdateWithdrawTicketIssuanceEnabled" in obj) {
+    return new UpdateWithdrawTicketIssuanceEnabled()
+  }
+  if ("UpdateWithdrawTicketRedemptionEnabled" in obj) {
+    return new UpdateWithdrawTicketRedemptionEnabled()
+  }
+  if ("UpdateMinWithdrawQueuedLiquidityValue" in obj) {
+    return new UpdateMinWithdrawQueuedLiquidityValue()
+  }
+  if ("UpdateFixedRolloverWindowDurationSeconds" in obj) {
+    return new UpdateFixedRolloverWindowDurationSeconds()
+  }
+  if ("UpdateVariableRolloverWindowDurationSeconds" in obj) {
+    return new UpdateVariableRolloverWindowDurationSeconds()
+  }
+  if ("UpdateObligationBorrowRolloverConfigurationEnabled" in obj) {
+    return new UpdateObligationBorrowRolloverConfigurationEnabled()
+  }
 
   throw new Error("Invalid enum object")
 }
@@ -917,6 +1073,24 @@ export function fromJSON(
     case "UpdateBorrowOrderExecutionEnabled": {
       return new UpdateBorrowOrderExecutionEnabled()
     }
+    case "UpdateWithdrawTicketIssuanceEnabled": {
+      return new UpdateWithdrawTicketIssuanceEnabled()
+    }
+    case "UpdateWithdrawTicketRedemptionEnabled": {
+      return new UpdateWithdrawTicketRedemptionEnabled()
+    }
+    case "UpdateMinWithdrawQueuedLiquidityValue": {
+      return new UpdateMinWithdrawQueuedLiquidityValue()
+    }
+    case "UpdateFixedRolloverWindowDurationSeconds": {
+      return new UpdateFixedRolloverWindowDurationSeconds()
+    }
+    case "UpdateVariableRolloverWindowDurationSeconds": {
+      return new UpdateVariableRolloverWindowDurationSeconds()
+    }
+    case "UpdateObligationBorrowRolloverConfigurationEnabled": {
+      return new UpdateObligationBorrowRolloverConfigurationEnabled()
+    }
   }
 }
 
@@ -953,6 +1127,12 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateObligationBorrowDebtTermLiquidationEnabled"),
     borsh.struct([], "UpdateBorrowOrderCreationEnabled"),
     borsh.struct([], "UpdateBorrowOrderExecutionEnabled"),
+    borsh.struct([], "UpdateWithdrawTicketIssuanceEnabled"),
+    borsh.struct([], "UpdateWithdrawTicketRedemptionEnabled"),
+    borsh.struct([], "UpdateMinWithdrawQueuedLiquidityValue"),
+    borsh.struct([], "UpdateFixedRolloverWindowDurationSeconds"),
+    borsh.struct([], "UpdateVariableRolloverWindowDurationSeconds"),
+    borsh.struct([], "UpdateObligationBorrowRolloverConfigurationEnabled"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

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

@@ -0,0 +1,117 @@
+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 WithdrawQueueFields {
+  /** The part of [ReserveLiquidity::total_available_amount] locked for ticketed withdrawals. */
+  queuedCollateralAmount: BN
+  /**
+   * The sequence number of the next ticket to be issued when enqueueing to withdraw.
+   * Note: it is also a number of tickets issued so far.
+   */
+  nextIssuedTicketSequenceNumber: BN
+  /**
+   * The sequence number of the next ticket to be used for actually transferring the withdrawn
+   * liquidity (assuming it is available in the reserve).
+   * Note: it is also a number of fully-consumed tickets so far.
+   */
+  nextWithdrawableTicketSequenceNumber: BN
+}
+
+export interface WithdrawQueueJSON {
+  /** The part of [ReserveLiquidity::total_available_amount] locked for ticketed withdrawals. */
+  queuedCollateralAmount: string
+  /**
+   * The sequence number of the next ticket to be issued when enqueueing to withdraw.
+   * Note: it is also a number of tickets issued so far.
+   */
+  nextIssuedTicketSequenceNumber: string
+  /**
+   * The sequence number of the next ticket to be used for actually transferring the withdrawn
+   * liquidity (assuming it is available in the reserve).
+   * Note: it is also a number of fully-consumed tickets so far.
+   */
+  nextWithdrawableTicketSequenceNumber: string
+}
+
+/** A tracker of ticket-based withdrawals. */
+export class WithdrawQueue {
+  /** The part of [ReserveLiquidity::total_available_amount] locked for ticketed withdrawals. */
+  readonly queuedCollateralAmount: BN
+  /**
+   * The sequence number of the next ticket to be issued when enqueueing to withdraw.
+   * Note: it is also a number of tickets issued so far.
+   */
+  readonly nextIssuedTicketSequenceNumber: BN
+  /**
+   * The sequence number of the next ticket to be used for actually transferring the withdrawn
+   * liquidity (assuming it is available in the reserve).
+   * Note: it is also a number of fully-consumed tickets so far.
+   */
+  readonly nextWithdrawableTicketSequenceNumber: BN
+
+  constructor(fields: WithdrawQueueFields) {
+    this.queuedCollateralAmount = fields.queuedCollateralAmount
+    this.nextIssuedTicketSequenceNumber = fields.nextIssuedTicketSequenceNumber
+    this.nextWithdrawableTicketSequenceNumber =
+      fields.nextWithdrawableTicketSequenceNumber
+  }
+
+  static layout(property?: string) {
+    return borsh.struct(
+      [
+        borsh.u64("queuedCollateralAmount"),
+        borsh.u64("nextIssuedTicketSequenceNumber"),
+        borsh.u64("nextWithdrawableTicketSequenceNumber"),
+      ],
+      property
+    )
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  static fromDecoded(obj: any) {
+    return new WithdrawQueue({
+      queuedCollateralAmount: obj.queuedCollateralAmount,
+      nextIssuedTicketSequenceNumber: obj.nextIssuedTicketSequenceNumber,
+      nextWithdrawableTicketSequenceNumber:
+        obj.nextWithdrawableTicketSequenceNumber,
+    })
+  }
+
+  static toEncodable(fields: WithdrawQueueFields) {
+    return {
+      queuedCollateralAmount: fields.queuedCollateralAmount,
+      nextIssuedTicketSequenceNumber: fields.nextIssuedTicketSequenceNumber,
+      nextWithdrawableTicketSequenceNumber:
+        fields.nextWithdrawableTicketSequenceNumber,
+    }
+  }
+
+  toJSON(): WithdrawQueueJSON {
+    return {
+      queuedCollateralAmount: this.queuedCollateralAmount.toString(),
+      nextIssuedTicketSequenceNumber:
+        this.nextIssuedTicketSequenceNumber.toString(),
+      nextWithdrawableTicketSequenceNumber:
+        this.nextWithdrawableTicketSequenceNumber.toString(),
+    }
+  }
+
+  static fromJSON(obj: WithdrawQueueJSON): WithdrawQueue {
+    return new WithdrawQueue({
+      queuedCollateralAmount: new BN(obj.queuedCollateralAmount),
+      nextIssuedTicketSequenceNumber: new BN(
+        obj.nextIssuedTicketSequenceNumber
+      ),
+      nextWithdrawableTicketSequenceNumber: new BN(
+        obj.nextWithdrawableTicketSequenceNumber
+      ),
+    })
+  }
+
+  toEncodable() {
+    return WithdrawQueue.toEncodable(this)
+  }
+}

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

@@ -5,6 +5,7 @@ import * as UpdateGlobalConfigMode from "./UpdateGlobalConfigMode"
 import * as FeeCalculation from "./FeeCalculation"
 import * as ReserveFarmKind from "./ReserveFarmKind"
 import * as ReserveStatus from "./ReserveStatus"
+import * as ProgressCallbackType from "./ProgressCallbackType"
 
 export { BorrowOrderConfigArgs } from "./BorrowOrderConfigArgs"
 export type {
@@ -38,7 +39,7 @@ export type UpdateConfigModeKind =
   | UpdateConfigMode.UpdateSwitchboardFeed
   | UpdateConfigMode.UpdateSwitchboardTwapFeed
   | UpdateConfigMode.UpdateBorrowRateCurve
-  | UpdateConfigMode.UpdateEntireReserveConfig
+  | UpdateConfigMode.DeprecatedUpdateEntireReserveConfig
   | UpdateConfigMode.UpdateDebtWithdrawalCap
   | UpdateConfigMode.UpdateDepositWithdrawalCap
   | UpdateConfigMode.DeprecatedUpdateDebtWithdrawalCapCurrentTotal
@@ -94,7 +95,7 @@ export type UpdateConfigModeJSON =
   | UpdateConfigMode.UpdateSwitchboardFeedJSON
   | UpdateConfigMode.UpdateSwitchboardTwapFeedJSON
   | UpdateConfigMode.UpdateBorrowRateCurveJSON
-  | UpdateConfigMode.UpdateEntireReserveConfigJSON
+  | UpdateConfigMode.DeprecatedUpdateEntireReserveConfigJSON
   | UpdateConfigMode.UpdateDebtWithdrawalCapJSON
   | UpdateConfigMode.UpdateDepositWithdrawalCapJSON
   | UpdateConfigMode.DeprecatedUpdateDebtWithdrawalCapCurrentTotalJSON
@@ -183,6 +184,12 @@ export type UpdateLendingMarketModeKind =
   | UpdateLendingMarketMode.UpdateObligationBorrowDebtTermLiquidationEnabled
   | UpdateLendingMarketMode.UpdateBorrowOrderCreationEnabled
   | UpdateLendingMarketMode.UpdateBorrowOrderExecutionEnabled
+  | UpdateLendingMarketMode.UpdateWithdrawTicketIssuanceEnabled
+  | UpdateLendingMarketMode.UpdateWithdrawTicketRedemptionEnabled
+  | UpdateLendingMarketMode.UpdateMinWithdrawQueuedLiquidityValue
+  | UpdateLendingMarketMode.UpdateFixedRolloverWindowDurationSeconds
+  | UpdateLendingMarketMode.UpdateVariableRolloverWindowDurationSeconds
+  | UpdateLendingMarketMode.UpdateObligationBorrowRolloverConfigurationEnabled
 export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateOwnerJSON
   | UpdateLendingMarketMode.UpdateEmergencyModeJSON
@@ -215,6 +222,12 @@ export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateObligationBorrowDebtTermLiquidationEnabledJSON
   | UpdateLendingMarketMode.UpdateBorrowOrderCreationEnabledJSON
   | UpdateLendingMarketMode.UpdateBorrowOrderExecutionEnabledJSON
+  | UpdateLendingMarketMode.UpdateWithdrawTicketIssuanceEnabledJSON
+  | UpdateLendingMarketMode.UpdateWithdrawTicketRedemptionEnabledJSON
+  | UpdateLendingMarketMode.UpdateMinWithdrawQueuedLiquidityValueJSON
+  | UpdateLendingMarketMode.UpdateFixedRolloverWindowDurationSecondsJSON
+  | UpdateLendingMarketMode.UpdateVariableRolloverWindowDurationSecondsJSON
+  | UpdateLendingMarketMode.UpdateObligationBorrowRolloverConfigurationEnabledJSON
 
 export { UpdateGlobalConfigMode }
 
@@ -231,6 +244,11 @@ export { ElevationGroup } from "./ElevationGroup"
 export type { ElevationGroupFields, ElevationGroupJSON } from "./ElevationGroup"
 export { BorrowOrder } from "./BorrowOrder"
 export type { BorrowOrderFields, BorrowOrderJSON } from "./BorrowOrder"
+export { FixedTermBorrowRolloverConfig } from "./FixedTermBorrowRolloverConfig"
+export type {
+  FixedTermBorrowRolloverConfigFields,
+  FixedTermBorrowRolloverConfigJSON,
+} from "./FixedTermBorrowRolloverConfig"
 export { InitObligationArgs } from "./InitObligationArgs"
 export type {
   InitObligationArgsFields,
@@ -300,6 +318,8 @@ export type ReserveStatusJSON =
   | ReserveStatus.ObsoleteJSON
   | ReserveStatus.HiddenJSON
 
+export { WithdrawQueue } from "./WithdrawQueue"
+export type { WithdrawQueueFields, WithdrawQueueJSON } from "./WithdrawQueue"
 export { WithdrawalCaps } from "./WithdrawalCaps"
 export type { WithdrawalCapsFields, WithdrawalCapsJSON } from "./WithdrawalCaps"
 export { PriceHeuristic } from "./PriceHeuristic"
@@ -321,6 +341,26 @@ export type {
 } from "./SwitchboardConfiguration"
 export { TokenInfo } from "./TokenInfo"
 export type { TokenInfoFields, TokenInfoJSON } from "./TokenInfo"
+export { ProgressCallbackType }
+
+/**
+ * A callback to be notified when the ticket is being processed.
+ *
+ * ## Why an enum?
+ *
+ * Only reliable programs may be used for callbacks (since any error or panic returned from a CPI
+ * aborts an entire transaction, which would stall the queue progress). Hence, we need a whitelist,
+ * and the simplest initial implementation is a hardcoded enum. If we want to be able to add new
+ * whitelist items without SC updates, we can implement such support using a special enum value
+ * (e.g. `SPECIFIED_BY_PDA = 255`).
+ */
+export type ProgressCallbackTypeKind =
+  | ProgressCallbackType.None
+  | ProgressCallbackType.KlendQueueAccountingHandlerOnKvault
+export type ProgressCallbackTypeJSON =
+  | ProgressCallbackType.NoneJSON
+  | ProgressCallbackType.KlendQueueAccountingHandlerOnKvaultJSON
+
 export { BorrowRateCurve } from "./BorrowRateCurve"
 export type {
   BorrowRateCurveFields,

package/src/classes/action.ts

@@ -23,6 +23,7 @@ import {
   depositReserveLiquidity,
   depositReserveLiquidityAndObligationCollateral,
   depositReserveLiquidityAndObligationCollateralV2,
+  enqueueToWithdraw,
   initObligation,
   initObligationFarmsForReserve,
   InitObligationFarmsForReserveAccounts,
@@ -46,6 +47,7 @@ import {
   setObligationOrder,
   withdrawObligationCollateralAndRedeemReserveCollateral,
   withdrawObligationCollateralAndRedeemReserveCollateralV2,
+  withdrawQueuedLiquidity,
   withdrawReferrerFees,
 } from '../@codegen/klend/instructions';
 import {
@@ -58,17 +60,19 @@ import {
   isNotNullPubkey,
   obligationFarmStatePda,
   ObligationType,
+  ownerQueuedCollateralVaultPda,
   referrerTokenStatePda,
   ScopePriceRefreshConfig,
   SOL_PADDING_FOR_INTEREST,
   U64_MAX,
   userMetadataPda,
+  withdrawTicketPda,
   WRAPPED_SOL_MINT,
 } from '../utils';
 import { getTokenIdsForScopeRefresh, KaminoMarket } from './market';
 import { isKaminoObligation, KaminoObligation } from './obligation';
 import { KaminoReserve } from './reserve';
-import { ReserveFarmKind } from '../@codegen/klend/types';
+import { ProgressCallbackType, ReserveFarmKind } from '../@codegen/klend/types';
 import { PROGRAM_ID as FARMS_PROGRAM_ID } from '@kamino-finance/farms-sdk/dist/@codegen/farms/programId';
 import { Reserve } from '../@codegen/klend/accounts';
 import { VanillaObligation } from '../utils/ObligationType';
@@ -1174,6 +1178,116 @@ export class KaminoAction {
     );
   }
 
+  /**
+   * Builds an instruction for enqueueing a withdrawal request to the withdraw queue.
+   * This is used when there isn't enough liquidity to immediately withdraw.
+   */
+  static async buildEnqueueToWithdrawIx(
+    owner: TransactionSigner,
+    kaminoMarket: KaminoMarket,
+    reserve: KaminoReserve,
+    collateralAmount: BN,
+    userDestinationLiquidityTa: Address,
+    progressCallbackType: ProgressCallbackType.None | ProgressCallbackType.KlendQueueAccountingHandlerOnKvault = new ProgressCallbackType.None(),
+    progressCallbackCustomAccount0: Option<Address> = none(),
+    progressCallbackCustomAccount1: Option<Address> = none()
+  ): Promise<Instruction> {
+    const lendingMarketAuthority = await kaminoMarket.getLendingMarketAuthority();
+    const userSourceCollateralTa = await getAssociatedTokenAddress(reserve.getCTokenMint(), owner.address);
+    const withdrawTicket = await withdrawTicketPda(
+      reserve.address,
+      BigInt(reserve.state.withdrawQueue.nextIssuedTicketSequenceNumber.toString()),
+      kaminoMarket.programId
+    );
+    const ownerQueuedCollateralVault = await ownerQueuedCollateralVaultPda(
+      reserve.address,
+      owner.address,
+      kaminoMarket.programId
+    );
+
+    return enqueueToWithdraw(
+      {
+        collateralAmount,
+        progressCallbackType,
+      },
+      {
+        owner,
+        lendingMarket: kaminoMarket.getAddress(),
+        lendingMarketAuthority,
+        reserve: reserve.address,
+        userSourceCollateralTa,
+        userDestinationLiquidityTa,
+        reserveLiquidityMint: reserve.getLiquidityMint(),
+        reserveCollateralMint: reserve.getCTokenMint(),
+        collateralTokenProgram: TOKEN_PROGRAM_ADDRESS,
+        withdrawTicket,
+        ownerQueuedCollateralVault,
+        systemProgram: SYSTEM_PROGRAM_ADDRESS,
+        progressCallbackCustomAccount0,
+        progressCallbackCustomAccount1,
+      },
+      undefined,
+      kaminoMarket.programId
+    );
+  }
+
+  /**
+   * Builds an instruction for withdrawing queued liquidity (permissionless).
+   * This allows anyone to process a withdraw ticket when liquidity becomes available.
+   */
+  static async buildWithdrawQueuedLiquidityIx(
+    payer: TransactionSigner,
+    kaminoMarket: KaminoMarket,
+    reserve: KaminoReserve,
+    withdrawTicket: Address,
+    withdrawTicketOwner: Address,
+    userDestinationLiquidity: Address,
+    progressCallbackProgram: Option<Address> = none(),
+    progressCallbackCustomAccount0: Option<Address> = none(),
+    progressCallbackCustomAccount1: Option<Address> = none()
+  ): Promise<Instruction> {
+    const lendingMarketAuthority = await kaminoMarket.getLendingMarketAuthority();
+    const resolvedProgressCallbackProgram = isNone(progressCallbackProgram)
+      ? some(SYSTEM_PROGRAM_ADDRESS)
+      : progressCallbackProgram;
+    const resolvedProgressCallbackCustomAccount0 = isNone(progressCallbackCustomAccount0)
+      ? some(SYSTEM_PROGRAM_ADDRESS)
+      : progressCallbackCustomAccount0;
+    const resolvedProgressCallbackCustomAccount1 = isNone(progressCallbackCustomAccount1)
+      ? some(SYSTEM_PROGRAM_ADDRESS)
+      : progressCallbackCustomAccount1;
+    const ownerQueuedCollateralVault = await ownerQueuedCollateralVaultPda(
+      reserve.address,
+      withdrawTicketOwner,
+      kaminoMarket.programId
+    );
+
+    return withdrawQueuedLiquidity(
+      {
+        payer,
+        lendingMarket: kaminoMarket.getAddress(),
+        lendingMarketAuthority,
+        reserve: reserve.address,
+        reserveLiquidityMint: reserve.getLiquidityMint(),
+        reserveCollateralMint: reserve.getCTokenMint(),
+        reserveLiquiditySupply: reserve.state.liquidity.supplyVault,
+        ownerQueuedCollateralVault,
+        userDestinationLiquidity,
+        collateralTokenProgram: TOKEN_PROGRAM_ADDRESS,
+        liquidityTokenProgram: reserve.getLiquidityTokenProgram(),
+        withdrawTicket,
+        withdrawTicketOwner,
+        associatedTokenProgram: ASSOCIATED_TOKEN_PROGRAM_ADDRESS,
+        systemProgram: SYSTEM_PROGRAM_ADDRESS,
+        progressCallbackProgram: resolvedProgressCallbackProgram,
+        progressCallbackCustomAccount0: resolvedProgressCallbackCustomAccount0,
+        progressCallbackCustomAccount1: resolvedProgressCallbackCustomAccount1,
+      },
+      undefined,
+      kaminoMarket.programId
+    );
+  }
+
   async addDepositReserveLiquidityIx() {
     this.lendingIxsLabels.push(`depositReserveLiquidity`);
     this.lendingIxs.push(

package/src/classes/actionTypes.ts

@@ -3,7 +3,9 @@ import BN from 'bn.js';
 import { ObligationType, ScopePriceRefreshConfig } from '../utils';
 import { KaminoObligation } from './obligation';
 import { KaminoMarket } from './market';
+import { KaminoReserve } from './reserve';
 import { ActionType } from './action';
+import { ProgressCallbackType } from '../@codegen/klend/types';
 
 /**
  * Props for KaminoAction.initialize
@@ -293,3 +295,32 @@ export interface BuildDepositObligationCollateralTxnsProps {
   referrer?: Option<Address>;
   currentSlot?: Slot;
 }
+
+/**
+ * Props for KaminoAction.buildEnqueueToWithdrawIx
+ */
+export interface BuildEnqueueToWithdrawIxProps {
+  owner: TransactionSigner;
+  kaminoMarket: KaminoMarket;
+  reserve: KaminoReserve;
+  collateralAmount: BN;
+  userDestinationLiquidityTa: Address;
+  progressCallbackType?: ProgressCallbackType.None | ProgressCallbackType.KlendQueueAccountingHandlerOnKvault;
+  progressCallbackCustomAccount0?: Option<Address>;
+  progressCallbackCustomAccount1?: Option<Address>;
+}
+
+/**
+ * Props for KaminoAction.buildWithdrawQueuedLiquidityIx
+ */
+export interface BuildWithdrawQueuedLiquidityIxProps {
+  payer: TransactionSigner;
+  kaminoMarket: KaminoMarket;
+  reserve: KaminoReserve;
+  withdrawTicket: Address;
+  withdrawTicketOwner: Address;
+  userDestinationLiquidity: Address;
+  progressCallbackProgram?: Option<Address>;
+  progressCallbackCustomAccount0?: Option<Address>;
+  progressCallbackCustomAccount1?: Option<Address>;
+}

package/src/classes/manager.ts

@@ -61,7 +61,6 @@ import {
   ReserveWithAddress,
   ScopeOracleConfig,
   setOrAppend,
-  updateEntireReserveConfigIx,
   updateLendingMarket,
   UpdateLendingMarketAccounts,
   UpdateLendingMarketArgs,
@@ -218,8 +217,7 @@ export class KaminoManager {
       marketWithAddress,
       reserveAccount.address,
       params.assetConfig.getReserveConfig(),
-      undefined,
-      false
+      undefined
     );
 
     const txnIxs: Instruction[][] = [];
@@ -533,36 +531,24 @@ export class KaminoManager {
     marketWithAddress: MarketWithAddress,
     reserve: Address,
     config: ReserveConfig,
-    reserveStateOverride?: Reserve,
-    updateEntireConfig: boolean = false
+    reserveStateOverride?: Reserve
   ): Promise<Instruction[]> {
     const reserveState = reserveStateOverride
       ? reserveStateOverride
       : (await Reserve.fetch(this._rpc, reserve, this._kaminoLendProgramId))!;
     const ixs: Instruction[] = [];
 
-    if (!reserveState || updateEntireConfig) {
-      ixs.push(
-        await updateEntireReserveConfigIx(
-          lendingMarketOwner,
-          marketWithAddress.address,
-          reserve,
-          config,
-          this._kaminoLendProgramId
-        )
-      );
-    } else {
-      ixs.push(
-        ...(await parseForChangesReserveConfigAndGetIxs(
-          marketWithAddress,
-          reserveState,
-          reserve,
-          config,
-          this._kaminoLendProgramId,
-          lendingMarketOwner
-        ))
-      );
-    }
+
+    ixs.push(
+      ...(await parseForChangesReserveConfigAndGetIxs(
+        marketWithAddress,
+        reserveState,
+        reserve,
+        config,
+        this._kaminoLendProgramId,
+        lendingMarketOwner
+      ))
+    );
 
     return ixs;
   }
@@ -1801,6 +1787,12 @@ export const MARKET_UPDATER = new ConfigUpdater(UpdateLendingMarketMode.fromDeco
     config.obligationBorrowDebtTermLiquidationEnabled,
   [UpdateLendingMarketMode.UpdateBorrowOrderCreationEnabled.kind]: config.borrowOrderCreationEnabled,
   [UpdateLendingMarketMode.UpdateBorrowOrderExecutionEnabled.kind]: config.borrowOrderExecutionEnabled,
+  [UpdateLendingMarketMode.UpdateWithdrawTicketIssuanceEnabled.kind]: config.withdrawTicketIssuanceEnabled,
+  [UpdateLendingMarketMode.UpdateWithdrawTicketRedemptionEnabled.kind]: config.withdrawTicketRedemptionEnabled,
+  [UpdateLendingMarketMode.UpdateMinWithdrawQueuedLiquidityValue.kind]: config.minWithdrawQueuedLiquidityValue,
+  [UpdateLendingMarketMode.UpdateFixedRolloverWindowDurationSeconds.kind]: config.fixedRolloverWindowDurationSeconds,
+  [UpdateLendingMarketMode.UpdateVariableRolloverWindowDurationSeconds.kind]: config.variableRolloverWindowDurationSeconds,
+  [UpdateLendingMarketMode.UpdateObligationBorrowRolloverConfigurationEnabled.kind]: config.obligationBorrowRolloverConfigurationEnabled,
 }));
 
 function parseForChangesMarketConfigAndGetIxs(