From 97a8d7a1f929a56ac52dc0089a2e5b1eeff0ea83 Mon Sep 17 00:00:00 2001
From: 0xgnek <0xgnek@gmail.com>
Date: Mon, 3 Mar 2025 17:13:24 +0000
Subject: [PATCH] fix param

---
 fees/fluid/fees.ts    | 14 +++++++-------
 fees/fluid/revenue.ts |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/fees/fluid/fees.ts b/fees/fluid/fees.ts
index 04fb37515f..41fbcae967 100644
--- a/fees/fluid/fees.ts
+++ b/fees/fluid/fees.ts
@@ -130,10 +130,10 @@ export const getVaultsT1Resolver = async (api: ChainApi) => {
   }
 }
 
-export const getFluidDexesDailyBorrowFees = async ({ fromApi, toApi, createBalances }: FetchOptions, liquidityOperateLogs: any[]) => {
+export const getFluidDexesDailyBorrowFees = async ({ fromApi, toApi, createBalances, api }: FetchOptions, liquidityOperateLogs: any[]) => {
   // borrow fees for all dexes that have smart debt pool enabled (covers smart debt vaults).
   const dailyFees = createBalances();
-  const dexes: string[] = await (await getDexResolver(fromApi)).getAllDexAddresses();
+  const dexes: string[] = await (await getDexResolver(api)).getAllDexAddresses();
 
   if(!dexes.length){
     return dailyFees;
@@ -142,7 +142,7 @@ export const getFluidDexesDailyBorrowFees = async ({ fromApi, toApi, createBalan
   const [dexStatesFrom, dexStatesTo, dexTokens] = await Promise.all([
     (await getDexResolver(fromApi)).getDexStates(dexes),
     (await getDexResolver(toApi)).getDexStates(dexes),
-    (await getDexResolver(fromApi)).getDexTokens(dexes),
+    (await getDexResolver(api)).getDexTokens(dexes),
   ]);
 
   for (const [i, dex] of dexes.entries()) {
@@ -201,10 +201,10 @@ export const getFluidDexesDailyBorrowFees = async ({ fromApi, toApi, createBalan
   return dailyFees;
 }
 
-export const getFluidVaultsDailyBorrowFees = async ({ fromApi, toApi, createBalances }: FetchOptions, liquidityOperateLogs: any[]) => {
+export const getFluidVaultsDailyBorrowFees = async ({ fromApi, toApi, createBalances, api}: FetchOptions, liquidityOperateLogs: any[]) => {
   // borrow fees for all normal debt vaults.
   const dailyFees = createBalances();
-  const vaults: string[] = await (await getVaultsResolver(fromApi)).getAllVaultsAddresses();
+  const vaults: string[] = await (await getVaultsResolver(api)).getAllVaultsAddresses();
 
   const [vaultDatasFrom, vaultDatasTo] = await Promise.all([
     (await getVaultsResolver(fromApi)).getVaultEntireData(vaults),
@@ -254,8 +254,8 @@ export const getFluidDailyFees = async (options: FetchOptions) => {
   const liquidityOperateLogs = await options.getLogs({
     target: LIQUIDITY,
     onlyArgs: true,
-    topics: [TOPIC0.logOperate],
-    eventAbi: EVENT_ABI.logOperate});
+    eventAbi: EVENT_ABI.logOperate}
+  );
 
   const [vaultFees, dexFees] = await Promise.all([
     await getFluidVaultsDailyBorrowFees(options, liquidityOperateLogs),
diff --git a/fees/fluid/revenue.ts b/fees/fluid/revenue.ts
index 75b0f91af4..fe9330b262 100644
--- a/fees/fluid/revenue.ts
+++ b/fees/fluid/revenue.ts
@@ -69,9 +69,9 @@ const getUncollectedLiquidities = async (api: ChainApi, tokens: string []) => {
   });
 }
 
-const getLiquidityRevenues = async ({ fromApi, toApi, getLogs, createBalances }: FetchOptions) => {
+const getLiquidityRevenues = async ({ fromApi, toApi, getLogs, createBalances, api }: FetchOptions) => {
   const dailyValues = createBalances();
-  const tokens: string[] = (await (await liquidityResolver(fromApi)).listedTokens()).map((t: string) => t.toLowerCase());
+  const tokens: string[] = (await (await liquidityResolver(api)).listedTokens()).map((t: string) => t.toLowerCase());
 
   // Fetch uncollected revenues for the "from" and "to" timestamps
   const [revenuesFrom, revenuesTo] = await Promise.all([
@@ -144,7 +144,7 @@ const getVaultT1CollectedRevenues = async (api: ChainApi, createBalances: Create
 const getVaultsT1Revenues = async ({ api, fromApi, toApi, createBalances, getLogs, fromTimestamp, toTimestamp }: FetchOptions) => {
   if (toTimestamp < CONFIG_FLUID[api.chain].vaultResolverExistAfterTimestamp) return 0
 
-  const vaults: string[] = await (await getVaultsT1Resolver(fromApi)).getAllVaultsAddresses();
+  const vaults: string[] = await (await getVaultsT1Resolver(api)).getAllVaultsAddresses();
 
   const [vaultUncollectedBalancesFrom, vaultUncollectedBalancesTo, vaultCollected] = await Promise.all([
     getVaultT1UncollectedRevenues(fromApi, createBalances, vaults, fromTimestamp),