@curvefi/llamalend-api 2.0.2 → 2.0.4

package/lib/index.d.ts

@@ -26,7 +26,7 @@ export declare function createLlamalend(): {
     readonly signerAddress: string;
     LendMarketTemplate: typeof LendMarketTemplate;
     MintMarketTemplate: typeof MintMarketTemplate;
-    getLendMarket: (lendMarketId: string) => LendMarketTemplate;
+    getLendMarket: (lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
     getMintMarket: (mintMarketId: string) => MintMarketTemplate;
     totalSupply: () => Promise<{
         total: string;
@@ -128,7 +128,7 @@ declare const _default: {
     readonly signerAddress: string;
     LendMarketTemplate: typeof LendMarketTemplate;
     MintMarketTemplate: typeof MintMarketTemplate;
-    getLendMarket: (lendMarketId: string) => LendMarketTemplate;
+    getLendMarket: (lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;
     getMintMarket: (mintMarketId: string) => MintMarketTemplate;
     totalSupply: () => Promise<{
         total: string;

package/lib/lendMarkets/LendMarketTemplate.d.ts

@@ -4,11 +4,14 @@ import { ILeverageZapV2 } from "./interfaces/leverageZapV2.js";
 import { IUserPosition, IWallet, IPrices, IAmm, IVault } from "./interfaces/common";
 import { IStatsV1, ILoanV1, ILeverageV1 } from "./interfaces/v1";
 import { IStatsV2, ILoanV2, ILeverageV2 } from "./interfaces/v2";
-export declare class LendMarketTemplate {
+type LoanForVersion<V extends 'v1' | 'v2'> = V extends 'v1' ? ILoanV1 : ILoanV2;
+type StatsForVersion<V extends 'v1' | 'v2'> = V extends 'v1' ? IStatsV1 : IStatsV2;
+type LeverageForVersion<V extends 'v1' | 'v2'> = V extends 'v1' ? ILeverageV1 : ILeverageV2;
+export declare class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
     private llamalend;
     id: string;
     name: string;
-    version: 'v1' | 'v2';
+    version: V;
     addresses: {
         amm: string;
         controller: string;
@@ -41,10 +44,11 @@ export declare class LendMarketTemplate {
     prices: IPrices;
     amm: IAmm;
     vault: IVault;
-    stats: IStatsV1 | IStatsV2;
-    loan: ILoanV1 | ILoanV2;
-    leverage: ILeverageV1 | ILeverageV2;
+    stats: StatsForVersion<V>;
+    loan: LoanForVersion<V>;
+    leverage: LeverageForVersion<V>;
     leverageZapV2: ILeverageZapV2;
     constructor(id: string, marketData: IOneWayMarket, llamalend: Llamalend);
     getLlamalend(): Llamalend;
 }
+export {};

package/lib/lendMarkets/LendMarketTemplate.js

@@ -29,7 +29,7 @@ export class LendMarketTemplate {
     constructor(id, marketData, llamalend) {
         this.swapDataCache = {};
         this.llamalend = llamalend;
-        this.version = marketData.version || 'v1';
+        this.version = (marketData.version || 'v1');
         this.id = id;
         this.name = marketData.name;
         this.addresses = marketData.addresses;
@@ -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/fetch/fetchLendMarkets.js

@@ -10,14 +10,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 import { getFactoryMarketDataV1, getFactoryMarketDataV2, getFactoryMarketDataByAPI } from "./fetchFactoryData.js";
 import LlammaABI from '../../constants/abis/Llamma.json' with { type: 'json' };
 import ControllerABI from '../../constants/abis/Controller.json' with { type: 'json' };
+import ControllerV2ABI from '../../constants/abis/ControllerV2.json' with { type: 'json' };
 import MonetaryPolicyABI from '../../constants/abis/MonetaryPolicy.json' with { type: 'json' };
 import VaultABI from '../../constants/abis/Vault.json' with { type: 'json' };
 import GaugeABI from '../../constants/abis/GaugeV5.json' with { type: 'json' };
 import SidechainGaugeABI from '../../constants/abis/SidechainGauge.json' with { type: 'json' };
+const controllerAbiMap = {
+    'v1': ControllerABI,
+    'v2': ControllerV2ABI,
+};
 const registerMarkets = (llamalend, names, amms, controllers, borrowed_tokens, collateral_tokens, monetary_policies, vaults, gauges, COIN_DATA, version) => {
     amms.forEach((amm, index) => {
         llamalend.setContract(amms[index], LlammaABI);
-        llamalend.setContract(controllers[index], ControllerABI);
+        llamalend.setContract(controllers[index], controllerAbiMap[version]);
         llamalend.setContract(monetary_policies[index], MonetaryPolicyABI);
         llamalend.setContract(vaults[index], VaultABI);
         if (gauges[index]) {

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/loanV2.d.ts

@@ -42,7 +42,7 @@ export interface ILoanV2 {
     repayPrices: (debt: TAmount, address?: string) => Promise<string[]>;
     repayIsApproved: (debt: TAmount) => Promise<boolean>;
     repayApprove: (debt: TAmount) => Promise<string[]>;
-    repayHealth: (debt: TAmount, full?: boolean, address?: string) => Promise<string>;
+    repayHealth: (debt: TAmount, shrink?: boolean, full?: boolean, address?: string) => Promise<string>;
     repay: (debt: TAmount, address?: string) => Promise<string>;
     repayFutureLeverage: (debt: TAmount, userAddress?: string) => Promise<string>;
     fullRepayIsApproved: (address?: string) => Promise<boolean>;

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/lendMarketConstructor.d.ts

@@ -1,3 +1,3 @@
 import { LendMarketTemplate } from "./LendMarketTemplate.js";
 import type { Llamalend } from "../llamalend.js";
-export declare const getLendMarket: (this: Llamalend, lendMarketId: string) => LendMarketTemplate;
+export declare const getLendMarket: (this: Llamalend, lendMarketId: string) => LendMarketTemplate<"v1"> | LendMarketTemplate<"v2">;

package/lib/lendMarkets/lendMarketConstructor.js

@@ -4,7 +4,12 @@ export const getLendMarket = function (lendMarketId) {
         const marketData = this.constants.ONE_WAY_MARKETS[lendMarketId] || this.constants.ONE_WAY_MARKETS_V2[lendMarketId];
         if (!marketData)
             throw new Error(`Lend market with id ${lendMarketId} not found`);
-        this.lendMarkets[lendMarketId] = new LendMarketTemplate(lendMarketId, marketData, this);
+        if (marketData.version === 'v2') {
+            this.lendMarkets[lendMarketId] = new LendMarketTemplate(lendMarketId, marketData, this);
+        }
+        else {
+            this.lendMarkets[lendMarketId] = new LendMarketTemplate(lendMarketId, marketData, this);
+        }
     }
     return this.lendMarkets[lendMarketId];
 };

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

@@ -71,7 +71,6 @@ export declare class LoanBaseModule {
     repayIsApproved(debt: number | string): Promise<boolean>;
     private repayApproveEstimateGas;
     repayApprove(debt: number | string): Promise<string[]>;
-    repayHealth(debt: number | string, full?: boolean, address?: string): Promise<string>;
     private _repay;
     repayEstimateGas(debt: number | string, address?: string): Promise<TGas>;
     repay(debt: number | string, address?: string): Promise<string>;

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

@@ -162,10 +162,8 @@ export class LoanBaseModule {
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            // TODO: verify parameters
-            let _health = yield contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
+            const _health = yield contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
         });
     }
     createLoanIsApproved(collateral) {
@@ -254,9 +252,8 @@ export class LoanBaseModule {
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            let _health = yield contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
+            const _health = yield contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
         });
     }
     borrowMoreIsApproved(collateral) {
@@ -345,9 +342,8 @@ export class LoanBaseModule {
             address = _getAddress.call(this.llamalend, address);
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            let _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
+            const _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
         });
     }
     addCollateralIsApproved(collateral) {
@@ -444,9 +440,8 @@ export class LoanBaseModule {
             address = _getAddress.call(this.llamalend, address);
             const _collateral = parseUnits(collateral, this.market.collateral_token.decimals) * BigInt(-1);
             const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            let _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
+            const _health = yield contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
         });
     }
     _removeCollateral(collateral, estimateGas) {
@@ -532,16 +527,6 @@ export class LoanBaseModule {
             return yield ensureAllowance.call(this.llamalend, [this.market.borrowed_token.address], [debt], this.market.addresses.controller);
         });
     }
-    repayHealth(debt_1) {
-        return __awaiter(this, arguments, void 0, function* (debt, full = true, address = "") {
-            address = _getAddress.call(this.llamalend, address);
-            const _debt = parseUnits(debt) * BigInt(-1);
-            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-            let _health = yield contract.health_calculator(address, 0, _debt, full, 0, this.llamalend.constantOptions);
-            _health = _health * BigInt(100);
-            return formatUnits(_health);
-        });
-    }
     _repay(debt, address, estimateGas) {
         return __awaiter(this, void 0, void 0, function* () {
             address = _getAddress.call(this.llamalend, address);

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/v1/loanV1.d.ts

@@ -1,4 +1,5 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV1 } from "../../interfaces/v1/loanV1";
 export declare class LoanV1Module extends LoanBaseModule implements ILoanV1 {
+    repayHealth(debt: number | string, full?: boolean, address?: string): Promise<string>;
 }

package/lib/lendMarkets/modules/v1/loanV1.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 { LoanBaseModule } from "../common/loanBase.js";
+import { _getAddress, formatUnits, parseUnits } from "../../../utils";
 export class LoanV1Module extends LoanBaseModule {
+    repayHealth(debt_1) {
+        return __awaiter(this, arguments, void 0, function* (debt, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _debt = parseUnits(debt) * BigInt(-1);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.health_calculator(address, 0, _debt, full, 0, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
 }

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

@@ -1,4 +1,9 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV2 } from "../../interfaces/v2";
 export declare class LoanV2Module extends LoanBaseModule implements ILoanV2 {
+    createLoanHealth(collateral: number | string, debt: number | string, range: number, full?: boolean): Promise<string>;
+    addCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    removeCollateralHealth(collateral: number | string, full?: boolean, address?: string): Promise<string>;
+    borrowMoreHealth(collateral: number | string, debt: number | string, full?: boolean, address?: string): Promise<string>;
+    repayHealth(debt: number | string, shrink?: boolean, full?: boolean, address?: string): Promise<string>;
 }

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

@@ -1,3 +1,60 @@
+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 { LoanBaseModule } from "../common/loanBase.js";
+import { _getAddress, formatUnits, parseUnits } from "../../../utils";
 export class LoanV2Module extends LoanBaseModule {
+    createLoanHealth(collateral_1, debt_1, range_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, debt, range, full = true) {
+            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
+            const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
+            const address = _getAddress.call(this.llamalend, '');
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.create_loan_health_preview(_collateral, _debt, range, address, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
+    addCollateralHealth(collateral_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.add_collateral_health_preview(_collateral, address, address, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
+    removeCollateralHealth(collateral_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.remove_collateral_health_preview(_collateral, address, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
+    borrowMoreHealth(collateral_1, debt_1) {
+        return __awaiter(this, arguments, void 0, function* (collateral, debt, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
+            const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.borrow_more_health_preview(_collateral, _debt, address, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
+    repayHealth(debt_1) {
+        return __awaiter(this, arguments, void 0, function* (debt, shrink = false, full = true, address = "") {
+            address = _getAddress.call(this.llamalend, address);
+            const _debt = parseUnits(debt);
+            const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+            const _health = yield contract.repay_health_preview(0, _debt, address, address, shrink, full, this.llamalend.constantOptions);
+            return formatUnits(_health * BigInt(100));
+        });
+    }
 }

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>;