Merge pull request #209 from connext/main

Everclear (connext) : bridge : fix timeout

adapters/connext/package.json

@@ -6,7 +6,7 @@
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
         "start": "node dist/index.js",
-        "dev": "ts-node src/index.ts",
+        "dev": "ts-node src/dev.ts",
         "compile": "tsc",
         "watch": "tsc -w",
         "clear": "rm -rf dist"

adapters/connext/src/dev.ts

@@ -0,0 +1,50 @@
+import { createPublicClient, formatUnits, http, parseAbi, parseUnits } from "viem";
+import { getUserTVLByBlock } from "./utils";
+import { linea } from "viem/chains";
+import { getLpAccountBalanceAtBlock } from "./utils/subgraph";
+import { getCompositeBalances } from "./utils/assets";
+
+const users = ['0xc82c7d826b1ed0b2a4e9a2be72b445416f901fd1', '0xdd507fecd5de6f5398060cc0404cb133f9048c3a'];
+
+const blocks = [5081800, 5082887, 5084087, 6055026];
+
+const logUserEntry = async (user: string) => {
+    const ret: Record<number, any> = {}
+    const composite: Record<number, any> = {}
+    for (const block of blocks) {
+        const results = await getLpAccountBalanceAtBlock(block, undefined, user);
+        composite[block] = (await getCompositeBalances(results)).map(r => {
+            return {
+                latestTransferBlock: r.block,
+                account: r.account.id,
+                tokens: r.underlyingTokens.join(', '),
+                amount: r.underlyingBalances.join(', '),
+            }
+        })
+
+        ret[block] = results.map(r => {
+            return {
+                latestTransferBlock: r.block,
+                account: r.account.id,
+                tokens: r.token.id,
+                amount: r.amount
+            }
+        })
+    }
+    console.log('tvl for', user, ':')
+    console.log(ret)
+    console.log('\ncomposite for', user, ':')
+    console.log(composite)
+}
+
+const dev = async () => {
+    for (const user of users) {
+        await logUserEntry(user)
+    }
+}
+dev();
+
+// 5081800,  1717289323
+// 5082887,  1717297198
+// 5084087,  1717300798
+// 5085287,  1717304398

adapters/connext/src/utils/assets.ts

@@ -1,6 +1,6 @@
 import { createPublicClient, http, parseUnits } from "viem";
 import { linea } from "viem/chains";
-import { PoolInformation, getPoolInformationFromLpToken } from "./cartographer";
+import { getPoolInformationFromLpToken, poolInfo } from "./cartographer";
 import { LINEA_CHAIN_ID, CONNEXT_LINEA_ADDRESS } from "./subgraph";
 import { LpAccountBalanceHourly, RouterEventResponse } from "./types";
 
@@ -37,18 +37,10 @@ const CONNEXT_ABI = [
 ]
 
 export const getCompositeBalances = async (amms: LpAccountBalanceHourly[]): Promise<CompositeBalanceHourly[]> => {
-    // get lp token balances
-    const poolInfo = new Map<string, PoolInformation>();
-
     // get pool info
-    await Promise.all(amms.map(async d => {
-        const poolId = d.token.id.toLowerCase();
-        if (poolInfo.has(poolId)) {
-            return;
-        }
-        const pool = await getPoolInformationFromLpToken(d.token.id, LINEA_CHAIN_ID);
-        poolInfo.set(poolId, pool);
-    }));
+    for (const amm of amms) {
+        await getPoolInformationFromLpToken(amm.token.id, LINEA_CHAIN_ID)
+    }
 
     // get contract interface
     const client = createPublicClient({ chain: linea, transport: http() });

adapters/connext/src/utils/cartographer.ts

@@ -20,7 +20,12 @@ type PoolInformationResponse = {
     pool_token_decimals: [number, number];
 }
 
+export const poolInfo = new Map<string, PoolInformation>();
+
 export const getPoolInformationFromLpToken = async (lpToken: string, chainId: number): Promise<PoolInformation> => {
+    if (poolInfo.has(lpToken.toLowerCase())) {
+        return poolInfo.get(lpToken.toLowerCase())!;
+    }
     const url = `${MAINNET_CARTOGRAPHER_URL}/stableswap_pools?lp_token=eq.${lpToken.toLowerCase()}&domain=eq.${chainIdToDomain(chainId)}`;
 
     const response = await fetch(url);
@@ -29,13 +34,15 @@ export const getPoolInformationFromLpToken = async (lpToken: string, chainId: nu
         throw new Error(`More than one pool found for lpToken/chain: ${lpToken}/${chainId}`)
     }
     const { key, lp_token, pooled_tokens, pool_token_decimals, domain } = data[0];
-    return {
+    const ret = {
         key,
         lpToken: lp_token,
         pooledTokens: pooled_tokens,
         pooledTokenDecimals: pool_token_decimals,
         chainId: domainToChainId(+domain)
     }
+    poolInfo.set(lpToken.toLowerCase(), ret);
+    return ret;
 };
 
 

adapters/connext/src/utils/getUserTvlByBlock.ts

@@ -18,8 +18,8 @@ export const getUserTVLByBlock = async (blocks: BlockData): Promise<OutputDataSc
   composite.forEach(({ account, underlyingBalances, underlyingTokens }) => {
     results.push(...underlyingBalances.map((b, i) => {
       const formatted: OutputDataSchemaRow = {
-        timestamp: blockTimestamp,
         block_number: blockNumber,
+        timestamp: blockTimestamp,
         user_address: account.id,
         token_address: underlyingTokens[i],
         token_balance: BigInt(b),

adapters/connext/src/utils/subgraph.ts

@@ -1,7 +1,6 @@
-import { PoolInformation, getPoolInformationFromLpToken } from "./cartographer";
 import { LpAccountBalanceHourly, SubgraphResult } from "./types";
 import { linea } from "viem/chains";
-import { createPublicClient, http, parseUnits } from "viem";
+import { createPublicClient, http } from "viem";
 
 export const CONNEXT_SUBGRAPH_QUERY_URL = "https://api.goldsky.com/api/public/project_clssc64y57n5r010yeoly05up/subgraphs/connext/stableswap-analytics-linea-0.0.1/gn";
 export const LINEA_CHAIN_ID = 59144;