Fix start values in adapter functions

vfat-io · Feb 8, 2024 · efe39dc · efe39dc
1 parent 927a548
commit efe39dc
Show file tree

Hide file tree

Showing 171 changed files with 425 additions and 807 deletions.
diff --git a/adapters/utils/runAdapter.ts b/adapters/utils/runAdapter.ts
@@ -27,7 +27,11 @@ export default async function runAdapter(volumeAdapter: BaseAdapter, cleanCurren
       //   console.log("Result before cleaning", id, version, cleanCurrentDayTimestamp, chain, result, JSON.stringify(chainBlocks ?? {}))
       for (const [key, value] of Object.entries(result)) {
         if (ignoreKeys.includes(key)) continue;
-        if (value === undefined || value === null) throw new Error(`Value: ${value} ${key} is undefined or null`)
+        if (value === undefined || value === null) { // dont store undefined or null values
+          delete result[key]
+          continue;
+        }
+        // if (value === undefined || value === null) throw new Error(`Value: ${value} ${key} is undefined or null`)
         if (value instanceof Balances) result[key] = await value.getUSDString()
         result[key] = +Number(result[key]).toFixed(0)
         if (isNaN(result[key] as number)) throw new Error(`[${chain}]Value: ${value} ${key} is NaN`)

diff --git a/dexs/DerpDEX/index.ts b/dexs/DerpDEX/index.ts
@@ -37,15 +37,15 @@ const adapter: Adapter = {
     adapter: {
         [CHAIN.ERA]: {
           fetch: v3Graphs(CHAIN.ERA),
-          start:  async () => 1688515200
+          start:  1688515200
         },
         [CHAIN.BASE]: {
           fetch: v3Graphs(CHAIN.BASE),
-          start:  async () => 1692296100
+          start:  1692296100
         },
         [CHAIN.OP_BNB]: {
           fetch: v3Graphs(CHAIN.OP_BNB),
-          start:  async () => 1695275237
+          start:  1695275237
         }
     }
 };

diff --git a/dexs/alienfi/index.ts b/dexs/alienfi/index.ts
@@ -10,6 +10,6 @@ const adapter = univ2Adapter(endpoints, {
   dayData: "pancakeDayData",
 });
 
-adapter.adapter.arbitrum.start = async () => 1676505600;
+adapter.adapter.arbitrum.start = 1676505600;
 
 export default adapter
diff --git a/dexs/ampleswap/index.ts b/dexs/ampleswap/index.ts
@@ -6,6 +6,6 @@ const endpoints = {
 };
 const adapter = univ2Adapter(endpoints, {});
 
-adapter.adapter.bsc.start = async()=> 1631404800;
+adapter.adapter.bsc.start = 1631404800;
 
 export default adapter
diff --git a/dexs/apeswap/index.ts b/dexs/apeswap/index.ts
@@ -9,10 +9,10 @@ const adapters = univ2Adapter({
   // [CHAIN.TELOS]: "https://telos.apeswapgraphs.com/subgraphs/name/ape-swap/apeswap-graph"
 }, {});
 
-adapters.adapter.bsc.start = async () => 1613273226;
-adapters.adapter.polygon.start = async () => 1623814026;
-adapters.adapter.ethereum.start = async () => 1652239626;
-// adapters.adapter.telos.start = async () => 1665880589;
-adapters.adapter.arbitrum.start = async () => 1678406400;
+adapters.adapter.bsc.start = 1613273226;
+adapters.adapter.polygon.start = 1623814026;
+adapters.adapter.ethereum.start = 1652239626;
+// adapters.adapter.telos.start = 1665880589;
+adapters.adapter.arbitrum.start = 1678406400;
 
 export default adapters;
diff --git a/dexs/archerswap/index.ts b/dexs/archerswap/index.ts
@@ -8,6 +8,6 @@ const endpoints = {
 
 const adapter = univ2Adapter(endpoints, {});
 
-adapter.adapter.core.start = async()=> 1678060800;
+adapter.adapter.core.start = 1678060800;
 
 export default adapter
diff --git a/dexs/astroswap/index.ts b/dexs/astroswap/index.ts
@@ -11,6 +11,6 @@ const adapters = univ2Adapter({
 });
 
 
-adapters.adapter.velas.start = async () => 1643414400;
+adapters.adapter.velas.start = 1643414400;
 adapters.adapter[DISABLED_ADAPTER_KEY] = disabledAdapter;
 export default adapters;
diff --git a/dexs/auraswap/index.ts b/dexs/auraswap/index.ts
@@ -10,5 +10,5 @@ const adapters = univ2Adapter({
   totalVolume: "volumeUSD",
 });
 
-adapters.adapter.polygon.start = async () => 1654992851;
+adapters.adapter.polygon.start = 1654992851;
 export default adapters;
diff --git a/dexs/babydogeswap/index.ts b/dexs/babydogeswap/index.ts
@@ -8,5 +8,5 @@ const adapters = univ2Adapter({
   dayData: "factoryDayData",
 });
 
-adapters.adapter.bsc.start = async () => 1661780137;
+adapters.adapter.bsc.start = 1661780137;
 export default adapters;
diff --git a/dexs/babyswap/index.ts b/dexs/babyswap/index.ts
@@ -7,5 +7,5 @@ const adapters = univ2Adapter({
     factoriesName: "pancakeFactories",
     dayData: "pancakeDayData",
 });
-adapters.adapter.bsc.start = async () => 1622518288;
+adapters.adapter.bsc.start = 1622518288;
 export default adapters;
diff --git a/dexs/baseswap/index.ts b/dexs/baseswap/index.ts
@@ -3,7 +3,7 @@ import { DEFAULT_TOTAL_VOLUME_FACTORY, DEFAULT_TOTAL_VOLUME_FIELD, DEFAULT_DAILY
 import { CHAIN } from "../../helpers/chains";
 import type { BreakdownAdapter, ChainEndpoints, SimpleAdapter } from "../../adapters/types";
 import type { Chain } from "@defillama/sdk/build/general";
-import { getGraphDimensions } from "../../helpers/getUniSubgraph";
+import { getGraphDimensions, wrapGraphError } from "../../helpers/getUniSubgraph";
 import { handle200Errors } from "../../helpers/getUniSubgraph/utils";
 import { getTimestampAtStartOfDayUTC } from "../../utils/date";
 import { gql, request } from "graphql-request";
@@ -75,7 +75,7 @@ const derivativesGraph = (chain: Chain) => {
     const tokens = derivativesTokenIds[chain];
     const prices = await getPrices(derivativesTokenIds[chain].map(e => chain + ":" + e), timestamp);
 
-    const graphResTotalVolume = await request(derivativesEndpoints[chain], totalVolumeQuery, { tokens }).catch(handle200Errors).catch(e => console.error(`Failed to get total volume on ${chain} with graph ${derivativesEndpoints[chain]}: ${e.message}`));
+    const graphResTotalVolume = await request(derivativesEndpoints[chain], totalVolumeQuery, { tokens }).catch(handle200Errors).catch(e => console.error(`Failed to get total volume on ${chain} with graph ${derivativesEndpoints[chain]}: ${wrapGraphError(e).message}`));
     const totalVolume = graphResTotalVolume['datas'].reduce((acc: number, e: any) => acc + Number(e.cumulativeVolume * prices[chain + ":" + e.id].price), 0) / 1e8;
     const totalFees = graphResTotalVolume['datas'].reduce((acc: number, e: any) => acc + Number(e.cumulativeFees * prices[chain + ":" + e.id].price), 0) / 1e8;
 

diff --git a/dexs/benswap/index.ts b/dexs/benswap/index.ts
@@ -8,5 +8,5 @@ const adapters = univ2Adapter({
   dayData: "benSwapDayData",
 });
 
-adapters.adapter.smartbch.start = async () => 1632326400;
+adapters.adapter.smartbch.start = 1632326400;
 export default adapters;
diff --git a/dexs/bxh/index.ts b/dexs/bxh/index.ts
@@ -7,6 +7,6 @@ const adapters = univ2Adapter({
   // [CHAIN.AVAX]: "https://api.thegraph.com/subgraphs/name/privatelabs-chainx/bxhavax", not current daily volume
 }, {});
 
-adapters.adapter.bsc.start = async () => 1627172051;
-adapters.adapter.ethereum.start = async () => 1629764051;
+adapters.adapter.bsc.start = 1627172051;
+adapters.adapter.ethereum.start = 1629764051;
 export default adapters;
diff --git a/dexs/camelot-v3/index.ts b/dexs/camelot-v3/index.ts
@@ -11,5 +11,5 @@ const adapters = univ2Adapter({
   totalVolume: "totalVolumeUSD",
 });
 
-adapters.adapter.arbitrum.start = async () => 1680220800;
+adapters.adapter.arbitrum.start = 1680220800;
 export default adapters;
diff --git a/dexs/camelot/index.ts b/dexs/camelot/index.ts
@@ -6,5 +6,5 @@ const adapters = univ2Adapter({
     [CHAIN.ARBITRUM]: "https://api.thegraph.com/subgraphs/name/camelotlabs/camelot-amm-2"
 }, {});
 
-adapters.adapter.arbitrum.start = async () => 1668124800;
+adapters.adapter.arbitrum.start = 1668124800;
 export default adapters;
diff --git a/dexs/candyswap/index.ts b/dexs/candyswap/index.ts
@@ -11,6 +11,6 @@ const adapter = univ2Adapter(endpoints, {
   dayData: "pancakeDayData",
 });
 
-adapter.adapter.meer.start = async () => 1662940800;
+adapter.adapter.meer.start = 1662940800;
 
 export default adapter
diff --git a/dexs/carbonswap/index.ts b/dexs/carbonswap/index.ts
@@ -7,5 +7,5 @@ const adapters = univ2Adapter({
 }, {
 });
 
-adapters.adapter.energyweb.start = async () => 1618446893;
+adapters.adapter.energyweb.start = 1618446893;
 export default adapters;
diff --git a/dexs/cone/index.ts b/dexs/cone/index.ts
@@ -5,6 +5,6 @@ const endpoints = {
   [CHAIN.BSC]: "https://api.thegraph.com/subgraphs/name/cone-exchange/cone",
 };
 const adapter = univ2Adapter(endpoints, {});
-adapter.adapter.bsc.start = async () => 1626677527;
+adapter.adapter.bsc.start = 1626677527;
 
 export default adapter
diff --git a/dexs/croswap/index.ts b/dexs/croswap/index.ts
@@ -14,6 +14,6 @@ const adapters = univ2Adapter({
   dayData: "uniswapDayData"
 });
 
-adapters.adapter.cronos.start = async () => 1664409600;
+adapters.adapter.cronos.start = 1664409600;
 adapters.adapter[DISABLED_ADAPTER_KEY] = disabledAdapter;
 export default adapters;
diff --git a/dexs/dao-swap/index.ts b/dexs/dao-swap/index.ts
@@ -7,5 +7,5 @@ const adpters = univ2Adapter({
   factoriesName: "pancakeFactories",
   dayData: "pancakeDayData",
 });
-adpters.adapter.bsc.start = async () => 1663921255;
+adpters.adapter.bsc.start = 1663921255;
 export default adpters;
diff --git a/dexs/defi-swap/index.ts b/dexs/defi-swap/index.ts
@@ -9,6 +9,6 @@ const adapter = univ2Adapter({
     dailyVolume: "dailyVolumeUSD",
     totalVolume: "totalVolumeUSD",
 });
-adapter.adapter.ethereum.start = async () => 1632268798;
+adapter.adapter.ethereum.start = 1632268798;
 
 export default adapter;
diff --git a/dexs/dfx-finance/index.ts b/dexs/dfx-finance/index.ts
@@ -9,6 +9,6 @@ const adapter = univ2Adapter({
     dayData: "dfxdayData",
     dailyVolume: "dailyVolumeUSD"
 });
-adapter.adapter.ethereum.start = async () => 1621418717;
-adapter.adapter.polygon.start = async () => 1626861917;
+adapter.adapter.ethereum.start = 1621418717;
+adapter.adapter.polygon.start = 1626861917;
 export default adapter;
diff --git a/dexs/dinosaur-eggs/index.ts b/dexs/dinosaur-eggs/index.ts
@@ -7,5 +7,5 @@ const adapters = univ2Adapter({
   factoriesName: "swapFactories",
   dayData: "swapDayData"
 });
-adapters.adapter.bsc.start = async () => 1633046917;
+adapters.adapter.bsc.start = 1633046917;
 export default adapters;
diff --git a/dexs/dystopia/index.ts b/dexs/dystopia/index.ts
@@ -4,5 +4,5 @@ import { univ2Adapter } from "../../helpers/getUniSubgraphVolume";
 const adapters = univ2Adapter({
   [CHAIN.POLYGON]: "https://api.thegraph.com/subgraphs/name/dystopia-exchange/dystopia"
 }, {});
-adapters.adapter.polygon.start = async () => 1652932015;
+adapters.adapter.polygon.start = 1652932015;
 export default adapters;
diff --git a/dexs/echodex-v3/index.ts b/dexs/echodex-v3/index.ts
@@ -10,5 +10,5 @@ const adapters = univ2Adapter({
 });
 
 
-adapters.adapter.linea.start = async () => 1691107200;
+adapters.adapter.linea.start = 1691107200;
 export default adapters;
diff --git a/dexs/echodex/index.ts b/dexs/echodex/index.ts
@@ -10,5 +10,5 @@ const adapters = univ2Adapter({
 });
 
 
-adapters.adapter.linea.start = async () => 1689638400;
+adapters.adapter.linea.start = 1689638400;
 export default adapters;
diff --git a/dexs/elk/index.ts b/dexs/elk/index.ts
@@ -24,19 +24,19 @@ const adapter = univ2Adapter({
   dayData: "elkDayData",
 });
 
-adapter.adapter.arbitrum.start = async () => 1648950817;
-adapter.adapter.avax.start = async () => 1616118817;
-adapter.adapter.bsc.start = async () => 1629251617;
-adapter.adapter.fantom.start = async () => 1621562017;
-adapter.adapter.polygon.start = async () => 1618019617;
-adapter.adapter.xdai.start = async () => 1629251617;
-adapter.adapter.elastos.start = async () => 1634954017;
-adapter.adapter.okexchain.start = async () => 1649555617;
-adapter.adapter.kcc.start = async () => 1634954017;
-adapter.adapter.ethereum.start = async () => 1619747617;
-adapter.adapter.optimism.start = async () => 1651542817;
-adapter.adapter.fuse.start = async () => 1639187617;
-adapter.adapter.iotex.start = async () => 1639792417;
-adapter.adapter.telos.start = async () => 1648684800;
+adapter.adapter.arbitrum.start = 1648950817;
+adapter.adapter.avax.start = 1616118817;
+adapter.adapter.bsc.start = 1629251617;
+adapter.adapter.fantom.start = 1621562017;
+adapter.adapter.polygon.start = 1618019617;
+adapter.adapter.xdai.start = 1629251617;
+adapter.adapter.elastos.start = 1634954017;
+adapter.adapter.okexchain.start = 1649555617;
+adapter.adapter.kcc.start = 1634954017;
+adapter.adapter.ethereum.start = 1619747617;
+adapter.adapter.optimism.start = 1651542817;
+adapter.adapter.fuse.start = 1639187617;
+adapter.adapter.iotex.start = 1639792417;
+adapter.adapter.telos.start = 1648684800;
 
 export default adapter;
diff --git a/dexs/fathom-dex/index.ts b/dexs/fathom-dex/index.ts
@@ -9,5 +9,5 @@ const adapters = univ2Adapter({
 });
 
 
-adapters.adapter.xdc.start = async () => 1682640000;
+adapters.adapter.xdc.start = 1682640000;
 export default adapters;
diff --git a/dexs/gin-finance/index.ts b/dexs/gin-finance/index.ts
@@ -6,5 +6,5 @@ const adapters = univ2Adapter({
 }, {
 });
 
-adapters.adapter.boba.start = async () => 1653525524;
+adapters.adapter.boba.start = 1653525524;
 export default adapters;
diff --git a/dexs/glide-finance/index.ts b/dexs/glide-finance/index.ts
@@ -7,5 +7,5 @@ const adapters = univ2Adapter({
   factoriesName: "glideFactories",
   dayData: "glideDayData"
 });
-adapters.adapter.elastos.start = async () => 1635479215;
+adapters.adapter.elastos.start = 1635479215;
 export default adapters;
diff --git a/dexs/gravis/index.ts b/dexs/gravis/index.ts
@@ -8,6 +8,6 @@ const adapters = univ2Adapter({
 }, {
 });
 
-adapters.adapter.polygon.start = async () => 1622766258;
-adapters.adapter.bsc.start = async () => 1620174258;
+adapters.adapter.polygon.start = 1622766258;
+adapters.adapter.bsc.start = 1620174258;
 export default adapters;
diff --git a/dexs/gravity-finance/index.ts b/dexs/gravity-finance/index.ts
@@ -7,5 +7,5 @@ const adapters = univ2Adapter({
 }, {
 });
 
-adapters.adapter.polygon.start = async () => 1629419058;
+adapters.adapter.polygon.start = 1629419058;
 export default adapters;
diff --git a/dexs/hiveswap/index.ts b/dexs/hiveswap/index.ts
@@ -7,6 +7,6 @@ const endpoints = {
 
 const adapter = univ2Adapter(endpoints, {});
 
-adapter.adapter.map.start = async () => 1657929600;
+adapter.adapter.map.start = 1657929600;
 
 export default adapter
diff --git a/dexs/honeyswap/index.ts b/dexs/honeyswap/index.ts
@@ -8,7 +8,7 @@ const adapters = univ2Adapter({
     factoriesName: "honeyswapFactories",
     dayData: "honeyswapDayData",
 });
-adapters.adapter.polygon.start = async () => 1622173831;
-adapters.adapter.xdai.start = async () => 1599191431;
+adapters.adapter.polygon.start = 1622173831;
+adapters.adapter.xdai.start = 1599191431;
 
 export default adapters;
diff --git a/dexs/horizondex/index.ts b/dexs/horizondex/index.ts
@@ -11,7 +11,7 @@ const adapters = univ2Adapter({
     totalVolume: "totalVolumeUSD",
 });
 
-adapters.adapter.linea.start = async () => 1689373614;
-adapters.adapter.base.start = async () => 1690894800;
+adapters.adapter.linea.start = 1689373614;
+adapters.adapter.base.start = 1690894800;
 
 export default adapters;
diff --git a/dexs/hummus/index.ts b/dexs/hummus/index.ts
@@ -10,7 +10,6 @@ const fetch: any = async (timestamp: number, _, { getLogs, createBalances, toTim
   const dailyVolume = createBalances();
 
   const logs: any[] = await getLogs({ target: "0x248fD66e6ED1E0B325d7b80F5A7e7d8AA2b2528b", eventAbi: abi_event.swap, })
-  console.log(logs, logs.length)
   logs.forEach((log: any) => dailyVolume.add(log.toToken, Number(log.toAmount)));
 
   return { dailyVolume, timestamp: toTimestamp, };

diff --git a/dexs/hydradex/index.ts b/dexs/hydradex/index.ts
@@ -8,6 +8,7 @@ import {
   DEFAULT_DAILY_VOLUME_FACTORY,
   DEFAULT_TOTAL_VOLUME_FIELD,
   DEFAULT_DAILY_VOLUME_FIELD,
+  wrapGraphError,
 } from '../../helpers/getUniSubgraph';
 import request, { gql } from 'graphql-request';
 import disabledAdapter from '../../helpers/disabledAdapter';
@@ -24,31 +25,38 @@ const VOLUME_USD = 'volumeUSD';
 const FEES_USD = 'feesUSD';
 
 const getV2CustomBlock = async (timestamp: number) => {
-  const blockGraphQuery = gql`
+  const blockGraphQuery = `
     query get_block {
       blocks(orderBy: "height", first: 1, orderDirection: "desc", where: { timestamp_lte: ${timestamp} }) {
         number
       }
     }
   `;
-
-  const blocks = (await request(v2Endpoints[CHAIN.HYDRA], blockGraphQuery)).blocks;
-  return Number(blocks[0].number);
+  try {
+    const blocks = (await request(v2Endpoints[CHAIN.HYDRA], blockGraphQuery)).blocks;
+    return Number(blocks[0].number);
+  } catch (e) {
+    throw new Error(`Error getting block: ${CHAIN.HYDRA} ${timestamp} ${wrapGraphError(e).message}`)
+  }
 };
 
 const getV3CustomBlock = async (timestamp: number) => {
-  const blockGraphQuery = gql`
+  const blockGraphQuery = `
     query get_block {
       blocks(orderBy: "number", first: 1, orderDirection: "desc", where: { timestamp_lte: ${timestamp} }) {
         number
       }
     }
   `;
 
-  const blocks = (
-    await request('https://graph.hydradex.org/subgraphs/name/blocklytics/ethereum-blocks', blockGraphQuery)
-  ).blocks;
-  return Number(blocks[0].number);
+  try {
+    const blocks = (
+      await request('https://graph.hydradex.org/subgraphs/name/blocklytics/ethereum-blocks', blockGraphQuery)
+    ).blocks;
+    return Number(blocks[0].number);
+  } catch (e) {
+    throw new Error(`Error getting block: ${CHAIN.HYDRA} ${timestamp} ${wrapGraphError(e).message}`)
+  }
 };
 
 const v2Graph = getGraphDimensions({