Merge remote-tracking branch 'origin/main'

adapters/connext/src/utils/getUserTvlByBlock.ts

@@ -1,4 +1,4 @@
-import { getCompositeBalances, getLpAccountBalanceAtBlock } from "./subgraph";
+import { getBlock, getCompositeBalances, getLpAccountBalanceAtBlock } from "./subgraph";
 import { BlockData, OutputDataSchemaRow } from "./types";
 
 export const getUserTVLByBlock = async (blocks: BlockData): Promise<OutputDataSchemaRow[]> => {
@@ -9,13 +9,16 @@ export const getUserTVLByBlock = async (blocks: BlockData): Promise<OutputDataSc
   // get the composite balances
   const composite = await getCompositeBalances(data);
 
+  // get block info
+  const { timestamp } = await getBlock(blockNumber);
+
   // format into output
   const results: OutputDataSchemaRow[] = [];
-  composite.forEach(({ block, modified, account, underlyingBalances, underlyingTokens }) => {
+  composite.forEach(({ account, underlyingBalances, underlyingTokens }) => {
     results.push(...underlyingBalances.map((b, i) => {
       const formatted: OutputDataSchemaRow = {
-        timestamp: +modified,
-        block_number: +block,
+        timestamp: +timestamp.toString(),
+        block_number: blockNumber,
         user_address: account.id,
         token_address: underlyingTokens[i],
         token_balance: BigInt(b),

adapters/connext/src/utils/subgraph.ts

@@ -1,7 +1,7 @@
 import { PoolInformation, getPoolInformationFromLpToken } from "./cartographer";
 import { LpAccountBalanceHourly, SubgraphResult } from "./types";
 import { linea } from "viem/chains";
-import { createPublicClient, formatUnits, http, parseUnits } from "viem";
+import { createPublicClient, http, parseUnits } from "viem";
 
 export const CONNEXT_SUBGRAPH_QUERY_URL = "https://api.goldsky.com/api/public/project_clssc64y57n5r010yeoly05up/subgraphs/amarok-stableswap-analytics/1.0/gn";
 export const LINEA_CHAIN_ID = 59144;
@@ -209,3 +209,8 @@ const appendSubgraphData = (data: LpAccountBalanceHourly[], existing: Map<string
     })
 }
 
+export const getBlock = async (blockNumber: number) => {
+    const client = createPublicClient({ chain: linea, transport: http() });
+    const block = await client.getBlock({ blockNumber: BigInt(blockNumber) });
+    return block;
+}

adapters/lyve/package.json

@@ -14,11 +14,13 @@
   "author": "",
   "license": "UNLICENSED",
   "dependencies": {
-    "fast-csv": "^5.0.1",
     "csv-parser": "^3.0.0",
+    "fast-csv": "^5.0.1",
+    "lodash": "^4.17.21",
     "node-fetch": "^3.3.2"
   },
   "devDependencies": {
+    "@types/lodash": "^4.17.1",
     "@types/node": "^20.11.30",
     "typescript": "^5.4.3"
   }