@curvefi/llamalend-api 2.0.3 → 2.0.4

package/docs/SUPPORT_LLv2.md

@@ -143,6 +143,12 @@ This document tracks feature support across market versions.
 | ammBalances() | ✅ | ✅ | ✅ | ✅ | ✅ |
 | capAndAvailable() | ✅ | ✅ | ❌ | ✅ | ❌ |
 
+## Stats Module (`market.stats`) new methods
+| Method | v1 | v2 | Same logic | Same params | Same type |
+|--------|----|----|-----------------|----------------------|-----------------------|
+| adminPercentage() | ✅ | ✅ | ✅ | ✅ | ✅ |
+
+
 ---
 
 ## Wallet Module (`market.wallet`)

package/lib/lendMarkets/LendMarketTemplate.js

@@ -68,16 +68,17 @@ 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),

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

@@ -46,4 +46,5 @@ export interface IStatsV1 {
         cap: string;
         available: string;
     }>;
+    adminPercentage: () => Promise<string>;
 }

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

@@ -46,4 +46,5 @@ export interface IStatsV2 {
         cap: string;
         available: string;
     }>;
+    adminPercentage: () => Promise<string>;
 }

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

@@ -6,6 +6,9 @@ export declare class StatsBaseModule {
     protected market: LendMarketTemplate;
     protected llamalend: Llamalend;
     constructor(market: LendMarketTemplate);
+    protected _fetchAdminPercentage: () => Promise<bigint>;
+    private _getRate;
+    private _getFutureRate;
     statsParameters: (() => Promise<{
         fee: string;
         admin_fee: string;
@@ -21,8 +24,6 @@ export declare class StatsBaseModule {
         base_price: string;
         A: string;
     }>>;
-    private _getRate;
-    private _getFutureRate;
     statsRates(isGetter?: boolean, useAPI?: boolean): Promise<{
         borrowApr: string;
         lendApr: string;
@@ -66,4 +67,5 @@ export declare class StatsBaseModule {
         cap: string;
         available: string;
     }>;
+    statsAdminPercentage: () => Promise<string>;
 }

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

@@ -8,11 +8,39 @@ 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._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;
@@ -34,21 +62,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,17 +81,11 @@ 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 fetchMarketDataByVault(this.llamalend.constants.NETWORK_NAME, this.market.addresses.vault, _getMarketsData);
+                return {
+                    borrowed: market.ammBalances.ammBalanceBorrowed.toString(),
+                    collateral: market.ammBalances.ammBalanceCollateral.toString(),
+                };
             }
             else {
                 const borrowedContract = this.llamalend.contracts[this.market.addresses.borrowed_token].multicallContract;
@@ -111,42 +118,29 @@ 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();
     }
     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 fetchMarketDataByVault(this.llamalend.constants.NETWORK_NAME, this.market.addresses.vault, _getMarketsData);
+                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 { cap } = Number(debt) > 0 ? yield this.statsCapAndAvailable(isGetter) : { cap: "0" };
+                return computeRatesFromRate(_rate, debt, cap);
             }
         });
     }
@@ -155,20 +149,9 @@ 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)).cap) + Number(dReserves);
+            return computeRatesFromRate(_rate, debt, cap);
         });
     }
     statsBalances() {
@@ -226,14 +209,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 fetchMarketDataByVault(this.llamalend.constants.NETWORK_NAME, this.market.addresses.vault, _getMarketsData);
+                return market.borrowed.total.toString();
             }
             else {
                 let _debt;
@@ -251,17 +228,11 @@ 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');
-                }
+                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(),
+                };
             }
             else {
                 const vaultContract = this.llamalend.contracts[this.market.addresses.vault].multicallContract;

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

@@ -1,3 +1,5 @@
+import memoize from "memoizee";
 import { StatsBaseModule } from "../common/statsBase.js";
 export declare class StatsV2Module extends StatsBaseModule {
+    protected _fetchAdminPercentage: (() => Promise<bigint>) & memoize.Memoized<() => Promise<bigint>>;
 }

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

@@ -1,3 +1,22 @@
+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";
 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
+        });
+    }
 }

package/lib/lendMarkets/utils.d.ts

@@ -0,0 +1,14 @@
+import { INetworkName, IMarketData, IMarketDataAPI } from "../interfaces";
+export type RatesResult = {
+    borrowApr: string;
+    lendApr: string;
+    borrowApy: string;
+    lendApy: string;
+};
+/**
+ * Computes borrow/lend APR and APY from a raw per-second rate and current debt/cap.
+ * borrowApy = e^(rate * 365 * 86400) - 1
+ * lendApy   = (debt * e^(rate * 365 * 86400) - debt) / cap
+ */
+export declare const computeRatesFromRate: (_rate: bigint, debt: string | number, cap: string | number) => RatesResult;
+export declare const fetchMarketDataByVault: (networkName: INetworkName, vaultAddress: string, getData: (network: INetworkName) => Promise<IMarketData>) => Promise<IMarketDataAPI>;

package/lib/lendMarkets/utils.js

@@ -0,0 +1,31 @@
+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 { BN, toBN } from "../utils";
+/**
+ * Computes borrow/lend APR and APY from a raw per-second rate and current debt/cap.
+ * borrowApy = e^(rate * 365 * 86400) - 1
+ * lendApy   = (debt * e^(rate * 365 * 86400) - debt) / cap
+ */
+export const computeRatesFromRate = (_rate, debt, cap) => {
+    const annualFactor = toBN(_rate).times(365).times(86400);
+    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();
+    return { borrowApr, lendApr, borrowApy, lendApy };
+};
+export const fetchMarketDataByVault = (networkName, vaultAddress, getData) => __awaiter(void 0, void 0, void 0, function* () {
+    const response = yield getData(networkName);
+    const market = response.lendingVaultData.find((item) => item.address.toLowerCase() === vaultAddress.toLowerCase());
+    if (!market)
+        throw new Error("Market not found in API");
+    return market;
+});

package/package.json

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

package/src/lendMarkets/LendMarketTemplate.ts

@@ -166,16 +166,17 @@ export class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
         }
 
         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),
         } as StatsForVersion<V>
 
         this.wallet = {

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

@@ -18,4 +18,5 @@ export interface IStatsV1 {
     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 }>,
+    adminPercentage: () => Promise<string>,
 }

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

@@ -18,4 +18,5 @@ export interface IStatsV2 {
     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 }>,
+    adminPercentage: () => Promise<string>,
 }

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

@@ -3,7 +3,6 @@ import {TAmount} from "../../../interfaces";
 import type { LendMarketTemplate } from "../../LendMarketTemplate";
 import {
     parseUnits,
-    BN,
     toBN,
     formatUnits,
     formatNumber,
@@ -11,6 +10,8 @@ import {
 import {Llamalend} from "../../../llamalend";
 import {_getMarketsData} from "../../../external-api";
 import {cacheKey, cacheStats} from "../../../cache";
+import { computeRatesFromRate, fetchMarketDataByVault } from "../../utils";
+const PRECISION = BigInt("1000000000000000000"); // 1e18
 
 export class StatsBaseModule {
     protected market: LendMarketTemplate;
@@ -21,6 +22,34 @@ export class StatsBaseModule {
         this.llamalend = market.getLlamalend();
     }
 
+    protected _fetchAdminPercentage = async (): Promise<bigint> => {
+        return BigInt(0)
+    }
+
+    private _getRate = async (isGetter = true): Promise<bigint> => {
+        if (isGetter) {
+            const _rate: bigint = cacheStats.get(cacheKey(this.market.addresses.amm, 'rate'));
+            const _adminPercentage = await this._fetchAdminPercentage();
+            return _rate * (PRECISION - _adminPercentage) / PRECISION;
+        } else {
+            const [_rate, _adminPercentage] = await 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;
+        }
+    }
+
+    private _getFutureRate = async (_dReserves: bigint, _dDebt: bigint): Promise<bigint> => {
+        const mpContract = this.llamalend.contracts[this.market.addresses.monetary_policy].contract;
+        const [_rate, _adminPercentage] = await Promise.all([
+            mpContract.future_rate(this.market.addresses.controller, _dReserves, _dDebt),
+            this._fetchAdminPercentage(),
+        ]);
+        return _rate * (PRECISION - _adminPercentage) / PRECISION;
+    }
+
     public statsParameters = memoize(async (): Promise<{
         fee: string, // %
         admin_fee: string, // %
@@ -53,55 +82,24 @@ export class StatsBaseModule {
         maxAge: 5 * 60 * 1000, // 5m
     });
 
-    private _getRate = async (isGetter = true): Promise<bigint> => {
-        let _rate;
-        if(isGetter) {
-            _rate = cacheStats.get(cacheKey(this.market.addresses.amm, 'rate'));
-        } else {
-            _rate = await this.llamalend.contracts[this.market.addresses.amm].contract.rate(this.llamalend.constantOptions);
-            cacheStats.set(cacheKey(this.market.addresses.controller, 'rate'), _rate);
-        }
-        return _rate;
-    }
-
-    private _getFutureRate = async (_dReserves: bigint, _dDebt: bigint): Promise<bigint> => {
-        const mpContract = this.llamalend.contracts[this.market.addresses.monetary_policy].contract;
-        return await mpContract.future_rate(this.market.addresses.controller, _dReserves, _dDebt);
-    }
-
     public async statsRates(isGetter = true, useAPI = false): Promise<{borrowApr: string, lendApr: string, borrowApy: string, lendApy: string}> {
         if(useAPI) {
-            const response = await _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 = await fetchMarketDataByVault(
+                this.llamalend.constants.NETWORK_NAME,
+                this.market.addresses.vault,
+                _getMarketsData
+            );
+            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 = await this._getRate(isGetter);
-            const borrowApr =  toBN(_rate).times(365).times(86400).times(100).toString();
-            // borrowApy = e**(rate*365*86400) - 1
-            const borrowApy = String(((2.718281828459 ** (toBN(_rate).times(365).times(86400)).toNumber()) - 1) * 100);
-            let lendApr = "0";
-            let lendApy = "0";
             const debt = await this.statsTotalDebt(isGetter);
-            if (Number(debt) > 0) {
-                const { cap } = await 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(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(debt) > 0 ? await this.statsCapAndAvailable(isGetter) : { cap: "0" };
+            return computeRatesFromRate(_rate, debt, cap);
         }
     }
 
@@ -109,21 +107,9 @@ export class StatsBaseModule {
         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 borrowApr =  toBN(_rate).times(365).times(86400).times(100).toString();
-        // borrowApy = e**(rate*365*86400) - 1
-        const borrowApy = String(((2.718281828459 ** (toBN(_rate).times(365).times(86400)).toNumber()) - 1) * 100);
-        let lendApr = "0";
-        let lendApy = "0";
         const debt = Number(await this.statsTotalDebt()) + Number(dDebt);
-        if (Number(debt) > 0) {
-            const cap = Number((await 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(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((await this.statsCapAndAvailable(true, useAPI)).cap) + Number(dReserves);
+        return computeRatesFromRate(_rate, debt, cap);
     }
 
     public async statsBalances(): Promise<[string, string]> {
@@ -202,15 +188,12 @@ export class StatsBaseModule {
 
     public async statsTotalDebt(isGetter = true, useAPI = true): Promise<string> {
         if(useAPI) {
-            const response = await _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 = await fetchMarketDataByVault(
+                this.llamalend.constants.NETWORK_NAME,
+                this.market.addresses.vault,
+                _getMarketsData
+            );
+            return market.borrowed.total.toString();
         } else {
             let _debt;
             if(isGetter) {
@@ -226,18 +209,15 @@ export class StatsBaseModule {
 
     public statsAmmBalances = async (isGetter = true, useAPI = false): Promise<{ borrowed: string, collateral: string }> => {
         if(useAPI) {
-            const response = await _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 = await fetchMarketDataByVault(
+                this.llamalend.constants.NETWORK_NAME,
+                this.market.addresses.vault,
+                _getMarketsData
+            );
+            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;
@@ -273,18 +253,15 @@ export class StatsBaseModule {
 
     public async statsCapAndAvailable(isGetter = true, useAPI = false): Promise<{ cap: string, available: string }> {
         if(useAPI) {
-            const response = await _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')
-            }
+            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;
@@ -310,4 +287,9 @@ export class StatsBaseModule {
             // add cap: controller.borrow_cap() // Display
         }
     }
+
+    public statsAdminPercentage = async (): Promise<string> => {
+        const _adminPercentage = await this._fetchAdminPercentage();
+        return formatUnits(_adminPercentage * BigInt(100));
+    }
 }

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

@@ -1,3 +1,11 @@
+import memoize from "memoizee";
 import { StatsBaseModule } from "../common/statsBase.js";
 
-export class StatsV2Module extends StatsBaseModule {}
+export class StatsV2Module extends StatsBaseModule {
+    protected _fetchAdminPercentage = memoize(async (): Promise<bigint> => {
+        return await this.llamalend.contracts[this.market.addresses.controller].contract.admin_percentage(this.llamalend.constantOptions);
+    }, {
+        promise: true,
+        maxAge: 30 * 60 * 1000, // 30m
+    });
+}

package/src/lendMarkets/utils.ts

@@ -0,0 +1,44 @@
+import { BN, toBN } from "../utils";
+import { INetworkName, IMarketData, IMarketDataAPI } from "../interfaces";
+
+export type RatesResult = {
+    borrowApr: string;
+    lendApr: string;
+    borrowApy: string;
+    lendApy: string;
+};
+
+/**
+ * Computes borrow/lend APR and APY from a raw per-second rate and current debt/cap.
+ * borrowApy = e^(rate * 365 * 86400) - 1
+ * lendApy   = (debt * e^(rate * 365 * 86400) - debt) / cap
+ */
+export const computeRatesFromRate = (
+    _rate: bigint,
+    debt: string | number,
+    cap: string | number
+): RatesResult => {
+    const annualFactor = toBN(_rate).times(365).times(86400);
+    const expFactor = 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();
+
+    return { borrowApr, lendApr, borrowApy, lendApy };
+}
+
+export const fetchMarketDataByVault = async (
+    networkName: INetworkName,
+    vaultAddress: string,
+    getData: (network: INetworkName) => Promise<IMarketData>
+): Promise<IMarketDataAPI> => {
+    const response = await getData(networkName);
+    const market = response.lendingVaultData.find(
+        (item) => item.address.toLowerCase() === vaultAddress.toLowerCase()
+    );
+    if (!market) throw new Error("Market not found in API");
+    return market;
+}