morreeeee

vfat-io · Mar 5, 2024 · 135b6b2 · 135b6b2
1 parent f35b6b1
commit 135b6b2
Show file tree

Hide file tree

Showing 50 changed files with 77 additions and 28 deletions.
diff --git a/dexs/3xcalibur/index.ts b/dexs/3xcalibur/index.ts
@@ -20,6 +20,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.ARBITRUM]: {
       fetch: graphs(CHAIN.ARBITRUM),

diff --git a/dexs/ascent/index.ts b/dexs/ascent/index.ts
@@ -41,6 +41,7 @@ const graphsV3 = getChainVolume({
 
 
 const adapter: BreakdownAdapter = {
+  version: 2,
   breakdown: {
     v2: {
       [CHAIN.EON]: {

diff --git a/dexs/auragi/index.ts b/dexs/auragi/index.ts
@@ -20,6 +20,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.ARBITRUM]: {
       fetch: graphs(CHAIN.ARBITRUM),

diff --git a/dexs/balancer/index.ts b/dexs/balancer/index.ts
@@ -1,6 +1,6 @@
 import { Chain } from "@defillama/sdk/build/general";
 import request, { gql } from "graphql-request";
-import { BaseAdapter, BreakdownAdapter, ChainEndpoints, FetchResultVolume } from "../../adapters/types";
+import { BaseAdapter, BreakdownAdapter, ChainEndpoints, FetchResultV2, FetchResultVolume, FetchV2 } from "../../adapters/types";
 import { CHAIN } from "../../helpers/chains";
 import customBackfill from "../../helpers/customBackfill";
 import { getStartTimestamp } from "../../helpers/getStartTimestamp";
@@ -37,8 +37,8 @@ interface IPoolSnapshot {
 
 
 const v2Graphs = (chain: Chain) => {
-    return async (timestamp: number): Promise<FetchResultVolume> => {
-      const startTimestamp = getTimestampAtStartOfDayUTC(timestamp)
+    return async ({ endTimestamp }): Promise<FetchResultV2> => {
+      const startTimestamp = getTimestampAtStartOfDayUTC(endTimestamp)
       const fromTimestamp = startTimestamp - 60 * 60 * 24
       const toTimestamp = startTimestamp
       const graphQuery = gql
@@ -62,7 +62,6 @@ const v2Graphs = (chain: Chain) => {
 
       return {
         dailyVolume: `${dailyVolume}`,
-        timestamp,
       };
     };
   };
@@ -76,6 +75,7 @@ const v1graphs = getChainVolume({
 });
 
 const adapter: BreakdownAdapter = {
+  version: 2,
   breakdown: {
     v1: {
       [CHAIN.ETHEREUM]: {

diff --git a/dexs/carthage/index.ts b/dexs/carthage/index.ts
@@ -33,6 +33,7 @@ const v3Graphs = getChainVolume({
 });
 
 const adapter: BreakdownAdapter = {
+  version: 2,
   breakdown: {
     v3: {
       [CANDLE]: {

diff --git a/dexs/cherryswap/index.ts b/dexs/cherryswap/index.ts
@@ -56,6 +56,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.OKEXCHAIN]: {
       fetch: graphs(CHAIN.OKEXCHAIN),

diff --git a/dexs/clipper/index.ts b/dexs/clipper/index.ts
@@ -26,6 +26,7 @@ const graphs = getChainVolume({
 
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: Object.keys(endpoints).reduce((acc, chain: any) => {
     return {
       ...acc,

diff --git a/dexs/crescent-swap/index.ts b/dexs/crescent-swap/index.ts
@@ -19,6 +19,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.ARBITRUM]: {
       fetch: graphs(CHAIN.ARBITRUM),

diff --git a/dexs/cryptoswap/index.ts b/dexs/cryptoswap/index.ts
@@ -27,6 +27,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.BSC]: {
       fetch: graphs(CHAIN.BSC),

diff --git a/dexs/elektrik/index.ts b/dexs/elektrik/index.ts
@@ -19,6 +19,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.LIGHTLINK_PHOENIX]: {
       fetch: graphs(CHAIN.LIGHTLINK_PHOENIX),

diff --git a/dexs/fairyswap/index.ts b/dexs/fairyswap/index.ts
@@ -56,6 +56,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.FINDORA]: {
       fetch: graphs(CHAIN.FINDORA),

diff --git a/dexs/ferro/index.ts b/dexs/ferro/index.ts
@@ -21,6 +21,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.CRONOS]: {
       fetch: graphs(CHAIN.CRONOS),

diff --git a/dexs/forge/index.ts b/dexs/forge/index.ts
@@ -22,6 +22,7 @@ const v1Graph = getChainVolume({
 
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.EVMOS]: {
       fetch: v1Graph(CHAIN.EVMOS),

diff --git a/dexs/hadouken-amm/index.ts b/dexs/hadouken-amm/index.ts
@@ -24,6 +24,7 @@ const v1graphs = getChainVolume({
 
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.GODWOKEN_V1]: {
       fetch: v1graphs(CHAIN.GODWOKEN_V1 as Chain),

diff --git a/dexs/holdr/index.ts b/dexs/holdr/index.ts
@@ -23,6 +23,7 @@ const v1graphs = getChainVolume({
 
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.AURORA]: {
       fetch: v1graphs(CHAIN.AURORA as Chain),

diff --git a/dexs/integral/index.ts b/dexs/integral/index.ts
@@ -32,6 +32,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: chains.reduce((acc, chain) => {
     return {
       ...acc,

diff --git a/dexs/katana/index.ts b/dexs/katana/index.ts
@@ -64,6 +64,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [RONIN]: {
       fetch: graphs(RONIN),

diff --git a/dexs/klex-finance/index.ts b/dexs/klex-finance/index.ts
@@ -25,6 +25,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: Object.keys(endpoints).reduce((acc, chain: any) => {
     return {
       ...acc,

diff --git a/dexs/knightswap-finance/index.ts b/dexs/knightswap-finance/index.ts
@@ -23,6 +23,7 @@ const v2Graph = getChainVolume({
 
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.BSC]: {
       fetch: v2Graph(CHAIN.BSC),

diff --git a/dexs/koyo/index.ts b/dexs/koyo/index.ts
@@ -18,6 +18,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.BOBA]: {
       fetch: graphs(CHAIN.BOBA),

diff --git a/dexs/kyberswap/index.ts b/dexs/kyberswap/index.ts
@@ -1,6 +1,6 @@
 import ADDRESSES from '../../helpers/coreAssets.json'
 import request from "graphql-request";
-import { BaseAdapter, BreakdownAdapter, FetchResultVolume } from "../../adapters/types";
+import { BaseAdapter, BreakdownAdapter, FetchOptions, FetchResultVolume } from "../../adapters/types";
 import { CHAIN } from "../../helpers/chains";
 import { getStartTimestamp } from "../../helpers/getStartTimestamp";
 import {
@@ -210,15 +210,14 @@ const customeElasicVolumeFunctions: {[s: Chain]: any} = {
 function buildFromEndpoints(endpoints: typeof classicEndpoints, graphs: typeof classicGraphs, volumeField:string, dailyDataField:string, isElastic: boolean){
     return Object.keys(endpoints).reduce((acc, chain) => {
         acc[chain] = {
-        fetch: async (timestamp: number) =>  {
-            const a = (customeElasicVolumeFunctions[chain] !== undefined) && isElastic  ? await customeElasicVolumeFunctions[chain](timestamp) : (await graphs(chain as any)(timestamp, {}))
-            const elasticV2 = (kyberswapElasticV2.adapter[chain as Chain]?.fetch != undefined && isElastic) ? (await kyberswapElasticV2.adapter[chain as Chain]?.fetch(timestamp, {})) : {} as FetchResultVolume;
+        fetch: async (options: FetchOptions) =>  {
+            const a = (customeElasicVolumeFunctions[chain] !== undefined) && isElastic  ? await customeElasicVolumeFunctions[chain](options.endTimestamp) : (await graphs(chain as any)(options))
+            const elasticV2 = (kyberswapElasticV2.adapter[chain as Chain]?.fetch != undefined && isElastic) ? (await kyberswapElasticV2.adapter[chain as Chain]?.fetch(options as any, {}, options)) : {} as FetchResultVolume;
             const dailyVolume = Number(a.dailyVolume) + Number(elasticV2?.dailyVolume || 0)
             const totalVolume = Number(a.totalVolume) + Number(elasticV2?.totalVolume || 0)
             return {
               dailyVolume: `${dailyVolume}`,
               totalVolume: chain === CHAIN.ARBITRUM ? undefined :  `${totalVolume}`,
-              timestamp
             };
           },
           start: getStartTimestamp({
@@ -233,6 +232,7 @@ function buildFromEndpoints(endpoints: typeof classicEndpoints, graphs: typeof c
 }
 
 const adapter: BreakdownAdapter = {
+  version: 2,
   breakdown: {
     classic: buildFromEndpoints(classicEndpoints, classicGraphs, DEFAULT_DAILY_VOLUME_FIELD, "dmmDayDatas", false),
     elastic: buildFromEndpoints(elasticEndpoints, elasticGraphs, "volumeUSD", "kyberSwapDayDatas", true)

diff --git a/dexs/mimo/index.ts b/dexs/mimo/index.ts
@@ -24,6 +24,7 @@ const graphs = getChainVolume({
 
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: Object.keys(endpoints).reduce((acc, chain: any) => {
     return {
       ...acc,

diff --git a/dexs/mobius-money/index.ts b/dexs/mobius-money/index.ts
@@ -22,6 +22,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.CELO]: {
       fetch: graphs(CHAIN.CELO),

diff --git a/dexs/mooniswap/index.ts b/dexs/mooniswap/index.ts
@@ -25,6 +25,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [ETHEREUM]: {
       fetch: graphs(ETHEREUM),

diff --git a/dexs/okcswap/index.ts b/dexs/okcswap/index.ts
@@ -55,6 +55,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.OKEXCHAIN]: {
       fetch: graphs(CHAIN.OKEXCHAIN),

diff --git a/dexs/pegasys-v3/index.ts b/dexs/pegasys-v3/index.ts
@@ -19,6 +19,7 @@ const graphs = getChainVolume({
 });
 // rollux
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.ROLLUX]: {
       fetch: graphs(CHAIN.ROLLUX),

diff --git a/dexs/radioshack/index.ts b/dexs/radioshack/index.ts
@@ -24,6 +24,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.POLYGON]: {
       fetch: graphs(CHAIN.POLYGON),

diff --git a/dexs/reax-one-dex/index.ts b/dexs/reax-one-dex/index.ts
@@ -24,6 +24,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: Object.keys(endpoints).reduce((acc, chain: any) => {
     return {
       ...acc,

diff --git a/dexs/saddle-finance/index.ts b/dexs/saddle-finance/index.ts
@@ -22,6 +22,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.ARBITRUM]: {
       fetch: graphs(CHAIN.ARBITRUM),

diff --git a/dexs/sobal/index.ts b/dexs/sobal/index.ts
@@ -23,6 +23,7 @@ const graphs = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.NEON]: {
       fetch: graphs(CHAIN.NEON),

diff --git a/dexs/soulswap/index.ts b/dexs/soulswap/index.ts
@@ -45,6 +45,7 @@ const volume = Object.keys(endpoints).reduce(
 );
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: volume,
 };
 

diff --git a/dexs/spiritswap/index.ts b/dexs/spiritswap/index.ts
@@ -25,6 +25,7 @@ const graphs = getChainVolumeWithGasToken({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     fantom: {
       fetch: graphs("fantom"),

diff --git a/dexs/spookyswap/index.ts b/dexs/spookyswap/index.ts
@@ -32,6 +32,7 @@ const graphsV3 = getChainVolume({
 });
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [FANTOM]: {
       fetch: graphs(FANTOM),

diff --git a/dexs/sushiswap/classic.ts b/dexs/sushiswap/classic.ts
@@ -7,6 +7,7 @@ import { getGraphDimensions } from "../../helpers/getUniSubgraph";
 import {
   getChainVolumeWithGasToken,
 }  from "../../helpers/getUniSubgraphVolume";
+import { FetchOptions } from "../../adapters/types";
 
 const blacklistTokens = {
   [CHAIN.ARBITRUM]: [
@@ -150,8 +151,8 @@ const fantomGraphs =  getChainVolumeWithGasToken({
   priceToken: "coingecko:fantom"
 } as any);
 classic[CHAIN.FANTOM] = {
-  fetch: async (timestamp: number) =>   {
-    const values = await fantomGraphs(CHAIN.FANTOM)(timestamp, {});
+  fetch: async (options: FetchOptions) =>   {
+    const values = await fantomGraphs(CHAIN.FANTOM)(options);
     const vol = Number(values.dailyVolume)
     return {
       ...values,

diff --git a/dexs/swaap/index.ts b/dexs/swaap/index.ts
@@ -143,6 +143,7 @@ const v1graphs = getChainVolume({
 });
 
 const adapter: BreakdownAdapter = {
+    version: 2,
     breakdown: {
         v1: {
             [CHAIN.POLYGON]: {

diff --git a/dexs/templedao-trade/index.ts b/dexs/templedao-trade/index.ts
@@ -22,6 +22,7 @@ const graphs = getChainVolume({
 
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: Object.keys(endpoints).reduce((acc, chain: any) => {
     return {
       ...acc,

diff --git a/dexs/traderjoe/index.ts b/dexs/traderjoe/index.ts
@@ -68,6 +68,7 @@ const graphsV2 = getChainVolume({
 });
 
 const adapter: BreakdownAdapter = {
+  version: 2,
   breakdown: {
     v1: {
       [CHAIN.AVAX]: {

diff --git a/dexs/velodrome/index.ts b/dexs/velodrome/index.ts
@@ -1,4 +1,4 @@
-import { SimpleAdapter } from "../../adapters/types";
+import { FetchOptions, SimpleAdapter } from "../../adapters/types";
 import { DEFAULT_DAILY_VOLUME_FIELD, DEFAULT_TOTAL_VOLUME_FIELD, getChainVolume } from "../../helpers/getUniSubgraphVolume";
 import { CHAIN } from "../../helpers/chains";
 import { Chain } from "@defillama/sdk/build/general";
@@ -19,18 +19,19 @@ const graphs = getChainVolume({
   },
 });
 
+
 const fetch = (chain: Chain) => {
-  return async (timestamp: number) => {
-    const [v1] = await Promise.all([graphs(chain)(timestamp, {})])
+  return async (options: FetchOptions) => {
+    const [v1] = await Promise.all([graphs(chain)(options)])
     const dailyVolume = Number(v1.dailyVolume);
     return {
       dailyVolume: `${dailyVolume}`,
-      timestamp
     }
   }
 }
 
 const adapter: SimpleAdapter = {
+  version: 2,
   adapter: {
     [CHAIN.OPTIMISM]: {
       fetch: fetch(CHAIN.OPTIMISM),

diff --git a/dexs/verse/index.ts b/dexs/verse/index.ts
@@ -31,6 +31,7 @@ const volumeAdapter: BaseAdapter = {
 }
 
 const adapter: SimpleAdapter = {
+    version: 2,
     adapter: volumeAdapter,
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,6 +45,7 @@ const volume = Object.keys(endpoints).reduce( @@
     );
     const adapter: SimpleAdapter = {
+      version: 2,
       adapter: volume,
     };
@@ Expand Down @@