Merge pull request DefiLlama#1372 from DefiLlama/across

Across
vfat-io · Apr 2, 2024 · 1121d15 · 1121d15
2 parents 20f89fd + 2ca5536
commit 1121d15
Showing 1 changed file with 84 additions and 32 deletions.
diff --git a/fees/across.ts b/fees/across.ts
@@ -1,47 +1,99 @@
-import { Chain } from "@defillama/sdk/build/general"
-import { ChainBlocks, FetchOptions, FetchResultFees, SimpleAdapter } from "../adapters/types"
-import { CHAIN } from "../helpers/chains"
+import { Chain } from "@defillama/sdk/build/general";
+import {
+  ChainBlocks,
+  FetchOptions,
+  FetchResultFees,
+  SimpleAdapter,
+} from "../adapters/types";
+import { CHAIN } from "../helpers/chains";
 
 const abis = {
-  "FundsDeposited": "event FundsDeposited(uint256 amount, uint256 originChainId, uint256 indexed destinationChainId, int64 relayerFeePct, uint32 indexed depositId, uint32 quoteTimestamp, address originToken, address recipient, address indexed depositor, bytes message)",
-  "FilledRelay": "event FilledRelay(uint256 amount, uint256 totalFilledAmount, uint256 fillAmount, uint256 repaymentChainId, uint256 indexed originChainId, uint256 destinationChainId, int64 relayerFeePct, int64 realizedLpFeePct, uint32 indexed depositId, address destinationToken, address relayer, address indexed depositor, address recipient, bytes message, (address recipient, bytes message, int64 relayerFeePct, bool isSlowRelay, int256 payoutAdjustmentPct) updatableRelayData)"
-}
-const topic0_fund_disposit_v2 = '0xafc4df6845a4ab948b492800d3d8a25d538a102a2bc07cd01f1cfa097fddcff6';
-const topic0_filled_replay_v2 = '0x8ab9dc6c19fe88e69bc70221b339c84332752fdd49591b7c51e66bae3947b73c';
-
+  FundsDeposited:
+    "event FundsDeposited(uint256 amount, uint256 originChainId, uint256 indexed destinationChainId, int64 relayerFeePct, uint32 indexed depositId, uint32 quoteTimestamp, address originToken, address recipient, address indexed depositor, bytes message)",
+  V3FundsDeposited:
+    "event V3FundsDeposited(address inputToken, address outputToken, uint256 inputAmount, uint256 outputAmount, uint256 indexed destinationChainId, uint32 depositId, uint32 quoteTimestamp, uint32 fillDeadline, uint32 exclusivityDeadline, address indexed depositor, address recipient, address exclusiveRelayer, bytes message)",
+  FilledRelay:
+    "event FilledRelay(uint256 amount, uint256 totalFilledAmount, uint256 fillAmount, uint256 repaymentChainId, uint256 indexed originChainId, uint256 destinationChainId, int64 relayerFeePct, int64 realizedLpFeePct, uint32 indexed depositId, address destinationToken, address relayer, address indexed depositor, address recipient, bytes message, (address recipient, bytes message, int64 relayerFeePct, bool isSlowRelay, int256 payoutAdjustmentPct) updatableRelayData)",
+  FilledV3Relay:
+    "event FilledV3Relay(address inputToken, address outputToken, uint256 inputAmount, uint256 outputAmount, uint256 repaymentChainId, uint256 indexed originChainId, uint32 indexed depositId, uint32 fillDeadline, uint32 exclusivityDeadline, address exclusiveRelayer, address indexed relayer, address depositor, address recipient, bytes message, (address updatedRecipient, bytes updatedMessage, uint256 updatedOutputAmount, uint8 fillType) relayExecutionInfo)",
+};
+const topic0_fund_disposit_v2 =
+  "0xafc4df6845a4ab948b492800d3d8a25d538a102a2bc07cd01f1cfa097fddcff6";
+const topic0_fund_disposit_v3 =
+  "0xa123dc29aebf7d0c3322c8eeb5b999e859f39937950ed31056532713d0de396f";
+const topic0_filled_replay_v2 =
+  "0x8ab9dc6c19fe88e69bc70221b339c84332752fdd49591b7c51e66bae3947b73c";
+const topic0_filled_replay_v3 =
+  "0x571749edf1d5c9599318cdbc4e28a6475d65e87fd3b2ddbe1e9a8d5e7a0f0ff7";
 
 const address: any = {
-  [CHAIN.ETHEREUM]: '0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5',
-  [CHAIN.ARBITRUM]: '0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A',
-  [CHAIN.OPTIMISM]: '0x6f26Bf09B1C792e3228e5467807a900A503c0281',
-  [CHAIN.POLYGON]: '0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096'
-}
-
+  [CHAIN.ETHEREUM]: "0x5c7BCd6E7De5423a257D81B442095A1a6ced35C5",
+  [CHAIN.ARBITRUM]: "0xe35e9842fceaCA96570B734083f4a58e8F7C5f2A",
+  [CHAIN.OPTIMISM]: "0x6f26Bf09B1C792e3228e5467807a900A503c0281",
+  [CHAIN.POLYGON]: "0x9295ee1d8C5b022Be115A2AD3c30C72E34e7F096",
+};
 const graph = (chain: Chain) => {
-  return async (timestamp: number, _: ChainBlocks, { createBalances, getLogs, }: FetchOptions): Promise<FetchResultFees> => {
-    const dailyFees = createBalances()
-    const logs_fund_disposit = (await getLogs({
-      target: address[chain],
-      eventAbi: abis.FundsDeposited,
-      topic: topic0_fund_disposit_v2,
-    })).filter((a: any) => Number(a!.destinationChainId) === 288)
+  return async (
+    timestamp: number,
+    _: ChainBlocks,
+    { createBalances, getLogs }: FetchOptions,
+  ): Promise<FetchResultFees> => {
+    const dailyFees = createBalances();
+    const logs_fund_disposit = (
+      await getLogs({
+        target: address[chain],
+        eventAbi: abis.FundsDeposited,
+        topic: topic0_fund_disposit_v2,
+      })
+    ).filter((a: any) => Number(a!.destinationChainId) === 288);
+
+    const logs_fund_disposit_v3 = (
+      await getLogs({
+        target: address[chain],
+        eventAbi: abis.V3FundsDeposited,
+        topic: topic0_fund_disposit_v3,
+      })
+    ).filter((a: any) => Number(a!.destinationChainId) === 288);
 
-    const logs_filled_replay = (await getLogs({
+    const logs_filled_replay = await getLogs({
       target: address[chain],
       eventAbi: abis.FilledRelay,
       topic: topic0_filled_replay_v2,
-    }))
+    });
+
+    const logs_filled_replay_v3 = await getLogs({
+      target: address[chain],
+      eventAbi: abis.FilledV3Relay,
+      topic: topic0_filled_replay_v3,
+    });
+
+    logs_fund_disposit.map((a: any) =>
+      dailyFees.add(a.originToken, Number(a.amount * a.relayerFeePct) / 1e18),
+    );
+
+    logs_fund_disposit_v3.map((a: any) =>
+      dailyFees.add(a.outputToken, Number(a.inputAmount - a.outputAmount)),
+    );
+
+    logs_filled_replay.map((a: any) =>
+      dailyFees.add(
+        a.destinationToken,
+        (Number(a.amount) * Number(a.relayerFeePct + a.realizedLpFeePct)) /
+          1e18,
+      ),
+    );
+
+    logs_filled_replay_v3.map((a: any) =>
+      dailyFees.add(a.outputToken, Number(a.inputAmount - a.outputAmount)),
+    );
 
-    logs_fund_disposit.map((a: any) => dailyFees.add(a.originToken, Number(a.amount * a.relayerFeePct) / 1e18));
-    logs_filled_replay.map((a: any) => dailyFees.add(a.destinationToken, Number(a.amount) * Number(a.relayerFeePct + a.realizedLpFeePct) / 1e18))
     return {
       dailyFees,
       dailySupplySideRevenue: dailyFees,
-      timestamp
-    }
-  }
-}
-
+      timestamp,
+    };
+  };
+};
 
 const adapter: SimpleAdapter = {
   adapter: {
@@ -61,7 +113,7 @@ const adapter: SimpleAdapter = {
       fetch: graph(CHAIN.POLYGON),
       start: 1682840443,
     },
-  }
+  },
 };
 
 export default adapter;