@kamino-finance/klend-sdk 5.10.28-beta.0 → 5.11.0-beta.0

package/src/classes/index.ts

@@ -9,6 +9,3 @@ export * from './jupiterPerps';
 export * from './manager';
 export * from './vault';
 export * from './fraction';
-export * from './standardStakePool';
-export * from './stakePool';
-export * from './unstakingPool';

package/src/classes/manager.ts

@@ -197,7 +197,7 @@ export class KaminoManager {
       reserveAccount.publicKey,
       params.assetConfig.getReserveConfig(),
       undefined,
-      true
+      false
     );
 
     const txnIxns: TransactionInstruction[][] = [];

package/src/classes/obligation.ts

@@ -105,7 +105,6 @@ export class KaminoObligation {
   ) {
     this.obligationAddress = obligationAddress;
     this.state = obligation;
-
     const { borrows, deposits, refreshedStats } = this.calculatePositions(
       market,
       obligation.deposits,
@@ -785,23 +784,20 @@ export class KaminoObligation {
     return new Decimal(0);
   };
 
-  static getOraclePx = (reserve: KaminoReserve) => {
-    return reserve.getOracleMarketPrice();
-  };
-
-  calculatePositions(
+  private calculatePositions(
     market: KaminoMarket,
     obligationDeposits: ObligationCollateral[],
     obligationBorrows: ObligationLiquidity[],
     elevationGroup: number,
     collateralExchangeRates: Map<PublicKey, Decimal>,
-    cumulativeBorrowRates: Map<PublicKey, Decimal> | null,
-    getOraclePx: (reserve: KaminoReserve) => Decimal = KaminoObligation.getOraclePx
+    cumulativeBorrowRates: Map<PublicKey, Decimal> | null
   ): {
     borrows: Map<PublicKey, Position>;
     deposits: Map<PublicKey, Position>;
     refreshedStats: ObligationStats;
   } {
+    const getOraclePx = (reserve: KaminoReserve) => reserve.getOracleMarketPrice();
+
     const depositStatsOraclePrice = KaminoObligation.calculateObligationDeposits(
       market,
       obligationDeposits,

package/src/classes/types.ts

@@ -1,4 +1,4 @@
-import { Keypair, TransactionInstruction } from '@solana/web3.js';
+import { TransactionInstruction } from '@solana/web3.js';
 import Decimal from 'decimal.js/decimal';
 
 /** the populateLUTIxs should be executed in a separate transaction as we cannot create and populate a lookup table in the same tx */
@@ -54,19 +54,3 @@ export type ReserveAllocationOverview = {
   tokenAllocationCap: Decimal;
   ctokenAllocation: Decimal;
 };
-
-// Unstaking pool types
-export type InitPoolIxs = {
-  initPoolIxs: TransactionInstruction[];
-  populateLUTIxs: TransactionInstruction[];
-};
-
-export type UpdatePoolConfigIxs = {
-  updatePoolConfigIx: TransactionInstruction;
-  updateLUTIxs: TransactionInstruction[];
-};
-
-export type MintIxs = {
-  mintIx: TransactionInstruction;
-  additionalSigners: Keypair[];
-};

package/src/client.ts

@@ -308,7 +308,8 @@ async function deposit(connection: Connection, wallet: Keypair, token: string, d
     depositAmount,
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
-    new VanillaObligation(STAGING_LENDING_MARKET)
+    new VanillaObligation(STAGING_LENDING_MARKET),
+    true
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -328,7 +329,8 @@ async function withdraw(connection: Connection, wallet: Keypair, token: string,
     depositAmount,
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
-    new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET))
+    new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
+    true
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -348,7 +350,8 @@ async function borrow(connection: Connection, wallet: Keypair, token: string, bo
     borrowAmount,
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
-    new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET))
+    new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
+    true
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -369,6 +372,7 @@ async function repay(connection: Connection, wallet: Keypair, token: string, bor
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
     new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
+    true,
     await connection.getSlot()
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());

package/src/idl.json

@@ -1521,7 +1521,7 @@
           "accounts": [
             {
               "name": "owner",
-              "isMut": false,
+              "isMut": true,
               "isSigner": true
             },
             {
@@ -1591,6 +1591,45 @@
               "isSigner": false
             }
           ]
+        },
+        {
+          "name": "collateralFarmsAccounts",
+          "accounts": [
+            {
+              "name": "obligationFarmUserState",
+              "isMut": true,
+              "isSigner": false,
+              "isOptional": true
+            },
+            {
+              "name": "reserveFarmState",
+              "isMut": true,
+              "isSigner": false,
+              "isOptional": true
+            }
+          ]
+        },
+        {
+          "name": "debtFarmsAccounts",
+          "accounts": [
+            {
+              "name": "obligationFarmUserState",
+              "isMut": true,
+              "isSigner": false,
+              "isOptional": true
+            },
+            {
+              "name": "reserveFarmState",
+              "isMut": true,
+              "isSigner": false,
+              "isOptional": true
+            }
+          ]
+        },
+        {
+          "name": "farmsProgram",
+          "isMut": false,
+          "isSigner": false
         }
       ],
       "args": [
@@ -1985,7 +2024,7 @@
       "accounts": [
         {
           "name": "owner",
-          "isMut": false,
+          "isMut": true,
           "isSigner": true
         },
         {
@@ -2070,7 +2109,7 @@
           "accounts": [
             {
               "name": "owner",
-              "isMut": false,
+              "isMut": true,
               "isSigner": true
             },
             {
@@ -3435,12 +3474,19 @@
             ],
             "type": "u8"
           },
+          {
+            "name": "lowestReserveDepositMaxLtvPct",
+            "docs": [
+              "The lowest max LTV found amongst the collateral deposits"
+            ],
+            "type": "u8"
+          },
           {
             "name": "reserved",
             "type": {
               "array": [
                 "u8",
-                6
+                5
               ]
             }
           },
@@ -5692,10 +5738,30 @@
     {
       "code": 6115,
       "name": "ObligationCurrentlyMarkedForDeleveraging",
-      "msg": "Obligation is currently marked for deleveraging"
+      "msg": "Obligation is already marked for deleveraging"
     },
     {
       "code": 6116,
+      "name": "MaximumWithdrawValueZero",
+      "msg": "Maximum withdraw value is zero"
+    },
+    {
+      "code": 6117,
+      "name": "ZeroMaxLtvAssetsInDeposits",
+      "msg": "No max LTV 0 assets allowed in deposits for repay and withdraw"
+    },
+    {
+      "code": 6118,
+      "name": "MinLtvAssetsPriority",
+      "msg": "The operation must prioritize the collateral with the lowest LTV"
+    },
+    {
+      "code": 6119,
+      "name": "WorseLTVThanUnhealthyLTV",
+      "msg": "Cannot get the obligation liquidatable"
+    },
+    {
+      "code": 6120,
       "name": "FarmAccountsMissing",
       "msg": "Farm accounts to refresh are missing"
     }

package/src/idl_codegen/accounts/Obligation.ts

@@ -48,6 +48,8 @@ export interface ObligationFields {
    * Only effective when `deleveraging_margin_call_started_slot != 0`.
    */
   autodeleverageTargetLtvPct: number
+  /** The lowest max LTV found amongst the collateral deposits */
+  lowestReserveDepositMaxLtvPct: number
   reserved: Array<number>
   highestBorrowFactorPct: BN
   /**
@@ -102,6 +104,8 @@ export interface ObligationJSON {
    * Only effective when `deleveraging_margin_call_started_slot != 0`.
    */
   autodeleverageTargetLtvPct: number
+  /** The lowest max LTV found amongst the collateral deposits */
+  lowestReserveDepositMaxLtvPct: number
   reserved: Array<number>
   highestBorrowFactorPct: string
   /**
@@ -157,6 +161,8 @@ export class Obligation {
    * Only effective when `deleveraging_margin_call_started_slot != 0`.
    */
   readonly autodeleverageTargetLtvPct: number
+  /** The lowest max LTV found amongst the collateral deposits */
+  readonly lowestReserveDepositMaxLtvPct: number
   readonly reserved: Array<number>
   readonly highestBorrowFactorPct: BN
   /**
@@ -191,7 +197,8 @@ export class Obligation {
     borsh.publicKey("referrer"),
     borsh.u8("borrowingDisabled"),
     borsh.u8("autodeleverageTargetLtvPct"),
-    borsh.array(borsh.u8(), 6, "reserved"),
+    borsh.u8("lowestReserveDepositMaxLtvPct"),
+    borsh.array(borsh.u8(), 5, "reserved"),
     borsh.u64("highestBorrowFactorPct"),
     borsh.u64("autodeleverageMarginCallStartedTimestamp"),
     borsh.array(borsh.u64(), 125, "padding3"),
@@ -224,6 +231,7 @@ export class Obligation {
     this.referrer = fields.referrer
     this.borrowingDisabled = fields.borrowingDisabled
     this.autodeleverageTargetLtvPct = fields.autodeleverageTargetLtvPct
+    this.lowestReserveDepositMaxLtvPct = fields.lowestReserveDepositMaxLtvPct
     this.reserved = fields.reserved
     this.highestBorrowFactorPct = fields.highestBorrowFactorPct
     this.autodeleverageMarginCallStartedTimestamp =
@@ -304,6 +312,7 @@ export class Obligation {
       referrer: dec.referrer,
       borrowingDisabled: dec.borrowingDisabled,
       autodeleverageTargetLtvPct: dec.autodeleverageTargetLtvPct,
+      lowestReserveDepositMaxLtvPct: dec.lowestReserveDepositMaxLtvPct,
       reserved: dec.reserved,
       highestBorrowFactorPct: dec.highestBorrowFactorPct,
       autodeleverageMarginCallStartedTimestamp:
@@ -336,6 +345,7 @@ export class Obligation {
       referrer: this.referrer.toString(),
       borrowingDisabled: this.borrowingDisabled,
       autodeleverageTargetLtvPct: this.autodeleverageTargetLtvPct,
+      lowestReserveDepositMaxLtvPct: this.lowestReserveDepositMaxLtvPct,
       reserved: this.reserved,
       highestBorrowFactorPct: this.highestBorrowFactorPct.toString(),
       autodeleverageMarginCallStartedTimestamp:
@@ -374,6 +384,7 @@ export class Obligation {
       referrer: new PublicKey(obj.referrer),
       borrowingDisabled: obj.borrowingDisabled,
       autodeleverageTargetLtvPct: obj.autodeleverageTargetLtvPct,
+      lowestReserveDepositMaxLtvPct: obj.lowestReserveDepositMaxLtvPct,
       reserved: obj.reserved,
       highestBorrowFactorPct: new BN(obj.highestBorrowFactorPct),
       autodeleverageMarginCallStartedTimestamp: new BN(

package/src/idl_codegen/errors/custom.ts

@@ -115,6 +115,10 @@ export type CustomError =
   | ObligationsMustMatch
   | LendingMarketsMustMatch
   | ObligationCurrentlyMarkedForDeleveraging
+  | MaximumWithdrawValueZero
+  | ZeroMaxLtvAssetsInDeposits
+  | MinLtvAssetsPriority
+  | WorseLTVThanUnhealthyLTV
   | FarmAccountsMissing
 
 export class InvalidMarketAuthority extends Error {
@@ -1443,21 +1447,71 @@ export class ObligationCurrentlyMarkedForDeleveraging extends Error {
   static readonly code = 6115
   readonly code = 6115
   readonly name = "ObligationCurrentlyMarkedForDeleveraging"
-  readonly msg = "Obligation is currently marked for deleveraging"
+  readonly msg = "Obligation is already marked for deleveraging"
 
   constructor(readonly logs?: string[]) {
-    super("6115: Obligation is currently marked for deleveraging")
+    super("6115: Obligation is already marked for deleveraging")
   }
 }
 
-export class FarmAccountsMissing extends Error {
+export class MaximumWithdrawValueZero extends Error {
   static readonly code = 6116
   readonly code = 6116
+  readonly name = "MaximumWithdrawValueZero"
+  readonly msg = "Maximum withdraw value is zero"
+
+  constructor(readonly logs?: string[]) {
+    super("6116: Maximum withdraw value is zero")
+  }
+}
+
+export class ZeroMaxLtvAssetsInDeposits extends Error {
+  static readonly code = 6117
+  readonly code = 6117
+  readonly name = "ZeroMaxLtvAssetsInDeposits"
+  readonly msg =
+    "No max LTV 0 assets allowed in deposits for repay and withdraw"
+
+  constructor(readonly logs?: string[]) {
+    super(
+      "6117: No max LTV 0 assets allowed in deposits for repay and withdraw"
+    )
+  }
+}
+
+export class MinLtvAssetsPriority extends Error {
+  static readonly code = 6118
+  readonly code = 6118
+  readonly name = "MinLtvAssetsPriority"
+  readonly msg =
+    "The operation must prioritize the collateral with the lowest LTV"
+
+  constructor(readonly logs?: string[]) {
+    super(
+      "6118: The operation must prioritize the collateral with the lowest LTV"
+    )
+  }
+}
+
+export class WorseLTVThanUnhealthyLTV extends Error {
+  static readonly code = 6119
+  readonly code = 6119
+  readonly name = "WorseLTVThanUnhealthyLTV"
+  readonly msg = "Cannot get the obligation liquidatable"
+
+  constructor(readonly logs?: string[]) {
+    super("6119: Cannot get the obligation liquidatable")
+  }
+}
+
+export class FarmAccountsMissing extends Error {
+  static readonly code = 6120
+  readonly code = 6120
   readonly name = "FarmAccountsMissing"
   readonly msg = "Farm accounts to refresh are missing"
 
   constructor(readonly logs?: string[]) {
-    super("6116: Farm accounts to refresh are missing")
+    super("6120: Farm accounts to refresh are missing")
   }
 }
 
@@ -1696,6 +1750,14 @@ export function fromCode(code: number, logs?: string[]): CustomError | null {
     case 6115:
       return new ObligationCurrentlyMarkedForDeleveraging(logs)
     case 6116:
+      return new MaximumWithdrawValueZero(logs)
+    case 6117:
+      return new ZeroMaxLtvAssetsInDeposits(logs)
+    case 6118:
+      return new MinLtvAssetsPriority(logs)
+    case 6119:
+      return new WorseLTVThanUnhealthyLTV(logs)
+    case 6120:
       return new FarmAccountsMissing(logs)
   }
 

package/src/idl_codegen/instructions/repayAndWithdrawAndRedeem.ts

@@ -37,6 +37,15 @@ export interface RepayAndWithdrawAndRedeemAccounts {
     liquidityTokenProgram: PublicKey
     instructionSysvarAccount: PublicKey
   }
+  collateralFarmsAccounts: {
+    obligationFarmUserState: PublicKey
+    reserveFarmState: PublicKey
+  }
+  debtFarmsAccounts: {
+    obligationFarmUserState: PublicKey
+    reserveFarmState: PublicKey
+  }
+  farmsProgram: PublicKey
 }
 
 export const layout = borsh.struct([
@@ -94,7 +103,7 @@ export function repayAndWithdrawAndRedeem(
     {
       pubkey: accounts.withdrawAccounts.owner,
       isSigner: true,
-      isWritable: false,
+      isWritable: true,
     },
     {
       pubkey: accounts.withdrawAccounts.obligation,
@@ -161,6 +170,27 @@ export function repayAndWithdrawAndRedeem(
       isSigner: false,
       isWritable: false,
     },
+    {
+      pubkey: accounts.collateralFarmsAccounts.obligationFarmUserState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.collateralFarmsAccounts.reserveFarmState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.debtFarmsAccounts.obligationFarmUserState,
+      isSigner: false,
+      isWritable: true,
+    },
+    {
+      pubkey: accounts.debtFarmsAccounts.reserveFarmState,
+      isSigner: false,
+      isWritable: true,
+    },
+    { pubkey: accounts.farmsProgram, isSigner: false, isWritable: false },
   ]
   const identifier = Buffer.from([2, 54, 152, 3, 148, 96, 109, 218])
   const buffer = Buffer.alloc(1000)

package/src/idl_codegen/instructions/withdrawObligationCollateralAndRedeemReserveCollateral.ts

@@ -33,7 +33,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateral(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.owner, isSigner: true, isWritable: false },
+    { pubkey: accounts.owner, isSigner: true, isWritable: true },
     { pubkey: accounts.obligation, isSigner: false, isWritable: true },
     { pubkey: accounts.lendingMarket, isSigner: false, isWritable: false },
     {

package/src/idl_codegen/instructions/withdrawObligationCollateralAndRedeemReserveCollateralV2.ts

@@ -43,7 +43,7 @@ export function withdrawObligationCollateralAndRedeemReserveCollateralV2(
     {
       pubkey: accounts.withdrawAccounts.owner,
       isSigner: true,
-      isWritable: false,
+      isWritable: true,
     },
     {
       pubkey: accounts.withdrawAccounts.obligation,

package/src/idl_codegen/zero_padding/ObligationZP.ts

@@ -50,6 +50,8 @@ export class ObligationZP {
   readonly borrowingDisabled: number
   /** A target LTV set by the risk council when marking this obligation for deleveraging. Only effective when `deleveraging_margin_call_started_slot != 0`. */
   readonly autodeleverageTargetLtvPct: number
+  /** The lowest max LTV found amongst the collateral deposits */
+  readonly lowestReserveDepositMaxLtvPct: number
   readonly reserved: Array<BN>;
   readonly highestBorrowFactorPct: BN
   /** A timestamp at which the risk council most-recently marked this obligation for deleveraging. Zero if not currently subject to deleveraging. */
@@ -77,7 +79,8 @@ export class ObligationZP {
     borsh.publicKey("referrer"),
     borsh.u8("borrowingDisabled"),
     borsh.u8("autodeleverageTargetLtvPct"),
-    borsh.array(borsh.u8(), 6, "reserved"),
+    borsh.u8("lowestReserveDepositMaxLtvPct"),
+    borsh.array(borsh.u8(), 5, "reserved"),
     borsh.u64("highestBorrowFactorPct"),
     borsh.u64("autodeleverageMarginCallStartedTimestamp"),
   ])
@@ -109,6 +112,7 @@ export class ObligationZP {
     this.referrer = fields.referrer
     this.borrowingDisabled = fields.borrowingDisabled
     this.autodeleverageTargetLtvPct = fields.autodeleverageTargetLtvPct
+    this.lowestReserveDepositMaxLtvPct = fields.lowestReserveDepositMaxLtvPct
     this.reserved = fields.reserved.map((num) => new BN(num))
     this.highestBorrowFactorPct = fields.highestBorrowFactorPct
     this.autodeleverageMarginCallStartedTimestamp = fields.autodeleverageMarginCallStartedTimestamp
@@ -187,6 +191,7 @@ export class ObligationZP {
       referrer: dec.referrer,
       borrowingDisabled: dec.borrowingDisabled,
       autodeleverageTargetLtvPct: dec.autodeleverageTargetLtvPct,
+      lowestReserveDepositMaxLtvPct: dec.lowestReserveDepositMaxLtvPct,
       reserved: dec.reserved,
       highestBorrowFactorPct: dec.highestBorrowFactorPct,
       autodeleverageMarginCallStartedTimestamp: dec.autodeleverageMarginCallStartedTimestamp,

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -52,6 +52,7 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   isClosingPosition: boolean;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
   scopeRefresh?: ScopeRefresh;
+  useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
 
@@ -67,6 +68,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   isClosingPosition,
   budgetAndPriorityFeeIxs,
   scopeRefresh,
+  useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
   initialInputs: RepayWithCollInitialInputs<QuoteResponse>;
@@ -132,7 +134,8 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     },
     isClosingPosition,
     repayAmountLamports,
-    inputAmountLamports
+    inputAmountLamports,
+    useV2Ixs
   );
   const uniqueKlendAccounts = uniqueAccounts(klendIxs);
 
@@ -189,6 +192,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   swapper,
   referrer,
   scopeRefresh,
+  useV2Ixs,
   logger = console.log,
 }: RepayWithCollIxsProps<QuoteResponse>): Promise<RepayWithCollIxsResponse<QuoteResponse>> {
   const { swapInputs, initialInputs } = await getRepayWithCollSwapInputs({
@@ -203,6 +207,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     isClosingPosition,
     budgetAndPriorityFeeIxs,
     scopeRefresh,
+    useV2Ixs,
   });
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
   const { inputAmountLamports: collSwapInLamports } = swapInputs;
@@ -243,7 +248,8 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     swapResponse,
     isClosingPosition,
     debtRepayAmountLamports,
-    swapInputs.inputAmountLamports
+    swapInputs.inputAmountLamports,
+    useV2Ixs
   );
 
   return {
@@ -266,7 +272,8 @@ async function buildRepayWithCollateralIxs(
   swapQuoteIxs: SwapIxs,
   isClosingPosition: boolean,
   debtRepayAmountLamports: Decimal,
-  collWithdrawLamports: Decimal
+  collWithdrawLamports: Decimal,
+  useV2Ixs: boolean
 ): Promise<TransactionInstruction[]> {
   // 1. Create atas & budget txns
   const budgetIxns = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxns(1_400_000);
@@ -306,6 +313,7 @@ async function buildRepayWithCollateralIxs(
     obligation.state.owner,
     currentSlot,
     obligation,
+    useV2Ixs,
     0,
     false,
     requestElevationGroup,

package/src/lending_operations/swap_collateral_operations.ts

@@ -63,6 +63,7 @@ export interface SwapCollIxnsInputs<QuoteResponse> {
   currentSlot: number;
   budgetAndPriorityFeeIxns?: TransactionInstruction[];
   scopeRefresh?: ScopeRefresh;
+  useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
   swapper: SwapIxsProvider<QuoteResponse>;
   logger?: (msg: string, ...extra: any[]) => void;
@@ -82,6 +83,11 @@ export interface SwapCollIxnsOutputs<QuoteResponse> {
    */
   lookupTables: AddressLookupTableAccount[];
 
+  /**
+   * Whether the swap is using V2 instructions.
+   */
+  useV2Ixs: boolean;
+
   /**
    * Informational-only details of the token amounts/fees/rates that were used during construction of `ixs`.
    */
@@ -168,6 +174,7 @@ export async function getSwapCollIxns<QuoteResponse>(
   return {
     ixs: listIxns(klendIxns, externalSwapIxns.ixns),
     lookupTables: externalSwapIxns.luts,
+    useV2Ixs: context.useV2Ixs,
     simulationDetails: {
       flashLoan: {
         targetCollFlashBorrowedAmount: klendIxns.simulationDetails.targetCollFlashBorrowedAmount,
@@ -198,6 +205,7 @@ type SwapCollContext<QuoteResponse> = {
   swapper: SwapIxsProvider<QuoteResponse>;
   referrer: PublicKey;
   currentSlot: number;
+  useV2Ixs: boolean;
   scopeRefresh: ScopeRefresh | undefined;
   logger: (msg: string, ...extra: any[]) => void;
 };
@@ -230,6 +238,7 @@ function extractArgsAndContext<QuoteResponse>(
       referrer: inputs.referrer,
       scopeRefresh: inputs.scopeRefresh,
       currentSlot: inputs.currentSlot,
+      useV2Ixs: inputs.useV2Ixs,
     },
   ];
 }
@@ -371,6 +380,7 @@ async function getDepositTargetCollIxns(
     context.targetCollReserve.getLiquidityMint(),
     context.obligation.state.owner,
     context.obligation,
+    context.useV2Ixs,
     0, // no extra compute budget
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     removesElevationGroup, // we may need to (temporarily) remove the elevation group; the same or a different one will be set on withdraw, if requested
@@ -419,6 +429,7 @@ async function getWithdrawSourceCollIxns(
     context.sourceCollReserve.getLiquidityMint(),
     context.obligation.state.owner,
     context.obligation,
+    context.useV2Ixs,
     0, // no extra compute budget
     false, // we do not need ATA ixns here (we construct and close them ourselves)
     requestedElevationGroup !== undefined, // the `elevationGroupIdToRequestAfterWithdraw()` has already decided on this