@kamino-finance/klend-sdk 5.10.35-beta.1 → 5.11.0

package/src/classes/lut_utils.ts

@@ -0,0 +1,63 @@
+import { AddressLookupTableProgram, Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
+
+/**
+ * This method retuns an instruction that creates a lookup table, alongside the pubkey of the lookup table
+ * @param payer - the owner of the lookup table
+ * @param slot - the current slot
+ * @returns - the instruction to create the lookup table and its address
+ */
+export function initLookupTableIx(payer: PublicKey, slot: number): [TransactionInstruction, PublicKey] {
+  const [ixn, address] = AddressLookupTableProgram.createLookupTable({
+    authority: payer,
+    payer,
+    recentSlot: slot,
+  });
+
+  return [ixn, address];
+}
+
+/**
+ * This method retuns an instruction that deactivates a lookup table, which is needed to close it
+ * @param payer - the owner of the lookup table
+ * @param lookupTable - the lookup table to deactivate
+ * @returns - the instruction to deactivate the lookup table
+ */
+export function deactivateLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction {
+  const ixn = AddressLookupTableProgram.deactivateLookupTable({
+    authority: payer,
+    lookupTable: lookupTable,
+  });
+
+  return ixn;
+}
+
+/**
+ * This method returns an instruction that closes a lookup table. That lookup table needs to be disabled at least 500 blocks before closing it.
+ * @param payer - the owner of the lookup table
+ * @param lookupTable - the lookup table to close
+ * @returns - the instruction to close the lookup table
+ */
+/// this require the LUT to be deactivated at least 500 blocks before
+export function closeLookupTableIx(payer: PublicKey, lookupTable: PublicKey): TransactionInstruction {
+  const ixn = AddressLookupTableProgram.closeLookupTable({
+    authority: payer,
+    recipient: payer,
+    lookupTable: lookupTable,
+  });
+
+  return ixn;
+}
+
+/**
+ * Returns the accounts in a lookup table
+ * @param lookupTable - lookup table to get the accounts from
+ * @returns - an array of accounts in the lookup table
+ */
+export async function getAccountsInLUT(connection: Connection, lookupTable: PublicKey): Promise<PublicKey[]> {
+  const lutState = await connection.getAddressLookupTable(lookupTable);
+  if (!lutState || !lutState.value) {
+    throw new Error(`Lookup table ${lookupTable} not found`);
+  }
+
+  return lutState.value.state.addresses;
+}

package/src/classes/manager.ts

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

package/src/classes/obligation.ts

@@ -266,7 +266,7 @@ export class KaminoObligation {
   /**
    * @returns total borrow power of the obligation, relative to max LTV of each asset's reserve
    */
-  getMaxAllowedBorrowValue(): Decimal {
+  getAllowedBorrowValue(): Decimal {
     return new Fraction(this.state.allowedBorrowValueSf).toDecimal();
   }
 

package/src/classes/vault.ts

@@ -82,7 +82,7 @@ import {
 import { batchFetch, collToLamportsDecimal, ZERO } from '@kamino-finance/kliquidity-sdk';
 import { FullBPSDecimal } from '@kamino-finance/kliquidity-sdk/dist/utils/CreationParameters';
 import { FarmState } from '@kamino-finance/farms-sdk/dist';
-import { getAccountsInLUT, initLookupTableIx } from '../utils/lookupTable';
+import { getAccountsInLUT, initLookupTableIx } from './lut_utils';
 import {
   getFarmStakeIxs,
   getFarmUnstakeAndWithdrawIxs,

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/lending_operations/repay_with_collateral_calcs.ts

@@ -2,7 +2,6 @@ import Decimal from 'decimal.js';
 import { KaminoMarket, KaminoObligation, KaminoReserve, numberToLamportsDecimal } from '../classes';
 import { PublicKey } from '@solana/web3.js';
 import { lamportsToDecimal } from '../classes/utils';
-import { MaxWithdrawLtvCheck, getMaxWithdrawLtvCheck } from './repay_with_collateral_operations';
 
 export function calcRepayAmountWithSlippage(
   kaminoMarket: KaminoMarket,
@@ -103,7 +102,6 @@ export function calcMaxWithdrawCollateral(
       .filter((p) => !p.reserveAddress.equals(borrow.reserveAddress))
       .reduce((acc, b) => acc.add(b.marketValueRefreshed), new Decimal('0'));
   }
-  const maxWithdrawLtvCheck = getMaxWithdrawLtvCheck(obligation);
 
   let remainingDepositsValueWithLtv = new Decimal('0');
   if (obligation.getDeposits().length > 1) {
@@ -111,13 +109,8 @@ export function calcMaxWithdrawCollateral(
       .getDeposits()
       .filter((p) => !p.reserveAddress.equals(deposit.reserveAddress))
       .reduce((acc, d) => {
-        const { maxLtv, liquidationLtv } = obligation.getLtvForReserve(
-          market,
-          market.getReserveByAddress(d.reserveAddress)!
-        );
-        const maxWithdrawLtv =
-          maxWithdrawLtvCheck === MaxWithdrawLtvCheck.LIQUIDATION_THRESHOLD ? liquidationLtv : maxLtv;
-        return acc.add(d.marketValueRefreshed.mul(maxWithdrawLtv));
+        const { maxLtv } = obligation.getLtvForReserve(market, market.getReserveByAddress(d.reserveAddress)!);
+        return acc.add(d.marketValueRefreshed.mul(maxLtv));
       }, new Decimal('0'));
   }
 
@@ -130,18 +123,16 @@ export function calcMaxWithdrawCollateral(
       repayingAllDebt: repayAmountLamports.gte(borrow.amount),
     };
   } else {
-    const { maxLtv: collMaxLtv, liquidationLtv: collLiquidationLtv } = obligation.getLtvForReserve(
+    const { maxLtv: collMaxLtv } = obligation.getLtvForReserve(
       market,
       market.getReserveByAddress(depositReserve.address)!
     );
-    const maxWithdrawLtv =
-      maxWithdrawLtvCheck === MaxWithdrawLtvCheck.LIQUIDATION_THRESHOLD ? collLiquidationLtv : collMaxLtv;
     const numerator = deposit.marketValueRefreshed
-      .mul(maxWithdrawLtv)
+      .mul(collMaxLtv)
       .add(remainingDepositsValueWithLtv)
       .sub(remainingBorrowsValue);
 
-    const denominator = depositReserve.getOracleMarketPrice().mul(maxWithdrawLtv);
+    const denominator = depositReserve.getOracleMarketPrice().mul(collMaxLtv);
     const maxCollWithdrawAmount = numerator.div(denominator);
     const withdrawableCollLamports = maxCollWithdrawAmount.mul(depositReserve.getMintFactor()).floor();
 

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -52,14 +52,10 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   isClosingPosition: boolean;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
   scopeRefresh?: ScopeRefresh;
+  useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
 
-export enum MaxWithdrawLtvCheck {
-  MAX_LTV,
-  LIQUIDATION_THRESHOLD,
-}
-
 export async function getRepayWithCollSwapInputs<QuoteResponse>({
   collTokenMint,
   currentSlot,
@@ -72,6 +68,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   isClosingPosition,
   budgetAndPriorityFeeIxs,
   scopeRefresh,
+  useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
   initialInputs: RepayWithCollInitialInputs<QuoteResponse>;
@@ -137,7 +134,8 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     },
     isClosingPosition,
     repayAmountLamports,
-    inputAmountLamports
+    inputAmountLamports,
+    useV2Ixs
   );
   const uniqueKlendAccounts = uniqueAccounts(klendIxs);
 
@@ -194,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({
@@ -208,21 +207,13 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     isClosingPosition,
     budgetAndPriorityFeeIxs,
     scopeRefresh,
+    useV2Ixs,
   });
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
   const { inputAmountLamports: collSwapInLamports } = swapInputs;
 
-  const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
-
-  if (!collReserve) {
-    throw new Error(`Collateral reserve with mint ${collTokenMint} not found in market ${kaminoMarket.getAddress()}`);
-  }
-
-  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
-
-  if (!debtReserve) {
-    throw new Error(`Debt reserve with mint ${debtTokenMint} not found in market ${kaminoMarket.getAddress()}`);
-  }
+  const collReserve = kaminoMarket.getReserveByMint(collTokenMint)!;
+  const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint)!;
 
   // the client should use these values to prevent this input, but the tx may succeed, so we don't want to fail
   // there is also a chance that the tx will consume debt token from the user's ata which they would not expect
@@ -257,7 +248,8 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     swapResponse,
     isClosingPosition,
     debtRepayAmountLamports,
-    swapInputs.inputAmountLamports
+    swapInputs.inputAmountLamports,
+    useV2Ixs
   );
 
   return {
@@ -280,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);
@@ -310,12 +303,8 @@ async function buildRepayWithCollateralIxs(
 
   const requestElevationGroup = !isClosingPosition && obligation.state.elevationGroup !== 0;
 
-  const maxWithdrawLtvCheck = getMaxWithdrawLtvCheck(obligation);
-
   // 3. Repay using the flash borrowed funds & withdraw collateral to swap and pay the flash loan
-  const repayAndWithdrawAction = await (maxWithdrawLtvCheck === MaxWithdrawLtvCheck.MAX_LTV
-    ? KaminoAction.buildRepayAndWithdrawTxns
-    : KaminoAction.buildRepayAndWithdrawV2Txns)(
+  const repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns(
     market,
     isClosingPosition ? U64_MAX : debtRepayAmountLamports.toString(),
     debtReserve.getLiquidityMint(),
@@ -324,6 +313,7 @@ async function buildRepayWithCollateralIxs(
     obligation.state.owner,
     currentSlot,
     obligation,
+    useV2Ixs,
     0,
     false,
     requestElevationGroup,
@@ -347,9 +337,3 @@ async function buildRepayWithCollateralIxs(
     flashRepayIxn,
   ];
 }
-
-export const getMaxWithdrawLtvCheck = (obligation: KaminoObligation) => {
-  return obligation.refreshedStats.userTotalBorrowBorrowFactorAdjusted.gte(obligation.refreshedStats.borrowLimit)
-    ? MaxWithdrawLtvCheck.LIQUIDATION_THRESHOLD
-    : MaxWithdrawLtvCheck.MAX_LTV;
-};

package/src/lending_operations/swap_collateral_operations.ts

@@ -62,6 +62,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;
@@ -81,6 +82,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`.
    */
@@ -167,6 +173,7 @@ export async function getSwapCollIxns<QuoteResponse>(
   return {
     ixs: listIxns(klendIxns, externalSwapIxns.ixns),
     lookupTables: externalSwapIxns.luts,
+    useV2Ixs: context.useV2Ixs,
     simulationDetails: {
       flashLoan: {
         targetCollFlashBorrowedAmount: klendIxns.simulationDetails.targetCollFlashBorrowedAmount,
@@ -197,6 +204,7 @@ type SwapCollContext<QuoteResponse> = {
   swapper: SwapIxsProvider<QuoteResponse>;
   referrer: PublicKey;
   currentSlot: number;
+  useV2Ixs: boolean;
   scopeRefresh: ScopeRefresh | undefined;
   logger: (msg: string, ...extra: any[]) => void;
 };
@@ -229,6 +237,7 @@ function extractArgsAndContext<QuoteResponse>(
       referrer: inputs.referrer,
       scopeRefresh: inputs.scopeRefresh,
       currentSlot: inputs.currentSlot,
+      useV2Ixs: inputs.useV2Ixs,
     },
   ];
 }
@@ -370,6 +379,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

package/src/leverage/operations.ts

@@ -53,7 +53,7 @@ import {
   DepositLeverageInitialInputs,
   DepositWithLeverageProps,
   DepositWithLeverageSwapInputsProps,
-  DepsoitLeverageIxsResponse,
+  DepositLeverageIxsResponse,
   PriceAinBProvider,
   SwapInputs,
   SwapIxs,
@@ -86,6 +86,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
   priceAinB,
   isKtoken,
   quoter,
+  useV2Ixs,
   elevationGroupOverride,
 }: DepositWithLeverageSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
@@ -151,6 +152,7 @@ export async function getDepositWithLeverageSwapInputs<QuoteResponse>({
     },
     strategy,
     collIsKtoken,
+    useV2Ixs,
     elevationGroupOverride
   );
 
@@ -315,7 +317,8 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
   quoter,
   swapper,
   elevationGroupOverride,
-}: DepositWithLeverageProps<QuoteResponse>): Promise<DepsoitLeverageIxsResponse<QuoteResponse>> {
+  useV2Ixs,
+}: DepositWithLeverageProps<QuoteResponse>): Promise<DepositLeverageIxsResponse<QuoteResponse>> {
   const { swapInputs, initialInputs } = await getDepositWithLeverageSwapInputs({
     owner,
     kaminoMarket,
@@ -337,6 +340,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
     priceAinB,
     isKtoken,
     quoter,
+    useV2Ixs,
   });
 
   let depositSwapper: SwapIxsProvider<QuoteResponse>;
@@ -392,6 +396,7 @@ export async function getDepositWithLeverageIxns<QuoteResponse>({
     },
     initialInputs.strategy,
     initialInputs.collIsKtoken,
+    useV2Ixs,
     elevationGroupOverride
   );
 
@@ -418,6 +423,7 @@ async function buildDepositWithLeverageIxns(
   swapQuoteIxs: SwapIxs,
   strategy: StrategyWithAddress | undefined,
   collIsKtoken: boolean,
+  useV2Ixs: boolean,
   elevationGroupOverride?: number
 ): Promise<TransactionInstruction[]> {
   const budgetIxns = budgetAndPriorityFeeIxs || getComputeBudgetAndPriorityFeeIxns(3000000);
@@ -530,6 +536,7 @@ async function buildDepositWithLeverageIxns(
     debtTokenMint,
     owner,
     obligation!,
+    useV2Ixs,
     0,
     false,
     elevationGroupOverride === 0 ? false : true, // emode
@@ -592,6 +599,7 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
   quoteBufferBps,
   isKtoken,
   quoter,
+  useV2Ixs,
 }: WithdrawWithLeverageSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
   initialInputs: WithdrawLeverageInitialInputs<QuoteResponse>;
@@ -642,7 +650,8 @@ export async function getWithdrawWithLeverageSwapInputs<QuoteResponse>({
       lookupTables: [],
     },
     strategy,
-    collIsKtoken
+    collIsKtoken,
+    useV2Ixs
   );
 
   const uniqueKlendAccounts = uniqueAccounts(klendIxs);
@@ -725,6 +734,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
   isKtoken,
   quoter,
   swapper,
+  useV2Ixs,
 }: WithdrawWithLeverageProps<QuoteResponse>): Promise<WithdrawLeverageIxsResponse<QuoteResponse>> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
@@ -752,6 +762,7 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
     quoteBufferBps,
     isKtoken,
     quoter,
+    useV2Ixs,
   });
 
   let withdrawSwapper: SwapIxsProvider<QuoteResponse>;
@@ -802,7 +813,8 @@ export async function getWithdrawWithLeverageIxns<QuoteResponse>({
       lookupTables,
     },
     initialInputs.strategy,
-    initialInputs.collIsKtoken
+    initialInputs.collIsKtoken,
+    useV2Ixs
   );
 
   // Send ixns and lookup tables
@@ -829,7 +841,8 @@ export async function buildWithdrawWithLeverageIxns(
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
   swapQuoteIxs: SwapIxs,
   strategy: StrategyWithAddress | undefined,
-  collIsKtoken: boolean
+  collIsKtoken: boolean,
+  useV2Ixs: boolean
 ): Promise<TransactionInstruction[]> {
   const collTokenMint = collReserve.getLiquidityMint();
   const debtTokenMint = debtReserve.getLiquidityMint();
@@ -941,6 +954,7 @@ export async function buildWithdrawWithLeverageIxns(
     owner,
     currentSlot,
     obligation,
+    useV2Ixs,
     0,
     false,
     false, // to be checked and created in a setup tx in the UI (won't be the case for withdraw anyway as this would be created in deposit)
@@ -986,6 +1000,7 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
   quoteBufferBps,
   isKtoken,
   quoter,
+  useV2Ixs,
 }: AdjustLeverageSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
   initialInputs: AdjustLeverageInitialInputs<QuoteResponse>;
@@ -1051,7 +1066,8 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
         swapIxs: [],
         lookupTables: [],
       },
-      budgetAndPriorityFeeIxs
+      budgetAndPriorityFeeIxs,
+      useV2Ixs
     );
 
     const uniqueKlendAccounts = uniqueAccounts(klendIxs);
@@ -1154,7 +1170,8 @@ export async function getAdjustLeverageSwapInputs<QuoteResponse>({
         swapIxs: [],
         lookupTables: [],
       },
-      budgetAndPriorityFeeIxs
+      budgetAndPriorityFeeIxs,
+      useV2Ixs
     );
 
     const uniqueKlendAccounts = uniqueAccounts(klendIxs);
@@ -1240,6 +1257,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
   isKtoken,
   quoter,
   swapper,
+  useV2Ixs,
 }: AdjustLeverageProps<QuoteResponse>): Promise<AdjustLeverageIxsResponse<QuoteResponse>> {
   const { swapInputs, initialInputs } = await getAdjustLeverageSwapInputs({
     owner,
@@ -1262,6 +1280,7 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
     priceAinB,
     isKtoken,
     quoter,
+    useV2Ixs,
   });
 
   // leverage increased so we need to deposit and borrow more
@@ -1309,7 +1328,8 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
         swapIxs,
         lookupTables,
       },
-      budgetAndPriorityFeeIxs
+      budgetAndPriorityFeeIxs,
+      useV2Ixs
     );
     return {
       ixs,
@@ -1355,7 +1375,8 @@ export async function getAdjustLeverageIxns<QuoteResponse>({
         swapIxs,
         lookupTables,
       },
-      budgetAndPriorityFeeIxs
+      budgetAndPriorityFeeIxs,
+      useV2Ixs
     );
 
     return {
@@ -1383,7 +1404,8 @@ async function buildIncreaseLeverageIxns(
   scopeFeed: string | undefined,
   collIsKtoken: boolean,
   swapQuoteIxs: SwapIxs,
-  budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined
+  budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined,
+  useV2Ixs: boolean
 ): Promise<TransactionInstruction[]> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
@@ -1475,6 +1497,7 @@ async function buildIncreaseLeverageIxns(
     collTokenMint,
     owner,
     obligation,
+    useV2Ixs,
     0,
     false,
     false,
@@ -1492,6 +1515,7 @@ async function buildIncreaseLeverageIxns(
     debtTokenMint,
     owner,
     obligation,
+    useV2Ixs,
     0,
     false,
     false,
@@ -1551,7 +1575,8 @@ async function buildDecreaseLeverageIxns(
   scopeFeed: string | undefined,
   collIsKtoken: boolean,
   swapQuoteIxs: SwapIxs,
-  budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined
+  budgetAndPriorityFeeIxns: TransactionInstruction[] | undefined,
+  useV2Ixs: boolean
 ): Promise<TransactionInstruction[]> {
   const collReserve = kaminoMarket.getReserveByMint(collTokenMint);
   const debtReserve = kaminoMarket.getReserveByMint(debtTokenMint);
@@ -1651,6 +1676,7 @@ async function buildDecreaseLeverageIxns(
     debtTokenMint,
     owner,
     obligation,
+    useV2Ixs,
     currentSlot,
     undefined,
     0,
@@ -1669,6 +1695,7 @@ async function buildDecreaseLeverageIxns(
     collTokenMint,
     owner,
     obligation,
+    useV2Ixs,
     0,
     false,
     false,

package/src/leverage/types.ts

@@ -49,7 +49,7 @@ export type KaminoDepositSwapOverride = (
   amountDebtAtaBalance: Decimal
 ) => Promise<InstructionsWithLookupTables>;
 
-export type DepsoitLeverageIxsResponse<QuoteResponse> = {
+export type DepositLeverageIxsResponse<QuoteResponse> = {
   ixs: TransactionInstruction[];
   lookupTables: AddressLookupTableAccount[];
   swapInputs: SwapInputs;
@@ -90,6 +90,7 @@ export interface DepositWithLeverageSwapInputsProps<QuoteResponse> {
   // currently only used to disable requesting elevation group when this value is 0
   // to be implemented properly in the future
   elevationGroupOverride?: number;
+  useV2Ixs: boolean;
 }
 
 export interface DepositWithLeverageProps<QuoteResponse> extends DepositWithLeverageSwapInputsProps<QuoteResponse> {
@@ -146,6 +147,7 @@ export interface WithdrawWithLeverageSwapInputsProps<QuoteResponse> {
   quoteBufferBps: Decimal;
   isKtoken: IsKtokenProvider;
   quoter: SwapQuoteProvider<QuoteResponse>;
+  useV2Ixs: boolean;
 }
 
 export interface WithdrawWithLeverageProps<QuoteResponse> extends WithdrawWithLeverageSwapInputsProps<QuoteResponse> {
@@ -199,6 +201,7 @@ export interface AdjustLeverageSwapInputsProps<QuoteResponse> {
   priceAinB: PriceAinBProvider;
   isKtoken: IsKtokenProvider;
   quoter: SwapQuoteProvider<QuoteResponse>;
+  useV2Ixs: boolean;
 }
 
 export interface AdjustLeverageProps<QuoteResponse> extends AdjustLeverageSwapInputsProps<QuoteResponse> {