@kamino-finance/klend-sdk 5.11.3-beta.1 → 5.11.4

package/src/classes/index.ts

@@ -9,3 +9,4 @@ export * from './jupiterPerps';
 export * from './manager';
 export * from './vault';
 export * from './fraction';
+export * from './types';

package/src/classes/manager.ts

@@ -575,6 +575,37 @@ export class KaminoManager {
     return this._vaultClient.getAllVaults();
   }
 
+  /**
+   * Get all lending markets
+   * @returns an array of all lending markets
+   */
+  async getAllMarkets(): Promise<KaminoMarket[]> {
+    const lendingMarketsAccounts = await getProgramAccounts(
+      this.getConnection(),
+      this._kaminoLendProgramId,
+      LendingMarket.layout.span + 8,
+      {
+        commitment: this.getConnection().commitment ?? 'processed',
+        filters: [
+          { dataSize: LendingMarket.layout.span + 8 },
+          { memcmp: { offset: 0, bytes: bs58.encode(LendingMarket.discriminator) } },
+        ],
+      }
+    );
+
+    const markets = await Promise.all(
+      lendingMarketsAccounts.map((account) =>
+        KaminoMarket.load(
+          this._connection,
+          account.pubkey,
+          this.recentSlotDurationMs,
+          this._kaminoLendProgramId
+        )
+      )
+    );
+    return markets.filter((market): market is KaminoMarket => market !== null);
+  }
+
   /**
    * Get all vaults for owner
    * @param owner the pubkey of the vaults owner
@@ -949,7 +980,7 @@ export class KaminoManager {
   }
 
   /**
-   * This retruns an array of scope oracle configs to be used to set the scope price and twap oracles for a reserve
+   * This returns an array of scope oracle configs to be used to set the scope price and twap oracles for a reserve
    * @param feed - scope feed to fetch prices from
    * @param cluster - cluster to fetch from, this should be left unchanged unless working on devnet or locally
    * @returns - an array of scope oracle configs

package/src/classes/market.ts

@@ -29,7 +29,7 @@ import Decimal from 'decimal.js';
 import { FarmState } from '@kamino-finance/farms-sdk';
 import { PROGRAM_ID } from '../idl_codegen/programId';
 import bs58 from 'bs58';
-import { OraclePrices, Scope } from '@kamino-finance/scope-sdk';
+import { OraclePrices, Scope, U16_MAX } from '@kamino-finance/scope-sdk';
 import { Fraction } from './fraction';
 import { chunks, KaminoPrices, MintToPriceMap } from '@kamino-finance/kliquidity-sdk';
 import { parseTokenSymbol, parseZeroPaddedUtf8 } from './utils';
@@ -59,8 +59,6 @@ export class KaminoMarket {
 
   readonly programId: PublicKey;
 
-  scope: Scope;
-
   private readonly recentSlotDurationMs: number;
 
   private constructor(
@@ -68,7 +66,6 @@ export class KaminoMarket {
     state: LendingMarket,
     marketAddress: string,
     reserves: Map<PublicKey, KaminoReserve>,
-    scope: Scope,
     recentSlotDurationMs: number,
     programId: PublicKey = PROGRAM_ID
   ) {
@@ -78,7 +75,6 @@ export class KaminoMarket {
     this.reserves = reserves;
     this.reservesActive = getReservesActive(this.reserves);
     this.programId = programId;
-    this.scope = scope;
     this.recentSlotDurationMs = recentSlotDurationMs;
   }
 
@@ -97,7 +93,6 @@ export class KaminoMarket {
     marketAddress: PublicKey,
     recentSlotDurationMs: number,
     programId: PublicKey = PROGRAM_ID,
-    setupLocalTest: boolean = false,
     withReserves: boolean = true
   ) {
     const market = await LendingMarket.fetch(connection, marketAddress, programId);
@@ -105,26 +100,12 @@ export class KaminoMarket {
     if (market === null) {
       return null;
     }
-    let scope: Scope;
-    if (!setupLocalTest) {
-      scope = new Scope('mainnet-beta', connection);
-    } else {
-      scope = new Scope('localnet', connection);
-    }
 
     const reserves = withReserves
       ? await getReservesForMarket(marketAddress, connection, programId, recentSlotDurationMs)
       : new Map<PublicKey, KaminoReserve>();
 
-    return new KaminoMarket(
-      connection,
-      market,
-      marketAddress.toString(),
-      reserves,
-      scope,
-      recentSlotDurationMs,
-      programId
-    );
+    return new KaminoMarket(connection, market, marketAddress.toString(), reserves, recentSlotDurationMs, programId);
   }
 
   async reload(): Promise<void> {
@@ -1186,9 +1167,9 @@ export class KaminoMarket {
   /**
    * Get all Scope prices used by all the market reserves
    */
-  async getAllScopePrices(oraclePrices?: OraclePrices): Promise<KaminoPrices> {
+  async getAllScopePrices(scope: Scope, oraclePrices?: OraclePrices): Promise<KaminoPrices> {
     if (!oraclePrices) {
-      oraclePrices = await this.scope.getOraclePrices();
+      oraclePrices = await scope.getOraclePrices();
     }
     const spot: MintToPriceMap = {};
     const twaps: MintToPriceMap = {};
@@ -1199,11 +1180,11 @@ export class KaminoMarket {
       const chain = reserve.state.config.tokenInfo.scopeConfiguration.priceChain;
       const twapChain = reserve.state.config.tokenInfo.scopeConfiguration.twapChain.filter((x) => x > 0);
       if (oracle && isNotNullPubkey(oracle) && chain && Scope.isScopeChainValid(chain)) {
-        const spotPrice = await this.scope.getPriceFromChain(chain, oraclePrices);
+        const spotPrice = await scope.getPriceFromChain(chain, oraclePrices);
         spot[tokenMint] = { price: spotPrice.price, name: tokenName };
       }
       if (oracle && isNotNullPubkey(oracle) && twapChain && Scope.isScopeChainValid(twapChain)) {
-        const twap = await this.scope.getPriceFromChain(twapChain, oraclePrices);
+        const twap = await scope.getPriceFromChain(twapChain, oraclePrices);
         twaps[tokenMint] = { price: twap.price, name: tokenName };
       }
     }
@@ -1527,6 +1508,34 @@ export function getReservesActive(reserves: Map<PublicKey, KaminoReserve>): Map<
   return reservesActive;
 }
 
+export function getTokenIdsForScopeRefresh(kaminoMarket: KaminoMarket, reserves: PublicKey[]): number[] {
+  const tokenIds: number[] = [];
+
+  for (const reserveAddress of reserves) {
+    const reserve = kaminoMarket.getReserveByAddress(reserveAddress);
+    if (!reserve) {
+      throw new Error(`Reserve not found for reserve ${reserveAddress.toBase58()}`);
+    }
+
+    if (!reserve.state.config.tokenInfo.scopeConfiguration.priceFeed.equals(PublicKey.default)) {
+      let x = 0;
+
+      while (reserve.state.config.tokenInfo.scopeConfiguration.priceChain[x] !== U16_MAX) {
+        tokenIds.push(reserve.state.config.tokenInfo.scopeConfiguration.priceChain[x]);
+        x++;
+      }
+
+      x = 0;
+      while (reserve.state.config.tokenInfo.scopeConfiguration.twapChain[x] !== U16_MAX) {
+        tokenIds.push(reserve.state.config.tokenInfo.scopeConfiguration.twapChain[x]);
+        x++;
+      }
+    }
+  }
+
+  return tokenIds;
+}
+
 export async function getReserveFromMintAndMarket(
   connection: Connection,
   market: KaminoMarket,

package/src/classes/obligation.ts

@@ -17,6 +17,7 @@ import {
   getObligationPdaWithArgs,
   getObligationType,
   isNotNullPubkey,
+  ObligationType,
   PubkeyHashMap,
   TOTAL_NUMBER_OF_IDS_TO_CHECK,
   U64_MAX,
@@ -1593,3 +1594,8 @@ export class KaminoObligation {
     }
   }
 }
+
+// Create a function that checks if an obligation is of type obligation or obligationType
+export function isKaminoObligation(obligation: KaminoObligation | ObligationType): obligation is KaminoObligation {
+  return 'obligationAddress' in obligation;
+}

package/src/classes/vault.ts

@@ -301,7 +301,7 @@ export class KaminoVaultClient {
       ctokenVault: cTokenVault,
       systemProgram: SystemProgram.programId,
       rent: SYSVAR_RENT_PUBKEY,
-      reserveCollateralTokenProgram: vaultState.tokenProgram,
+      reserveCollateralTokenProgram: TOKEN_PROGRAM_ID,
     };
 
     const updateReserveAllocationArgs: UpdateReserveAllocationArgs = {

package/src/client.ts

@@ -22,6 +22,7 @@ import { VanillaObligation } from './utils/ObligationType';
 import { parseTokenSymbol } from './classes/utils';
 import { Env, initEnv } from '../tests/runner/setup_utils';
 import { initializeFarmsForReserve } from '../tests/runner/farms/farms_operations';
+import { Scope } from '@kamino-finance/scope-sdk';
 
 const STAGING_LENDING_MARKET = new PublicKey('6WVSwDQXrBZeQVnu6hpnsRZhodaJTZBUaC334SiiBKdb');
 const MAINNET_LENDING_MARKET = new PublicKey('7u3HeHxYDLhnCoErrtycNokbQYbWGzLs6JSDqGAv5PfF');
@@ -309,7 +310,8 @@ async function deposit(connection: Connection, wallet: Keypair, token: string, d
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
     new VanillaObligation(STAGING_LENDING_MARKET),
-    true
+    true,
+    { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -330,7 +332,8 @@ async function withdraw(connection: Connection, wallet: Keypair, token: string,
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
     new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
-    true
+    true,
+    { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -351,7 +354,8 @@ async function borrow(connection: Connection, wallet: Keypair, token: string, bo
     kaminoMarket.getReserveBySymbol(token)!.getLiquidityMint(),
     wallet.publicKey,
     new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
-    true
+    true,
+    { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' }
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());
 
@@ -373,6 +377,7 @@ async function repay(connection: Connection, wallet: Keypair, token: string, bor
     wallet.publicKey,
     new VanillaObligation(new PublicKey(STAGING_LENDING_MARKET)),
     true,
+    { scope: new Scope('mainnet-beta', connection), scopeFeed: 'hubble' },
     await connection.getSlot()
   );
   console.log('User obligation', kaminoAction.obligation!.obligationAddress.toString());

package/src/lending_operations/repay_with_collateral_operations.ts

@@ -6,12 +6,13 @@ import {
   SwapIxs,
   SwapIxsProvider,
   SwapQuoteProvider,
+  getScopeRefreshIx,
 } from '../leverage';
 import {
   createAtasIdempotent,
   getComputeBudgetAndPriorityFeeIxns,
   removeBudgetAndAtaIxns,
-  ScopeRefresh,
+  ScopePriceRefreshConfig,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -51,7 +52,7 @@ interface RepayWithCollSwapInputsProps<QuoteResponse> {
   repayAmount: Decimal;
   isClosingPosition: boolean;
   budgetAndPriorityFeeIxs?: TransactionInstruction[];
-  scopeRefresh?: ScopeRefresh;
+  scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
 }
@@ -67,7 +68,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
   repayAmount,
   isClosingPosition,
   budgetAndPriorityFeeIxs,
-  scopeRefresh,
+  scopeRefreshConfig,
   useV2Ixs,
 }: RepayWithCollSwapInputsProps<QuoteResponse>): Promise<{
   swapInputs: SwapInputs;
@@ -126,7 +127,7 @@ export async function getRepayWithCollSwapInputs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     {
       preActionIxs: [],
       swapIxs: [],
@@ -191,7 +192,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
   quoter,
   swapper,
   referrer,
-  scopeRefresh,
+  scopeRefreshConfig,
   useV2Ixs,
   logger = console.log,
 }: RepayWithCollIxsProps<QuoteResponse>): Promise<RepayWithCollIxsResponse<QuoteResponse>> {
@@ -206,7 +207,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     repayAmount,
     isClosingPosition,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     useV2Ixs,
   });
   const { debtRepayAmountLamports, flashRepayAmountLamports, maxCollateralWithdrawLamports, swapQuote } = initialInputs;
@@ -244,7 +245,7 @@ export async function getRepayWithCollIxs<QuoteResponse>({
     referrer,
     currentSlot,
     budgetAndPriorityFeeIxs,
-    scopeRefresh,
+    scopeRefreshConfig,
     swapResponse,
     isClosingPosition,
     debtRepayAmountLamports,
@@ -268,7 +269,7 @@ async function buildRepayWithCollateralIxs(
   referrer: PublicKey,
   currentSlot: number,
   budgetAndPriorityFeeIxs: TransactionInstruction[] | undefined,
-  scopeRefresh: ScopeRefresh | undefined,
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined,
   swapQuoteIxs: SwapIxs,
   isClosingPosition: boolean,
   debtRepayAmountLamports: Decimal,
@@ -286,9 +287,11 @@ 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,
+    borrowIxnIndex: budgetIxns.length + atasAndIxs.length + (scopeRefreshIxn.length > 0 ? 1 : 0),
     walletPublicKey: obligation.state.owner,
     lendingMarketAuthority: market.getLendingMarketAuthority(),
     lendingMarketAddress: market.getAddress(),
@@ -314,13 +317,13 @@ async function buildRepayWithCollateralIxs(
     currentSlot,
     obligation,
     useV2Ixs,
+    undefined,
     0,
     false,
     requestElevationGroup,
     undefined,
     undefined,
-    referrer,
-    scopeRefresh
+    referrer
   );
 
   // 4. Swap collateral to debt to repay flash loan
@@ -328,6 +331,7 @@ async function buildRepayWithCollateralIxs(
   const swapInstructions = removeBudgetAndAtaIxns(swapIxs, []);
 
   return [
+    ...scopeRefreshIxn,
     ...budgetIxns,
     ...atasAndIxs.map((x) => x.createAtaIx),
     flashBorrowIxn,

package/src/lending_operations/swap_collateral_operations.ts

@@ -6,14 +6,14 @@ import {
   KaminoObligation,
   KaminoReserve,
 } from '../classes';
-import { getFlashLoanInstructions, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
+import { getFlashLoanInstructions, getScopeRefreshIx, SwapIxsProvider, SwapQuoteProvider } from '../leverage';
 import {
   createAtasIdempotent,
   DEFAULT_MAX_COMPUTE_UNITS,
   getAssociatedTokenAddress,
   getComputeBudgetAndPriorityFeeIxns,
   PublicKeySet,
-  ScopeRefresh,
+  ScopePriceRefreshConfig,
   U64_MAX,
   uniqueAccounts,
 } from '../utils';
@@ -61,7 +61,7 @@ export interface SwapCollIxnsInputs<QuoteResponse> {
   referrer: PublicKey;
   currentSlot: number;
   budgetAndPriorityFeeIxns?: TransactionInstruction[];
-  scopeRefresh?: ScopeRefresh;
+  scopeRefreshConfig?: ScopePriceRefreshConfig;
   useV2Ixs: boolean;
   quoter: SwapQuoteProvider<QuoteResponse>;
   swapper: SwapIxsProvider<QuoteResponse>;
@@ -205,7 +205,7 @@ type SwapCollContext<QuoteResponse> = {
   referrer: PublicKey;
   currentSlot: number;
   useV2Ixs: boolean;
-  scopeRefresh: ScopeRefresh | undefined;
+  scopeRefreshConfig: ScopePriceRefreshConfig | undefined;
   logger: (msg: string, ...extra: any[]) => void;
 };
 
@@ -235,7 +235,7 @@ function extractArgsAndContext<QuoteResponse>(
       quoter: inputs.quoter,
       swapper: inputs.swapper,
       referrer: inputs.referrer,
-      scopeRefresh: inputs.scopeRefresh,
+      scopeRefreshConfig: inputs.scopeRefreshConfig,
       currentSlot: inputs.currentSlot,
       useV2Ixs: inputs.useV2Ixs,
     },
@@ -264,6 +264,18 @@ async function getKlendIxns(
   const { ataCreationIxns, targetCollAta } = getAtaCreationIxns(context);
   const setupIxns = [...context.budgetAndPriorityFeeIxns, ...ataCreationIxns];
 
+  const scopeRefreshIxn = await getScopeRefreshIx(
+    context.market,
+    context.sourceCollReserve,
+    context.targetCollReserve,
+    context.obligation,
+    context.scopeRefreshConfig
+  );
+
+  if (scopeRefreshIxn) {
+    setupIxns.unshift(...scopeRefreshIxn);
+  }
+
   const targetCollFlashBorrowedAmount = calculateTargetCollFlashBorrowedAmount(targetCollSwapOutAmount, context);
   const { targetCollFlashBorrowIxn, targetCollFlashRepayIxn } = getTargetCollFlashLoanIxns(
     targetCollFlashBorrowedAmount,
@@ -380,6 +392,7 @@ async function getDepositTargetCollIxns(
     context.obligation.state.owner,
     context.obligation,
     context.useV2Ixs,
+    undefined, // we create the scope refresh ixn outside of KaminoAction
     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
@@ -387,7 +400,6 @@ async function getDepositTargetCollIxns(
     false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
-    context.scopeRefresh,
     removesElevationGroup ? 0 : undefined // only applicable when removing the group
   );
   return {
@@ -430,6 +442,7 @@ async function getWithdrawSourceCollIxns(
     context.obligation.state.owner,
     context.obligation,
     context.useV2Ixs,
+    undefined, // we create the scope refresh ixn outside of KaminoAction
     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
@@ -437,7 +450,6 @@ async function getWithdrawSourceCollIxns(
     false, // we do not need to create a lookup table, dealing with an existing obligation
     context.referrer,
     context.currentSlot,
-    undefined, // we have refreshed scope already, during depositing
     requestedElevationGroup,
     context.obligation.deposits.has(context.targetCollReserve.address) // if our obligation already had the target coll...
       ? undefined // ... then we need no customizations here, but otherwise...

package/src/leverage/calcs.ts

@@ -35,7 +35,6 @@ export interface LeverageFormsCalcsArgs {
   targetLeverage: Decimal;
   activeTab: FormTabs;
   flashBorrowReserveFlashLoanFeePercentage: Decimal;
-  borrowFee: Decimal;
   debtBorrowFactorPct: Decimal;
   priceCollToDebt: Decimal;
   priceDebtToColl: Decimal;
@@ -63,7 +62,6 @@ export async function calculateMultiplyEffects(
     targetLeverage,
     activeTab,
     flashBorrowReserveFlashLoanFeePercentage,
-    borrowFee,
     debtBorrowFactorPct,
     priceCollToDebt,
     priceDebtToColl,
@@ -82,7 +80,6 @@ export async function calculateMultiplyEffects(
     selectedTokenMint,
     collTokenMint: collTokenMint,
     flashLoanFee: flashBorrowReserveFlashLoanFeePercentage,
-    borrowFee,
   });
 
   // calculate estimations for withdraw operation
@@ -109,7 +106,6 @@ export async function calculateMultiplyEffects(
     totalDeposited: new Decimal(deposited),
     totalBorrowed: new Decimal(borrowed),
     flashLoanFee: flashBorrowReserveFlashLoanFeePercentage, // TODO: is this the right flash borrow?
-    borrowFee,
   });
 
   if (logEstimations) {
@@ -195,13 +191,11 @@ export const calcBorrowAmount = ({
   targetLeverage,
   priceCollToDebt,
   flashBorrowFee,
-  borrowFee,
 }: {
   depositTokenAmount: Decimal;
   targetLeverage: Decimal;
   priceCollToDebt: Decimal;
   flashBorrowFee: Decimal;
-  borrowFee: Decimal;
 }) => {
   const initialCollAmountInCollToken = depositTokenAmount;
 
@@ -210,8 +204,7 @@ export const calcBorrowAmount = ({
   const finalDebtAmountInDebtToken = finalDebtAmountInCollToken.mul(priceCollToDebt);
 
   const flashFeeFactor = new Decimal(1).add(flashBorrowFee);
-  const borrowFeeFactor = new Decimal(1).add(borrowFee);
-  const debtTokenToBorrow = finalDebtAmountInDebtToken.mul(flashFeeFactor).mul(borrowFeeFactor);
+  const debtTokenToBorrow = finalDebtAmountInDebtToken.mul(flashFeeFactor);
 
   return debtTokenToBorrow;
 };
@@ -281,7 +274,6 @@ export function calcWithdrawAmounts(params: WithdrawParams): WithdrawResult {
     priceCollToDebt: new Decimal(priceCollToDebt),
     targetLeverage: new Decimal(targetLeverage),
     flashBorrowFee: new Decimal(0),
-    borrowFee: new Decimal(0),
   });
 
   const adjustDepositPosition = currentDepositPosition.minus(targetDeposit);
@@ -301,7 +293,6 @@ interface UseEstimateAdjustAmountsProps {
   totalDeposited: Decimal;
   totalBorrowed: Decimal;
   flashLoanFee: Decimal;
-  borrowFee: Decimal;
 }
 
 /**
@@ -312,7 +303,7 @@ interface UseEstimateAdjustAmountsProps {
  */
 export const estimateAdjustMode = (
   priceCollToDebt: Decimal,
-  { targetLeverage, totalDeposited, totalBorrowed, flashLoanFee, borrowFee }: UseEstimateAdjustAmountsProps
+  { targetLeverage, totalDeposited, totalBorrowed, flashLoanFee }: UseEstimateAdjustAmountsProps
 ) => {
   return calcAdjustAmounts({
     currentBorrowPosition: totalBorrowed,
@@ -320,7 +311,6 @@ export const estimateAdjustMode = (
     priceCollToDebt,
     targetLeverage,
     flashLoanFee,
-    borrowFee,
   });
 };
 
@@ -330,7 +320,6 @@ export interface AdjustLeverageParams {
   currentDepositPosition: Decimal;
   priceCollToDebt: Decimal;
   flashLoanFee: Decimal;
-  borrowFee: Decimal;
 }
 
 interface AdjustLeverageResult {
@@ -354,7 +343,6 @@ export function calcAdjustAmounts({
   currentDepositPosition,
   priceCollToDebt,
   flashLoanFee,
-  borrowFee,
 }: AdjustLeverageParams): AdjustLeverageResult {
   const initialDeposit = currentDepositPosition.minus(currentBorrowPosition.div(priceCollToDebt));
   const targetDeposit = initialDeposit.mul(targetLeverage);
@@ -364,7 +352,6 @@ export function calcAdjustAmounts({
     priceCollToDebt: new Decimal(priceCollToDebt),
     targetLeverage: new Decimal(targetLeverage),
     flashBorrowFee: flashLoanFee,
-    borrowFee,
   });
 
   const adjustDepositPosition = targetDeposit.minus(currentDepositPosition);
@@ -384,7 +371,6 @@ interface UseTransactionInfoStats {
   selectedTokenMint: PublicKey;
   collTokenMint: PublicKey;
   flashLoanFee: Decimal;
-  borrowFee: Decimal;
   slippagePct?: Decimal;
 }
 
@@ -398,7 +384,6 @@ export const estimateDepositMode = ({
   selectedTokenMint,
   collTokenMint,
   flashLoanFee,
-  borrowFee,
   slippagePct = new Decimal(0),
 }: UseTransactionInfoStats) => {
   const isDepositingCollToken = selectedTokenMint.equals(collTokenMint);
@@ -413,7 +398,6 @@ export const estimateDepositMode = ({
     targetLeverage: new Decimal(targetLeverage),
     priceCollToDebt: new Decimal(priceCollToDebt),
     flashBorrowFee: new Decimal(flashLoanFee),
-    borrowFee: new Decimal(borrowFee),
   });
 
   const slippageFactor = new Decimal(1).add(slippagePct.div(new Decimal(100)));