Merge pull request #1918 from DefiLlama/migrate

Migrate

dexs/wagmi/wagmi.ts

@@ -69,8 +69,8 @@ const getData = async (chain: Chain, timestamp: number) => {
   const totalVolume = Number(data.factories[0].totalVolumeUSD);
   const totalFee = Number(data.factories[0].totalFeesUSD);
 
-  const dailyVolume = Number(data.uniswapDayData.volumeUSD);
-  const dailyFees = Number(data.uniswapDayData.feesUSD);
+  const dailyVolume = Number(data.uniswapDayData?.volumeUSD ?? '0');
+  const dailyFees = Number(data.uniswapDayData?.feesUSD ?? '0');
 
   return {
     dailyFees: `${dailyFees}`,

fees/babydogeswap.ts

@@ -1,17 +1,14 @@
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
 // 0.2% to LP providers
 // 0.05% to treasury
 // 0.05% to buy back and burn BabyDoge!
 
-const adapters = univ2DimensionAdapter({
+const adapters = univ2DimensionAdapter2({
   graphUrls: {
     [CHAIN.BSC]: "https://graph-bsc-mainnet.babydoge.com/subgraphs/name/babydoge/exchange"
   },
-  dailyVolume: {
-    factory: "factoryDayData"
-  },
   totalVolume: {
     factory: "babyDogeFactories"
   },

fees/biswap.ts

@@ -1,13 +1,10 @@
-import * as sdk from "@defillama/sdk";
+import { graph } from "@defillama/sdk";
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
-const adapters = univ2DimensionAdapter({
+const adapters = univ2DimensionAdapter2({
   graphUrls: {
-    [CHAIN.BSC]: sdk.graph.modifyEndpoint('2D9rXpMTvAgofWngsyRE17jKr5ywrU4W3Eaa71579qkd')
-  },
-  dailyVolume: {
-    factory: "pancakeDayData"
+    [CHAIN.BSC]: graph.modifyEndpoint('2D9rXpMTvAgofWngsyRE17jKr5ywrU4W3Eaa71579qkd')
   },
   totalVolume: {
     factory: "pancakeFactories"

fees/elk.ts

@@ -1,8 +1,8 @@
 import * as sdk from "@defillama/sdk";
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
-const adapter = univ2DimensionAdapter({
+const adapter = univ2DimensionAdapter2({
   graphUrls: {
     [CHAIN.ARBITRUM]: sdk.graph.modifyEndpoint('B8TGNwQ8xMoeFCdsv9dPkciRBpEYAy1UxmXDr7nc9fpE'),
     [CHAIN.AVAX]: sdk.graph.modifyEndpoint('2dyce92CewvhV17C8BMFoMCgaXdPTtwBzaz8AReQR3YV'),
@@ -22,9 +22,6 @@ const adapter = univ2DimensionAdapter({
     // [CHAIN.IOTEX]: "https://iotex-graph.elk.finance/subgraphs/name/elkfinance/elkdex-iotex",
     // [CHAIN.TELOS]: "https://telos-graph2.elk.finance/subgraphs/name/elkfinance/elkdex-telos"
   },
-  dailyVolume: {
-    factory: "elkDayData"
-  },
   totalVolume: {
     factory: "elkFactories"
   },

fees/ferro.ts

@@ -1,15 +1,10 @@
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
-const adapters = univ2DimensionAdapter({
+const adapters = univ2DimensionAdapter2({
   graphUrls: {
     [CHAIN.CRONOS]: "https://graph.cronoslabs.com/subgraphs/name/ferro/swap",
   },
-  dailyVolume: {
-    factory: "dailyVolume",
-    field: "volume",
-    dateField: "timestamp"
-  },
   totalVolume: {
     factory: "tradeVolumes",
     field: "volume"

fees/honeyswap.ts

@@ -1,14 +1,11 @@
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
-const adapters = univ2DimensionAdapter({
+const adapters = univ2DimensionAdapter2({
   graphUrls: {
     [CHAIN.POLYGON]: " https://api.thegraph.com/subgraphs/name/1hive/honeyswap-polygon",
     [CHAIN.XDAI]: "https://api.thegraph.com/subgraphs/name/1hive/honeyswap-xdai"
   },
-  dailyVolume: {
-    factory: "honeyswapDayData"
-  },
   totalVolume: {
     factory: "honeyswapFactories"
   },

fees/mimo.ts

@@ -1,19 +1,14 @@
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
-const adapter = univ2DimensionAdapter({
+const adapter = univ2DimensionAdapter2({
   graphUrls: {
     [CHAIN.IOTEX]: "https://graph.mimo.exchange/subgraphs/name/mimo/mainnet"
   },
   totalVolume: {
     factory: "uniswapFactories",
     field: "totalVolumeUSD",
   },
-  dailyVolume: {
-    factory: "uniswapDayData",
-    field: "dailyVolumeUSD",
-    dateField: "date"
-  },
   feesPercent: {
     type: "volume",
     UserFees: 0.3,

fees/mojitoswap.ts

@@ -1,11 +1,11 @@
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
 const graphUrls = {
   [CHAIN.KCC]: "https://thegraph.kcc.network/subgraphs/name/mojito/swap",
 };
 
-const adapter = univ2DimensionAdapter({
+const adapter = univ2DimensionAdapter2({
   graphUrls,
   feesPercent: {
     type: "volume",

fees/pangolin.ts

@@ -1,13 +1,10 @@
-import * as sdk from "@defillama/sdk";
+import { graph } from "@defillama/sdk";
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
-const adapter = univ2DimensionAdapter({
+const adapter = univ2DimensionAdapter2({
   graphUrls: {
-    [CHAIN.AVAX]: sdk.graph.modifyEndpoint('CPXTDcwh6tVP88QvFWW7pdvZJsCN4hSnfMmYeF1sxCLq')
-  },
-  dailyVolume: {
-    factory: "pangolinDayData"
+    [CHAIN.AVAX]: graph.modifyEndpoint('CPXTDcwh6tVP88QvFWW7pdvZJsCN4hSnfMmYeF1sxCLq')
   },
   totalVolume: {
     factory: "pangolinFactories"

fees/vvs-finance.ts

@@ -1,13 +1,10 @@
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
-const adapters = univ2DimensionAdapter({
+const adapters = univ2DimensionAdapter2({
   graphUrls: {
     [CHAIN.CRONOS]: "https://graph.cronoslabs.com/subgraphs/name/vvs/exchange"
   },
-  dailyVolume: {
-    factory: "vvsDayData"
-  },
   totalVolume: {
     factory: "vvsFactories"
   },

fees/wigoswap.ts

@@ -1,13 +1,10 @@
-import * as sdk from "@defillama/sdk";
+import { graph } from "@defillama/sdk";
 import { CHAIN } from "../helpers/chains";
-import { univ2DimensionAdapter } from "../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../helpers/getUniSubgraph";
 
-const adapters = univ2DimensionAdapter({
+const adapters = univ2DimensionAdapter2({
   graphUrls: {
-    [CHAIN.FANTOM]: sdk.graph.modifyEndpoint('71os49womDk3DFcNRCAFYzATxxMgWpSMKhRn5ih6aWF1')
-  },
-  dailyVolume: {
-    factory: "wigoDayData"
+    [CHAIN.FANTOM]: graph.modifyEndpoint('71os49womDk3DFcNRCAFYzATxxMgWpSMKhRn5ih6aWF1')
   },
   totalVolume: {
     factory: "wigoswapFactories"

helpers/getUniSubgraph/index.ts

@@ -449,6 +449,32 @@ function univ2DimensionAdapter(params: IGetChainVolumeParams, meta: BaseAdapter[
   return adapter;
 }
 
+function univ2DimensionAdapter2(params: IGetChainVolumeParams, meta: BaseAdapter[string]['meta']) {
+  const graphs = getGraphDimensions2(params);
+
+  const adapter: SimpleAdapter = {
+    adapter: Object.keys(params.graphUrls).reduce((acc, chain) => {
+      return {
+        ...acc,
+        [chain]: {
+          fetch: graphs(chain as Chain),
+          start: getStartTimestamp({
+            endpoints: params.graphUrls,
+            chain,
+            volumeField: params.dailyVolume?.field,
+            dailyDataField: params.dailyVolume?.factory + "s",
+            dateField: params.dailyVolume?.dateField,
+          }),
+          meta,
+        },
+      };
+    }, {} as BaseAdapter),
+    version: 2
+  };
+
+  return adapter;
+}
+
 function wrapGraphError(e: Error) {
   const message = (e as any).response?.errors?.[0]?.message ?? e.message;
   return new Error(shortenString(message));
@@ -463,6 +489,7 @@ export {
   getGraphDimensions,
   getGraphDimensions2,
   univ2DimensionAdapter,
+  univ2DimensionAdapter2,
   DEFAULT_TOTAL_VOLUME_FACTORY,
   DEFAULT_TOTAL_VOLUME_FIELD,
   DEFAULT_DAILY_VOLUME_FACTORY,

protocols/alita-finance/index.ts

@@ -1,11 +1,10 @@
-import * as sdk from "@defillama/sdk";
-import { univ2Adapter } from "../../helpers/getUniSubgraphVolume";
+import { graph } from "@defillama/sdk";
 import { CHAIN } from "../../helpers/chains";
-import { univ2DimensionAdapter } from "../../helpers/getUniSubgraph";
+import { univ2DimensionAdapter2 } from "../../helpers/getUniSubgraph";
 
-const adapter = univ2DimensionAdapter({
+const adapter = univ2DimensionAdapter2({
   graphUrls: {
-    [CHAIN.BSC]: sdk.graph.modifyEndpoint('FBPHPJNE1jX18Lz8rgscvsigfxAUXakUC8w9KMid4dDz')
+    [CHAIN.BSC]: graph.modifyEndpoint('FBPHPJNE1jX18Lz8rgscvsigfxAUXakUC8w9KMid4dDz')
   },
   feesPercent: {
     type: "volume",