revert balance fallback for now

Author: ReynardoEW

adapters/balance/index.ts

@@ -33,32 +33,13 @@ export async function latest(
   return res;
 }
 
-async function getStoredEmissions(adapter: string, sectionKey: string): Promise<CliffAdapterResult[]> {
-  try {
-    const r = await fetch(`https://api.llama.fi/emission/${adapter}`).then((r) => r.json());
-    if (!r.body) return [];
-    const data = JSON.parse(r.body);
-    const section = data.documentedData?.data?.find((s: any) => s.label === sectionKey);
-    if (!section?.data) return [];
-
-    return section.data.map((d: any) => ({
-      type: "cliff" as const,
-      start: d.timestamp,
-      amount: d.rawEmission || d.unlocked || 0
-    }));
-  } catch {
-    return [];
-  }
-}
-
 export async function balance(
   owners: string[],
   target: string,
   chain: any,
   adapter: string,
   timestampDeployed: number,
-  backfill: boolean = false,
-  sectionKey?: string
+  backfill: boolean = false
 ): Promise<CliffAdapterResult[]> {
   let trackedTimestamp: number;
   let decimals: number;
@@ -74,48 +55,41 @@ export async function balance(
         }),
   ]);
 
-  try {
-    const chainData = await findBlockHeightArray(trackedTimestamp, chain);
+  const chainData = await findBlockHeightArray(trackedTimestamp, chain);
 
-    await PromisePool.withConcurrency(10)
-      .for(Object.keys(chainData))
-      .process(async (block) =>
-        target == GAS_TOKEN
-          ? await PromisePool.withConcurrency(10)
-              .for(owners)
-              .process(async (target) => {
-                getBalance({
-                  target,
-                  block: Number(block),
-                  chain,
-                }).then((r: any) => {
-                  if (!r.output)
-                    throw new Error(`balance call failed for ${adapter}`);
-                  if (!chainData[block].result) chainData[block].result = 0;
-                  chainData[block].result += Number(r.output);
-                });
-              })
-          : 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,
-              );
-            }),
-      );
+  await PromisePool.withConcurrency(10)
+    .for(Object.keys(chainData))
+    .process(async (block) =>
+      target == GAS_TOKEN
+        ? await PromisePool.withConcurrency(10)
+            .for(owners)
+            .process(async (target) => {
+              getBalance({
+                target,
+                block: Number(block),
+                chain,
+              }).then((r: any) => {
+                if (!r.output)
+                  throw new Error(`balance call failed for ${adapter}`);
+                if (!chainData[block].result) chainData[block].result = 0;
+                chainData[block].result += Number(r.output);
+              });
+            })
+        : 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);
-  } catch {
-    if (sectionKey) {
-      return await getStoredEmissions(adapter, sectionKey);
-    }
-    return [];
-  }
+  return filterRawAmounts(chainData, decimals);
 }

protocols/merit-circle.ts

@@ -6,8 +6,8 @@ const token = "0x949D48EcA67b17269629c7194F4b727d4Ef9E5d6";
 const chain = "ethereum";
 const qty = 1e9;
 const realtime =
-  (holder: string, deployed: number, sectionKey: string) => async (backfill: boolean) =>
-    balance([holder], token, chain, "merit-circle", deployed, backfill, sectionKey).then(
+  (holder: string, deployed: number) => async (backfill: boolean) =>
+    balance([holder], token, chain, "merit-circle", deployed, backfill).then(
       (s: CliffAdapterResult[]) =>
         s.filter((c: CliffAdapterResult) => c.amount < 1e8),
     );
@@ -16,29 +16,24 @@ const merit: Protocol = {
   "Community Incentives": realtime(
     "0x56475a4a8D00b6F7b01E0879CBbba609707aef6b",
     1641513600,
-    "Community Incentives",
   ),
   Contributors: realtime(
     "0x97173277FED329ee844BAfa44D7719ad372a7150",
     1668124800,
-    "Contributors",
   ),
   "DAO Treasury": realtime(
     "0x7e9e4c0876B2102F33A1d82117Cc73B7FddD0032",
     1635548400,
-    "DAO Treasury",
   ),
   "Early Contributors": realtime(
     "0xB5A0cbB4fC7294642216Cd7AFbc3525B24316cbc",
     1652137200,
-    "Early Contributors",
   ),
   "Liquidity Rewards": manualCliff(1633042800, qty * 0.1),
   "Public Distribution": manualCliff(1633042800, qty * 0.075),
   "Retroactive Rewards": realtime(
     "0x4f6d9907fBc54feDeA9296860d36E14ccC348F7A",
     1640649600,
-    "Retroactive Rewards",
   ),
   meta: {
     notes: [],