@curvefi/api 2.70.4 → 2.70.5

package/lib/cached.d.ts

@@ -1,5 +1,6 @@
 import { IDict, IExtendedPoolDataFromApi, INetworkName, IPoolType } from "./interfaces.js";
 export declare const _getPoolsFromApi: (network: INetworkName, poolType: IPoolType, isLiteChain?: boolean) => Promise<IExtendedPoolDataFromApi>;
+export declare const _getPoolTotalLiquidityFromApi: (network: INetworkName, poolId: string, address: string, isCrypto: boolean, isLiteChain: boolean) => Promise<string | undefined>;
 export declare const _setPoolsFromApi: (network: INetworkName, isLiteChain: boolean, data: Record<IPoolType, IExtendedPoolDataFromApi>) => void;
 export declare const _getAllPoolsFromApi: (network: INetworkName, isLiteChain: boolean) => Promise<IExtendedPoolDataFromApi[]>;
 export declare const _getUsdPricesFromApi: (network: INetworkName, isLiteChain: boolean) => Promise<IDict<number>>;

package/lib/cached.js

@@ -74,6 +74,13 @@ export const _getPoolsFromApi = (network_1, poolType_1, ...args_1) => __awaiter(
     const { poolsDict } = yield _getCachedData(network, isLiteChain);
     return poolsDict[poolType];
 });
+export const _getPoolTotalLiquidityFromApi = (network, poolId, address, isCrypto, isLiteChain) => __awaiter(void 0, void 0, void 0, function* () {
+    const poolType = poolId.startsWith("factory") ? poolId.replace(/-\d+$/, '').replace(/-v2$/, '') : isCrypto ? "crypto" : "main";
+    const { poolData } = yield _getPoolsFromApi(network, poolType, isLiteChain);
+    const poolAddress = address.toLowerCase();
+    const poolEntry = poolData.find((data) => data.address.toLowerCase() === poolAddress);
+    return poolEntry ? String(poolEntry.usdTotal) : undefined;
+});
 export const _setPoolsFromApi = (network, isLiteChain, data) => _getCachedData.set(createCache(data), network, isLiteChain);
 export const _getAllPoolsFromApi = (network, isLiteChain) => __awaiter(void 0, void 0, void 0, function* () {
     const { poolLists } = yield _getCachedData(network, isLiteChain);

package/lib/pools/subClasses/statsPool.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { _getPoolsFromApi, _getCrvApyFromApi } from '../../cached.js';
+import { _getPoolTotalLiquidityFromApi, _getCrvApyFromApi } from '../../cached.js';
 import { _getUsdRate, BN, toBN, _getRewardsFromApi, getVolumeApiController, } from '../../utils.js';
 import { rewardNetworks } from '../../constants/rewardNetworks.js';
 import memoize from "memoizee";
@@ -107,17 +107,9 @@ export class StatsPool {
                 return stablecoinTvlBN.plus(collateralTvlBN).toString();
             }
             if (useApi) {
-                const network = curve.constants.NETWORK_NAME;
-                let poolType = this.pool.isCrypto ? "crypto" : "main";
-                if (this.pool.id.startsWith("factory")) {
-                    poolType = this.pool.id.replace(/-\d+$/, '');
-                    poolType = poolType.replace(/-v2$/, '');
-                }
-                const poolsData = (yield _getPoolsFromApi.call(curve, network, poolType, curve.isLiteChain)).poolData;
-                const poolEntry = poolsData.find((data) => data.address.toLowerCase() === this.pool.address.toLowerCase());
-                if (poolEntry) {
-                    return String(poolEntry.usdTotal);
-                }
+                const totalLiquidity = yield _getPoolTotalLiquidityFromApi(curve.constants.NETWORK_NAME, this.pool.id, this.pool.address, this.pool.isCrypto, curve.isLiteChain);
+                if (totalLiquidity !== undefined)
+                    return totalLiquidity;
             }
             const balances = yield this.underlyingBalances();
             const promises = [];

package/lib/route-finder.worker.d.ts

@@ -7,4 +7,3 @@ export type IRouterWorkerInput = {
     ybAssets: string[];
 };
 export declare function routeFinderWorker(): (({ inputCoinAddress, outputCoinAddress, routerGraph, poolData, ybAssets }: IRouterWorkerInput) => IRouteStep[][]) | undefined;
-export declare const routeFinderWorkerCode: string;

package/lib/route-finder.worker.js

@@ -110,5 +110,3 @@ export function routeFinderWorker() {
         }
     });
 }
-// this is a workaround to avoid importing web-worker in the main bundle (nextjs will try to inject invalid hot-reloading code)
-export const routeFinderWorkerCode = `${routeFinderWorker.toString()}; ${routeFinderWorker.name}();`;

package/lib/route-graph.worker.d.ts

@@ -10,4 +10,3 @@ export type IRouteGraphInput = {
     blacklist?: string[];
 };
 export declare function routeGraphWorker(): (({ constants, chainId, isLiteChain, allPools, amplificationCoefficientDict, poolTvlDict, blacklist }: IRouteGraphInput) => IDict<IDict<IRouteStep[]>>) | undefined;
-export declare const routeGraphWorkerCode: string;

package/lib/route-graph.worker.js

@@ -541,5 +541,3 @@ export function routeGraphWorker() {
         }
     });
 }
-// this is a workaround to avoid importing web-worker in the main bundle (nextjs will try to inject invalid hot-reloading code)
-export const routeGraphWorkerCode = `${routeGraphWorker.toString()}; ${routeGraphWorker.name}();`;

package/lib/router.js

@@ -13,10 +13,11 @@ import { _cutZeros, _get_price_impact, _get_small_x, _getCoinAddresses, _getCoin
 import { getPool } from "./pools/index.js";
 import { _getAmplificationCoefficientsFromApi } from "./pools/utils.js";
 import { L2Networks } from "./constants/L2Networks.js";
-import { routeFinderWorker, routeFinderWorkerCode } from "./route-finder.worker.js";
-import { routeGraphWorker, routeGraphWorkerCode } from "./route-graph.worker.js";
+import { routeFinderWorker } from "./route-finder.worker.js";
+import { routeGraphWorker } from "./route-graph.worker.js";
 import { memoizeMethod } from "./constants/utils.js";
 import { YB_ASSETS } from "./constants/ybPools.js";
+import { _getPoolTotalLiquidityFromApi } from "./cached.js";
 const MAX_STEPS = 5;
 const ROUTE_LENGTH = (MAX_STEPS * 2) + 1;
 export function setRouterBlacklist(blacklist) {
@@ -25,8 +26,16 @@ export function setRouterBlacklist(blacklist) {
     delete this._buildRouteGraph;
     delete this._getBestRoute;
 }
-function _getTVL(poolId) {
-    return __awaiter(this, void 0, void 0, function* () { return Number(yield getPool.call(this, poolId).stats.totalLiquidityMemoized()); });
+function _getTVL(poolId_1, _a) {
+    return __awaiter(this, arguments, void 0, function* (poolId, { is_crypto, is_llamma, swap_address }) {
+        // LLAMMA liquidity must be calculated on-chain, even when the API has an entry.
+        if (!is_llamma) {
+            const totalLiquidity = yield _getPoolTotalLiquidityFromApi(this.constants.NETWORK_NAME, poolId, swap_address, is_crypto !== null && is_crypto !== void 0 ? is_crypto : false, this.isLiteChain);
+            if (totalLiquidity !== undefined)
+                return Number(totalLiquidity);
+        }
+        return Number(yield getPool.call(this, poolId).stats.totalLiquidityMemoized());
+    });
 }
 function entriesToDictAsync(entries, mapper) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -47,7 +56,7 @@ function _buildRouteGraphImpl(chainId, isLiteChain) {
         const amplificationCoefficientDict = yield _getAmplificationCoefficientsFromApi.call(this);
         const poolTvlDict = yield entriesToDictAsync(allPools, _getTVL.bind(this));
         const input = { constants, chainId, isLiteChain, allPools, amplificationCoefficientDict, poolTvlDict, blacklist: this.routerBlacklist };
-        return runWorker(routeGraphWorkerCode, routeGraphWorker, Object.assign({ type: 'createRouteGraph' }, input));
+        return runWorker(routeGraphWorker, Object.assign({ type: 'createRouteGraph' }, input));
     });
 }
 function _findRoutes(inputCoinAddress, outputCoinAddress) {
@@ -57,7 +66,7 @@ function _findRoutes(inputCoinAddress, outputCoinAddress) {
         // extract only the fields we need for the worker
         const poolData = mapDict(this.getPoolsData(), (_, { is_lending, wrapped_coin_addresses, underlying_coin_addresses, token_address }) => ({ is_lending, wrapped_coin_addresses, underlying_coin_addresses, token_address }));
         const input = { inputCoinAddress, outputCoinAddress, routerGraph, poolData, ybAssets: YB_ASSETS };
-        return runWorker(routeFinderWorkerCode, routeFinderWorker, Object.assign({ type: 'findRoutes' }, input));
+        return runWorker(routeFinderWorker, Object.assign({ type: 'findRoutes' }, input));
     });
 }
 const _getRouteKey = (route, inputCoinAddress, outputCoinAddress) => {

package/lib/utils.d.ts

@@ -108,7 +108,7 @@ export declare function getBasePools(this: Curve): Promise<IBasePoolShortItem[]>
 export declare function log(fnName: string, ...args: unknown[]): void;
 export declare function runWorker<In extends {
     type: string;
-}, Out>(code: string, syncFn: () => ((val: In) => Out) | undefined, inputData: In, timeout?: number): Promise<Out>;
+}, Out>(workerFn: () => ((val: In) => Out) | undefined, inputData: In, timeout?: number): Promise<Out>;
 export declare const PERIODS: {
     DAY: number;
     WEEK: number;

package/lib/utils.js

@@ -823,11 +823,12 @@ export function log(fnName, ...args) {
         console.log(`curve-js@${new Date().toISOString()} -> ${fnName}:`, ...args);
     }
 }
-export function runWorker(code, syncFn, inputData, timeout = 30000) {
+export function runWorker(workerFn, inputData, timeout = 30000) {
     if (typeof Worker === 'undefined') {
         // in nodejs run worker in main thread
-        return Promise.resolve(syncFn()(inputData));
+        return Promise.resolve(workerFn()(inputData));
     }
+    const code = `${workerFn.toString()}; ${workerFn.name}();`;
     const blob = new Blob([code], { type: 'application/javascript' });
     const blobUrl = URL.createObjectURL(blob);
     const worker = new Worker(blobUrl, { type: 'module' });
@@ -835,7 +836,7 @@ export function runWorker(code, syncFn, inputData, timeout = 30000) {
         const timer = setTimeout(() => reject(new Error('Timeout')), timeout);
         worker.onerror = (e) => {
             clearTimeout(timer);
-            console.error(code, inputData, e);
+            console.error(workerFn.name, inputData, e);
             reject(e);
         };
         worker.onmessage = (e) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/api",
-  "version": "2.70.4",
+  "version": "2.70.5",
   "description": "JavaScript library for curve.finance",
   "main": "lib/index.js",
   "author": "Macket",