@curvefi/llamalend-api 2.2.2 → 2.2.4

package/lib/lendMarkets/fetch/fetchFactoryData.js

@@ -83,7 +83,7 @@ export const getFactoryMarketDataV2 = (llamalend) => __awaiter(void 0, void 0, v
     const collateral_tokens = [];
     const borrowed_tokens = [];
     const monetary_policies = [];
-    const gauges = [];
+    const gauges = new Array(Number(markets_count)).fill(llamalend.constants.ZERO_ADDRESS);
     for (let i = 0; i < markets_count; i++) {
         const marketData = res[i];
         vaults.push(marketData[0].toLowerCase());
@@ -93,7 +93,12 @@ export const getFactoryMarketDataV2 = (llamalend) => __awaiter(void 0, void 0, v
         borrowed_tokens.push(marketData[4].toLowerCase());
         monetary_policies.push(marketData[6].toLowerCase());
         names.push(''); // new factory does not give names, it's generated at the market creation level
-        gauges.push(llamalend.constants.ZERO_ADDRESS);
+    }
+    // Fetch gauges for non-mainnet chains. Mainnet will use the new approach of fetching gauges from the new factory.
+    const gaugeFactoryAddress = llamalend.constants.ALIASES.gauge_factory;
+    if (llamalend.chainId !== 1 && gaugeFactoryAddress && gaugeFactoryAddress !== llamalend.constants.ZERO_ADDRESS) {
+        const gaugeFactory = llamalend.contracts[gaugeFactoryAddress];
+        (yield llamalend.multicallProvider.all(vaults.map((vault) => createCall(gaugeFactory, "get_gauge_from_lp_token", [vault])))).forEach((gauge, i) => { gauges[i] = gauge.toLowerCase(); });
     }
     return {
         names,

package/lib/lendMarkets/modules/common/vault.js

@@ -15,7 +15,7 @@ import { WEEK } from "../../../constants/utils";
 export class VaultModule {
     constructor(market) {
         this._calcCrvApr = (...args_1) => __awaiter(this, [...args_1], void 0, function* (futureWorkingSupplyBN = null) {
-            const totalLiquidityUSD = yield this.vaultTotalLiquidity();
+            const totalLiquidityUSD = yield this.vaultTotalLiquidity(false);
             if (Number(totalLiquidityUSD) === 0)
                 return [0, 0];
             let inflationRateBN, workingSupplyBN, totalSupplyBN;
@@ -415,7 +415,7 @@ export class VaultModule {
     }
     vaultTotalLiquidity() {
         return __awaiter(this, arguments, void 0, function* (useAPI = true) {
-            const { totalAssets } = yield this.market.stats.capAndAvailable(true, useAPI);
+            const { totalAssets } = yield this.market.stats.capAndAvailable(false, useAPI);
             const price = yield _getUsdRate.call(this.llamalend, this.market.addresses.borrowed_token);
             return BN(totalAssets).times(price).toFixed(6);
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@curvefi/llamalend-api",
-  "version": "2.2.2",
+  "version": "2.2.4",
   "description": "JavaScript library for Curve Lending",
   "main": "lib/index.js",
   "author": "Macket",

package/src/lendMarkets/fetch/fetchFactoryData.ts

@@ -95,7 +95,7 @@ export const getFactoryMarketDataV2 = async (llamalend: Llamalend) => {
     const collateral_tokens: string[] = [];
     const borrowed_tokens: string[] = [];
     const monetary_policies: string[] = [];
-    const gauges: string[] = [];
+    const gauges: string[] = new Array(Number(markets_count)).fill(llamalend.constants.ZERO_ADDRESS);
 
     for (let i = 0; i < markets_count; i++) {
         const marketData = res[i] as any;
@@ -107,7 +107,15 @@ export const getFactoryMarketDataV2 = async (llamalend: Llamalend) => {
         borrowed_tokens.push(marketData[4].toLowerCase());
         monetary_policies.push(marketData[6].toLowerCase());
         names.push(''); // new factory does not give names, it's generated at the market creation level
-        gauges.push(llamalend.constants.ZERO_ADDRESS);
+    }
+
+    // Fetch gauges for non-mainnet chains. Mainnet will use the new approach of fetching gauges from the new factory.
+    const gaugeFactoryAddress = llamalend.constants.ALIASES.gauge_factory;
+    if (llamalend.chainId !== 1 && gaugeFactoryAddress && gaugeFactoryAddress !== llamalend.constants.ZERO_ADDRESS) {
+        const gaugeFactory = llamalend.contracts[gaugeFactoryAddress];
+        (await llamalend.multicallProvider.all(
+            vaults.map((vault: string) => createCall(gaugeFactory, "get_gauge_from_lp_token", [vault]))
+        ) as string[]).forEach((gauge, i) => { gauges[i] = gauge.toLowerCase(); });
     }
 
     return {

package/src/lendMarkets/modules/common/vault.ts

@@ -289,14 +289,15 @@ export class VaultModule {
     }
 
     public async vaultTotalLiquidity(useAPI = true): Promise<string> {
-        const { totalAssets } = await this.market.stats.capAndAvailable(true, useAPI);
+        const { totalAssets } = await this.market.stats.capAndAvailable(false, useAPI);
         const price = await _getUsdRate.call(this.llamalend, this.market.addresses.borrowed_token);
 
         return BN(totalAssets).times(price).toFixed(6)
     }
 
     private _calcCrvApr = async (futureWorkingSupplyBN: BigNumber | null = null): Promise<[baseApy: number, boostedApy: number]> => {
-        const totalLiquidityUSD = await this.vaultTotalLiquidity();
+        const totalLiquidityUSD = await this.vaultTotalLiquidity(false);
+        
         if (Number(totalLiquidityUSD) === 0) return [0, 0];
 
         let inflationRateBN, workingSupplyBN, totalSupplyBN;