Merge branch 'master' of github.com:curvefi/curve-js into fix/init

Author: DanielSchiavini

package-lock.json

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

package.json

@@ -27,17 +27,17 @@ export const _getPoolsFromApi =
         return poolsDict[poolType]
     }
 
-export const _getAllPoolsFromApi = async (network: INetworkName, isLiteChain = false): Promise<IExtendedPoolDataFromApi[]> => {
+export const _getAllPoolsFromApi = async (network: INetworkName, isLiteChain: boolean): Promise<IExtendedPoolDataFromApi[]> => {
     const {poolLists} = await _getCachedData(network, isLiteChain);
     return poolLists
 }
 
-export const _getUsdPricesFromApi = async (network:INetworkName): Promise<IDict<number>> => {
-    const {usdPrices} = await _getCachedData(network, false);
+export const _getUsdPricesFromApi = async (network:INetworkName, isLiteChain: boolean): Promise<IDict<number>> => {
+    const {usdPrices} = await _getCachedData(network, isLiteChain);
     return usdPrices
 }
 
-export const _getCrvApyFromApi = async (network:INetworkName): Promise<IDict<[number, number]>> => {
-    const {crvApy} = await _getCachedData(network, false);
+export const _getCrvApyFromApi = async (network:INetworkName, isLiteChain: boolean): Promise<IDict<[number, number]>> => {
+    const {crvApy} = await _getCachedData(network, isLiteChain);
     return crvApy
 }

src/cached.ts

@@ -170,7 +170,7 @@ export class StatsPool implements IStatsPool {
                 poolType = this.pool.id.replace(/-\d+$/, '');
                 poolType = poolType.replace(/-v2$/, '');
             }
-            const poolsData = (await _getPoolsFromApi.call(curve, network, poolType as IPoolType)).poolData;
+            const poolsData = (await _getPoolsFromApi.call(curve, network, poolType as IPoolType, curve.isLiteChain)).poolData;
 
             try {
                 const totalLiquidity = poolsData.filter((data) => data.address.toLowerCase() === this.pool.address.toLowerCase())[0].usdTotal;
@@ -244,7 +244,7 @@ export class StatsPool implements IStatsPool {
 
         const isDisabledChain = [1313161554].includes(curve.chainId); // Disable Aurora
         if (useApi && !isDisabledChain) {
-            const crvAPYs = await _getCrvApyFromApi(curve.constants.NETWORK_NAME);
+            const crvAPYs = await _getCrvApyFromApi(curve.constants.NETWORK_NAME, curve.isLiteChain);
             const poolCrvApy = crvAPYs[this.pool.gauge.address] ?? [0, 0];  // new pools might be missing
             return [poolCrvApy[0], poolCrvApy[1]];
         }

src/pools/subClasses/statsPool.ts

@@ -319,7 +319,7 @@ export function getPoolIdBySwapAddress(this: Curve, swapAddress: string): string
 
 export async function _getRewardsFromApi(this: Curve): Promise<IDict<IRewardFromApi[]>> {
     const network = this.constants.NETWORK_NAME;
-    const allTypesExtendedPoolData = await _getAllPoolsFromApi.call(this, network);
+    const allTypesExtendedPoolData = await _getAllPoolsFromApi(network, this.isLiteChain);
     const rewardsDict: IDict<IRewardFromApi[]> = {};
 
     for (const extendedPoolData of allTypesExtendedPoolData) {
@@ -337,7 +337,7 @@ export async function _getRewardsFromApi(this: Curve): Promise<IDict<IRewardFrom
 const _usdRatesCache: IDict<{ rate: number, time: number }> = {}
 export async function _getUsdRate(this: Curve, assetId: string): Promise<number> {
     if (this.chainId === 1 && assetId.toLowerCase() === '0x8762db106b2c2a0bccb3a80d1ed41273552616e8') return 0; // RSR
-    const pricesFromApi = await _getUsdPricesFromApi(this.constants.NETWORK_NAME);
+    const pricesFromApi = await _getUsdPricesFromApi(this.constants.NETWORK_NAME, this.isLiteChain);
     if (assetId.toLowerCase() in pricesFromApi) return pricesFromApi[assetId.toLowerCase()];
 
     if (assetId === 'USD' || (this.chainId === 137 && (assetId.toLowerCase() === this.constants.COINS.am3crv.toLowerCase()))) return 1
@@ -573,7 +573,7 @@ export async function getNetworkConstants(this: Curve, chainId: IChainId | numbe
 
 export async function getTVL(this: Curve, chainId = this.chainId): Promise<number> {
     const networkConstants = await getNetworkConstants.call(this, chainId);
-    const allTypesExtendedPoolData = await _getAllPoolsFromApi.call(this, networkConstants.NAME);
+    const allTypesExtendedPoolData = await _getAllPoolsFromApi(networkConstants.NAME, this.isLiteChain);
 
     return allTypesExtendedPoolData.reduce((sum, data) => sum + (data.tvl ?? data.tvlAll ?? 0), 0)
 }