@net-protocol/score 0.1.6 → 0.1.7

package/dist/index.d.mts

@@ -1,5 +1,5 @@
-import { S as ScoreClientOptions, G as GetUpvotesOptions, a as GetUpvotesForItemsOptions, b as GetStrategyKeyScoresOptions, c as GetAppKeyScoresOptions, D as DecodedStrategyMetadata, P as PoolKey, d as PoolDiscoveryResult } from './scoreKeyUtils-DuH70ypB.mjs';
-export { e as DecodedUpvoteBlob, F as FeedMessage, f as PoolStrategyMetadata, g as PureAlphaMetadata, h as ScoreItem, U as UseTokenUpvotesOptions, i as UseUpvotePriceOptions, j as UseUpvoteUserOptions, k as UseUpvotesBatchOptions, l as UseUpvotesOptions, m as UseUserUpvotesGivenOptions, n as UseUserUpvotesGivenPerTokenBatchOptions, o as UseUserUpvotesReceivedOptions, p as UseUserUpvotesReceivedPerTokenBatchOptions, q as extractTokenAddressFromScoreKey, r as getFeedContentKey, s as getScoreKey, t as getStorageScoreKey, u as getStorageUpvoteContext, v as getTokenScoreKey, w as isTokenScoreKey } from './scoreKeyUtils-DuH70ypB.mjs';
+import { S as ScoreClientOptions, G as GetUpvotesOptions, a as GetUpvotesForItemsOptions, b as GetStrategyKeyScoresOptions, c as GetAppKeyScoresOptions, D as DecodedStrategyMetadata, P as PoolKey, d as PoolDiscoveryResult } from './scoreKeyUtils-D-ONTPej.mjs';
+export { e as DecodedUpvoteBlob, F as FeedMessage, f as PoolStrategyMetadata, g as PureAlphaMetadata, h as ScoreItem, U as UseTokenUpvotesOptions, i as UseUpvotePriceOptions, j as UseUpvoteUserOptions, k as UseUpvotesBatchOptions, l as UseUpvotesOptions, m as UseUserUpvotesGivenOptions, n as UseUserUpvotesGivenPerTokenBatchOptions, o as UseUserUpvotesReceivedOptions, p as UseUserUpvotesReceivedPerTokenBatchOptions, q as extractTokenAddressFromScoreKey, r as getFeedContentKey, s as getScoreKey, t as getStorageScoreKey, u as getStorageUpvoteContext, v as getTokenScoreKey, w as isTokenScoreKey } from './scoreKeyUtils-D-ONTPej.mjs';
 import { Address, WalletClient, PublicClient, Abi } from 'viem';
 
 /**

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { S as ScoreClientOptions, G as GetUpvotesOptions, a as GetUpvotesForItemsOptions, b as GetStrategyKeyScoresOptions, c as GetAppKeyScoresOptions, D as DecodedStrategyMetadata, P as PoolKey, d as PoolDiscoveryResult } from './scoreKeyUtils-DuH70ypB.js';
-export { e as DecodedUpvoteBlob, F as FeedMessage, f as PoolStrategyMetadata, g as PureAlphaMetadata, h as ScoreItem, U as UseTokenUpvotesOptions, i as UseUpvotePriceOptions, j as UseUpvoteUserOptions, k as UseUpvotesBatchOptions, l as UseUpvotesOptions, m as UseUserUpvotesGivenOptions, n as UseUserUpvotesGivenPerTokenBatchOptions, o as UseUserUpvotesReceivedOptions, p as UseUserUpvotesReceivedPerTokenBatchOptions, q as extractTokenAddressFromScoreKey, r as getFeedContentKey, s as getScoreKey, t as getStorageScoreKey, u as getStorageUpvoteContext, v as getTokenScoreKey, w as isTokenScoreKey } from './scoreKeyUtils-DuH70ypB.js';
+import { S as ScoreClientOptions, G as GetUpvotesOptions, a as GetUpvotesForItemsOptions, b as GetStrategyKeyScoresOptions, c as GetAppKeyScoresOptions, D as DecodedStrategyMetadata, P as PoolKey, d as PoolDiscoveryResult } from './scoreKeyUtils-D-ONTPej.js';
+export { e as DecodedUpvoteBlob, F as FeedMessage, f as PoolStrategyMetadata, g as PureAlphaMetadata, h as ScoreItem, U as UseTokenUpvotesOptions, i as UseUpvotePriceOptions, j as UseUpvoteUserOptions, k as UseUpvotesBatchOptions, l as UseUpvotesOptions, m as UseUserUpvotesGivenOptions, n as UseUserUpvotesGivenPerTokenBatchOptions, o as UseUserUpvotesReceivedOptions, p as UseUserUpvotesReceivedPerTokenBatchOptions, q as extractTokenAddressFromScoreKey, r as getFeedContentKey, s as getScoreKey, t as getStorageScoreKey, u as getStorageUpvoteContext, v as getTokenScoreKey, w as isTokenScoreKey } from './scoreKeyUtils-D-ONTPej.js';
 import { Address, WalletClient, PublicClient, Abi } from 'viem';
 
 /**

package/dist/index.js

@@ -1807,7 +1807,59 @@ var multi_version_uniswap_pool_info_retriever_default = [
     type: "function",
     name: "V4_POOL_MANAGER",
     inputs: [],
-    outputs: [{ name: "", type: "address", internalType: "address" }],
+    outputs: [
+      {
+        name: "",
+        type: "address",
+        internalType: "address"
+      }
+    ],
+    stateMutability: "view"
+  },
+  {
+    type: "function",
+    name: "_getV4Liquidity",
+    inputs: [
+      {
+        name: "poolKey",
+        type: "tuple",
+        internalType: "struct PoolKey",
+        components: [
+          {
+            name: "currency0",
+            type: "address",
+            internalType: "Currency"
+          },
+          {
+            name: "currency1",
+            type: "address",
+            internalType: "Currency"
+          },
+          {
+            name: "fee",
+            type: "uint24",
+            internalType: "uint24"
+          },
+          {
+            name: "tickSpacing",
+            type: "int24",
+            internalType: "int24"
+          },
+          {
+            name: "hooks",
+            type: "address",
+            internalType: "contract IHooks"
+          }
+        ]
+      }
+    ],
+    outputs: [
+      {
+        name: "liquidity",
+        type: "uint128",
+        internalType: "uint128"
+      }
+    ],
     stateMutability: "view"
   },
   {
@@ -1829,8 +1881,16 @@ var multi_version_uniswap_pool_info_retriever_default = [
             type: "address",
             internalType: "Currency"
           },
-          { name: "fee", type: "uint24", internalType: "uint24" },
-          { name: "tickSpacing", type: "int24", internalType: "int24" },
+          {
+            name: "fee",
+            type: "uint24",
+            internalType: "uint24"
+          },
+          {
+            name: "tickSpacing",
+            type: "int24",
+            internalType: "int24"
+          },
           {
             name: "hooks",
             type: "address",
@@ -1840,7 +1900,11 @@ var multi_version_uniswap_pool_info_retriever_default = [
       }
     ],
     outputs: [
-      { name: "sqrtPriceX96", type: "uint160", internalType: "uint160" }
+      {
+        name: "sqrtPriceX96",
+        type: "uint160",
+        internalType: "uint160"
+      }
     ],
     stateMutability: "view"
   },
@@ -1873,8 +1937,16 @@ var multi_version_uniswap_pool_info_retriever_default = [
             type: "address",
             internalType: "Currency"
           },
-          { name: "fee", type: "uint24", internalType: "uint24" },
-          { name: "tickSpacing", type: "int24", internalType: "int24" },
+          {
+            name: "fee",
+            type: "uint24",
+            internalType: "uint24"
+          },
+          {
+            name: "tickSpacing",
+            type: "int24",
+            internalType: "int24"
+          },
           {
             name: "hooks",
             type: "address",
@@ -1882,7 +1954,11 @@ var multi_version_uniswap_pool_info_retriever_default = [
           }
         ]
       },
-      { name: "baseToken", type: "address", internalType: "address" }
+      {
+        name: "baseToken",
+        type: "address",
+        internalType: "address"
+      }
     ],
     outputs: [
       {
@@ -1895,8 +1971,16 @@ var multi_version_uniswap_pool_info_retriever_default = [
             type: "address",
             internalType: "address"
           },
-          { name: "token0", type: "address", internalType: "address" },
-          { name: "token1", type: "address", internalType: "address" },
+          {
+            name: "token0",
+            type: "address",
+            internalType: "address"
+          },
+          {
+            name: "token1",
+            type: "address",
+            internalType: "address"
+          },
           {
             name: "token0Decimals",
             type: "uint8",
@@ -1926,6 +2010,11 @@ var multi_version_uniswap_pool_info_retriever_default = [
             name: "token1Balance",
             type: "uint256",
             internalType: "uint256"
+          },
+          {
+            name: "liquidity",
+            type: "uint128",
+            internalType: "uint128"
           }
         ]
       }
@@ -2433,7 +2522,7 @@ var MULTI_VERSION_UNISWAP_BULK_POOL_FINDER = {
   abi: multi_version_uniswap_bulk_pool_finder_default
 };
 var MULTI_VERSION_UNISWAP_POOL_INFO_RETRIEVER = {
-  address: "0x7A9EF0AC6F6a254cd570B05D62D094D3aa5067f1",
+  address: "0x00000002986Ca76897216a8A3A7Db10FcB0d29Cf",
   abi: multi_version_uniswap_pool_info_retriever_default
 };
 var WETH_BY_CHAIN = {
@@ -3167,8 +3256,24 @@ var V4_HOOKS = [
   "0xbB7784A4d481184283Ed89619A3e3ed143e1Adc0",
   "0xBDF938149ac6a781F94FAa0ed45E6A0e984c6544"
 ];
-var LIQUIDITY_THRESHOLD_TO_PREFER_V2_V3_POOLS = 0.1 * 1e18;
-var LIQUIDITY_THRESHOLD_TO_CONSIDER_V2_V3_POOLS = 0.01 * 1e18;
+var Q96 = BigInt(2) ** BigInt(96);
+var ZERO_BI = BigInt(0);
+function deriveV4WethDepthWei(liquidity, sqrtPriceX96, wethIsCurrency1) {
+  if (sqrtPriceX96 === ZERO_BI || liquidity === ZERO_BI) return ZERO_BI;
+  if (wethIsCurrency1) {
+    return liquidity * sqrtPriceX96 / Q96;
+  }
+  return liquidity * Q96 / sqrtPriceX96;
+}
+function deriveV2V3WethDepthWei(info, wethLower) {
+  if ((info.token0 ?? "").toLowerCase() === wethLower) {
+    return BigInt(info.token0Balance ?? 0);
+  }
+  if ((info.token1 ?? "").toLowerCase() === wethLower) {
+    return BigInt(info.token1Balance ?? 0);
+  }
+  return BigInt(info.baseTokenBalance ?? 0);
+}
 function normalizeTokenPairs(pairs, wethAddress) {
   return pairs.map((pair) => {
     const tokenA = pair.tokenAddress;
@@ -3375,42 +3480,7 @@ function constructPoolKey(info, pair, version, v4PoolKey) {
     return void 0;
   }
 }
-function getWethBalanceWei(pool, wethAddress) {
-  if (pool.token0?.toLowerCase() === wethAddress.toLowerCase()) {
-    return Number(pool.token0Balance);
-  } else if (pool.token1?.toLowerCase() === wethAddress.toLowerCase()) {
-    return Number(pool.token1Balance);
-  } else {
-    return Number(pool.baseTokenBalance);
-  }
-}
-function filterV2V3PoolsByLiquidity(pools, threshold, wethAddress) {
-  return pools.filter((pool) => {
-    if (!pool.poolAddress) return false;
-    const wethBalanceWei = getWethBalanceWei(pool, wethAddress);
-    return wethBalanceWei >= threshold;
-  });
-}
-function selectBestV2V3Pool(pools) {
-  return pools.reduce((a, b) => {
-    const aIsV3 = a.fee > 0;
-    const bIsV3 = b.fee > 0;
-    if (aIsV3 && !bIsV3) return a;
-    if (!aIsV3 && bIsV3) return b;
-    return Number(a.baseTokenBalance) > Number(b.baseTokenBalance) ? a : b;
-  });
-}
-function selectBestV4Pool(pools) {
-  return pools.reduce((a, b) => {
-    return a.fee < b.fee ? a : b;
-  });
-}
-function selectBestV2V3PoolByFee(pools) {
-  return pools.reduce((a, b) => {
-    return a.fee < b.fee ? a : b;
-  });
-}
-function selectBestPoolPerPair(allPools, wethAddress) {
+function selectBestPoolPerPair(allPools) {
   const poolsByPair = {};
   for (const pool of allPools) {
     const key = pool.tokenAddress.toLowerCase() + "_" + pool.baseTokenAddress.toLowerCase();
@@ -3418,37 +3488,13 @@ function selectBestPoolPerPair(allPools, wethAddress) {
     poolsByPair[key].push(pool);
   }
   const bestPools = [];
-  for (const [, group] of Object.entries(poolsByPair)) {
-    let best;
-    if (group.length === 1) {
-      best = group[0];
-    } else {
-      const v2v3PoolsWithPreferredLiquidity = filterV2V3PoolsByLiquidity(
-        group,
-        LIQUIDITY_THRESHOLD_TO_PREFER_V2_V3_POOLS,
-        wethAddress
-      );
-      if (v2v3PoolsWithPreferredLiquidity.length > 0) {
-        best = selectBestV2V3Pool(v2v3PoolsWithPreferredLiquidity);
-      } else {
-        const v4Pools = group.filter((pool) => !pool.poolAddress);
-        if (v4Pools.length > 0) {
-          best = selectBestV4Pool(v4Pools);
-        } else {
-          const v2v3PoolsWithAcceptableLiquidity = filterV2V3PoolsByLiquidity(
-            group,
-            LIQUIDITY_THRESHOLD_TO_CONSIDER_V2_V3_POOLS,
-            wethAddress
-          );
-          if (v2v3PoolsWithAcceptableLiquidity.length > 0) {
-            best = selectBestV2V3PoolByFee(v2v3PoolsWithAcceptableLiquidity);
-          }
-        }
-      }
-    }
-    if (best) {
-      bestPools.push(best);
-    }
+  for (const group of Object.values(poolsByPair)) {
+    const withDepth = group.filter((p) => p.wethDepthWei > ZERO_BI);
+    if (withDepth.length === 0) continue;
+    const best = withDepth.reduce(
+      (a, b) => a.wethDepthWei > b.wethDepthWei ? a : b
+    );
+    bestPools.push(best);
   }
   return bestPools;
 }
@@ -3482,13 +3528,27 @@ async function discoverPools({
     ]
   });
   if (!Array.isArray(poolInfos) || poolInfos.length === 0) return [];
+  const wethLower = wethAddress.toLowerCase();
   const allPools = poolInfos.map((info, index) => {
     const poolData = determinePoolVersion(discoveries, index);
     if (!poolData || !poolData.pair) return null;
+    const isV4 = poolData.version === 4;
+    const liquidity = BigInt(info.liquidity ?? 0);
+    let wethDepthWei;
+    if (isV4) {
+      const wethIsCurrency1 = poolData.v4PoolKey.currency1.toLowerCase() === wethLower;
+      wethDepthWei = deriveV4WethDepthWei(
+        liquidity,
+        BigInt(info.sqrtPriceX96 ?? 0),
+        wethIsCurrency1
+      );
+    } else {
+      wethDepthWei = deriveV2V3WethDepthWei(info, wethLower);
+    }
     return {
       tokenAddress: poolData.pair.tokenAddress,
       baseTokenAddress: poolData.pair.baseTokenAddress || wethAddress,
-      poolAddress: poolData.version === 4 ? null : info.poolAddress,
+      poolAddress: isV4 ? null : info.poolAddress,
       price: calculatePoolPrice(info, poolData.pair, poolData.version),
       baseTokenBalance: String(info.baseTokenBalance || 0),
       token0: info.token0,
@@ -3501,10 +3561,12 @@ async function discoverPools({
         poolData.pair,
         poolData.version,
         poolData.v4PoolKey
-      )
+      ),
+      liquidity: String(liquidity),
+      wethDepthWei
     };
   }).filter((p) => p !== null);
-  const bestPools = selectBestPoolPerPair(allPools, wethAddress);
+  const bestPools = selectBestPoolPerPair(allPools);
   return bestPools.map(
     (pool) => ({
       tokenAddress: pool.tokenAddress,
@@ -3513,6 +3575,7 @@ async function discoverPools({
       price: pool.price,
       fee: pool.fee,
       poolKey: pool.poolKey,
+      liquidity: pool.liquidity,
       balances: {
         baseTokenBalance: pool.baseTokenBalance,
         token0Balance: pool.token0Balance,