Merge pull request #87 from DefiLlama/ethereum

Ethereum
DefiLlama · Apr 19, 2024 · f5ce085 · f5ce085
2 parents 2e3840e + 6b869d9
commit f5ce085
Show file tree

Hide file tree

Showing 9 changed files with 3,393 additions and 24 deletions.
diff --git a/adapters/balance/index.ts b/adapters/balance/index.ts
@@ -1,9 +1,10 @@
-import { multiCall } from "@defillama/sdk/build/abi/abi2";
+import { multiCall, call } from "@defillama/sdk/build/abi/abi2";
 import fetch from "node-fetch";
-import { call } from "@defillama/sdk/build/abi/abi2";
 import { CliffAdapterResult } from "../../types/adapters";
 import { PromisePool } from "@supercharge/promise-pool";
 import { filterRawAmounts, findBlockHeightArray } from "../../utils/chainCalls";
+import { GAS_TOKEN } from "../../utils/constants";
+import { getBalance } from "@defillama/sdk/build/eth";
 
 let res: number;
 
@@ -37,33 +38,43 @@ export async function balance(
 
   [trackedTimestamp, decimals] = await Promise.all([
     latest(adapter, timestampDeployed),
-    call({
-      target,
-      abi: "erc20:decimals",
-      chain,
-    }),
+    target == GAS_TOKEN
+      ? 18
+      : call({
+          target,
+          abi: "erc20:decimals",
+          chain,
+        }),
   ]);
 
   const chainData = await findBlockHeightArray(trackedTimestamp, chain);
 
   await PromisePool.withConcurrency(10)
     .for(Object.keys(chainData))
-    .process(
-      async (block) =>
-        await multiCall({
-          calls: owners.map((o: string) => ({ target, params: [o] })),
-          abi: "erc20:balanceOf",
-          chain,
-          block,
-          requery: true,
-        }).then((r: (number | null)[]) => {
-          if (r.includes(null))
-            throw new Error(`balance call failed for ${adapter}`);
-          chainData[block].result = r.reduce(
-            (p: number, c: any) => Number(p) + Number(c),
-            0,
-          );
-        }),
+    .process(async (block) =>
+      target == GAS_TOKEN
+        ? await getBalance({
+            target: owners[0],
+            block: Number(block),
+            chain,
+            decimals,
+          }).catch((r) => {
+            r;
+          })
+        : await multiCall({
+            calls: owners.map((o: string) => ({ target, params: [o] })),
+            abi: "erc20:balanceOf",
+            chain,
+            block,
+            requery: true,
+          }).then((r: (number | null)[]) => {
+            if (r.includes(null))
+              throw new Error(`balance call failed for ${adapter}`);
+            chainData[block].result = r.reduce(
+              (p: number, c: any) => Number(p) + Number(c),
+              0,
+            );
+          }),
     );
 
   return filterRawAmounts(chainData, decimals);