@curvefi/llamalend-api 2.0.19 → 2.0.21

package/lib/constants/aliases.js

@@ -29,6 +29,7 @@ export const ALIASES_OPTIMISM = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory_old": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "gauge_factory": "0x871fBD4E01012e2E8457346059e8C189d664DbA4",
+    "old_gauge_end_index": "4",
     "leverage_zap": "0xBFab8ebc836E1c4D81837798FC076D219C9a1855", // odos v3
     "leverage_zap_v2": "0xE94d1fBF399c27CCBf0185b2Dd11Bf0FA0f0D95C",
     "leverage_markets_start_id": "0",
@@ -41,6 +42,7 @@ export const ALIASES_FRAXTAL = lowerCaseValues({
     "gauge_controller": "0x0000000000000000000000000000000000000000", // <--- TODO CHANGE
     "gauge_factory_old": "0xeF672bD94913CB6f1d2812a6e18c1fFdEd8eFf5c",
     "gauge_factory": "0x0b8d6b6cefc7aa1c2852442e518443b1b22e1c52",
+    "old_gauge_end_index": "3",
     "leverage_zap": "0x3294514B78Df4Bb90132567fcf8E5e99f390B687", // odos v3
     "leverage_zap_v2": "0x16C6521Dff6baB339122a0FE25a9116693265353",
     "leverage_markets_start_id": "0",

package/lib/lendMarkets/fetch/fetchFactoryData.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { createCall, handleMultiCallResponse } from "../../utils.js";
 import { _getMarketsData } from "../../external-api.js";
 export const getFactoryMarketDataV1 = (llamalend) => __awaiter(void 0, void 0, void 0, function* () {
+    var _a;
     const factoryAlias = 'one_way_factory';
     if (!llamalend.constants.ALIASES[factoryAlias] || llamalend.constants.ALIASES[factoryAlias] === llamalend.constants.ZERO_ADDRESS) {
         throw new Error(`Factory v1 is not available for network ${llamalend.constants.NETWORK_NAME}`);
@@ -26,7 +27,15 @@ export const getFactoryMarketDataV1 = (llamalend) => __awaiter(void 0, void 0, v
         });
     }
     const res = (yield llamalend.multicallProvider.all(calls)).map((addr) => addr.toLowerCase());
-    return handleMultiCallResponse(callsMap, res);
+    const factoryData = handleMultiCallResponse(callsMap, res);
+    const oldGaugeEndIndex = Number((_a = llamalend.constants.ALIASES.old_gauge_end_index) !== null && _a !== void 0 ? _a : -1);
+    if (oldGaugeEndIndex >= 0) {
+        const oldGaugeFactory = llamalend.contracts[llamalend.constants.ALIASES.gauge_factory_old];
+        const vaults = factoryData.vaults.slice(0, oldGaugeEndIndex + 1);
+        const gauges = (yield llamalend.multicallProvider.all(vaults.map((vault) => createCall(oldGaugeFactory, "get_gauge_from_lp_token", [vault])))).map((address) => address.toLowerCase());
+        gauges.forEach((gauge, i) => { factoryData.gauges[i] = gauge; });
+    }
+    return factoryData;
 });
 export const getFactoryMarketDataByAPI = (llamalend) => __awaiter(void 0, void 0, void 0, function* () {
     const apiData = (yield _getMarketsData(llamalend.constants.NETWORK_NAME)).lendingVaultData;

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

@@ -174,11 +174,12 @@ export class StatsBaseModule {
     }
     statsFutureRates(dReserves_1, dDebt_1) {
         return __awaiter(this, arguments, void 0, function* (dReserves, dDebt, useAPI = true) {
+            const isGetter = false;
             const _dReserves = parseUnits(dReserves, this.market.borrowed_token.decimals);
             const _dDebt = parseUnits(dDebt, this.market.borrowed_token.decimals);
             const _rate = yield this._getFutureRate(_dReserves, _dDebt);
-            const debt = Number(yield this.statsTotalDebt()) + Number(dDebt);
-            const cap = Number((yield this.statsCapAndAvailable(true, useAPI)).totalAssets) + Number(dReserves);
+            const debt = Number(yield this.statsTotalDebt(isGetter, useAPI)) + Number(dDebt);
+            const cap = Number((yield this.statsCapAndAvailable(isGetter, useAPI)).totalAssets) + Number(dReserves);
             return computeRatesFromRate(_rate, debt, cap);
         });
     }

package/package.json

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

package/src/constants/aliases.ts

@@ -33,6 +33,7 @@ export const ALIASES_OPTIMISM = lowerCaseValues({
     "gauge_controller": "0x2F50D538606Fa9EDD2B11E2446BEb18C9D5846bB",
     "gauge_factory_old": "0xabC000d88f23Bb45525E447528DBF656A9D55bf5",
     "gauge_factory": "0x871fBD4E01012e2E8457346059e8C189d664DbA4",
+    "old_gauge_end_index": "4",
     "leverage_zap": "0xBFab8ebc836E1c4D81837798FC076D219C9a1855", // odos v3
     "leverage_zap_v2": "0xE94d1fBF399c27CCBf0185b2Dd11Bf0FA0f0D95C",
     "leverage_markets_start_id": "0",
@@ -46,6 +47,7 @@ export const ALIASES_FRAXTAL = lowerCaseValues({
     "gauge_controller": "0x0000000000000000000000000000000000000000", // <--- TODO CHANGE
     "gauge_factory_old": "0xeF672bD94913CB6f1d2812a6e18c1fFdEd8eFf5c",
     "gauge_factory": "0x0b8d6b6cefc7aa1c2852442e518443b1b22e1c52",
+    "old_gauge_end_index": "3",
     "leverage_zap": "0x3294514B78Df4Bb90132567fcf8E5e99f390B687", // odos v3
     "leverage_zap_v2": "0x16C6521Dff6baB339122a0FE25a9116693265353",
     "leverage_markets_start_id": "0",

package/src/lendMarkets/fetch/fetchFactoryData.ts

@@ -25,7 +25,19 @@ export const getFactoryMarketDataV1 = async (llamalend: Llamalend) => {
     }
     const res = (await llamalend.multicallProvider.all(calls) as string[]).map((addr) => addr.toLowerCase());
 
-    return handleMultiCallResponse(callsMap, res)
+    const factoryData = handleMultiCallResponse(callsMap, res);
+
+    const oldGaugeEndIndex = Number(llamalend.constants.ALIASES.old_gauge_end_index ?? -1);
+    if (oldGaugeEndIndex >= 0) {
+        const oldGaugeFactory = llamalend.contracts[llamalend.constants.ALIASES.gauge_factory_old];
+        const vaults = factoryData.vaults.slice(0, oldGaugeEndIndex + 1);
+        const gauges = (await llamalend.multicallProvider.all(
+            vaults.map((vault: string) => createCall(oldGaugeFactory, "get_gauge_from_lp_token", [vault]))
+        ) as string[]).map((address) => address.toLowerCase());
+        gauges.forEach((gauge, i) => { factoryData.gauges[i] = gauge; });
+    }
+
+    return factoryData;
 };
 
 export const getFactoryMarketDataByAPI = async (llamalend: Llamalend) => {

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

@@ -130,11 +130,12 @@ export class StatsBaseModule {
     }
 
     public async statsFutureRates(dReserves: TAmount, dDebt: TAmount, useAPI = true): Promise<{borrowApr: string, lendApr: string, borrowApy: string, lendApy: string}> {
+        const isGetter = false;
         const _dReserves = parseUnits(dReserves, this.market.borrowed_token.decimals);
         const _dDebt = parseUnits(dDebt, this.market.borrowed_token.decimals);
         const _rate = await this._getFutureRate(_dReserves, _dDebt);
-        const debt = Number(await this.statsTotalDebt()) + Number(dDebt);
-        const cap = Number((await this.statsCapAndAvailable(true, useAPI)).totalAssets) + Number(dReserves);
+        const debt = Number(await this.statsTotalDebt(isGetter, useAPI)) + Number(dDebt);
+        const cap = Number((await this.statsCapAndAvailable(isGetter, useAPI)).totalAssets) + Number(dReserves);
         return computeRatesFromRate(_rate, debt, cap);
     }