diff --git a/fees/fluid/fees.ts b/fees/fluid/fees.ts index 1dbad8acaa..cf5c6afc33 100644 --- a/fees/fluid/fees.ts +++ b/fees/fluid/fees.ts @@ -252,7 +252,13 @@ export const getFluidVaultsDailyBorrowFees = async ({ fromApi, toApi, createBala export const getFluidDailyFees = async (options: FetchOptions) => { // fetch all operate logs at liquidity layer at once - const liquidityOperateLogs = await options.getLogs({ target: LIQUIDITY, onlyArgs: true, topics: [TOPIC0.logOperate], eventAbi: EVENT_ABI.logOperate, flatten: true, skipCacheRead: true }); + const liquidityOperateLogs = await options.getLogs({ + target: LIQUIDITY, + onlyArgs: true, + topics: [TOPIC0.logOperate], + eventAbi: EVENT_ABI.logOperate, + flatten: true + }); const [vaultFees, dexFees] = await Promise.all([ await getFluidVaultsDailyBorrowFees(options, liquidityOperateLogs), diff --git a/fees/fluid/index.ts b/fees/fluid/index.ts index e4bf639615..b55b7fac0e 100644 --- a/fees/fluid/index.ts +++ b/fees/fluid/index.ts @@ -1,18 +1,18 @@ -import { Adapter, FetchOptions, FetchV2 } from "../../adapters/types"; +import { Adapter, FetchOptions, Fetch } from "../../adapters/types"; import { CONFIG_FLUID, METHODOLOGY_FLUID } from "./config"; import { getFluidDailyFees } from "./fees"; import { getFluidDailyRevenue } from "./revenue"; -const fetch: FetchV2 = async (options: FetchOptions) => { +const fetch: Fetch = async (_t: any, _a: any, options: FetchOptions) => { const [dailyFees, dailyRevenue] = await Promise.all([ getFluidDailyFees(options), getFluidDailyRevenue(options) ]) - return { dailyFees, dailyRevenue }; + return { dailyFees, dailyRevenue, timestamp: options.startOfDay }; } const adapter: Adapter = { - version: 2, + version: 1, adapter: Object.entries(CONFIG_FLUID).reduce((acc, [chain, config]) => { acc[chain] = { meta: { methodology: METHODOLOGY_FLUID }, diff --git a/fees/fluid/revenue.ts b/fees/fluid/revenue.ts index e9653d0585..75b0f91af4 100644 --- a/fees/fluid/revenue.ts +++ b/fees/fluid/revenue.ts @@ -37,7 +37,6 @@ const revenueResolver = async (api: ChainApi) => { const block = await api.getBlock(); let address: string let abi: any = ABI.revenueResolver; - switch (api.chain) { case CHAIN.ETHEREUM: // fluid revenueResolver exist after block 19784319 @@ -50,7 +49,7 @@ const revenueResolver = async (api: ChainApi) => { case CHAIN.ARBITRUM: address = "0xFe4affaD55c7AeC012346195654634F7C786fA2c"; - break + break; case CHAIN.BASE: address = "0xFe4affaD55c7AeC012346195654634F7C786fA2c"; break; @@ -63,7 +62,7 @@ const revenueResolver = async (api: ChainApi) => { } const getUncollectedLiquidities = async (api: ChainApi, tokens: string []) => { - const revenueResolverInfo = (await revenueResolver(api)).targetInfo(); + const revenueResolverInfo = (await revenueResolver(api)).targetInfo(); return await api.multiCall({ calls: tokens.map((token) => ({ target: revenueResolverInfo.address, params: [token] })), abi: revenueResolverInfo.abi.getRevenue,