Merge pull request #2230 from FeeFreeFi/master

feat: update FeeFree adpater
DefiLlama · Dec 18, 2024 · b9ca776 · b9ca776
2 parents bcfb062 + 362b7a3
commit b9ca776
Showing 1 changed file with 23 additions and 54 deletions.
diff --git a/dexs/FeeFree/index.ts b/dexs/FeeFree/index.ts
@@ -2,72 +2,37 @@ import { FetchOptions, FetchV2, SimpleAdapter } from "../../adapters/types";
 import { CHAIN } from "../../helpers/chains";
 import { addOneToken } from "../../helpers/prices";
 
-const INITIALIZE_EVENT_ABI = 'event Initialize(bytes32 id, address indexed currency0, address indexed currency1, uint24 fee, int24 tickSpacing, address hooks)';
-const SWAP_EVENT_ABI = "event Swap(bytes32 indexed id, address sender, int128 amount0, int128 amount1, uint160 sqrtPriceX96, uint128 liquidity, int24 tick, uint24 fee)";
+const SWAP_EVENT_ABI = "event Swap(address indexed sender, address indexed input, address indexed output, uint256 amountIn, uint256 amountOut, uint256 swapFee)";
 
 const CONFIG = {
-  [CHAIN.ZORA]: {
-    pool: "0xB43287b2106BC044F07aE674794f5492E851d3dC",
-    router: "0x0Fee97363deEFBE4De038D437D805A98dbEbA400",
-    fromBlock: 13704184,
-    swapFee: 10000000000000n,
-  },
-  [CHAIN.BASE]: {
-    pool: "0xc08304a5300D9a2310A603b8D7fB8470f752947F",
-    router: "0x0Fee76f15DE74A5211e5Bc2aBF95394d7f50C400",
-    fromBlock: 14089843,
-    swapFee: 10000000000000n,
-  },
+  [CHAIN.ZORA]: "0x0FeeCCFaa507d20c2b18a6381080C062d52DbF00",
+  [CHAIN.BASE]: "0x0Fee3Fa06550723cbf8590AC2f769F2F603e4000",
+  [CHAIN.SCROLL]: "0x0Feeb68668672B3d6bF3E01455164a24B266c400",
 };
 
-type Pair = {
-  id: string,
-  currency0: string;
-  currency1: string;
-};
-
-const getTokenPairs = async (options: FetchOptions): Promise<{[id:string]: Pair}> => {
-  const config = CONFIG[options.chain];
-
-  const logs = await options.api.getLogs({
-    target: config.pool,
-    eventAbi: INITIALIZE_EVENT_ABI,
-    fromBlock: config.fromBlock,
-    toBlock: options.api.block,
-    onlyArgs: true,
-  });
-
-  const pairs = logs.map(log => {
-    const [id, currency0, currency1] = log
-    return { id, currency0, currency1 }
-  });
-
-  return Object.fromEntries(pairs.map((pair) => [pair.id, pair]));
-}
-
-const fetchVolume: FetchV2 = async (options: FetchOptions) => {
+const fetch: FetchV2 = async (options: FetchOptions) => {
   const dailyVolume = options.createBalances();
   const dailyFees = options.createBalances();
-  const pairs = await getTokenPairs(options);
 
-  const config = CONFIG[options.chain];
+  const address = CONFIG[options.chain];
   const logs = await options.getLogs({
-    target: config.pool,
+    target: address,
     eventAbi: SWAP_EVENT_ABI,
   });
   logs.forEach((log: any) => {
-    const [id,,amount0, amount1] = log;
-    const pair = pairs[id];
+    const [,input, output, amountIn, amountOut, swapFee] = log;
+
     addOneToken({
       balances: dailyVolume,
       chain: options.chain,
-      token0: pair.currency0,
-      token1: pair.currency1,
-      amount0,
-      amount1,
+      token0: input,
+      token1: output,
+      amount0: amountIn,
+      amount1: amountOut,
     });
+
+    dailyFees.addGasToken(swapFee);
   });
-  dailyFees.addGasToken(config.swapFee * BigInt(logs.length));
 
   return {
     dailyVolume,
@@ -79,12 +44,16 @@ const adapter: SimpleAdapter = {
   version: 2,
   adapter: {
     [CHAIN.ZORA]: {
-      fetch: fetchVolume,
-      start: '2024-04-25',
+      fetch,
+      start: '2024-12-17',
     },
     [CHAIN.BASE]: {
-      fetch: fetchVolume,
-      start: '2024-05-05',
+      fetch,
+      start: '2024-12-17',
+    },
+    [CHAIN.SCROLL]: {
+      fetch,
+      start: '2024-12-17',
     },
   }
 }