@kamino-finance/klend-sdk 7.4.0-beta.5 → 7.4.0-beta.7

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

@@ -786,48 +786,48 @@ export class UpdateMinWithdrawQueuedLiquidityValue {
   }
 }
 
-export interface UpdateFixedRolloverWindowDurationSecondsJSON {
-  kind: "UpdateFixedRolloverWindowDurationSeconds"
+export interface UpdateFixedTermRolloverWindowDurationSecondsJSON {
+  kind: "UpdateFixedTermRolloverWindowDurationSeconds"
 }
 
-export class UpdateFixedRolloverWindowDurationSeconds {
+export class UpdateFixedTermRolloverWindowDurationSeconds {
   static readonly discriminator = 34
-  static readonly kind = "UpdateFixedRolloverWindowDurationSeconds"
+  static readonly kind = "UpdateFixedTermRolloverWindowDurationSeconds"
   readonly discriminator = 34
-  readonly kind = "UpdateFixedRolloverWindowDurationSeconds"
+  readonly kind = "UpdateFixedTermRolloverWindowDurationSeconds"
 
-  toJSON(): UpdateFixedRolloverWindowDurationSecondsJSON {
+  toJSON(): UpdateFixedTermRolloverWindowDurationSecondsJSON {
     return {
-      kind: "UpdateFixedRolloverWindowDurationSeconds",
+      kind: "UpdateFixedTermRolloverWindowDurationSeconds",
     }
   }
 
   toEncodable() {
     return {
-      UpdateFixedRolloverWindowDurationSeconds: {},
+      UpdateFixedTermRolloverWindowDurationSeconds: {},
     }
   }
 }
 
-export interface UpdateVariableRolloverWindowDurationSecondsJSON {
-  kind: "UpdateVariableRolloverWindowDurationSeconds"
+export interface UpdateOpenTermRolloverWindowDurationSecondsJSON {
+  kind: "UpdateOpenTermRolloverWindowDurationSeconds"
 }
 
-export class UpdateVariableRolloverWindowDurationSeconds {
+export class UpdateOpenTermRolloverWindowDurationSeconds {
   static readonly discriminator = 35
-  static readonly kind = "UpdateVariableRolloverWindowDurationSeconds"
+  static readonly kind = "UpdateOpenTermRolloverWindowDurationSeconds"
   readonly discriminator = 35
-  readonly kind = "UpdateVariableRolloverWindowDurationSeconds"
+  readonly kind = "UpdateOpenTermRolloverWindowDurationSeconds"
 
-  toJSON(): UpdateVariableRolloverWindowDurationSecondsJSON {
+  toJSON(): UpdateOpenTermRolloverWindowDurationSecondsJSON {
     return {
-      kind: "UpdateVariableRolloverWindowDurationSeconds",
+      kind: "UpdateOpenTermRolloverWindowDurationSeconds",
     }
   }
 
   toEncodable() {
     return {
-      UpdateVariableRolloverWindowDurationSeconds: {},
+      UpdateOpenTermRolloverWindowDurationSeconds: {},
     }
   }
 }
@@ -963,11 +963,11 @@ export function fromDecoded(obj: any): types.UpdateLendingMarketModeKind {
   if ("UpdateMinWithdrawQueuedLiquidityValue" in obj) {
     return new UpdateMinWithdrawQueuedLiquidityValue()
   }
-  if ("UpdateFixedRolloverWindowDurationSeconds" in obj) {
-    return new UpdateFixedRolloverWindowDurationSeconds()
+  if ("UpdateFixedTermRolloverWindowDurationSeconds" in obj) {
+    return new UpdateFixedTermRolloverWindowDurationSeconds()
   }
-  if ("UpdateVariableRolloverWindowDurationSeconds" in obj) {
-    return new UpdateVariableRolloverWindowDurationSeconds()
+  if ("UpdateOpenTermRolloverWindowDurationSeconds" in obj) {
+    return new UpdateOpenTermRolloverWindowDurationSeconds()
   }
   if ("UpdateObligationBorrowRolloverConfigurationEnabled" in obj) {
     return new UpdateObligationBorrowRolloverConfigurationEnabled()
@@ -1082,11 +1082,11 @@ export function fromJSON(
     case "UpdateMinWithdrawQueuedLiquidityValue": {
       return new UpdateMinWithdrawQueuedLiquidityValue()
     }
-    case "UpdateFixedRolloverWindowDurationSeconds": {
-      return new UpdateFixedRolloverWindowDurationSeconds()
+    case "UpdateFixedTermRolloverWindowDurationSeconds": {
+      return new UpdateFixedTermRolloverWindowDurationSeconds()
     }
-    case "UpdateVariableRolloverWindowDurationSeconds": {
-      return new UpdateVariableRolloverWindowDurationSeconds()
+    case "UpdateOpenTermRolloverWindowDurationSeconds": {
+      return new UpdateOpenTermRolloverWindowDurationSeconds()
     }
     case "UpdateObligationBorrowRolloverConfigurationEnabled": {
       return new UpdateObligationBorrowRolloverConfigurationEnabled()
@@ -1130,8 +1130,8 @@ export function layout(property?: string) {
     borsh.struct([], "UpdateWithdrawTicketIssuanceEnabled"),
     borsh.struct([], "UpdateWithdrawTicketRedemptionEnabled"),
     borsh.struct([], "UpdateMinWithdrawQueuedLiquidityValue"),
-    borsh.struct([], "UpdateFixedRolloverWindowDurationSeconds"),
-    borsh.struct([], "UpdateVariableRolloverWindowDurationSeconds"),
+    borsh.struct([], "UpdateFixedTermRolloverWindowDurationSeconds"),
+    borsh.struct([], "UpdateOpenTermRolloverWindowDurationSeconds"),
     borsh.struct([], "UpdateObligationBorrowRolloverConfigurationEnabled"),
   ])
   if (property !== undefined) {

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

@@ -0,0 +1,151 @@
+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 FixedTermRolloverEnabledJSON {
+  kind: "FixedTermRolloverEnabled"
+}
+
+export class FixedTermRolloverEnabled {
+  static readonly discriminator = 0
+  static readonly kind = "FixedTermRolloverEnabled"
+  readonly discriminator = 0
+  readonly kind = "FixedTermRolloverEnabled"
+
+  toJSON(): FixedTermRolloverEnabledJSON {
+    return {
+      kind: "FixedTermRolloverEnabled",
+    }
+  }
+
+  toEncodable() {
+    return {
+      FixedTermRolloverEnabled: {},
+    }
+  }
+}
+
+export interface FixedTermRolloverMaxBorrowRateBpsJSON {
+  kind: "FixedTermRolloverMaxBorrowRateBps"
+}
+
+export class FixedTermRolloverMaxBorrowRateBps {
+  static readonly discriminator = 1
+  static readonly kind = "FixedTermRolloverMaxBorrowRateBps"
+  readonly discriminator = 1
+  readonly kind = "FixedTermRolloverMaxBorrowRateBps"
+
+  toJSON(): FixedTermRolloverMaxBorrowRateBpsJSON {
+    return {
+      kind: "FixedTermRolloverMaxBorrowRateBps",
+    }
+  }
+
+  toEncodable() {
+    return {
+      FixedTermRolloverMaxBorrowRateBps: {},
+    }
+  }
+}
+
+export interface FixedTermRolloverMinDebtTermSecondsJSON {
+  kind: "FixedTermRolloverMinDebtTermSeconds"
+}
+
+export class FixedTermRolloverMinDebtTermSeconds {
+  static readonly discriminator = 2
+  static readonly kind = "FixedTermRolloverMinDebtTermSeconds"
+  readonly discriminator = 2
+  readonly kind = "FixedTermRolloverMinDebtTermSeconds"
+
+  toJSON(): FixedTermRolloverMinDebtTermSecondsJSON {
+    return {
+      kind: "FixedTermRolloverMinDebtTermSeconds",
+    }
+  }
+
+  toEncodable() {
+    return {
+      FixedTermRolloverMinDebtTermSeconds: {},
+    }
+  }
+}
+
+export interface FixedTermRolloverOpenTermAllowedJSON {
+  kind: "FixedTermRolloverOpenTermAllowed"
+}
+
+export class FixedTermRolloverOpenTermAllowed {
+  static readonly discriminator = 3
+  static readonly kind = "FixedTermRolloverOpenTermAllowed"
+  readonly discriminator = 3
+  readonly kind = "FixedTermRolloverOpenTermAllowed"
+
+  toJSON(): FixedTermRolloverOpenTermAllowedJSON {
+    return {
+      kind: "FixedTermRolloverOpenTermAllowed",
+    }
+  }
+
+  toEncodable() {
+    return {
+      FixedTermRolloverOpenTermAllowed: {},
+    }
+  }
+}
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function fromDecoded(obj: any): types.UpdateObligationConfigModeKind {
+  if (typeof obj !== "object") {
+    throw new Error("Invalid enum object")
+  }
+
+  if ("FixedTermRolloverEnabled" in obj) {
+    return new FixedTermRolloverEnabled()
+  }
+  if ("FixedTermRolloverMaxBorrowRateBps" in obj) {
+    return new FixedTermRolloverMaxBorrowRateBps()
+  }
+  if ("FixedTermRolloverMinDebtTermSeconds" in obj) {
+    return new FixedTermRolloverMinDebtTermSeconds()
+  }
+  if ("FixedTermRolloverOpenTermAllowed" in obj) {
+    return new FixedTermRolloverOpenTermAllowed()
+  }
+
+  throw new Error("Invalid enum object")
+}
+
+export function fromJSON(
+  obj: types.UpdateObligationConfigModeJSON
+): types.UpdateObligationConfigModeKind {
+  switch (obj.kind) {
+    case "FixedTermRolloverEnabled": {
+      return new FixedTermRolloverEnabled()
+    }
+    case "FixedTermRolloverMaxBorrowRateBps": {
+      return new FixedTermRolloverMaxBorrowRateBps()
+    }
+    case "FixedTermRolloverMinDebtTermSeconds": {
+      return new FixedTermRolloverMinDebtTermSeconds()
+    }
+    case "FixedTermRolloverOpenTermAllowed": {
+      return new FixedTermRolloverOpenTermAllowed()
+    }
+  }
+}
+
+export function layout(property?: string) {
+  const ret = borsh.rustEnum([
+    borsh.struct([], "FixedTermRolloverEnabled"),
+    borsh.struct([], "FixedTermRolloverMaxBorrowRateBps"),
+    borsh.struct([], "FixedTermRolloverMinDebtTermSeconds"),
+    borsh.struct([], "FixedTermRolloverOpenTermAllowed"),
+  ])
+  if (property !== undefined) {
+    return ret.replicate(property)
+  }
+  return ret
+}

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

@@ -2,6 +2,7 @@ import * as UpdateConfigMode from "./UpdateConfigMode"
 import * as UpdateLendingMarketConfigValue from "./UpdateLendingMarketConfigValue"
 import * as UpdateLendingMarketMode from "./UpdateLendingMarketMode"
 import * as UpdateGlobalConfigMode from "./UpdateGlobalConfigMode"
+import * as UpdateObligationConfigMode from "./UpdateObligationConfigMode"
 import * as FeeCalculation from "./FeeCalculation"
 import * as ReserveFarmKind from "./ReserveFarmKind"
 import * as ReserveStatus from "./ReserveStatus"
@@ -187,8 +188,8 @@ export type UpdateLendingMarketModeKind =
   | UpdateLendingMarketMode.UpdateWithdrawTicketIssuanceEnabled
   | UpdateLendingMarketMode.UpdateWithdrawTicketRedemptionEnabled
   | UpdateLendingMarketMode.UpdateMinWithdrawQueuedLiquidityValue
-  | UpdateLendingMarketMode.UpdateFixedRolloverWindowDurationSeconds
-  | UpdateLendingMarketMode.UpdateVariableRolloverWindowDurationSeconds
+  | UpdateLendingMarketMode.UpdateFixedTermRolloverWindowDurationSeconds
+  | UpdateLendingMarketMode.UpdateOpenTermRolloverWindowDurationSeconds
   | UpdateLendingMarketMode.UpdateObligationBorrowRolloverConfigurationEnabled
 export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateOwnerJSON
@@ -225,8 +226,8 @@ export type UpdateLendingMarketModeJSON =
   | UpdateLendingMarketMode.UpdateWithdrawTicketIssuanceEnabledJSON
   | UpdateLendingMarketMode.UpdateWithdrawTicketRedemptionEnabledJSON
   | UpdateLendingMarketMode.UpdateMinWithdrawQueuedLiquidityValueJSON
-  | UpdateLendingMarketMode.UpdateFixedRolloverWindowDurationSecondsJSON
-  | UpdateLendingMarketMode.UpdateVariableRolloverWindowDurationSecondsJSON
+  | UpdateLendingMarketMode.UpdateFixedTermRolloverWindowDurationSecondsJSON
+  | UpdateLendingMarketMode.UpdateOpenTermRolloverWindowDurationSecondsJSON
   | UpdateLendingMarketMode.UpdateObligationBorrowRolloverConfigurationEnabledJSON
 
 export { UpdateGlobalConfigMode }
@@ -269,6 +270,29 @@ export type {
   ObligationOrderFields,
   ObligationOrderJSON,
 } from "./ObligationOrder"
+export { UpdateObligationConfigMode }
+
+/**
+ * A discriminator of a user-configurable piece of [Obligation].
+ *
+ * Implementation note: due to TS-side codegen quirks (and a "convention" currently seen e.g.
+ * within reserve and market update operations), this is not a true Rust enum. The new value of
+ * a config item is provided in a separate handler argument (borsh-serialized), and its expected
+ * type is defined by each discriminator here. Additionally, each update mode acts on a specific
+ * [ObligationConfigUpdateSubject] (e.g. the auto-rollover of fixed-term borrows is configured on
+ * a per-borrow basis), which is also specified by separate handler arguments.
+ */
+export type UpdateObligationConfigModeKind =
+  | UpdateObligationConfigMode.FixedTermRolloverEnabled
+  | UpdateObligationConfigMode.FixedTermRolloverMaxBorrowRateBps
+  | UpdateObligationConfigMode.FixedTermRolloverMinDebtTermSeconds
+  | UpdateObligationConfigMode.FixedTermRolloverOpenTermAllowed
+export type UpdateObligationConfigModeJSON =
+  | UpdateObligationConfigMode.FixedTermRolloverEnabledJSON
+  | UpdateObligationConfigMode.FixedTermRolloverMaxBorrowRateBpsJSON
+  | UpdateObligationConfigMode.FixedTermRolloverMinDebtTermSecondsJSON
+  | UpdateObligationConfigMode.FixedTermRolloverOpenTermAllowedJSON
+
 export { BigFractionBytes } from "./BigFractionBytes"
 export type {
   BigFractionBytesFields,

package/src/classes/action.ts

@@ -45,8 +45,11 @@ import {
   RequestElevationGroupAccounts,
   RequestElevationGroupArgs,
   setObligationOrder,
+  updateObligationConfig,
+  type UpdateObligationConfigAccounts,
   withdrawObligationCollateralAndRedeemReserveCollateral,
   withdrawObligationCollateralAndRedeemReserveCollateralV2,
+  withdrawObligationCollateralV2,
   withdrawQueuedLiquidity,
   withdrawReferrerFees,
 } from '../@codegen/klend/instructions';
@@ -69,10 +72,11 @@ import {
   withdrawTicketPda,
   WRAPPED_SOL_MINT,
 } from '../utils';
+import { FixedRateReserveKind } from '../utils/ReserveKind';
 import { getTokenIdsForScopeRefresh, KaminoMarket } from './market';
 import { isKaminoObligation, KaminoObligation } from './obligation';
 import { KaminoReserve } from './reserve';
-import { ProgressCallbackType, ReserveFarmKind } from '../@codegen/klend/types';
+import { ProgressCallbackType, ReserveFarmKind, UpdateObligationConfigMode } 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';
@@ -93,6 +97,7 @@ import {
   BuildDepositReserveLiquidityTxnsProps,
   BuildRedeemReserveCollateralTxnsProps,
   BuildWithdrawTxnsProps,
+  BuildWithdrawFromObligationAndEnqueueTxnsProps,
   BuildRepayTxnsProps,
   BuildDepositAndBorrowTxnsProps,
   BuildRefreshObligationTxnsProps,
@@ -121,7 +126,8 @@ export type ActionType =
   | 'requestElevationGroup'
   | 'withdrawReferrerFees'
   | 'repayAndWithdrawV2'
-  | 'depositAndWithdraw';
+  | 'depositAndWithdraw'
+  | 'withdrawAndEnqueue';
 
 export type AuxiliaryIx = 'setup' | 'inBetween' | 'cleanup';
 
@@ -466,6 +472,7 @@ export class KaminoAction {
       referrer = none(),
       currentSlot = 0n,
       overrideElevationGroupRequest,
+      rollOver = false,
     } = props;
 
     const axn = await KaminoAction.initialize({
@@ -511,6 +518,9 @@ export class KaminoAction {
     } else {
       await axn.addBorrowIx();
     }
+    if (rollOver && axn.reserve.getKind().isFixedRate()) {
+      await axn.addBorrowRolloverConfigIxs();
+    }
     axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
 
     return axn;
@@ -1006,6 +1016,72 @@ export class KaminoAction {
     return axn;
   }
 
+  static async buildWithdrawFromObligationAndEnqueueTxns(props: BuildWithdrawFromObligationAndEnqueueTxnsProps) {
+    const {
+      kaminoMarket,
+      collateralAmount,
+      reserveAddress,
+      owner,
+      obligation,
+      scopeRefreshConfig,
+      extraComputeBudget = 1_000_000,
+      includeAtaIxs = true,
+      requestElevationGroup = false,
+      initUserMetadata = { skipInitialization: false, skipLutCreation: false },
+      referrer = none(),
+      currentSlot = 0n,
+      userDestinationLiquidityAta,
+      progressCallbackType = new ProgressCallbackType.None(),
+      progressCallbackCustomAccount0 = none(),
+      progressCallbackCustomAccount1 = none(),
+    } = props;
+
+    const axn = await KaminoAction.initialize({
+      kaminoMarket,
+      action: 'withdrawAndEnqueue',
+      amount: collateralAmount,
+      reserveAddress,
+      owner,
+      obligation,
+      referrer,
+      currentSlot,
+    });
+
+    if (extraComputeBudget > 0) {
+      axn.addComputeBudgetIx(extraComputeBudget);
+    }
+
+    await axn.addSupportIxs(
+      'withdrawAndEnqueue',
+      includeAtaIxs,
+      requestElevationGroup,
+      true,
+      true,
+      scopeRefreshConfig,
+      initUserMetadata
+    );
+
+    await axn.addWithdrawObligationCollateralIxV2(axn.amount);
+
+    const destinationLiquidityAta = userDestinationLiquidityAta ?? (await axn.getUserTokenAccountAddress(axn.reserve));
+    const enqueueIx = await KaminoAction.buildEnqueueToWithdrawIx(
+      owner,
+      kaminoMarket,
+      axn.reserve,
+      axn.amount,
+      destinationLiquidityAta,
+      progressCallbackType,
+      progressCallbackCustomAccount0,
+      progressCallbackCustomAccount1
+    );
+    axn.lendingIxs.push(enqueueIx);
+    axn.lendingIxsLabels.push(`enqueueToWithdraw`);
+
+    axn.addRefreshFarmsCleanupTxnIxsToCleanupIxs();
+
+    return axn;
+  }
+
   /**
    * Build repay transactions
    * @param props - BuildRepayTxnsProps containing all required and optional parameters
@@ -1188,7 +1264,9 @@ export class KaminoAction {
     reserve: KaminoReserve,
     collateralAmount: BN,
     userDestinationLiquidityTa: Address,
-    progressCallbackType: ProgressCallbackType.None | ProgressCallbackType.KlendQueueAccountingHandlerOnKvault = new ProgressCallbackType.None(),
+    progressCallbackType:
+      | ProgressCallbackType.None
+      | ProgressCallbackType.KlendQueueAccountingHandlerOnKvault = new ProgressCallbackType.None(),
     progressCallbackCustomAccount0: Option<Address> = none(),
     progressCallbackCustomAccount1: Option<Address> = none()
   ): Promise<Instruction> {
@@ -1560,6 +1638,73 @@ export class KaminoAction {
     this.lendingIxs.push(borrowIx);
   }
 
+  private async addBorrowRolloverConfigIxs(): Promise<void> {
+    const reserveKind = this.reserve.getKind() as FixedRateReserveKind;
+    const borrowRateBps = reserveKind.borrowRateBps;
+    const maxBorrowRateBpsBytes = Buffer.alloc(4);
+    maxBorrowRateBpsBytes.writeUInt32LE(borrowRateBps, 0);
+
+    const minDebtTermSecondsBytes = Buffer.alloc(8);
+    minDebtTermSecondsBytes.writeBigUInt64LE(BigInt(reserveKind.debtTermSeconds.toString()), 0);
+
+    const obligation = await this.getObligationPda();
+    const accounts: UpdateObligationConfigAccounts = {
+      owner: this.owner,
+      obligation,
+      borrowReserve: some(this.reserve.address),
+      depositReserve: none<Address>(),
+      lendingMarket: this.kaminoMarket.getAddress(),
+    };
+
+    const updateRolloverIx = updateObligationConfig(
+      {
+        mode: new UpdateObligationConfigMode.FixedTermRolloverEnabled(),
+        value: Uint8Array.from([1]),
+      },
+      accounts,
+      undefined,
+      this.kaminoMarket.programId
+    );
+    this.lendingIxs.push(updateRolloverIx);
+    this.lendingIxsLabels.push('updateObligationConfig[FixedTermRolloverEnabled]');
+
+    const updateMaxBorrowRateIx = updateObligationConfig(
+      {
+        mode: new UpdateObligationConfigMode.FixedTermRolloverMaxBorrowRateBps(),
+        value: maxBorrowRateBpsBytes,
+      },
+      accounts,
+      undefined,
+      this.kaminoMarket.programId
+    );
+    this.lendingIxs.push(updateMaxBorrowRateIx);
+    this.lendingIxsLabels.push('updateObligationConfig[FixedTermRolloverMaxBorrowRateBps]');
+
+    const updateMinDebtTermIx = updateObligationConfig(
+      {
+        mode: new UpdateObligationConfigMode.FixedTermRolloverMinDebtTermSeconds(),
+        value: minDebtTermSecondsBytes,
+      },
+      accounts,
+      undefined,
+      this.kaminoMarket.programId
+    );
+    this.lendingIxs.push(updateMinDebtTermIx);
+    this.lendingIxsLabels.push('updateObligationConfig[FixedTermRolloverMinDebtTermSeconds]');
+
+    const updateOpenTermAllowedIx = updateObligationConfig(
+      {
+        mode: new UpdateObligationConfigMode.FixedTermRolloverOpenTermAllowed(),
+        value: Uint8Array.from([1]),
+      },
+      accounts,
+      undefined,
+      this.kaminoMarket.programId
+    );
+    this.lendingIxs.push(updateOpenTermAllowedIx);
+    this.lendingIxsLabels.push('updateObligationConfig[FixedTermRolloverOpenTermAllowed]');
+  }
+
   /// @deprecated -- use addWithdrawIxV2 instead
   async addWithdrawIx(collateralAmount: BN) {
     this.lendingIxsLabels.push(`withdrawObligationCollateralAndRedeemReserveCollateral`);
@@ -1628,6 +1773,39 @@ export class KaminoAction {
     );
   }
 
+  async addWithdrawObligationCollateralIxV2(collateralAmount: BN): Promise<void> {
+    const obligationAddress = await this.getObligationPda();
+    const { collateralFarmAccounts: farmsAccounts } = await KaminoAction.getFarmAccountsForReserve(
+      obligationAddress,
+      this.reserve
+    );
+    this.lendingIxsLabels.push(`withdrawObligationCollateralV2`);
+    this.lendingIxs.push(
+      withdrawObligationCollateralV2(
+        {
+          collateralAmount,
+        },
+        {
+          withdrawAccounts: {
+            owner: this.owner,
+            obligation: obligationAddress,
+            lendingMarket: this.kaminoMarket.getAddress(),
+            lendingMarketAuthority: await this.kaminoMarket.getLendingMarketAuthority(),
+            withdrawReserve: this.reserve.address,
+            reserveSourceCollateral: this.reserve.state.collateral.supplyVault,
+            userDestinationCollateral: await this.getUserCollateralAccountAddress(this.reserve),
+            tokenProgram: TOKEN_PROGRAM_ADDRESS,
+            instructionSysvarAccount: SYSVAR_INSTRUCTIONS_ADDRESS,
+          },
+          farmsAccounts,
+          farmsProgram: FARMS_PROGRAM_ID,
+        },
+        undefined,
+        this.kaminoMarket.programId
+      )
+    );
+  }
+
   /// @deprecated -- use addRepayIxV2 instead
   async addRepayIx() {
     const obligationAddress = await this.getObligationPda();
@@ -2422,6 +2600,7 @@ export class KaminoAction {
         'depositCollateral',
         'deposit',
         'withdraw',
+        'withdrawAndEnqueue',
         'borrow',
         'liquidate',
         'repay',
@@ -2496,6 +2675,7 @@ export class KaminoAction {
           action === 'depositAndBorrow' ||
           action === 'depositCollateral' ||
           action === 'withdraw' ||
+          action === 'withdrawAndEnqueue' ||
           action === 'deposit' ||
           action === 'depositAndWithdraw'
         ) {
@@ -2663,6 +2843,7 @@ export class KaminoAction {
             action === 'depositAndBorrow' ||
             action === 'depositCollateral' ||
             action === 'withdraw' ||
+            action === 'withdrawAndEnqueue' ||
             action === 'deposit'
           ) {
             await this.addRefreshFarmsForReserve(
@@ -3221,7 +3402,13 @@ export class KaminoAction {
       await this.updateWSOLAccount(action);
     }
 
-    if ((action === 'withdraw' || action === 'borrow' || action === 'redeem') && this.mint !== WRAPPED_SOL_MINT) {
+    if (
+      (action === 'withdraw' ||
+        action === 'withdrawAndEnqueue' ||
+        action === 'borrow' ||
+        action === 'redeem') &&
+      this.mint !== WRAPPED_SOL_MINT
+    ) {
       const reserveAta = await this.getUserTokenAccountAddress(this.reserve);
       const [, createUserTokenAccountIx] = await createAssociatedTokenAccountIdempotentInstruction(
         this.owner,
@@ -3303,7 +3490,7 @@ export class KaminoAction {
       this.setupIxs.unshift(createUserTokenAccountIx);
       this.setupIxsLabels.unshift(`CreateUserAta[${reserveAta}]`);
     }
-    if (action === 'mint') {
+    if (action === 'mint' || action === 'withdrawAndEnqueue') {
       const ctokenAta = await this.getUserCollateralAccountAddress(this.reserve);
       const [, createUserCollateralAccountIx] = await createAssociatedTokenAccountIdempotentInstruction(
         this.owner,

package/src/classes/actionTypes.ts

@@ -60,6 +60,7 @@ export interface BuildBorrowTxnsProps {
   referrer?: Option<Address>;
   currentSlot?: Slot;
   overrideElevationGroupRequest?: number;
+  rollOver?: boolean;
 }
 
 /**
@@ -119,6 +120,28 @@ export interface BuildWithdrawTxnsProps {
   };
 }
 
+/**
+ * Props for KaminoAction.buildWithdrawFromObligationAndEnqueueTxns
+ */
+export interface BuildWithdrawFromObligationAndEnqueueTxnsProps {
+  kaminoMarket: KaminoMarket;
+  collateralAmount: string | BN;
+  reserveAddress: Address;
+  owner: TransactionSigner;
+  obligation: KaminoObligation | ObligationType;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
+  extraComputeBudget?: number;
+  includeAtaIxs?: boolean;
+  requestElevationGroup?: boolean;
+  initUserMetadata?: { skipInitialization: boolean; skipLutCreation: boolean };
+  referrer?: Option<Address>;
+  currentSlot?: Slot;
+  userDestinationLiquidityAta?: Address;
+  progressCallbackType?: ProgressCallbackType.None | ProgressCallbackType.KlendQueueAccountingHandlerOnKvault;
+  progressCallbackCustomAccount0?: Option<Address>;
+  progressCallbackCustomAccount1?: Option<Address>;
+}
+
 /**
  * Props for KaminoAction.buildRepayTxns
  */

package/src/classes/manager.ts

@@ -538,7 +538,6 @@ export class KaminoManager {
       : (await Reserve.fetch(this._rpc, reserve, this._kaminoLendProgramId))!;
     const ixs: Instruction[] = [];
 
-
     ixs.push(
       ...(await parseForChangesReserveConfigAndGetIxs(
         marketWithAddress,
@@ -1790,9 +1789,12 @@ export const MARKET_UPDATER = new ConfigUpdater(UpdateLendingMarketMode.fromDeco
   [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,
+  [UpdateLendingMarketMode.UpdateFixedTermRolloverWindowDurationSeconds.kind]:
+    config.fixedTermRolloverWindowDurationSeconds,
+  [UpdateLendingMarketMode.UpdateOpenTermRolloverWindowDurationSeconds.kind]:
+    config.openTermRolloverWindowDurationSeconds,
+  [UpdateLendingMarketMode.UpdateObligationBorrowRolloverConfigurationEnabled.kind]:
+    config.obligationBorrowRolloverConfigurationEnabled,
 }));
 
 function parseForChangesMarketConfigAndGetIxs(