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

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/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,
@@ -293,7 +293,7 @@ export class KaminoVaultClient {
     );
 
     const updateReserveAllocationAccounts: UpdateReserveAllocationAccounts = {
-      signer: vaultState.adminAuthority,
+      signer: vaultState.vaultAdminAuthority,
       vaultState: vault.address,
       baseVaultAuthority: vaultState.baseVaultAuthority,
       reserveCollateralMint: reserveState.collateral.mintPubkey,
@@ -325,7 +325,7 @@ export class KaminoVaultClient {
     accountsToAddToLUT.push(lendingMarketAuth);
 
     const insertIntoLUTIxs = await this.insertIntoLookupTableIxs(
-      vaultState.adminAuthority,
+      vaultState.vaultAdminAuthority,
       vaultState.vaultLookupTable,
       accountsToAddToLUT
     );
@@ -355,12 +355,12 @@ export class KaminoVaultClient {
     const vaultState: VaultState = await vault.getState(this.getConnection());
 
     const updateVaultConfigAccs: UpdateVaultConfigAccounts = {
-      adminAuthority: vaultState.adminAuthority,
+      vaultAdminAuthority: vaultState.vaultAdminAuthority,
       vaultState: vault.address,
       klendProgram: this._kaminoLendProgramId,
     };
     if (signer) {
-      updateVaultConfigAccs.adminAuthority = signer;
+      updateVaultConfigAccs.vaultAdminAuthority = signer;
     }
 
     const updateVaultConfigArgs: UpdateVaultConfigArgs = {
@@ -414,7 +414,7 @@ export class KaminoVaultClient {
     if (mode.kind === new VaultConfigField.PendingVaultAdmin().kind) {
       const newPubkey = new PublicKey(value);
       const insertIntoLutIxs = await this.insertIntoLookupTableIxs(
-        vaultState.adminAuthority,
+        vaultState.vaultAdminAuthority,
         vaultState.vaultLookupTable,
         [newPubkey]
       );
@@ -432,7 +432,7 @@ export class KaminoVaultClient {
           farmState!.globalConfig
         );
         const insertIntoLutIxs = await this.insertIntoLookupTableIxs(
-          vaultState.adminAuthority,
+          vaultState.vaultAdminAuthority,
           vaultState.vaultLookupTable,
           keysToAddToLUT
         );
@@ -481,7 +481,7 @@ export class KaminoVaultClient {
     value: string
   ): TransactionInstruction {
     const updateVaultConfigAccs: UpdateVaultConfigAccounts = {
-      adminAuthority: admin,
+      vaultAdminAuthority: admin,
       vaultState: vault,
       klendProgram: this._kaminoLendProgramId,
     };
@@ -531,7 +531,7 @@ export class KaminoVaultClient {
 
     // read the current LUT and create a new one for the new admin and backfill it
     const accountsInExistentLUT = (await getAccountsInLUT(this.getConnection(), vaultState.vaultLookupTable)).filter(
-      (account) => !account.equals(vaultState.adminAuthority)
+      (account) => !account.equals(vaultState.vaultAdminAuthority)
     );
 
     const LUTIxs: TransactionInstruction[] = [];
@@ -574,7 +574,7 @@ export class KaminoVaultClient {
     const vaultState: VaultState = await vault.getState(this.getConnection());
 
     const giveUpPendingFeesAccounts: GiveUpPendingFeesAccounts = {
-      adminAuthority: vaultState.adminAuthority,
+      vaultAdminAuthority: vaultState.vaultAdminAuthority,
       vaultState: vault.address,
       klendProgram: this._kaminoLendProgramId,
     };
@@ -604,7 +604,7 @@ export class KaminoVaultClient {
   ): Promise<TransactionInstruction[]> {
     const vaultState: VaultState = await vault.getState(this.getConnection());
     const vaultReservesState = vaultReservesMap ? vaultReservesMap : await this.loadVaultReserves(vaultState);
-    const [{ ata: adminTokenAta, createAtaIx }] = createAtasIdempotent(vaultState.adminAuthority, [
+    const [{ ata: adminTokenAta, createAtaIx }] = createAtasIdempotent(vaultState.vaultAdminAuthority, [
       {
         mint: vaultState.tokenMint,
         tokenProgram: TOKEN_PROGRAM_ID,
@@ -1295,7 +1295,7 @@ export class KaminoVaultClient {
     const lendingMarketAuth = lendingMarketAuthPda(marketAddress, this._kaminoLendProgramId)[0];
 
     const withdrawPendingFeesAccounts: WithdrawPendingFeesAccounts = {
-      adminAuthority: vaultState.adminAuthority,
+      vaultAdminAuthority: vaultState.vaultAdminAuthority,
       vaultState: vault.address,
       reserve: reserve.address,
       tokenVault: vaultState.tokenVault,
@@ -1355,7 +1355,7 @@ export class KaminoVaultClient {
     const vaultState = await vault.getState(this.getConnection());
     const allAccountsToBeInserted = [
       vault.address,
-      vaultState.adminAuthority,
+      vaultState.vaultAdminAuthority,
       vaultState.baseVaultAuthority,
       vaultState.tokenMint,
       vaultState.tokenVault,
@@ -1400,7 +1400,7 @@ export class KaminoVaultClient {
     let lut = vaultState.vaultLookupTable;
     if (lut.equals(PublicKey.default)) {
       const recentSlot = await this.getConnection().getSlot();
-      const [ixn, address] = initLookupTableIx(vaultState.adminAuthority, recentSlot);
+      const [ixn, address] = initLookupTableIx(vaultState.vaultAdminAuthority, recentSlot);
       setupLUTIfNeededIxs.push(ixn);
       lut = address;
 
@@ -1420,7 +1420,7 @@ export class KaminoVaultClient {
     }
     ixns.push(
       ...(await this.insertIntoLookupTableIxs(
-        vaultState.adminAuthority,
+        vaultState.vaultAdminAuthority,
         lut,
         allAccountsToBeInserted,
         overridenExistentAccounts

package/src/idl_codegen_kamino_vault/accounts/VaultState.ts

@@ -5,7 +5,7 @@ import * as types from "../types" // eslint-disable-line @typescript-eslint/no-u
 import { PROGRAM_ID } from "../programId"
 
 export interface VaultStateFields {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   baseVaultAuthority: PublicKey
   baseVaultAuthorityBump: BN
   tokenMint: PublicKey
@@ -43,7 +43,7 @@ export interface VaultStateFields {
 }
 
 export interface VaultStateJSON {
-  adminAuthority: string
+  vaultAdminAuthority: string
   baseVaultAuthority: string
   baseVaultAuthorityBump: string
   tokenMint: string
@@ -81,7 +81,7 @@ export interface VaultStateJSON {
 }
 
 export class VaultState {
-  readonly adminAuthority: PublicKey
+  readonly vaultAdminAuthority: PublicKey
   readonly baseVaultAuthority: PublicKey
   readonly baseVaultAuthorityBump: BN
   readonly tokenMint: PublicKey
@@ -122,7 +122,7 @@ export class VaultState {
   ])
 
   static readonly layout = borsh.struct([
-    borsh.publicKey("adminAuthority"),
+    borsh.publicKey("vaultAdminAuthority"),
     borsh.publicKey("baseVaultAuthority"),
     borsh.u64("baseVaultAuthorityBump"),
     borsh.publicKey("tokenMint"),
@@ -160,7 +160,7 @@ export class VaultState {
   ])
 
   constructor(fields: VaultStateFields) {
-    this.adminAuthority = fields.adminAuthority
+    this.vaultAdminAuthority = fields.vaultAdminAuthority
     this.baseVaultAuthority = fields.baseVaultAuthority
     this.baseVaultAuthorityBump = fields.baseVaultAuthorityBump
     this.tokenMint = fields.tokenMint
@@ -243,7 +243,7 @@ export class VaultState {
     const dec = VaultState.layout.decode(data.slice(8))
 
     return new VaultState({
-      adminAuthority: dec.adminAuthority,
+      vaultAdminAuthority: dec.vaultAdminAuthority,
       baseVaultAuthority: dec.baseVaultAuthority,
       baseVaultAuthorityBump: dec.baseVaultAuthorityBump,
       tokenMint: dec.tokenMint,
@@ -287,7 +287,7 @@ export class VaultState {
 
   toJSON(): VaultStateJSON {
     return {
-      adminAuthority: this.adminAuthority.toString(),
+      vaultAdminAuthority: this.vaultAdminAuthority.toString(),
       baseVaultAuthority: this.baseVaultAuthority.toString(),
       baseVaultAuthorityBump: this.baseVaultAuthorityBump.toString(),
       tokenMint: this.tokenMint.toString(),
@@ -329,7 +329,7 @@ export class VaultState {
 
   static fromJSON(obj: VaultStateJSON): VaultState {
     return new VaultState({
-      adminAuthority: new PublicKey(obj.adminAuthority),
+      vaultAdminAuthority: new PublicKey(obj.vaultAdminAuthority),
       baseVaultAuthority: new PublicKey(obj.baseVaultAuthority),
       baseVaultAuthorityBump: new BN(obj.baseVaultAuthorityBump),
       tokenMint: new PublicKey(obj.tokenMint),

package/src/idl_codegen_kamino_vault/instructions/giveUpPendingFees.ts

@@ -9,7 +9,7 @@ export interface GiveUpPendingFeesArgs {
 }
 
 export interface GiveUpPendingFeesAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -22,7 +22,7 @@ export function giveUpPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
   ]

package/src/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.ts

@@ -11,7 +11,7 @@ export interface InitializeSharesMetadataArgs {
 }
 
 export interface InitializeSharesMetadataAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   sharesMint: PublicKey
   baseVaultAuthority: PublicKey
@@ -33,7 +33,7 @@ export function initializeSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/updateSharesMetadata.ts

@@ -11,7 +11,7 @@ export interface UpdateSharesMetadataArgs {
 }
 
 export interface UpdateSharesMetadataAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   sharesMetadata: PublicKey
@@ -30,7 +30,7 @@ export function updateSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: false },
     { pubkey: accounts.baseVaultAuthority, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMetadata, isSigner: false, isWritable: true },

package/src/idl_codegen_kamino_vault/instructions/updateVaultConfig.ts

@@ -10,7 +10,7 @@ export interface UpdateVaultConfigArgs {
 }
 
 export interface UpdateVaultConfigAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -26,7 +26,7 @@ export function updateVaultConfig(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: false },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: false },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.klendProgram, isSigner: false, isWritable: false },
   ]

package/src/idl_codegen_kamino_vault/instructions/withdrawPendingFees.ts

@@ -5,7 +5,7 @@ import * as types from "../types" // eslint-disable-line @typescript-eslint/no-u
 import { PROGRAM_ID } from "../programId"
 
 export interface WithdrawPendingFeesAccounts {
-  adminAuthority: PublicKey
+  vaultAdminAuthority: PublicKey
   vaultState: PublicKey
   reserve: PublicKey
   tokenVault: PublicKey
@@ -29,7 +29,7 @@ export function withdrawPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { pubkey: accounts.reserve, isSigner: false, isWritable: true },
     { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },

package/src/idl_kamino_vault.json

@@ -403,7 +403,7 @@
       "name": "updateVaultConfig",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": false,
           "isSigner": true
         },
@@ -435,7 +435,7 @@
       "name": "withdrawPendingFees",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -540,7 +540,7 @@
       "name": "giveUpPendingFees",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -566,7 +566,7 @@
       "name": "initializeSharesMetadata",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -625,7 +625,7 @@
       "name": "updateSharesMetadata",
       "accounts": [
         {
-          "name": "adminAuthority",
+          "name": "vaultAdminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -858,7 +858,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "adminAuthority",
+            "name": "vaultAdminAuthority",
             "type": "publicKey"
           },
           {
@@ -2189,4 +2189,4 @@
       "msg": "Wrong admin or allocation admin"
     }
   ]
-}
+}

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

@@ -56,11 +56,6 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
 
-export enum MaxWithdrawLtvCheck {
-  MAX_LTV,
-  LIQUIDATION_THRESHOLD,
-}
-
 export async function getRepayWithCollSwapInputs<QuoteResponse>({
   collTokenMint,
   currentSlot,
@@ -217,17 +212,8 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   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
@@ -317,48 +303,25 @@ 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
-  let repayAndWithdrawAction;
-  if (maxWithdrawLtvCheck === MaxWithdrawLtvCheck.MAX_LTV) {
-    repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns(
-      market,
-      isClosingPosition ? U64_MAX : debtRepayAmountLamports.toString(),
-      debtReserve.getLiquidityMint(),
-      isClosingPosition ? U64_MAX : collWithdrawLamports.toString(),
-      collReserve.getLiquidityMint(),
-      obligation.state.owner,
-      currentSlot,
-      obligation,
-      useV2Ixs,
-      0,
-      false,
-      requestElevationGroup,
-      undefined,
-      undefined,
-      referrer,
-      scopeRefresh
-    );
-  } else {
-    repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawV2Txns(
-      market,
-      isClosingPosition ? U64_MAX : debtRepayAmountLamports.toString(),
-      debtReserve.getLiquidityMint(),
-      isClosingPosition ? U64_MAX : collWithdrawLamports.toString(),
-      collReserve.getLiquidityMint(),
-      obligation.state.owner,
-      currentSlot,
-      obligation,
-      0,
-      false,
-      requestElevationGroup,
-      undefined,
-      undefined,
-      referrer,
-      scopeRefresh
-    );
-  }
+  const repayAndWithdrawAction = await KaminoAction.buildRepayAndWithdrawTxns(
+    market,
+    isClosingPosition ? U64_MAX : debtRepayAmountLamports.toString(),
+    debtReserve.getLiquidityMint(),
+    isClosingPosition ? U64_MAX : collWithdrawLamports.toString(),
+    collReserve.getLiquidityMint(),
+    obligation.state.owner,
+    currentSlot,
+    obligation,
+    useV2Ixs,
+    0,
+    false,
+    requestElevationGroup,
+    undefined,
+    undefined,
+    referrer,
+    scopeRefresh
+  );
 
   // 4. Swap collateral to debt to repay flash loan
   const { preActionIxs, swapIxs } = swapQuoteIxs;
@@ -374,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/utils/lookupTable.ts

@@ -53,65 +53,3 @@ export const extendLookupTableIxs = (
 
   return extendLookupIxs;
 };
-
-/**
- * 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;
-}