Merge pull request #688 from ZkSwapFinance/master

rename and fixed volume query
DefiLlama · Jul 30, 2023 · ddeb2ea · ddeb2ea
2 parents 1a5ce47 + b77e367
commit ddeb2ea
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/dexs/zkSwap_Finance/index.ts b/dexs/zkSwap_Finance/index.ts
@@ -1,6 +1,6 @@
 import { SimpleAdapter } from "../../adapters/types";
 import { CHAIN } from "../../helpers/chains";
-import { fetchVolume } from "./zkswapFiance";
+import { fetchVolume } from "./zkswapFinance";
 
 const adapter: SimpleAdapter = {
   adapter: {

diff --git a/dexs/zkSwap_Finance/zkswapFiance.ts → dexs/zkSwap_Finance/zkswapFinance.ts b/dexs/zkSwap_Finance/zkswapFiance.ts → dexs/zkSwap_Finance/zkswapFinance.ts
@@ -53,31 +53,30 @@ const getData = async (chain: string, timestamp: number) => {
     totalSum += Number(pair.volumeToken0) * price0
   }
 
+  let lasTimestampQuery = startDayTimestamp
 
   while (returnCount == 1000) {
     const graphQL = `{
       swaps(
-          orderBy: id
-          orderDirection: desc
-          first: 1000
-          skip: ${step * 1000}
-          where: {timestamp_gt: ${startDayTimestamp}, timestamp_lt: ${startDayTimestamp + dayMiliseconds} }
+        orderBy: timestamp
+        orderDirection: asc
+        first: 1000
+        where: {timestamp_gte: ${lasTimestampQuery}, timestamp_lt: ${startDayTimestamp + dayMiliseconds} }
         ) {
           amount0In
           amount0Out
+          timestamp
           pair {
             token0 {
               id
             }
           }
-          timestamp
         }
       }`;
 
     const data = await request(info[chain].subgraph, graphQL);
     returnCount = data.swaps.length;
-    step++;
-
+    lasTimestampQuery = data?.swaps[returnCount-1]?.timestamp
 
     for (const swap of data.swaps) {