@curvefi/llamalend-api 2.0.4 → 2.0.5

package/docs/SUPPORT_LLv2.md

@@ -143,6 +143,42 @@ This document tracks feature support across market versions.
 | ammBalances() | ✅ | ✅ | ✅ | ✅ | ✅ |
 | capAndAvailable() | ✅ | ✅ | ❌ | ✅ | ❌ |
 
+### Update for `capAndAvailable` method
+
+Previously the `capAndAvailable` method returned:
+
+```ts
+{
+  cap: string
+  available: string
+}
+```
+
+Now it returns:
+
+```ts
+{
+  totalAssets: string
+  borrowCap: string
+  available: string
+  availableForBorrow: string
+}
+```
+
+#### Important clarification
+
+Previously the value called **`cap`** was incorrectly named.
+
+On the frontend, the value that we now return as **`totalAssets`** corresponds to what was previously treated as **`cap`**.
+
+#### Summary
+
+- `totalAssets` → total assets deposited in the vault (what was previously used as `cap` on the frontend)
+- `borrowCap` → maximum total debt allowed by the controller (LLv2 only; `Infinity` for LLv1)
+- `available` → balance of borrowed token available in the controller
+- `availableForBorrow` → effective amount available to borrow: `min(available, borrowCap - totalDebt)`
+
+
 ## Stats Module (`market.stats`) new methods
 | Method | v1 | v2 | Same logic | Same params | Same type |
 |--------|----|----|-----------------|----------------------|-----------------------|

package/lib/interfaces.d.ts

@@ -186,6 +186,7 @@ export interface IMarketDataAPI {
     totalSupplied: Total;
     borrowed: Total;
     availableToBorrow: Total;
+    borrowCap: Total;
     lendingVaultUrls: LendingVaultUrls;
     usdTotal: number;
     ammBalances: AmmBalances;

package/lib/lendMarkets/LendMarketTemplate.js

@@ -81,7 +81,7 @@ export class LendMarketTemplate {
             adminPercentage: stats.statsAdminPercentage.bind(stats),
         };
         this.wallet = {
-            balances: wallet.balances.bind(this),
+            balances: wallet.balances.bind(wallet),
         };
         this.prices = {
             A: prices.A.bind(prices),

package/lib/lendMarkets/interfaces/v1/statsV1.d.ts

@@ -43,8 +43,10 @@ export interface IStatsV1 {
         collateral: string;
     }>;
     capAndAvailable: (isGetter?: boolean, useAPI?: boolean) => Promise<{
-        cap: string;
+        borrowCap: string;
         available: string;
+        totalAssets: string;
+        availableForBorrow: string;
     }>;
     adminPercentage: () => Promise<string>;
 }

package/lib/lendMarkets/interfaces/v2/statsV2.d.ts

@@ -43,8 +43,10 @@ export interface IStatsV2 {
         collateral: string;
     }>;
     capAndAvailable: (isGetter?: boolean, useAPI?: boolean) => Promise<{
-        cap: string;
+        borrowCap: string;
         available: string;
+        totalAssets: string;
+        availableForBorrow: string;
     }>;
     adminPercentage: () => Promise<string>;
 }

package/lib/lendMarkets/modules/common/statsBase.d.ts

@@ -1,12 +1,15 @@
 import memoize from "memoizee";
-import { TAmount } from "../../../interfaces";
+import { TAmount, IMarketDataAPI } from "../../../interfaces";
 import type { LendMarketTemplate } from "../../LendMarketTemplate";
 import { Llamalend } from "../../../llamalend";
 export declare class StatsBaseModule {
     protected market: LendMarketTemplate;
     protected llamalend: Llamalend;
     constructor(market: LendMarketTemplate);
+    protected _fetchMarketDataFromAPI(): Promise<IMarketDataAPI>;
     protected _fetchAdminPercentage: () => Promise<bigint>;
+    protected _fetchAdminFee: () => Promise<bigint>;
+    protected _getAdminFeesXY(isGetter: boolean): Promise<[bigint, bigint]>;
     private _getRate;
     private _getFutureRate;
     statsParameters: (() => Promise<{
@@ -63,9 +66,23 @@ export declare class StatsBaseModule {
         borrowed: string;
         collateral: string;
     }>;
+    protected _statsCapAndAvailableFromAPI(): Promise<{
+        borrowCap: string;
+        available: string;
+        totalAssets: string;
+        availableForBorrow: string;
+    }>;
+    protected _statsCapAndAvailableOnChain(isGetter: boolean): Promise<{
+        borrowCap: string;
+        available: string;
+        totalAssets: string;
+        availableForBorrow: string;
+    }>;
     statsCapAndAvailable(isGetter?: boolean, useAPI?: boolean): Promise<{
-        cap: string;
+        borrowCap: string;
         available: string;
+        totalAssets: string;
+        availableForBorrow: string;
     }>;
     statsAdminPercentage: () => Promise<string>;
 }

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

@@ -18,6 +18,9 @@ export class StatsBaseModule {
         this._fetchAdminPercentage = () => __awaiter(this, void 0, void 0, function* () {
             return BigInt(0);
         });
+        this._fetchAdminFee = () => __awaiter(this, void 0, void 0, function* () {
+            return this.llamalend.contracts[this.market.addresses.amm].contract.admin_fee(this.llamalend.constantOptions);
+        });
         this._getRate = (...args_1) => __awaiter(this, [...args_1], void 0, function* (isGetter = true) {
             if (isGetter) {
                 const _rate = cacheStats.get(cacheKey(this.market.addresses.amm, 'rate'));
@@ -44,15 +47,16 @@ export class StatsBaseModule {
         this.statsParameters = memoize(() => __awaiter(this, void 0, void 0, function* () {
             const llammaContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
             const controllerContract = this.llamalend.contracts[this.market.addresses.controller].multicallContract;
-            const calls = [
-                llammaContract.fee(),
-                llammaContract.admin_fee(), // TODO: removed
-                controllerContract.liquidation_discount(),
-                controllerContract.loan_discount(),
-                llammaContract.get_base_price(),
-                llammaContract.A(),
-            ];
-            const [_fee, _admin_fee, _liquidation_discount, _loan_discount, _base_price, _A] = yield this.llamalend.multicallProvider.all(calls);
+            const [[_fee, _liquidation_discount, _loan_discount, _base_price, _A], _admin_fee] = yield Promise.all([
+                this.llamalend.multicallProvider.all([
+                    llammaContract.fee(),
+                    controllerContract.liquidation_discount(),
+                    controllerContract.loan_discount(),
+                    llammaContract.get_base_price(),
+                    llammaContract.A(),
+                ]),
+                this._fetchAdminFee(),
+            ]);
             const A = formatUnits(_A, 0);
             const base_price = formatUnits(_base_price);
             const [fee, admin_fee, liquidation_discount, loan_discount] = [_fee, _admin_fee, _liquidation_discount, _loan_discount]
@@ -81,7 +85,7 @@ export class StatsBaseModule {
         });
         this.statsAmmBalances = (...args_1) => __awaiter(this, [...args_1], void 0, function* (isGetter = true, useAPI = false) {
             if (useAPI) {
-                const market = yield fetchMarketDataByVault(this.llamalend.constants.NETWORK_NAME, this.market.addresses.vault, _getMarketsData);
+                const market = yield this._fetchMarketDataFromAPI();
                 return {
                     borrowed: market.ammBalances.ammBalanceBorrowed.toString(),
                     collateral: market.ammBalances.ammBalanceCollateral.toString(),
@@ -90,27 +94,23 @@ export class StatsBaseModule {
             else {
                 const borrowedContract = this.llamalend.contracts[this.market.addresses.borrowed_token].multicallContract;
                 const collateralContract = this.llamalend.contracts[this.market.addresses.collateral_token].multicallContract;
-                const ammContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
-                let _balance_x, _fee_x, _balance_y, _fee_y; // TODO: fees are always 0
+                let _balance_x, _balance_y;
+                let _fee_x, _fee_y;
                 if (isGetter) {
-                    [_balance_x, _fee_x, _balance_y, _fee_y] = [
-                        cacheStats.get(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.amm)),
-                        cacheStats.get(cacheKey(this.market.addresses.amm, 'admin_fees_x')),
-                        cacheStats.get(cacheKey(this.market.addresses.collateral_token, 'balanceOf', this.market.addresses.amm)),
-                        cacheStats.get(cacheKey(this.market.addresses.amm, 'admin_fees_y')),
-                    ];
+                    _balance_x = cacheStats.get(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.amm));
+                    _balance_y = cacheStats.get(cacheKey(this.market.addresses.collateral_token, 'balanceOf', this.market.addresses.amm));
+                    [_fee_x, _fee_y] = yield this._getAdminFeesXY(true);
                 }
                 else {
-                    [_balance_x, _fee_x, _balance_y, _fee_y] = yield this.llamalend.multicallProvider.all([
-                        borrowedContract.balanceOf(this.market.addresses.amm),
-                        ammContract.admin_fees_x(),
-                        collateralContract.balanceOf(this.market.addresses.amm),
-                        ammContract.admin_fees_y(),
-                    ]);
+                    [[_balance_x, _balance_y], [_fee_x, _fee_y]] = (yield Promise.all([
+                        this.llamalend.multicallProvider.all([
+                            borrowedContract.balanceOf(this.market.addresses.amm),
+                            collateralContract.balanceOf(this.market.addresses.amm),
+                        ]),
+                        this._getAdminFeesXY(false),
+                    ]));
                     cacheStats.set(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.amm), _balance_x);
-                    cacheStats.set(cacheKey(this.market.addresses.amm, 'admin_fees_x'), _fee_x);
                     cacheStats.set(cacheKey(this.market.addresses.collateral_token, 'balanceOf', this.market.addresses.amm), _balance_y);
-                    cacheStats.set(cacheKey(this.market.addresses.amm, 'admin_fees_y'), _fee_y);
                 }
                 return {
                     borrowed: toBN(_balance_x, this.market.borrowed_token.decimals).minus(toBN(_fee_x, this.market.borrowed_token.decimals)).toString(),
@@ -125,10 +125,33 @@ export class StatsBaseModule {
         this.market = market;
         this.llamalend = market.getLlamalend();
     }
+    _fetchMarketDataFromAPI() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return fetchMarketDataByVault(this.llamalend.constants.NETWORK_NAME, this.market.addresses.vault, _getMarketsData);
+        });
+    }
+    _getAdminFeesXY(isGetter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (isGetter) {
+                return [
+                    cacheStats.get(cacheKey(this.market.addresses.amm, 'admin_fees_x')),
+                    cacheStats.get(cacheKey(this.market.addresses.amm, 'admin_fees_y')),
+                ];
+            }
+            const ammContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
+            const [_fee_x, _fee_y] = yield this.llamalend.multicallProvider.all([
+                ammContract.admin_fees_x(),
+                ammContract.admin_fees_y(),
+            ]);
+            cacheStats.set(cacheKey(this.market.addresses.amm, 'admin_fees_x'), _fee_x);
+            cacheStats.set(cacheKey(this.market.addresses.amm, 'admin_fees_y'), _fee_y);
+            return [_fee_x, _fee_y];
+        });
+    }
     statsRates() {
         return __awaiter(this, arguments, void 0, function* (isGetter = true, useAPI = false) {
             if (useAPI) {
-                const market = yield fetchMarketDataByVault(this.llamalend.constants.NETWORK_NAME, this.market.addresses.vault, _getMarketsData);
+                const market = yield this._fetchMarketDataFromAPI();
                 return {
                     borrowApr: (market.rates.borrowApr * 100).toString(),
                     lendApr: (market.rates.lendApr * 100).toString(),
@@ -138,9 +161,9 @@ export class StatsBaseModule {
             }
             else {
                 const _rate = yield this._getRate(isGetter);
-                const debt = yield this.statsTotalDebt(isGetter);
-                const { cap } = Number(debt) > 0 ? yield this.statsCapAndAvailable(isGetter) : { cap: "0" };
-                return computeRatesFromRate(_rate, debt, cap);
+                const debt = yield this.statsTotalDebt(isGetter, false);
+                const { totalAssets } = Number(debt) > 0 ? yield this.statsCapAndAvailable(isGetter, false) : { totalAssets: "0" };
+                return computeRatesFromRate(_rate, debt, totalAssets);
             }
         });
     }
@@ -150,7 +173,7 @@ export class StatsBaseModule {
             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)).cap) + Number(dReserves);
+            const cap = Number((yield this.statsCapAndAvailable(true, useAPI)).totalAssets) + Number(dReserves);
             return computeRatesFromRate(_rate, debt, cap);
         });
     }
@@ -158,14 +181,13 @@ export class StatsBaseModule {
         return __awaiter(this, void 0, void 0, function* () {
             const borrowedContract = this.llamalend.contracts[this.market.borrowed_token.address].multicallContract;
             const collateralContract = this.llamalend.contracts[this.market.collateral_token.address].multicallContract;
-            const ammContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
-            const calls = [
-                borrowedContract.balanceOf(this.market.addresses.amm),
-                collateralContract.balanceOf(this.market.addresses.amm),
-                ammContract.admin_fees_x(), // TODO: always 0
-                ammContract.admin_fees_y(), // TODO: always 0
-            ];
-            const [_borrowedBalance, _collateralBalance, _borrowedAdminFees, _collateralAdminFees] = yield this.llamalend.multicallProvider.all(calls);
+            const [[_borrowedBalance, _collateralBalance], [_borrowedAdminFees, _collateralAdminFees]] = yield Promise.all([
+                this.llamalend.multicallProvider.all([
+                    borrowedContract.balanceOf(this.market.addresses.amm),
+                    collateralContract.balanceOf(this.market.addresses.amm),
+                ]),
+                this._getAdminFeesXY(false),
+            ]);
             return [
                 formatUnits(_borrowedBalance - _borrowedAdminFees, this.market.borrowed_token.decimals),
                 formatUnits(_collateralBalance - _collateralAdminFees, this.market.collateral_token.decimals),
@@ -209,7 +231,7 @@ export class StatsBaseModule {
     statsTotalDebt() {
         return __awaiter(this, arguments, void 0, function* (isGetter = true, useAPI = true) {
             if (useAPI) {
-                const market = yield fetchMarketDataByVault(this.llamalend.constants.NETWORK_NAME, this.market.addresses.vault, _getMarketsData);
+                const market = yield this._fetchMarketDataFromAPI();
                 return market.borrowed.total.toString();
             }
             else {
@@ -225,38 +247,48 @@ export class StatsBaseModule {
             }
         });
     }
-    statsCapAndAvailable() {
-        return __awaiter(this, arguments, void 0, function* (isGetter = true, useAPI = false) {
-            if (useAPI) {
-                const market = yield fetchMarketDataByVault(this.llamalend.constants.NETWORK_NAME, this.market.addresses.vault, _getMarketsData);
-                return {
-                    cap: market.totalSupplied.total.toString(),
-                    available: market.availableToBorrow.total.toString(),
-                };
+    _statsCapAndAvailableFromAPI() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const market = yield this._fetchMarketDataFromAPI();
+            return {
+                totalAssets: market.totalSupplied.total.toString(),
+                borrowCap: Infinity.toString(),
+                available: market.availableToBorrow.total.toString(),
+                availableForBorrow: market.availableToBorrow.total.toString(),
+            };
+        });
+    }
+    _statsCapAndAvailableOnChain(isGetter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const vaultContract = this.llamalend.contracts[this.market.addresses.vault].multicallContract;
+            const borrowedContract = this.llamalend.contracts[this.market.addresses.borrowed_token].multicallContract;
+            let _cap, _available;
+            if (isGetter) {
+                _cap = cacheStats.get(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller));
+                _available = cacheStats.get(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.controller));
             }
             else {
-                const vaultContract = this.llamalend.contracts[this.market.addresses.vault].multicallContract;
-                const borrowedContract = this.llamalend.contracts[this.market.addresses.borrowed_token].multicallContract;
-                let _cap, _available;
-                if (isGetter) { // TODO: should call controller.available_balance() instead of borrowed_token.balanceOf(controller)
-                    _cap = cacheStats.get(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller));
-                    _available = cacheStats.get(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.controller));
-                }
-                else {
-                    [_cap, _available] = yield this.llamalend.multicallProvider.all([
-                        vaultContract.totalAssets(this.market.addresses.controller),
-                        borrowedContract.balanceOf(this.market.addresses.controller),
-                    ]);
-                    cacheStats.set(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller), _cap);
-                    cacheStats.set(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.controller), _available);
-                }
-                return {
-                    cap: this.llamalend.formatUnits(_cap, this.market.borrowed_token.decimals),
-                    available: this.llamalend.formatUnits(_available, this.market.borrowed_token.decimals),
-                };
-                // cap -> totalAssets
-                // add cap: controller.borrow_cap() // Display
+                [_cap, _available] = yield this.llamalend.multicallProvider.all([
+                    vaultContract.totalAssets(this.market.addresses.controller),
+                    borrowedContract.balanceOf(this.market.addresses.controller),
+                ]);
+                cacheStats.set(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller), _cap);
+                cacheStats.set(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.controller), _available);
             }
+            const available = this.llamalend.formatUnits(_available, this.market.borrowed_token.decimals);
+            return {
+                totalAssets: this.llamalend.formatUnits(_cap, this.market.borrowed_token.decimals),
+                borrowCap: Infinity.toString(),
+                available,
+                availableForBorrow: available,
+            };
+        });
+    }
+    statsCapAndAvailable() {
+        return __awaiter(this, arguments, void 0, function* (isGetter = true, useAPI = false) {
+            if (useAPI)
+                return this._statsCapAndAvailableFromAPI();
+            return this._statsCapAndAvailableOnChain(isGetter);
         });
     }
 }

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

@@ -415,9 +415,9 @@ export class VaultModule {
     }
     vaultTotalLiquidity() {
         return __awaiter(this, arguments, void 0, function* (useAPI = true) {
-            const { cap } = yield this.market.stats.capAndAvailable(true, useAPI);
+            const { totalAssets } = yield this.market.stats.capAndAvailable(true, useAPI);
             const price = yield _getUsdRate.call(this.llamalend, this.market.addresses.borrowed_token);
-            return BN(cap).times(price).toFixed(6);
+            return BN(totalAssets).times(price).toFixed(6);
         });
     }
     vaultCrvApr() {

package/lib/lendMarkets/modules/v2/statsV2.d.ts

@@ -2,4 +2,18 @@ import memoize from "memoizee";
 import { StatsBaseModule } from "../common/statsBase.js";
 export declare class StatsV2Module extends StatsBaseModule {
     protected _fetchAdminPercentage: (() => Promise<bigint>) & memoize.Memoized<() => Promise<bigint>>;
+    protected _fetchAdminFee: () => Promise<bigint>;
+    protected _getAdminFeesXY: () => Promise<[bigint, bigint]>;
+    protected _statsCapAndAvailableFromAPI(): Promise<{
+        totalAssets: string;
+        borrowCap: string;
+        available: string;
+        availableForBorrow: string;
+    }>;
+    protected _statsCapAndAvailableOnChain(isGetter: boolean): Promise<{
+        borrowCap: string;
+        available: string;
+        totalAssets: string;
+        availableForBorrow: string;
+    }>;
 }

package/lib/lendMarkets/modules/v2/statsV2.js

@@ -9,6 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import memoize from "memoizee";
 import { StatsBaseModule } from "../common/statsBase.js";
+import { cacheKey, cacheStats } from "../../../cache";
+import BigNumber from "bignumber.js";
+import { BN } from "../../../utils";
 export class StatsV2Module extends StatsBaseModule {
     constructor() {
         super(...arguments);
@@ -18,5 +21,49 @@ export class StatsV2Module extends StatsBaseModule {
             promise: true,
             maxAge: 30 * 60 * 1000, // 30m
         });
+        this._fetchAdminFee = () => __awaiter(this, void 0, void 0, function* () { return BigInt(0); });
+        this._getAdminFeesXY = () => __awaiter(this, void 0, void 0, function* () { return [BigInt(0), BigInt(0)]; });
+    }
+    _statsCapAndAvailableFromAPI() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const market = yield this._fetchMarketDataFromAPI();
+            return {
+                totalAssets: market.totalSupplied.total.toString(),
+                borrowCap: market.borrowCap.total.toString(),
+                available: market.availableToBorrow.total.toString(),
+                availableForBorrow: market.availableToBorrow.total.toString(),
+            };
+        });
+    }
+    _statsCapAndAvailableOnChain(isGetter) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const vaultContract = this.llamalend.contracts[this.market.addresses.vault].multicallContract;
+            const controllerContract = this.llamalend.contracts[this.market.addresses.controller].multicallContract;
+            let _cap, _available, _totalAssets, _totalDebt;
+            if (isGetter) {
+                _totalAssets = cacheStats.get(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller));
+                _cap = cacheStats.get(cacheKey(this.market.addresses.controller, 'borrow_cap'));
+                _available = cacheStats.get(cacheKey(this.market.addresses.controller, 'available_balance'));
+                _totalDebt = cacheStats.get(cacheKey(this.market.addresses.controller, 'total_debt'));
+            }
+            else {
+                [_totalAssets, _available, _cap, _totalDebt] = yield this.llamalend.multicallProvider.all([
+                    vaultContract.totalAssets(this.market.addresses.controller),
+                    controllerContract.available_balance(),
+                    controllerContract.borrow_cap(),
+                    controllerContract.total_debt(),
+                ]);
+                cacheStats.set(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller), _totalAssets);
+                cacheStats.set(cacheKey(this.market.addresses.controller, 'borrow_cap'), _cap);
+                cacheStats.set(cacheKey(this.market.addresses.controller, 'available_balance'), _available);
+                cacheStats.set(cacheKey(this.market.addresses.controller, 'total_debt'), _totalDebt);
+            }
+            const totalAssets = this.llamalend.formatUnits(_totalAssets, this.market.borrowed_token.decimals);
+            const borrowCap = this.llamalend.formatUnits(_cap, this.market.borrowed_token.decimals);
+            const available = this.llamalend.formatUnits(_available, this.market.borrowed_token.decimals);
+            const totalDebt = this.llamalend.formatUnits(_totalDebt, this.market.borrowed_token.decimals);
+            const availableForBorrow = BigNumber.min(BN(available), BN(borrowCap).minus(BN(totalDebt))).toFixed();
+            return { totalAssets, borrowCap, available, availableForBorrow };
+        });
     }
 }

package/lib/lendMarkets/utils.js

@@ -18,8 +18,10 @@ export const computeRatesFromRate = (_rate, debt, cap) => {
     const expFactor = Math.pow(Math.E, annualFactor.toNumber());
     const borrowApr = annualFactor.times(100).toString();
     const borrowApy = String((expFactor - 1) * 100);
-    const lendApr = annualFactor.times(debt).div(cap).times(100).toString();
-    const lendApy = BN(debt).times(expFactor).minus(debt).div(cap).times(100).toString();
+    const lendAprRaw = annualFactor.times(debt).div(cap).times(100);
+    const lendApr = lendAprRaw.isNaN() ? "0" : lendAprRaw.toString();
+    const lendApyRaw = BN(debt).times(expFactor).minus(debt).div(cap).times(100);
+    const lendApy = lendApyRaw.isNaN() ? "0" : lendApyRaw.toString();
     return { borrowApr, lendApr, borrowApy, lendApy };
 };
 export const fetchMarketDataByVault = (networkName, vaultAddress, getData) => __awaiter(void 0, void 0, void 0, function* () {

package/package.json

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

package/src/interfaces.ts

@@ -193,6 +193,7 @@ export interface IMarketDataAPI {
     totalSupplied: Total;
     borrowed: Total;
     availableToBorrow: Total;
+    borrowCap: Total;
     lendingVaultUrls: LendingVaultUrls;
     usdTotal: number;
     ammBalances: AmmBalances;

package/src/lendMarkets/LendMarketTemplate.ts

@@ -180,7 +180,7 @@ export class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
         } as StatsForVersion<V>
 
         this.wallet = {
-            balances: wallet.balances.bind(this),
+            balances: wallet.balances.bind(wallet),
         }
 
         this.prices = {

package/src/lendMarkets/interfaces/v1/statsV1.ts

@@ -17,6 +17,6 @@ export interface IStatsV1 {
     bandsBalances: () => Promise<{ [index: number]: { borrowed: string, collateral: string } }>,
     totalDebt: (isGetter?: boolean, useAPI?: boolean) => Promise<string>,
     ammBalances: (isGetter?: boolean, useAPI?: boolean) => Promise<{ borrowed: string, collateral: string }>,
-    capAndAvailable: (isGetter?: boolean, useAPI?: boolean) => Promise<{ cap: string, available: string }>,
+    capAndAvailable: (isGetter?: boolean, useAPI?: boolean) => Promise<{ borrowCap: string, available: string, totalAssets: string, availableForBorrow: string }>,
     adminPercentage: () => Promise<string>,
 }

package/src/lendMarkets/interfaces/v2/statsV2.ts

@@ -17,6 +17,6 @@ export interface IStatsV2 {
     bandsBalances: () => Promise<{ [index: number]: { borrowed: string, collateral: string } }>,
     totalDebt: (isGetter?: boolean, useAPI?: boolean) => Promise<string>,
     ammBalances: (isGetter?: boolean, useAPI?: boolean) => Promise<{ borrowed: string, collateral: string }>,
-    capAndAvailable: (isGetter?: boolean, useAPI?: boolean) => Promise<{ cap: string, available: string }>,
+    capAndAvailable: (isGetter?: boolean, useAPI?: boolean) => Promise<{ borrowCap: string, available: string, totalAssets: string, availableForBorrow: string }>,
     adminPercentage: () => Promise<string>,
 }

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

@@ -1,5 +1,5 @@
 import memoize from "memoizee";
-import {TAmount} from "../../../interfaces";
+import {TAmount, IMarketDataAPI} from "../../../interfaces";
 import type { LendMarketTemplate } from "../../LendMarketTemplate";
 import {
     parseUnits,
@@ -22,10 +22,39 @@ export class StatsBaseModule {
         this.llamalend = market.getLlamalend();
     }
 
+    protected async _fetchMarketDataFromAPI(): Promise<IMarketDataAPI> {
+        return fetchMarketDataByVault(
+            this.llamalend.constants.NETWORK_NAME,
+            this.market.addresses.vault,
+            _getMarketsData
+        );
+    }
+
     protected _fetchAdminPercentage = async (): Promise<bigint> => {
         return BigInt(0)
     }
 
+    protected _fetchAdminFee = async (): Promise<bigint> => {
+        return this.llamalend.contracts[this.market.addresses.amm].contract.admin_fee(this.llamalend.constantOptions);
+    }
+
+    protected async _getAdminFeesXY(isGetter: boolean): Promise<[bigint, bigint]> {
+        if(isGetter) {
+            return [
+                cacheStats.get(cacheKey(this.market.addresses.amm, 'admin_fees_x')),
+                cacheStats.get(cacheKey(this.market.addresses.amm, 'admin_fees_y')),
+            ];
+        }
+        const ammContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
+        const [_fee_x, _fee_y] = await this.llamalend.multicallProvider.all([
+            ammContract.admin_fees_x(),
+            ammContract.admin_fees_y(),
+        ]) as [bigint, bigint];
+        cacheStats.set(cacheKey(this.market.addresses.amm, 'admin_fees_x'), _fee_x);
+        cacheStats.set(cacheKey(this.market.addresses.amm, 'admin_fees_y'), _fee_y);
+        return [_fee_x, _fee_y];
+    }
+
     private _getRate = async (isGetter = true): Promise<bigint> => {
         if (isGetter) {
             const _rate: bigint = cacheStats.get(cacheKey(this.market.addresses.amm, 'rate'));
@@ -61,16 +90,17 @@ export class StatsBaseModule {
         const llammaContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
         const controllerContract = this.llamalend.contracts[this.market.addresses.controller].multicallContract;
 
-        const calls = [
-            llammaContract.fee(),
-            llammaContract.admin_fee(), // TODO: removed
-            controllerContract.liquidation_discount(),
-            controllerContract.loan_discount(),
-            llammaContract.get_base_price(),
-            llammaContract.A(),
-        ]
+        const [[_fee, _liquidation_discount, _loan_discount, _base_price, _A], _admin_fee] = await Promise.all([
+            this.llamalend.multicallProvider.all([
+                llammaContract.fee(),
+                controllerContract.liquidation_discount(),
+                controllerContract.loan_discount(),
+                llammaContract.get_base_price(),
+                llammaContract.A(),
+            ]),
+            this._fetchAdminFee(),
+        ]) as [bigint[], bigint];
 
-        const [_fee, _admin_fee, _liquidation_discount, _loan_discount, _base_price, _A]: bigint[] = await this.llamalend.multicallProvider.all(calls) as bigint[];
         const A = formatUnits(_A, 0)
         const base_price = formatUnits(_base_price)
         const [fee, admin_fee, liquidation_discount, loan_discount] = [_fee, _admin_fee, _liquidation_discount, _loan_discount]
@@ -84,11 +114,7 @@ export class StatsBaseModule {
 
     public async statsRates(isGetter = true, useAPI = false): Promise<{borrowApr: string, lendApr: string, borrowApy: string, lendApy: string}> {
         if(useAPI) {
-            const market = await fetchMarketDataByVault(
-                this.llamalend.constants.NETWORK_NAME,
-                this.market.addresses.vault,
-                _getMarketsData
-            );
+            const market = await this._fetchMarketDataFromAPI();
             return {
                 borrowApr: (market.rates.borrowApr * 100).toString(),
                 lendApr: (market.rates.lendApr * 100).toString(),
@@ -97,9 +123,9 @@ export class StatsBaseModule {
             };
         } else {
             const _rate = await this._getRate(isGetter);
-            const debt = await this.statsTotalDebt(isGetter);
-            const { cap } = Number(debt) > 0 ? await this.statsCapAndAvailable(isGetter) : { cap: "0" };
-            return computeRatesFromRate(_rate, debt, cap);
+            const debt = await this.statsTotalDebt(isGetter, false);
+            const { totalAssets } = Number(debt) > 0 ? await this.statsCapAndAvailable(isGetter, false) : { totalAssets: "0" };
+            return computeRatesFromRate(_rate, debt, totalAssets);
         }
     }
 
@@ -108,21 +134,21 @@ export class StatsBaseModule {
         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)).cap) + Number(dReserves);
+        const cap = Number((await this.statsCapAndAvailable(true, useAPI)).totalAssets) + Number(dReserves);
         return computeRatesFromRate(_rate, debt, cap);
     }
 
     public async statsBalances(): Promise<[string, string]> {
         const borrowedContract = this.llamalend.contracts[this.market.borrowed_token.address].multicallContract;
         const collateralContract = this.llamalend.contracts[this.market.collateral_token.address].multicallContract;
-        const ammContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
-        const calls = [
-            borrowedContract.balanceOf(this.market.addresses.amm),
-            collateralContract.balanceOf(this.market.addresses.amm),
-            ammContract.admin_fees_x(), // TODO: always 0
-            ammContract.admin_fees_y(), // TODO: always 0
-        ]
-        const [_borrowedBalance, _collateralBalance, _borrowedAdminFees, _collateralAdminFees]: bigint[] = await this.llamalend.multicallProvider.all(calls);
+
+        const [[_borrowedBalance, _collateralBalance], [_borrowedAdminFees, _collateralAdminFees]] = await Promise.all([
+            this.llamalend.multicallProvider.all([
+                borrowedContract.balanceOf(this.market.addresses.amm),
+                collateralContract.balanceOf(this.market.addresses.amm),
+            ]),
+            this._getAdminFeesXY(false),
+        ]) as [bigint[], [bigint, bigint]];
 
         return [
             formatUnits(_borrowedBalance - _borrowedAdminFees, this.market.borrowed_token.decimals),
@@ -188,11 +214,7 @@ export class StatsBaseModule {
 
     public async statsTotalDebt(isGetter = true, useAPI = true): Promise<string> {
         if(useAPI) {
-            const market = await fetchMarketDataByVault(
-                this.llamalend.constants.NETWORK_NAME,
-                this.market.addresses.vault,
-                _getMarketsData
-            );
+            const market = await this._fetchMarketDataFromAPI();
             return market.borrowed.total.toString();
         } else {
             let _debt;
@@ -209,11 +231,7 @@ export class StatsBaseModule {
 
     public statsAmmBalances = async (isGetter = true, useAPI = false): Promise<{ borrowed: string, collateral: string }> => {
         if(useAPI) {
-            const market = await fetchMarketDataByVault(
-                this.llamalend.constants.NETWORK_NAME,
-                this.market.addresses.vault,
-                _getMarketsData
-            );
+            const market = await this._fetchMarketDataFromAPI();
             return {
                 borrowed: market.ammBalances.ammBalanceBorrowed.toString(),
                 collateral: market.ammBalances.ammBalanceCollateral.toString(),
@@ -221,27 +239,24 @@ export class StatsBaseModule {
         } else {
             const borrowedContract = this.llamalend.contracts[this.market.addresses.borrowed_token].multicallContract;
             const collateralContract = this.llamalend.contracts[this.market.addresses.collateral_token].multicallContract;
-            const ammContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
 
-            let _balance_x, _fee_x, _balance_y, _fee_y; // TODO: fees are always 0
+            let _balance_x: bigint, _balance_y: bigint;
+            let _fee_x: bigint, _fee_y: bigint;
+
             if(isGetter) {
-                [_balance_x, _fee_x, _balance_y, _fee_y] = [
-                    cacheStats.get(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.amm)),
-                    cacheStats.get(cacheKey(this.market.addresses.amm, 'admin_fees_x')),
-                    cacheStats.get(cacheKey(this.market.addresses.collateral_token, 'balanceOf', this.market.addresses.amm)),
-                    cacheStats.get(cacheKey(this.market.addresses.amm, 'admin_fees_y')),
-                ]
+                _balance_x = cacheStats.get(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.amm));
+                _balance_y = cacheStats.get(cacheKey(this.market.addresses.collateral_token, 'balanceOf', this.market.addresses.amm));
+                [_fee_x, _fee_y] = await this._getAdminFeesXY(true);
             } else {
-                [_balance_x, _fee_x, _balance_y, _fee_y] = await this.llamalend.multicallProvider.all([
-                    borrowedContract.balanceOf(this.market.addresses.amm),
-                    ammContract.admin_fees_x(),
-                    collateralContract.balanceOf(this.market.addresses.amm),
-                    ammContract.admin_fees_y(),
-                ]);
+                [[_balance_x, _balance_y], [_fee_x, _fee_y]] = await Promise.all([
+                    this.llamalend.multicallProvider.all([
+                        borrowedContract.balanceOf(this.market.addresses.amm),
+                        collateralContract.balanceOf(this.market.addresses.amm),
+                    ]),
+                    this._getAdminFeesXY(false),
+                ]) as [[bigint, bigint], [bigint, bigint]];
                 cacheStats.set(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.amm), _balance_x);
-                cacheStats.set(cacheKey(this.market.addresses.amm, 'admin_fees_x'), _fee_x);
                 cacheStats.set(cacheKey(this.market.addresses.collateral_token, 'balanceOf', this.market.addresses.amm), _balance_y);
-                cacheStats.set(cacheKey(this.market.addresses.amm, 'admin_fees_y'), _fee_y);
             }
 
             return {
@@ -251,43 +266,47 @@ export class StatsBaseModule {
         }
     }
 
-    public async statsCapAndAvailable(isGetter = true, useAPI = false): Promise<{ cap: string, available: string }> {
-        if(useAPI) {
-            const market = await fetchMarketDataByVault(
-                this.llamalend.constants.NETWORK_NAME,
-                this.market.addresses.vault,
-                _getMarketsData
-            );
-            return {
-                cap: market.totalSupplied.total.toString(),
-                available: market.availableToBorrow.total.toString(),
-            };
-        } else {
-            const vaultContract = this.llamalend.contracts[this.market.addresses.vault].multicallContract;
-            const borrowedContract = this.llamalend.contracts[this.market.addresses.borrowed_token].multicallContract;
+    protected async _statsCapAndAvailableFromAPI(): Promise<{ borrowCap: string, available: string, totalAssets: string, availableForBorrow: string }> {
+        const market = await this._fetchMarketDataFromAPI();
+        return {
+            totalAssets: market.totalSupplied.total.toString(),
+            borrowCap: Infinity.toString(),
+            available: market.availableToBorrow.total.toString(),
+            availableForBorrow: market.availableToBorrow.total.toString(),
+        };
+    }
 
-            let _cap, _available;
-            if(isGetter) { // TODO: should call controller.available_balance() instead of borrowed_token.balanceOf(controller)
-                _cap = cacheStats.get(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller));
-                _available = cacheStats.get(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.controller));
-            } else {
-                [_cap, _available] =await this.llamalend.multicallProvider.all([
-                    vaultContract.totalAssets(this.market.addresses.controller),
-                    borrowedContract.balanceOf(this.market.addresses.controller),
-                ]);
-                cacheStats.set(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller), _cap);
-                cacheStats.set(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.controller), _available);
-            }
+    protected async _statsCapAndAvailableOnChain(isGetter: boolean): Promise<{ borrowCap: string, available: string, totalAssets: string, availableForBorrow: string }> {
+        const vaultContract = this.llamalend.contracts[this.market.addresses.vault].multicallContract;
+        const borrowedContract = this.llamalend.contracts[this.market.addresses.borrowed_token].multicallContract;
 
-            return {
-                cap: this.llamalend.formatUnits(_cap, this.market.borrowed_token.decimals),
-                available: this.llamalend.formatUnits(_available, this.market.borrowed_token.decimals),
-            }
-            // cap -> totalAssets
-            // add cap: controller.borrow_cap() // Display
+        let _cap, _available;
+        if(isGetter) {
+            _cap = cacheStats.get(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller));
+            _available = cacheStats.get(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.controller));
+        } else {
+            [_cap, _available] = await this.llamalend.multicallProvider.all([
+                vaultContract.totalAssets(this.market.addresses.controller),
+                borrowedContract.balanceOf(this.market.addresses.controller),
+            ]);
+            cacheStats.set(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller), _cap);
+            cacheStats.set(cacheKey(this.market.addresses.borrowed_token, 'balanceOf', this.market.addresses.controller), _available);
+        }
+
+        const available = this.llamalend.formatUnits(_available, this.market.borrowed_token.decimals);
+        return {
+            totalAssets: this.llamalend.formatUnits(_cap, this.market.borrowed_token.decimals),
+            borrowCap: Infinity.toString(),
+            available,
+            availableForBorrow: available,
         }
     }
 
+    public async statsCapAndAvailable(isGetter = true, useAPI = false): Promise<{ borrowCap: string, available: string, totalAssets: string, availableForBorrow: string }> {
+        if(useAPI) return this._statsCapAndAvailableFromAPI();
+        return this._statsCapAndAvailableOnChain(isGetter);
+    }
+
     public statsAdminPercentage = async (): Promise<string> => {
         const _adminPercentage = await this._fetchAdminPercentage();
         return formatUnits(_adminPercentage * BigInt(100));

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

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

package/src/lendMarkets/modules/v2/statsV2.ts

@@ -1,5 +1,8 @@
 import memoize from "memoizee";
 import { StatsBaseModule } from "../common/statsBase.js";
+import {cacheKey, cacheStats} from "../../../cache";
+import BigNumber from "bignumber.js";
+import {BN} from "../../../utils";
 
 export class StatsV2Module extends StatsBaseModule {
     protected _fetchAdminPercentage = memoize(async (): Promise<bigint> => {
@@ -8,4 +11,51 @@ export class StatsV2Module extends StatsBaseModule {
         promise: true,
         maxAge: 30 * 60 * 1000, // 30m
     });
+
+    protected _fetchAdminFee = async (): Promise<bigint> => BigInt(0);
+
+    protected _getAdminFeesXY = async (): Promise<[bigint, bigint]> => [BigInt(0), BigInt(0)];
+
+    protected async _statsCapAndAvailableFromAPI() {
+        const market = await this._fetchMarketDataFromAPI();
+        return {
+            totalAssets: market.totalSupplied.total.toString(),
+            borrowCap: market.borrowCap.total.toString(),
+            available: market.availableToBorrow.total.toString(),
+            availableForBorrow: market.availableToBorrow.total.toString(),
+        };
+    }
+
+    protected async _statsCapAndAvailableOnChain(isGetter: boolean): Promise<{ borrowCap: string, available: string, totalAssets: string, availableForBorrow: string }> {
+        const vaultContract = this.llamalend.contracts[this.market.addresses.vault].multicallContract;
+        const controllerContract = this.llamalend.contracts[this.market.addresses.controller].multicallContract;
+
+        let _cap: bigint, _available: bigint, _totalAssets: bigint, _totalDebt: bigint;
+        if(isGetter) {
+            _totalAssets = cacheStats.get(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller));
+            _cap = cacheStats.get(cacheKey(this.market.addresses.controller, 'borrow_cap'));
+            _available = cacheStats.get(cacheKey(this.market.addresses.controller, 'available_balance'));
+            _totalDebt = cacheStats.get(cacheKey(this.market.addresses.controller, 'total_debt'));
+        } else {
+            [_totalAssets, _available, _cap, _totalDebt] = await this.llamalend.multicallProvider.all([
+                vaultContract.totalAssets(this.market.addresses.controller),
+                controllerContract.available_balance(),
+                controllerContract.borrow_cap(),
+                controllerContract.total_debt(),
+            ]);
+
+            cacheStats.set(cacheKey(this.market.addresses.vault, 'totalAssets', this.market.addresses.controller), _totalAssets);
+            cacheStats.set(cacheKey(this.market.addresses.controller, 'borrow_cap'), _cap);
+            cacheStats.set(cacheKey(this.market.addresses.controller, 'available_balance'), _available);
+            cacheStats.set(cacheKey(this.market.addresses.controller, 'total_debt'), _totalDebt);
+        }
+
+        const totalAssets = this.llamalend.formatUnits(_totalAssets, this.market.borrowed_token.decimals);
+        const borrowCap = this.llamalend.formatUnits(_cap, this.market.borrowed_token.decimals);
+        const available = this.llamalend.formatUnits(_available, this.market.borrowed_token.decimals);
+        const totalDebt = this.llamalend.formatUnits(_totalDebt, this.market.borrowed_token.decimals);
+        const availableForBorrow = BigNumber.min(BN(available), BN(borrowCap).minus(BN(totalDebt))).toFixed();
+
+        return { totalAssets, borrowCap, available, availableForBorrow }
+    }
 }

package/src/lendMarkets/utils.ts

@@ -24,8 +24,10 @@ export const computeRatesFromRate = (
     const borrowApr = annualFactor.times(100).toString();
     const borrowApy = String((expFactor - 1) * 100);
 
-    const lendApr = annualFactor.times(debt).div(cap).times(100).toString();
-    const lendApy = BN(debt).times(expFactor).minus(debt).div(cap).times(100).toString();
+    const lendAprRaw = annualFactor.times(debt).div(cap).times(100);
+    const lendApr = lendAprRaw.isNaN() ? "0" : lendAprRaw.toString();
+    const lendApyRaw = BN(debt).times(expFactor).minus(debt).div(cap).times(100);
+    const lendApy = lendApyRaw.isNaN() ? "0" : lendApyRaw.toString();
 
     return { borrowApr, lendApr, borrowApy, lendApy };
 }