Merge pull request #104 from invariant-labs/refactor-liquidity-calcul…

…ations refactor liquidity calculations
invariant-labs · Dec 6, 2024 · 886b66d · 886b66d
2 parents f9c9f95 + 8d7e905
commit 886b66d
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 11 deletions.
diff --git a/eclipse/src/snap.ts b/eclipse/src/snap.ts
@@ -141,11 +141,12 @@ export const createSnapshotForNetwork = async (network: Network) => {
       fee: pool.fee,
       tickSpacing: pool.tickSpacing,
     });
-    const [address, volumes, liq, fees] = await Promise.all([
+    const [address, volumes, fees, dataX, dataY] = await Promise.all([
       pair.getAddress(market.program.programId),
       market.getVolume(pair),
-      market.getPairLiquidityValues(pair),
       market.getGlobalFee(pair),
+      connection.getParsedAccountInfo(pool.tokenXReserve),
+      connection.getParsedAccountInfo(pool.tokenYReserve),
     ]);
 
     poolsDict[address.toString()] = pool;
@@ -190,8 +191,12 @@ export const createSnapshotForNetwork = async (network: Network) => {
     }
 
     try {
-      liquidityX = liq.liquidityX;
-      liquidityY = liq.liquidityY;
+      liquidityX = new BN(
+        (dataX?.value?.data as any).parsed.info.tokenAmount.amount
+      );
+      liquidityY = new BN(
+        (dataY?.value?.data as any).parsed.info.tokenAmount.amount
+      );
     } catch {
       liquidityX = new BN("0");
       liquidityY = new BN("0");

diff --git a/solana/src/snap.ts b/solana/src/snap.ts
@@ -51,12 +51,19 @@ export const createSnapshotForNetwork = async (network: Network) => {
 
   const jupPrices = await getJupPricesData(Object.keys(tokensData));
 
-  const coingeckoIds =  tokensPriceViaCoingecko.map(token => token.coingeckoId)
-  const coingeckoAddresses = tokensPriceViaCoingecko.map(token => token.address)
-  const coingeckoPrices = await getTokensPrices(coingeckoIds, coingeckoAddresses)
+  const coingeckoIds = tokensPriceViaCoingecko.map(
+    (token) => token.coingeckoId
+  );
+  const coingeckoAddresses = tokensPriceViaCoingecko.map(
+    (token) => token.address
+  );
+  const coingeckoPrices = await getTokensPrices(
+    coingeckoIds,
+    coingeckoAddresses
+  );
 
   Object.entries(coingeckoPrices).forEach(([address, price]) => {
-    jupPrices[address] = price.toString()
+    jupPrices[address] = price.toString();
   });
 
   const connection = provider.connection;
@@ -112,9 +119,14 @@ export const createSnapshotForNetwork = async (network: Network) => {
     }
 
     try {
-      const liq = await market.getPairLiquidityValues(pair);
-      liquidityX = liq.liquidityX;
-      liquidityY = liq.liquidityY;
+      const dataX = await connection.getParsedAccountInfo(pool.tokenXReserve);
+      const dataY = await connection.getParsedAccountInfo(pool.tokenYReserve);
+      liquidityX = new BN(
+        (dataX?.value?.data as any).parsed.info.tokenAmount.amount
+      );
+      liquidityY = new BN(
+        (dataY?.value?.data as any).parsed.info.tokenAmount.amount
+      );
     } catch {
       liquidityX = new BN("0");
       liquidityY = new BN("0");