@curvefi/llamalend-api 2.0.2 → 2.0.4

package/src/lendMarkets/LendMarketTemplate.ts

@@ -24,6 +24,10 @@ import {
     VaultModule,
 } from "./modules/common";
 
+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;
+
 type V1ModuleConstructors = {
     UserPosition: typeof UserPositionModule;
     Stats: typeof StatsV1Module;
@@ -73,11 +77,11 @@ const versionModules: { v1: V1ModuleConstructors; v2: V2ModuleConstructors } = {
     },
 };
 
-export class LendMarketTemplate {
+export class LendMarketTemplate<V extends 'v1' | 'v2' = 'v1' | 'v2'> {
     private llamalend: Llamalend;
     id: string;
     name: string;
-    version: 'v1' | 'v2';
+    version: V;
     addresses: {
         amm: string,
         controller: string,
@@ -111,14 +115,14 @@ export 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) {
         this.llamalend = llamalend;
-        this.version = marketData.version || 'v1';
+        this.version = (marketData.version || 'v1') as V;
         this.id = id;
         this.name = marketData.name;
         this.addresses = marketData.addresses;
@@ -162,17 +166,18 @@ export class LendMarketTemplate {
         }
 
         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 = {
             balances: wallet.balances.bind(this),
@@ -285,7 +290,7 @@ export class LendMarketTemplate {
                 partialSelfLiquidateApprove: loan.estimateGas.partialSelfLiquidateApprove,
                 partialSelfLiquidate: loan.partialSelfLiquidateEstimateGas.bind(loan),
             },
-        }
+        } as LoanForVersion<V>
 
         this.vault = {
             maxDeposit: vault.vaultMaxDeposit.bind(vault),
@@ -389,7 +394,7 @@ export class LendMarketTemplate {
                 repayApprove: leverageZapV1.leverageRepayApproveEstimateGas.bind(leverageZapV1),
                 repay: leverageZapV1.leverageRepayEstimateGas.bind(leverageZapV1),
             },
-        }
+        } as LeverageForVersion<V>
 
         this.leverageZapV2 = {
             hasLeverage: leverageZapV2.hasLeverage.bind(leverageZapV2),

package/src/lendMarkets/fetch/fetchLendMarkets.ts

@@ -4,11 +4,17 @@ import { getFactoryMarketDataV1, getFactoryMarketDataV2, getFactoryMarketDataByA
 
 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: Llamalend,
     names: string[],
@@ -24,7 +30,7 @@ const registerMarkets = (
 ) => {
     amms.forEach((amm: string, index: number) => {
         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/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/loanV2.ts

@@ -41,7 +41,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>;
 

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

@@ -1,11 +1,15 @@
 import { LendMarketTemplate} from "./LendMarketTemplate.js";
 import type { Llamalend } from "../llamalend.js";
 
-export const getLendMarket = function (this: Llamalend, lendMarketId: string): LendMarketTemplate {
+export const getLendMarket = function (this: Llamalend, lendMarketId: string): LendMarketTemplate<'v1'> | LendMarketTemplate<'v2'> {
     if (!(lendMarketId in this.lendMarkets)) {
         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<'v2'>(lendMarketId, marketData, this);
+        } else {
+            this.lendMarkets[lendMarketId] = new LendMarketTemplate<'v1'>(lendMarketId, marketData, this);
+        }
     }
     return this.lendMarkets[lendMarketId];
 }

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

@@ -155,11 +155,10 @@ export class LoanBaseModule {
         const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        // TODO: verify parameters
-        let _health = await contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
 
-        return formatUnits(_health);
+        const _health = await contract.health_calculator(this.llamalend.constants.ZERO_ADDRESS, _collateral, _debt, full, range, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
     }
 
     public async createLoanIsApproved(collateral: number | string): Promise<boolean> {
@@ -243,10 +242,9 @@ export class LoanBaseModule {
         const _debt = parseUnits(debt, this.market.borrowed_token.decimals);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        let _health = await contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
+        const _health = await contract.health_calculator(address, _collateral, _debt, full, 0, this.llamalend.constantOptions) as bigint;
 
-        return formatUnits(_health);
+        return formatUnits(_health * BigInt(100));
     }
 
     public async borrowMoreIsApproved(collateral: number | string): Promise<boolean> {
@@ -330,10 +328,9 @@ export class LoanBaseModule {
         const _collateral = parseUnits(collateral, this.market.collateral_token.decimals);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        let _health = await contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
+        const _health = await contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions) as bigint;
 
-        return formatUnits(_health);
+        return formatUnits(_health * BigInt(100));
     }
 
     public async addCollateralIsApproved(collateral: number | string): Promise<boolean> {
@@ -424,10 +421,9 @@ export class LoanBaseModule {
         const _collateral = parseUnits(collateral, this.market.collateral_token.decimals) * BigInt(-1);
 
         const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        let _health = await contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
+        const _health = await contract.health_calculator(address, _collateral, 0, full, 0, this.llamalend.constantOptions) as bigint;
 
-        return formatUnits(_health);
+        return formatUnits(_health * BigInt(100));
     }
 
     private async _removeCollateral(collateral: number | string, estimateGas: boolean): Promise<string | TGas> {
@@ -505,17 +501,6 @@ export class LoanBaseModule {
         return await ensureAllowance.call(this.llamalend, [this.market.borrowed_token.address], [debt], this.market.addresses.controller);
     }
 
-    public async repayHealth(debt: number | string, full = true, address = ""): Promise<string> {
-        address = _getAddress.call(this.llamalend, address);
-        const _debt = parseUnits(debt) * BigInt(-1);
-
-        const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
-        let _health = await contract.health_calculator(address, 0, _debt, full, 0, this.llamalend.constantOptions) as bigint;
-        _health = _health * BigInt(100);
-
-        return formatUnits(_health);
-    }
-
     private async _repay(debt: number | string, address: string, estimateGas: boolean): Promise<string | TGas> {
         address = _getAddress.call(this.llamalend, address);
         const { debt: currentDebt } = await this.market.userPosition.userState(address);

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

@@ -1,4 +1,15 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV1 } from "../../interfaces/v1/loanV1";
+import {_getAddress, formatUnits, parseUnits} from "../../../utils";
 
-export class LoanV1Module extends LoanBaseModule implements ILoanV1 {}
+export class LoanV1Module extends LoanBaseModule implements ILoanV1 {
+    public async repayHealth(debt: number | string, full = true, address = ""): Promise<string> {
+        address = _getAddress.call(this.llamalend, address);
+        const _debt = parseUnits(debt) * BigInt(-1);
+
+        const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+        const _health = await contract.health_calculator(address, 0, _debt, full, 0, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+}

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

@@ -1,4 +1,58 @@
 import { LoanBaseModule } from "../common/loanBase.js";
 import { ILoanV2 } from "../../interfaces/v2";
+import {_getAddress, formatUnits, parseUnits} from "../../../utils";
 
-export class LoanV2Module extends LoanBaseModule implements ILoanV2 {}
+export class LoanV2Module extends LoanBaseModule implements ILoanV2 {
+    public async createLoanHealth(collateral: number | string, debt: number | string, range: number, full = true): Promise<string> {
+        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 = await contract.create_loan_health_preview(_collateral, _debt, range, address, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+
+    public async addCollateralHealth(collateral: number | string, full = true, address = ""): Promise<string> {
+        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 = await contract.add_collateral_health_preview(_collateral, address, address, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+
+    public async removeCollateralHealth(collateral: number | string, full = true, address = ""): Promise<string> {
+        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 = await contract.remove_collateral_health_preview(_collateral, address, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+
+    public async borrowMoreHealth(collateral: number | string, debt: number | string, full = true, address = ""): Promise<string> {
+        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 = await contract.borrow_more_health_preview(_collateral, _debt, address, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * BigInt(100));
+    }
+
+    public async repayHealth(debt: number | string, shrink = false, full = true, address = ""): Promise<string> {
+        address = _getAddress.call(this.llamalend, address);
+        const _debt = parseUnits(debt);
+
+        const contract = this.llamalend.contracts[this.market.addresses.controller].contract;
+        const _health = await contract.repay_health_preview(0, _debt, address, address, shrink, full, this.llamalend.constantOptions) as bigint;
+
+        return formatUnits(_health * 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;
+}

package/src/llamalend.ts

@@ -99,7 +99,7 @@ class Llamalend implements ILlamalend {
     chainId: IChainId;
     contracts: { [index: string]: ICurveContract };
     mintMarkets: { [addres: string]: MintMarketTemplate };
-    lendMarkets: { [addres: string]: LendMarketTemplate };
+    lendMarkets: { [address: string]: LendMarketTemplate<'v1'> | LendMarketTemplate<'v2'> };
     feeData: { gasPrice?: number, maxFeePerGas?: number, maxPriorityFeePerGas?: number };
     constantOptions: { gasLimit: number };
     options: { gasPrice?: number | bigint, maxFeePerGas?: number | bigint, maxPriorityFeePerGas?: number | bigint };