@curvefi/llamalend-api 2.0.3 → 2.0.5

package/docs/SUPPORT_LLv2.md

@@ -143,6 +143,48 @@ 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 |
+|--------|----|----|-----------------|----------------------|-----------------------|
+| adminPercentage() | ✅ | ✅ | ✅ | ✅ | ✅ |
+
+
 ---
 
 ## Wallet Module (`market.wallet`)

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

@@ -68,19 +68,20 @@ export class LendMarketTemplate {
             getCurrentLeverageParams: userPosition.getCurrentLeverageParams.bind(userPosition),
         };
         this.stats = {
-            parameters: stats.statsParameters.bind(this),
-            rates: stats.statsRates.bind(this),
-            futureRates: stats.statsFutureRates.bind(this),
-            balances: stats.statsBalances.bind(this),
-            bandsInfo: stats.statsBandsInfo.bind(this),
-            bandBalances: stats.statsBandBalances.bind(this),
-            bandsBalances: stats.statsBandsBalances.bind(this),
-            totalDebt: stats.statsTotalDebt.bind(this),
-            ammBalances: stats.statsAmmBalances.bind(this),
-            capAndAvailable: stats.statsCapAndAvailable.bind(this),
+            parameters: stats.statsParameters.bind(stats),
+            rates: stats.statsRates.bind(stats),
+            futureRates: stats.statsFutureRates.bind(stats),
+            balances: stats.statsBalances.bind(stats),
+            bandsInfo: stats.statsBandsInfo.bind(stats),
+            bandBalances: stats.statsBandBalances.bind(stats),
+            bandsBalances: stats.statsBandsBalances.bind(stats),
+            totalDebt: stats.statsTotalDebt.bind(stats),
+            ammBalances: stats.statsAmmBalances.bind(stats),
+            capAndAvailable: stats.statsCapAndAvailable.bind(stats),
+            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,7 +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,7 +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,11 +1,17 @@
 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<{
         fee: string;
         admin_fee: string;
@@ -21,8 +27,6 @@ export declare class StatsBaseModule {
         base_price: string;
         A: string;
     }>>;
-    private _getRate;
-    private _getFutureRate;
     statsRates(isGetter?: boolean, useAPI?: boolean): Promise<{
         borrowApr: string;
         lendApr: string;
@@ -62,8 +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

@@ -8,23 +8,55 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import memoize from "memoizee";
-import { parseUnits, BN, toBN, formatUnits, formatNumber, } from "../../../utils";
+import { parseUnits, toBN, formatUnits, formatNumber, } from "../../../utils";
 import { _getMarketsData } from "../../../external-api";
 import { cacheKey, cacheStats } from "../../../cache";
+import { computeRatesFromRate, fetchMarketDataByVault } from "../../utils";
+const PRECISION = BigInt("1000000000000000000"); // 1e18
 export class StatsBaseModule {
     constructor(market) {
+        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'));
+                const _adminPercentage = yield this._fetchAdminPercentage();
+                return _rate * (PRECISION - _adminPercentage) / PRECISION;
+            }
+            else {
+                const [_rate, _adminPercentage] = yield Promise.all([
+                    this.llamalend.contracts[this.market.addresses.amm].contract.rate(this.llamalend.constantOptions),
+                    this._fetchAdminPercentage(),
+                ]);
+                cacheStats.set(cacheKey(this.market.addresses.controller, 'rate'), _rate);
+                return _rate * (PRECISION - _adminPercentage) / PRECISION;
+            }
+        });
+        this._getFutureRate = (_dReserves, _dDebt) => __awaiter(this, void 0, void 0, function* () {
+            const mpContract = this.llamalend.contracts[this.market.addresses.monetary_policy].contract;
+            const [_rate, _adminPercentage] = yield Promise.all([
+                mpContract.future_rate(this.market.addresses.controller, _dReserves, _dDebt),
+                this._fetchAdminPercentage(),
+            ]);
+            return _rate * (PRECISION - _adminPercentage) / PRECISION;
+        });
         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]
@@ -34,21 +66,6 @@ export class StatsBaseModule {
             promise: true,
             maxAge: 5 * 60 * 1000, // 5m
         });
-        this._getRate = (...args_1) => __awaiter(this, [...args_1], void 0, function* (isGetter = true) {
-            let _rate;
-            if (isGetter) {
-                _rate = cacheStats.get(cacheKey(this.market.addresses.amm, 'rate'));
-            }
-            else {
-                _rate = yield this.llamalend.contracts[this.market.addresses.amm].contract.rate(this.llamalend.constantOptions);
-                cacheStats.set(cacheKey(this.market.addresses.controller, 'rate'), _rate);
-            }
-            return _rate;
-        });
-        this._getFutureRate = (_dReserves, _dDebt) => __awaiter(this, void 0, void 0, function* () {
-            const mpContract = this.llamalend.contracts[this.market.addresses.monetary_policy].contract;
-            return yield mpContract.future_rate(this.market.addresses.controller, _dReserves, _dDebt);
-        });
         this.statsBandsInfo = memoize(() => __awaiter(this, void 0, void 0, function* () {
             const ammContract = this.llamalend.contracts[this.market.addresses.amm].multicallContract;
             const calls = [
@@ -68,42 +85,32 @@ export class StatsBaseModule {
         });
         this.statsAmmBalances = (...args_1) => __awaiter(this, [...args_1], void 0, function* (isGetter = true, useAPI = false) {
             if (useAPI) {
-                const response = yield _getMarketsData(this.llamalend.constants.NETWORK_NAME);
-                const market = response.lendingVaultData.find((item) => item.address.toLowerCase() === this.market.addresses.vault.toLowerCase());
-                if (market) {
-                    return {
-                        borrowed: market.ammBalances.ammBalanceBorrowed.toString(),
-                        collateral: market.ammBalances.ammBalanceCollateral.toString(),
-                    };
-                }
-                else {
-                    throw new Error('Market not found in API');
-                }
+                const market = yield this._fetchMarketDataFromAPI();
+                return {
+                    borrowed: market.ammBalances.ammBalanceBorrowed.toString(),
+                    collateral: market.ammBalances.ammBalanceCollateral.toString(),
+                };
             }
             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(),
@@ -111,42 +118,52 @@ export class StatsBaseModule {
                 };
             }
         });
+        this.statsAdminPercentage = () => __awaiter(this, void 0, void 0, function* () {
+            const _adminPercentage = yield this._fetchAdminPercentage();
+            return formatUnits(_adminPercentage * BigInt(100));
+        });
         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 response = yield _getMarketsData(this.llamalend.constants.NETWORK_NAME);
-                const market = response.lendingVaultData.find((item) => item.address.toLowerCase() === this.market.addresses.vault.toLowerCase());
-                if (market) {
-                    return {
-                        borrowApr: (market.rates.borrowApr * 100).toString(),
-                        lendApr: (market.rates.lendApr * 100).toString(),
-                        borrowApy: (market.rates.borrowApy * 100).toString(),
-                        lendApy: (market.rates.lendApy * 100).toString(),
-                    };
-                }
-                else {
-                    throw new Error('Market not found in API');
-                }
+                const market = yield this._fetchMarketDataFromAPI();
+                return {
+                    borrowApr: (market.rates.borrowApr * 100).toString(),
+                    lendApr: (market.rates.lendApr * 100).toString(),
+                    borrowApy: (market.rates.borrowApy * 100).toString(),
+                    lendApy: (market.rates.lendApy * 100).toString(),
+                };
             }
             else {
                 const _rate = yield this._getRate(isGetter);
-                const borrowApr = toBN(_rate).times(365).times(86400).times(100).toString();
-                // borrowApy = e**(rate*365*86400) - 1
-                const borrowApy = String(((Math.pow(2.718281828459, (toBN(_rate).times(365).times(86400)).toNumber())) - 1) * 100);
-                let lendApr = "0";
-                let lendApy = "0";
-                const debt = yield this.statsTotalDebt(isGetter);
-                if (Number(debt) > 0) {
-                    const { cap } = yield this.statsCapAndAvailable(isGetter);
-                    lendApr = toBN(_rate).times(365).times(86400).times(debt).div(cap).times(100).toString();
-                    // lendApy = (debt * e**(rate*365*86400) - debt) / cap
-                    const debtInAYearBN = BN(debt).times(Math.pow(2.718281828459, (toBN(_rate).times(365).times(86400)).toNumber()));
-                    lendApy = debtInAYearBN.minus(debt).div(cap).times(100).toString();
-                }
-                return { borrowApr, lendApr, borrowApy, lendApy };
+                const debt = yield this.statsTotalDebt(isGetter, false);
+                const { totalAssets } = Number(debt) > 0 ? yield this.statsCapAndAvailable(isGetter, false) : { totalAssets: "0" };
+                return computeRatesFromRate(_rate, debt, totalAssets);
             }
         });
     }
@@ -155,34 +172,22 @@ export class StatsBaseModule {
             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 borrowApr = toBN(_rate).times(365).times(86400).times(100).toString();
-            // borrowApy = e**(rate*365*86400) - 1
-            const borrowApy = String(((Math.pow(2.718281828459, (toBN(_rate).times(365).times(86400)).toNumber())) - 1) * 100);
-            let lendApr = "0";
-            let lendApy = "0";
             const debt = Number(yield this.statsTotalDebt()) + Number(dDebt);
-            if (Number(debt) > 0) {
-                const cap = Number((yield this.statsCapAndAvailable(true, useAPI)).cap) + Number(dReserves);
-                lendApr = toBN(_rate).times(365).times(86400).times(debt).div(cap).times(100).toString();
-                // lendApy = (debt * e**(rate*365*86400) - debt) / cap
-                const debtInAYearBN = BN(debt).times(Math.pow(2.718281828459, (toBN(_rate).times(365).times(86400)).toNumber()));
-                lendApy = debtInAYearBN.minus(debt).div(cap).times(100).toString();
-            }
-            return { borrowApr, lendApr, borrowApy, lendApy };
+            const cap = Number((yield this.statsCapAndAvailable(true, useAPI)).totalAssets) + Number(dReserves);
+            return computeRatesFromRate(_rate, debt, cap);
         });
     }
     statsBalances() {
         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),
@@ -226,14 +231,8 @@ export class StatsBaseModule {
     statsTotalDebt() {
         return __awaiter(this, arguments, void 0, function* (isGetter = true, useAPI = true) {
             if (useAPI) {
-                const response = yield _getMarketsData(this.llamalend.constants.NETWORK_NAME);
-                const market = response.lendingVaultData.find((item) => item.address.toLowerCase() === this.market.addresses.vault.toLowerCase());
-                if (market) {
-                    return market.borrowed.total.toString();
-                }
-                else {
-                    throw new Error('Market not found in API');
-                }
+                const market = yield this._fetchMarketDataFromAPI();
+                return market.borrowed.total.toString();
             }
             else {
                 let _debt;
@@ -248,44 +247,48 @@ export class StatsBaseModule {
             }
         });
     }
-    statsCapAndAvailable() {
-        return __awaiter(this, arguments, void 0, function* (isGetter = true, useAPI = false) {
-            if (useAPI) {
-                const response = yield _getMarketsData(this.llamalend.constants.NETWORK_NAME);
-                const market = response.lendingVaultData.find((item) => item.address.toLowerCase() === this.market.addresses.vault.toLowerCase());
-                if (market) {
-                    return {
-                        cap: market.totalSupplied.total.toString(),
-                        available: market.availableToBorrow.total.toString(),
-                    };
-                }
-                else {
-                    throw new Error('Market not found in API');
-                }
+    _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

@@ -1,3 +1,19 @@
+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

@@ -1,3 +1,69 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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);
+        this._fetchAdminPercentage = memoize(() => __awaiter(this, void 0, void 0, function* () {
+            return yield this.llamalend.contracts[this.market.addresses.controller].contract.admin_percentage(this.llamalend.constantOptions);
+        }), {
+            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 };
+        });
+    }
 }