@kamino-finance/klend-sdk 5.11.5-beta.0 → 5.11.6-beta.0

package/src/idl_codegen_kamino_vault/errors/custom.ts

@@ -43,9 +43,6 @@ export type CustomError =
   | ManagementFeeGreaterThanMaxAllowed
   | VaultAUMZero
   | MissingReserveForBatchRefresh
-  | MinWithdrawAmountTooBig
-  | InvestTooSoon
-  | WrongAdminOrAllocationAdmin
 
 export class DepositAmountsZero extends Error {
   static readonly code = 7000
@@ -531,39 +528,6 @@ export class MissingReserveForBatchRefresh extends Error {
   }
 }
 
-export class MinWithdrawAmountTooBig extends Error {
-  static readonly code = 7044
-  readonly code = 7044
-  readonly name = "MinWithdrawAmountTooBig"
-  readonly msg = "Min withdraw amount is too big"
-
-  constructor(readonly logs?: string[]) {
-    super("7044: Min withdraw amount is too big")
-  }
-}
-
-export class InvestTooSoon extends Error {
-  static readonly code = 7045
-  readonly code = 7045
-  readonly name = "InvestTooSoon"
-  readonly msg = "Invest is called too soon after last invest"
-
-  constructor(readonly logs?: string[]) {
-    super("7045: Invest is called too soon after last invest")
-  }
-}
-
-export class WrongAdminOrAllocationAdmin extends Error {
-  static readonly code = 7046
-  readonly code = 7046
-  readonly name = "WrongAdminOrAllocationAdmin"
-  readonly msg = "Wrong admin or allocation admin"
-
-  constructor(readonly logs?: string[]) {
-    super("7046: Wrong admin or allocation admin")
-  }
-}
-
 export function fromCode(code: number, logs?: string[]): CustomError | null {
   switch (code) {
     case 7000:
@@ -654,12 +618,6 @@ export function fromCode(code: number, logs?: string[]): CustomError | null {
       return new VaultAUMZero(logs)
     case 7043:
       return new MissingReserveForBatchRefresh(logs)
-    case 7044:
-      return new MinWithdrawAmountTooBig(logs)
-    case 7045:
-      return new InvestTooSoon(logs)
-    case 7046:
-      return new WrongAdminOrAllocationAdmin(logs)
   }
 
   return null

package/src/idl_codegen_kamino_vault/instructions/giveUpPendingFees.ts

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

@@ -11,7 +11,6 @@ export interface InitVaultAccounts {
   tokenVault: PublicKey
   baseTokenMint: PublicKey
   sharesMint: PublicKey
-  adminTokenAccount: PublicKey
   systemProgram: PublicKey
   rent: PublicKey
   tokenProgram: PublicKey
@@ -29,7 +28,6 @@ export function initVault(
     { pubkey: accounts.tokenVault, isSigner: false, isWritable: true },
     { pubkey: accounts.baseTokenMint, isSigner: false, isWritable: false },
     { pubkey: accounts.sharesMint, isSigner: false, isWritable: true },
-    { pubkey: accounts.adminTokenAccount, isSigner: false, isWritable: true },
     { pubkey: accounts.systemProgram, isSigner: false, isWritable: false },
     { pubkey: accounts.rent, isSigner: false, isWritable: false },
     { pubkey: accounts.tokenProgram, isSigner: false, isWritable: false },

package/src/idl_codegen_kamino_vault/instructions/initializeSharesMetadata.ts

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

@@ -10,7 +10,7 @@ export interface UpdateReserveAllocationArgs {
 }
 
 export interface UpdateReserveAllocationAccounts {
-  signer: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   reserveCollateralMint: PublicKey
@@ -29,7 +29,7 @@ export function updateReserveAllocation(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.signer, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, isSigner: true, isWritable: true },
     { pubkey: accounts.vaultState, isSigner: false, isWritable: true },
     { 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 {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   baseVaultAuthority: PublicKey
   sharesMetadata: PublicKey
@@ -30,7 +30,7 @@ export function updateSharesMetadata(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, 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 {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   klendProgram: PublicKey
 }
@@ -26,7 +26,7 @@ export function updateVaultConfig(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: false },
+    { pubkey: accounts.adminAuthority, 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 {
-  vaultAdminAuthority: PublicKey
+  adminAuthority: PublicKey
   vaultState: PublicKey
   reserve: PublicKey
   tokenVault: PublicKey
@@ -29,7 +29,7 @@ export function withdrawPendingFees(
   programId: PublicKey = PROGRAM_ID
 ) {
   const keys: Array<AccountMeta> = [
-    { pubkey: accounts.vaultAdminAuthority, isSigner: true, isWritable: true },
+    { pubkey: accounts.adminAuthority, 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_codegen_kamino_vault/types/VaultConfigField.ts

@@ -256,29 +256,6 @@ export class Farm {
   }
 }
 
-export interface AllocationAdminJSON {
-  kind: "AllocationAdmin"
-}
-
-export class AllocationAdmin {
-  static readonly discriminator = 11
-  static readonly kind = "AllocationAdmin"
-  readonly discriminator = 11
-  readonly kind = "AllocationAdmin"
-
-  toJSON(): AllocationAdminJSON {
-    return {
-      kind: "AllocationAdmin",
-    }
-  }
-
-  toEncodable() {
-    return {
-      AllocationAdmin: {},
-    }
-  }
-}
-
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if (typeof obj !== "object") {
@@ -318,9 +295,6 @@ export function fromDecoded(obj: any): types.VaultConfigFieldKind {
   if ("Farm" in obj) {
     return new Farm()
   }
-  if ("AllocationAdmin" in obj) {
-    return new AllocationAdmin()
-  }
 
   throw new Error("Invalid enum object")
 }
@@ -362,9 +336,6 @@ export function fromJSON(
     case "Farm": {
       return new Farm()
     }
-    case "AllocationAdmin": {
-      return new AllocationAdmin()
-    }
   }
 }
 
@@ -381,7 +352,6 @@ export function layout(property?: string) {
     borsh.struct([], "Name"),
     borsh.struct([], "LookupTable"),
     borsh.struct([], "Farm"),
-    borsh.struct([], "AllocationAdmin"),
   ])
   if (property !== undefined) {
     return ret.replicate(property)

package/src/idl_codegen_kamino_vault/types/index.ts

@@ -63,7 +63,6 @@ export type VaultConfigFieldKind =
   | VaultConfigField.Name
   | VaultConfigField.LookupTable
   | VaultConfigField.Farm
-  | VaultConfigField.AllocationAdmin
 export type VaultConfigFieldJSON =
   | VaultConfigField.PerformanceFeeBpsJSON
   | VaultConfigField.ManagementFeeBpsJSON
@@ -76,7 +75,6 @@ export type VaultConfigFieldJSON =
   | VaultConfigField.NameJSON
   | VaultConfigField.LookupTableJSON
   | VaultConfigField.FarmJSON
-  | VaultConfigField.AllocationAdminJSON
 
 export { VaultAllocation } from "./VaultAllocation"
 export type {

package/src/idl_kamino_vault.json

@@ -35,11 +35,6 @@
           "isMut": true,
           "isSigner": false
         },
-        {
-          "name": "adminTokenAccount",
-          "isMut": true,
-          "isSigner": false
-        },
         {
           "name": "systemProgram",
           "isMut": false,
@@ -67,7 +62,7 @@
       "name": "updateReserveAllocation",
       "accounts": [
         {
-          "name": "signer",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -403,7 +398,7 @@
       "name": "updateVaultConfig",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": false,
           "isSigner": true
         },
@@ -435,7 +430,7 @@
       "name": "withdrawPendingFees",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -540,7 +535,7 @@
       "name": "giveUpPendingFees",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -566,7 +561,7 @@
       "name": "initializeSharesMetadata",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -625,7 +620,7 @@
       "name": "updateSharesMetadata",
       "accounts": [
         {
-          "name": "vaultAdminAuthority",
+          "name": "adminAuthority",
           "isMut": true,
           "isSigner": true
         },
@@ -858,7 +853,7 @@
         "kind": "struct",
         "fields": [
           {
-            "name": "vaultAdminAuthority",
+            "name": "adminAuthority",
             "type": "publicKey"
           },
           {
@@ -1001,16 +996,12 @@
             "name": "padding1",
             "type": "u64"
           },
-          {
-            "name": "allocationAdmin",
-            "type": "publicKey"
-          },
           {
             "name": "padding2",
             "type": {
               "array": [
                 "u128",
-                242
+                244
               ]
             }
           }
@@ -1883,9 +1874,6 @@
           },
           {
             "name": "Farm"
-          },
-          {
-            "name": "AllocationAdmin"
           }
         ]
       }
@@ -2172,21 +2160,6 @@
       "code": 7043,
       "name": "MissingReserveForBatchRefresh",
       "msg": "Missing reserve for batch refresh"
-    },
-    {
-      "code": 7044,
-      "name": "MinWithdrawAmountTooBig",
-      "msg": "Min withdraw amount is too big"
-    },
-    {
-      "code": 7045,
-      "name": "InvestTooSoon",
-      "msg": "Invest is called too soon after last invest"
-    },
-    {
-      "code": 7046,
-      "name": "WrongAdminOrAllocationAdmin",
-      "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

@@ -6,13 +6,12 @@ import {
   SwapIxs,
   SwapIxsProvider,
   SwapQuoteProvider,
-  getScopeRefreshIx,
 } from '../leverage';
 import {
   createAtasIdempotent,
   getComputeBudgetAndPriorityFeeIxns,
   removeBudgetAndAtaIxns,
-  ScopePriceRefreshConfig,
+  ScopeRefresh,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -52,16 +51,11 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   repayAmount: Decimal;
   isClosingPosition: boolean;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
-  scopeRefreshConfig?: ScopePriceRefreshConfig;
+  scopeRefresh?: ScopeRefresh;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
 
-export enum MaxWithdrawLtvCheck {
-  MAX_LTV,
-  LIQUIDATION_THRESHOLD,
-}
-
 export async function getRepayWithCollSwapInputs<QuoteResponse>({
   collTokenMint,
   currentSlot,
@@ -73,7 +67,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   repayAmount,
   isClosingPosition,
   budgetAndPriorityFeeIxs,
-  scopeRefreshConfig,
+  scopeRefresh,
   useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
@@ -132,7 +126,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefreshConfig,
+    scopeRefresh,
     {
       preActionIxs: [],
       swapIxs: [],
@@ -197,7 +191,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   quoter,
   swapper,
   referrer,
-  scopeRefreshConfig,
+  scopeRefresh,
   useV2Ixs,
   logger = console.log,
 }: RepayWithCollIxsProps<QuoteResponse>): Promise<RepayWithCollIxsResponse<QuoteResponse>> {
@@ -212,23 +206,14 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     repayAmount,
     isClosingPosition,
     budgetAndPriorityFeeIxs,
-    scopeRefreshConfig,
+    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
@@ -259,7 +244,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefreshConfig,
+    scopeRefresh,
     swapResponse,
     isClosingPosition,
     debtRepayAmountLamports,
@@ -283,7 +268,7 @@ async function buildRepayWithCollateralIxs(
   referrer: PublicKey,
   currentSlot: number,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
-  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
+  scopeRefresh: ScopeRefresh | undefined,
   swapQuoteIxs: SwapIxs,
   isClosingPosition: boolean,
   debtRepayAmountLamports: Decimal,
@@ -301,11 +286,9 @@ async function buildRepayWithCollateralIxs(
   const atasAndIxs = createAtasIdempotent(obligation.state.owner, atas);
   const [, { ata: debtTokenAta }] = atasAndIxs;
 
-  const scopeRefreshIxn = await getScopeRefreshIx(market, collReserve, debtReserve, obligation, scopeRefreshConfig);
-
   // 2. Flash borrow & repay the debt to repay amount needed
   const { flashBorrowIxn, flashRepayIxn } = getFlashLoanInstructions({
-    borrowIxnIndex: budgetIxns.length + atasAndIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
+    borrowIxnIndex: budgetIxns.length + atasAndIxs.length,
     walletPublicKey: obligation.state.owner,
     lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -320,55 +303,31 @@ 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,
-      undefined,
-      0,
-      false,
-      requestElevationGroup,
-      undefined,
-      undefined,
-      referrer
-    );
-  } 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,
-      undefined,
-      0,
-      false,
-      requestElevationGroup,
-      undefined,
-      undefined,
-      referrer
-    );
-  }
+  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;
   const swapInstructions = removeBudgetAndAtaIxns(swapIxs, []);
 
   return [
-    ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndIxs.map((x) => x.createAtaIx),
     flashBorrowIxn,
@@ -378,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;
-};